diff --git a/beeline/pom.xml b/beeline/pom.xml
index 4806fb7ede50..3001018004f2 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -133,6 +133,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sf.supercsv</groupId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 862cbda11f46..8b241dd27291 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -88,6 +88,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
index 5852535a7ac3..a8f1c39141a8 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHs2ConnectionMetricsHttp.java
@@ -24,14 +24,14 @@
 import org.apache.hadoop.hive.common.metrics.common.MetricsFactory;
 import org.apache.hadoop.hive.common.metrics.metrics2.CodahaleMetrics;
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hive.jdbc.HttpBasicAuthInterceptor;
 import org.apache.hive.service.rpc.thrift.TCLIService;
 import org.apache.hive.service.rpc.thrift.TCloseSessionReq;
 import org.apache.hive.service.rpc.thrift.TOpenSessionReq;
 import org.apache.hive.service.rpc.thrift.TOpenSessionResp;
 import org.apache.hive.service.rpc.thrift.TSessionHandle;
-import org.apache.http.client.CookieStore;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.THttpClient;
@@ -89,14 +89,14 @@ public void testOpenConnectionMetrics() throws Exception {
   }
 
   private TCLIService.Client getHttpClient() throws Exception {
-    DefaultHttpClient httpClient = new DefaultHttpClient();
+    HttpClientBuilder httpClient = HttpClientBuilder.create();
 
     Map<String, String> headers = new HashMap<>();
     headers.put("Connection", "close");
-    httpClient.addRequestInterceptor(new BasicHttpRequestInterceptor(USERNAME, PASSWORD, null,
+    httpClient.addRequestInterceptorLast(new BasicHttpRequestInterceptor(USERNAME, PASSWORD, null,
             null, false, headers));
 
-    TTransport transport = new THttpClient(getHttpUrl(), httpClient);
+    TTransport transport = new THttpClient(getHttpUrl(), httpClient.build());
     TProtocol protocol = new TBinaryProtocol(transport);
     return new TCLIService.Client(protocol);
   }
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/TestHttpServices.java b/itests/hive-unit/src/test/java/org/apache/hive/service/TestHttpServices.java
index d4f9ab1fc6ad..9aa0e260f155 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/service/TestHttpServices.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/service/TestHttpServices.java
@@ -20,11 +20,11 @@
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.Header;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.Header;
 import org.apache.hive.jdbc.miniHS2.MiniHS2;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -83,7 +83,7 @@ private void testHttpServiceDoesNotContainServerVersionAndXPoweredBy(String mini
       HttpGet request = new HttpGet(miniHS2);
 
       try (CloseableHttpResponse response = httpClient.execute(request)) {
-        for (Header header : response.getAllHeaders()) {
+        for (Header header : response.getHeaders()) {
           Assert.assertNotEquals("x-powered-by", header.getName().toLowerCase());
           Assert.assertNotEquals("server", header.getName().toLowerCase());
         }
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java
index 5aa8f42e7f02..9521c1cfd44e 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java
@@ -45,20 +45,22 @@
 import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject;
 import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzContext;
 import org.apache.hadoop.hive.common.IPStackUtils;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.protocol.RequestDefaultHeaders;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hive.jdbc.HttpBasicAuthInterceptor;
 import org.apache.hive.service.auth.HiveAuthConstants;
 import org.apache.hive.service.rpc.thrift.TCLIService;
 import org.apache.hive.service.rpc.thrift.TExecuteStatementReq;
 import org.apache.hive.service.rpc.thrift.TOpenSessionReq;
 import org.apache.hive.service.rpc.thrift.TOpenSessionResp;
-import org.apache.http.Header;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.protocol.RequestDefaultHeaders;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HttpContext;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.THttpClient;
@@ -101,13 +103,13 @@ public HttpBasicAuthInterceptorWithLogging(String username, String password,
     }
 
     @Override
-    public void process(HttpRequest httpRequest, HttpContext httpContext)
+    public void process(HttpRequest httpRequest, EntityDetails entityDetails, HttpContext httpContext)
         throws HttpException, IOException {
-      super.process(httpRequest, httpContext);
+      super.process(httpRequest, entityDetails, httpContext);
 
       String currHeaders = "";
 
-      for (org.apache.http.Header h : httpRequest.getAllHeaders()) {
+      for (Header h : httpRequest.getHeaders()) {
         currHeaders += h.getName() + ":" + h.getValue() + " ";
       }
       requestHeaders.add(currHeaders);
@@ -222,11 +224,15 @@ private TTransport getRawBinaryTransport() throws Exception {
   }
 
   private static TTransport getHttpTransport() throws Exception {
-    DefaultHttpClient httpClient = new DefaultHttpClient();
     String httpUrl = getHttpUrl();
-    httpClient.addRequestInterceptor(
-        new HttpBasicAuthInterceptor(USERNAME, PASSWORD,
-            null, null, false, null, null));
+
+    HttpClient httpClient = HttpClientBuilder.create()
+        .addRequestInterceptorLast(
+            new HttpBasicAuthInterceptor(USERNAME, PASSWORD,
+                null, null, false, null, null)
+        )
+        .build();
+
     return new THttpClient(httpUrl, httpClient);
   }
 
@@ -281,12 +287,13 @@ public void testCustomCookies() throws Exception {
   public HttpBasicAuthInterceptorWithLogging openSessionWithTestInterceptor(
           Map<String, String> additionalHeaders, Map<String, String> cookieHeaders) throws Exception {
     TTransport transport;
-    DefaultHttpClient hClient = new DefaultHttpClient();
     String httpUrl = getHttpUrl();
     HttpBasicAuthInterceptorWithLogging authInt =
-      new HttpBasicAuthInterceptorWithLogging(USERNAME, PASSWORD, null, null,
-      false, additionalHeaders, cookieHeaders);
-    hClient.addRequestInterceptor(authInt);
+        new HttpBasicAuthInterceptorWithLogging(USERNAME, PASSWORD, null, null,
+            false, additionalHeaders, cookieHeaders);
+    HttpClient hClient = HttpClientBuilder.create()
+        .addRequestInterceptorLast(authInt)
+        .build();
     transport = new THttpClient(httpUrl, hClient);
     TCLIService.Client httpClient = getClient(transport);
 
@@ -324,24 +331,24 @@ public void testForwardedHeaders() throws Exception {
 
   private void verifyForwardedHeaders(ArrayList<String> headerIPs, String cmd) throws Exception {
     TTransport transport;
-    DefaultHttpClient hClient = new DefaultHttpClient();
     String httpUrl = getHttpUrl();
+    HttpClientBuilder hClient = HttpClientBuilder.create();
 
     // add an interceptor that adds the X-Forwarded-For header with given ips
     if (!headerIPs.isEmpty()) {
       Header xForwardHeader = new BasicHeader("X-Forwarded-For", Joiner.on(",").join(headerIPs));
       RequestDefaultHeaders headerInterceptor = new RequestDefaultHeaders(
           Arrays.asList(xForwardHeader));
-      hClient.addRequestInterceptor(headerInterceptor);
+      hClient.addRequestInterceptorLast(headerInterceptor);
     }
 
     // interceptor for adding username, pwd
     HttpBasicAuthInterceptor authInt = new HttpBasicAuthInterceptor(USERNAME,
             PASSWORD, null, null,
         false, null, null);
-    hClient.addRequestInterceptor(authInt);
+    hClient.addRequestInterceptorLast(authInt);
 
-    transport = new THttpClient(httpUrl, hClient);
+    transport = new THttpClient(httpUrl, hClient.build());
     TCLIService.Client httpClient = getClient(transport);
 
     // Create a new open session request object
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 3243d5d66f7f..555421420c95 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -113,16 +113,28 @@
     </dependency>
     <!-- inter-project -->
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
+      <version>${httpcomponents5.client.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
+      <version>${httpcomponents5.core.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
@@ -179,6 +191,12 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>
diff --git a/jdbc/src/java/org/apache/hive/jdbc/CsrfHttpRequestInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/CsrfHttpRequestInterceptor.java
index e23df76ac491..b33784225097 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/CsrfHttpRequestInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/CsrfHttpRequestInterceptor.java
@@ -18,10 +18,11 @@
 
 package org.apache.hive.jdbc;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 import java.io.IOException;
 
@@ -47,10 +48,10 @@ public static void setInjectHeader(boolean headerInjection){
   }
 
   @Override
-  public void process(HttpRequest httpRequest, HttpContext httpContext)
+  public void process(HttpRequest request, EntityDetails entity, HttpContext context)
       throws HttpException, IOException {
     if (injectHeader){
-      httpRequest.addHeader("X-CSRF-TOKEN", "true");
+      request.addHeader("X-CSRF-TOKEN", "true");
     }
   }
 }
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
index 8f7c3ea8acd4..834dd92f8169 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
@@ -19,6 +19,7 @@
 package org.apache.hive.jdbc;
 
 import static org.apache.hadoop.hive.conf.Constants.MODE;
+import static org.apache.hc.core5.http.Method.isIdempotent;
 import static org.apache.hive.service.auth.HiveAuthConstants.AuthTypes;
 import static org.apache.hive.service.cli.operation.hplsql.HplSqlQueryExecutor.HPLSQL;
 
@@ -69,6 +70,7 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Stream;
 
@@ -92,6 +94,34 @@
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.hive.common.IPStackUtils;
+import org.apache.hc.client5.http.HttpRequestRetryStrategy;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
+import org.apache.hc.client5.http.config.ConnectionConfig;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.NoHttpResponseException;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
 import org.apache.hive.jdbc.jwt.HttpJwtAuthRequestInterceptor;
 import org.apache.hive.jdbc.saml.HiveJdbcBrowserClientFactory;
 import org.apache.hive.jdbc.saml.HiveJdbcSamlRedirectStrategy;
@@ -122,31 +152,6 @@
 import org.apache.hive.service.rpc.thrift.TRenewDelegationTokenReq;
 import org.apache.hive.service.rpc.thrift.TRenewDelegationTokenResp;
 import org.apache.hive.service.rpc.thrift.TSessionHandle;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.ServiceUnavailableRetryStrategy;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.RequestWrapper;
-import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.Args;
 import org.apache.thrift.TBaseHelper;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
@@ -665,12 +670,19 @@ host, getServerHttpUrl(useSsl), loggedInSubject, cookieStore, cookieName,
     if (isCookieEnabled) {
       // Create a http client with a retry mechanism when the server returns a status code of 401.
       httpClientBuilder =
-          HttpClients.custom().setDefaultCookieStore(cookieStore).setServiceUnavailableRetryStrategy(
-              new ServiceUnavailableRetryStrategy() {
+          HttpClients.custom().setDefaultCookieStore(cookieStore).setRetryStrategy(
+              new HttpRequestRetryStrategy() {
+                @Override
+                public boolean retryRequest(HttpRequest request, IOException exception, int execCount,
+                    HttpContext context) {
+                  // Do not retry on raw I/O exceptions
+                  return false;
+                }
+
                 @Override
                 public boolean retryRequest(final HttpResponse response, final int executionCount,
                     final HttpContext context) {
-                  int statusCode = response.getStatusLine().getStatusCode();
+                  int statusCode = response.getCode();
                   boolean sentCredentials = context.getAttribute(Utils.HIVE_SERVER2_SENT_CREDENTIALS) != null &&
                       context.getAttribute(Utils.HIVE_SERVER2_SENT_CREDENTIALS).equals(Utils.HIVE_SERVER2_CONST_TRUE);
                   boolean ret = statusCode == 401 && executionCount <= 1 && !sentCredentials;
@@ -685,15 +697,18 @@ public boolean retryRequest(final HttpResponse response, final int executionCoun
                 }
 
                 @Override
-                public long getRetryInterval() {
-                  // Immediate retry
-                  return 0;
+                public TimeValue getRetryInterval(HttpResponse response, int execCount, HttpContext context) {
+                  return TimeValue.ZERO_MILLISECONDS;
                 }
               });
     } else {
       httpClientBuilder = HttpClientBuilder.create();
     }
 
+    httpClientBuilder.addRequestInterceptorLast((request, entity, context) -> {
+      context.setAttribute("hive.request_sent", Boolean.TRUE);
+    });
+
     // Beeline <------> LB <------> Reverse Proxy <-----> Hiveserver2
     // In case of deployments like above, the LoadBalancer (LB) can be configured with Idle Timeout after which the LB
     // will send TCP RST to Client (Beeline) and Backend (Reverse Proxy). If user is connected to beeline, idle for
@@ -704,7 +719,7 @@ public long getRetryInterval() {
     // SocketTimeoutException (Read Timeout) or NoHttpResponseException both of which can be retried if maxRetries is
     // also specified by the user (jdbc param).
     // The following retry handler handles the above cases in addition to retries for idempotent and unsent requests.
-    httpClientBuilder.setRetryHandler(new HttpRequestRetryHandler() {
+    httpClientBuilder.setRetryStrategy(new DefaultHttpRequestRetryStrategy() {
       // This handler is mostly a copy of DefaultHttpRequestRetryHandler except it also retries some exceptions
       // which could be thrown in certain cases where idle timeout from intermediate proxy triggers a connection reset.
       private final List<Class<? extends IOException>> nonRetriableClasses = Arrays.asList(
@@ -721,7 +736,7 @@ public long getRetryInterval() {
       );
 
       @Override
-      public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
+      public boolean retryRequest(HttpRequest request, IOException exception, int executionCount, HttpContext context) {
         Args.notNull(exception, "Exception parameter");
         Args.notNull(context, "HTTP context");
         if (executionCount > maxRetries) {
@@ -745,20 +760,20 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
           }
         }
         final HttpClientContext clientContext = HttpClientContext.adapt(context);
-        final HttpRequest request = clientContext.getRequest();
 
         if(requestIsAborted(request)){
           LOG.info("Not retrying as request is aborted.");
           return false;
         }
 
-        if (handleAsIdempotent(request)) {
+        if (isIdempotent(request.getMethod())) {
           LOG.info("Retrying idempotent request. Attempt " + executionCount + " of " + maxRetries);
           // Retry if the request is considered idempotent
           return true;
         }
 
-        if (!clientContext.isRequestSent()) {
+        Boolean isSent = (Boolean) context.getAttribute("hive.request_sent");
+        if (isSent == null || !isSent) {
           LOG.info("Retrying unsent request. Attempt " + executionCount + " of " + maxRetries);
           // Retry if the request has not been sent fully or
           // if it's OK to retry methods that have been sent
@@ -770,20 +785,9 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
         return false;
       }
 
-      // requests that handles "Expect continue" handshakes. If server received the header and is waiting for body
-      // then those requests can be retried. Most basic http method methods except DELETE are idempotent as long as they
-      // are not aborted.
-      protected boolean handleAsIdempotent(final HttpRequest request) {
-        return !(request instanceof HttpEntityEnclosingRequest);
-      }
-
       // checks if the request got aborted
       protected boolean requestIsAborted(final HttpRequest request) {
-        HttpRequest req = request;
-        if (request instanceof RequestWrapper) { // does not forward request to original
-          req = ((RequestWrapper) request).getOriginal();
-        }
-        return (req instanceof HttpUriRequest && ((HttpUriRequest)req).isAborted());
+        return (request instanceof HttpUriRequest && ((HttpUriRequest) request).isAborted());
       }
 
     });
@@ -796,21 +800,30 @@ protected boolean requestIsAborted(final HttpRequest request) {
     requestInterceptor.setRequestTrackingEnabled(isRequestTrackingEnabled());
 
     // Add the request interceptor to the client builder
-    httpClientBuilder.addInterceptorFirst(requestInterceptor.sessionId(getSessionId()));
-    httpClientBuilder.addInterceptorLast(new HttpDefaultResponseInterceptor());
+    httpClientBuilder.addRequestInterceptorFirst(requestInterceptor.sessionId(getSessionId()));
+    httpClientBuilder.addResponseInterceptorLast(new HttpDefaultResponseInterceptor());
 
     // Add an interceptor to add in an XSRF header
-    httpClientBuilder.addInterceptorLast(new XsrfHttpRequestInterceptor());
+    httpClientBuilder.addRequestInterceptorLast(new XsrfHttpRequestInterceptor());
 
     // Add an interceptor to add in a CSRF header
-    httpClientBuilder.addInterceptorLast(new CsrfHttpRequestInterceptor());
+    httpClientBuilder.addRequestInterceptorLast((new CsrfHttpRequestInterceptor()));
 
     // set the specified timeout (socketTimeout jdbc param) for http connection as well
     RequestConfig config = RequestConfig.custom()
-            .setConnectTimeout(loginTimeout * 1000)
-            .setConnectionRequestTimeout(loginTimeout * 1000)
-            .setSocketTimeout(loginTimeout * 1000).build();
+        .setConnectionRequestTimeout(Timeout.ofSeconds(loginTimeout))
+        .setResponseTimeout(Timeout.ofSeconds(loginTimeout))
+        .build();
+    ConnectionConfig connectionConfig = ConnectionConfig.custom()
+        .setConnectTimeout(Timeout.ofSeconds(loginTimeout))
+        .setSocketTimeout(Timeout.ofSeconds(loginTimeout))
+        .build();
+
     httpClientBuilder.setDefaultRequestConfig(config);
+    HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create()
+        .setDefaultConnectionConfig(connectionConfig)
+        .build();
+    httpClientBuilder.setConnectionManager(cm);
 
     // Configure http client for SSL
     if (useSsl) {
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HttpBasicAuthInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/HttpBasicAuthInterceptor.java
index 1887e07b19d2..92af5f79dd98 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HttpBasicAuthInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HttpBasicAuthInterceptor.java
@@ -18,15 +18,14 @@
 
 package org.apache.hive.jdbc;
 
-import java.util.Map;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.auth.BasicScheme;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
-import org.apache.http.Header;
-import org.apache.http.HttpRequest;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CookieStore;
-import org.apache.http.impl.auth.AuthSchemeBase;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.protocol.HttpContext;
+import java.util.Map;
 
 /**
  * The class is instantiated with the username and password, it is then used to add header with
@@ -35,7 +34,7 @@
  */
 public class HttpBasicAuthInterceptor extends HttpRequestInterceptorBase {
   UsernamePasswordCredentials credentials;
-  AuthSchemeBase authScheme;
+  BasicScheme authScheme;
 
   public HttpBasicAuthInterceptor(String username, String password, CookieStore cookieStore,
       String cn, boolean isSSL, Map<String, String> additionalHeaders,
@@ -43,14 +42,18 @@ public HttpBasicAuthInterceptor(String username, String password, CookieStore co
     super(cookieStore, cn, isSSL, additionalHeaders, customCookies);
     this.authScheme = new BasicScheme();
     if (username != null) {
-      this.credentials = new UsernamePasswordCredentials(username, password);
+      this.credentials = new UsernamePasswordCredentials(username, password.toCharArray());
+      this.authScheme.initPreemptive(credentials);
     }
   }
 
   @Override
   protected void addHttpAuthHeader(HttpRequest httpRequest, HttpContext httpContext)
       throws Exception {
-    Header basicAuthHeader = authScheme.authenticate(credentials, httpRequest, httpContext);
-    httpRequest.addHeader(basicAuthHeader);
+    String authHeaderValue = authScheme.generateAuthResponse(null, httpRequest, httpContext);
+
+    if (authHeaderValue != null) {
+      httpRequest.addHeader(HttpHeaders.AUTHORIZATION, authHeaderValue);
+    }
   }
 }
\ No newline at end of file
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HttpDefaultResponseInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/HttpDefaultResponseInterceptor.java
index 94e5b9125d05..3d0369b410df 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HttpDefaultResponseInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HttpDefaultResponseInterceptor.java
@@ -21,14 +21,15 @@
 
 import org.apache.hadoop.hive.conf.Constants;
 import org.apache.hadoop.util.Time;
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 public class HttpDefaultResponseInterceptor extends HttpResponseInterceptorBase {
 
   @Override
-  public void process(HttpResponse response, HttpContext context) throws HttpException, IOException {
+  public void process(HttpResponse response, EntityDetails entityDetails, HttpContext context) throws HttpException, IOException {
     String trackHeader = (String) context.getAttribute(Constants.HTTP_HEADER_REQUEST_TRACK);
     if (trackHeader == null) {
       return;
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java
index bff6fd65806b..a8709c67c91e 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HttpKerberosRequestInterceptor.java
@@ -23,11 +23,11 @@
 
 import javax.security.auth.Subject;
 
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hive.service.auth.HttpAuthUtils;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.client.CookieStore;
-import org.apache.http.protocol.HttpContext;
 
 /**
  * Authentication interceptor which adds Base64 encoded payload,
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java b/jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java
index a31c157354ee..ddc71107fed2 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HttpRequestInterceptorBase.java
@@ -25,12 +25,13 @@
 import java.util.function.Supplier;
 import org.apache.hadoop.hive.conf.Constants;
 import org.apache.hadoop.util.Time;
-import org.apache.http.Header;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.client.CookieStore;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +63,7 @@ public HttpRequestInterceptorBase(CookieStore cs, String cn, boolean isSSL,
   }
 
   @Override
-  public void process(HttpRequest httpRequest, HttpContext httpContext)
+  public void process(HttpRequest httpRequest, EntityDetails entity, HttpContext httpContext)
     throws HttpException, IOException {
     try {
       // If cookie based authentication is allowed, generate ticket only when necessary.
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HttpResponseInterceptorBase.java b/jdbc/src/java/org/apache/hive/jdbc/HttpResponseInterceptorBase.java
index 6036a12d38fb..9950d303c5f2 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HttpResponseInterceptorBase.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HttpResponseInterceptorBase.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hive.jdbc;
 
-import org.apache.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HttpTokenAuthInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/HttpTokenAuthInterceptor.java
index fbfa7f6d5a6e..e8c95bfdc766 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HttpTokenAuthInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HttpTokenAuthInterceptor.java
@@ -18,11 +18,11 @@
 
 package org.apache.hive.jdbc;
 
-import java.util.Map;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.client.CookieStore;
-import org.apache.http.protocol.HttpContext;
+import java.util.Map;
 
 /**
  * The class is instantiated with the username and password, it is then
diff --git a/jdbc/src/java/org/apache/hive/jdbc/Utils.java b/jdbc/src/java/org/apache/hive/jdbc/Utils.java
index a5bba8b8c456..c96569773d48 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/Utils.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/Utils.java
@@ -35,11 +35,11 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.common.IPStackUtils;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieStore;
 import org.apache.hive.service.cli.HiveSQLException;
 import org.apache.hive.service.rpc.thrift.TStatus;
 import org.apache.hive.service.rpc.thrift.TStatusCode;
-import org.apache.http.client.CookieStore;
-import org.apache.http.cookie.Cookie;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jdbc/src/java/org/apache/hive/jdbc/XsrfHttpRequestInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/XsrfHttpRequestInterceptor.java
index ec6c13f980b7..1aeb05128441 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/XsrfHttpRequestInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/XsrfHttpRequestInterceptor.java
@@ -18,10 +18,11 @@
 
 package org.apache.hive.jdbc;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 import java.io.IOException;
 
@@ -47,7 +48,7 @@ public static void enableHeaderInjection(boolean enabled){
   }
 
   @Override
-  public void process(HttpRequest httpRequest, HttpContext httpContext)
+  public void process(HttpRequest httpRequest, EntityDetails entity, HttpContext httpContext)
       throws HttpException, IOException {
     if (injectHeader){
       httpRequest.addHeader("X-XSRF-HEADER", "true");
diff --git a/jdbc/src/java/org/apache/hive/jdbc/jwt/HttpJwtAuthRequestInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/jwt/HttpJwtAuthRequestInterceptor.java
index 51390c686b84..58c25f0caa05 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/jwt/HttpJwtAuthRequestInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/jwt/HttpJwtAuthRequestInterceptor.java
@@ -18,12 +18,12 @@
 
 package org.apache.hive.jdbc.jwt;
 
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hive.jdbc.HttpRequestInterceptorBase;
 import org.apache.hive.service.auth.HttpAuthUtils;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.client.CookieStore;
-import org.apache.http.protocol.HttpContext;
 
 import java.util.Map;
 
diff --git a/jdbc/src/java/org/apache/hive/jdbc/saml/HiveJdbcSamlRedirectStrategy.java b/jdbc/src/java/org/apache/hive/jdbc/saml/HiveJdbcSamlRedirectStrategy.java
index c5ce4eeea5ee..0857b23168f3 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/saml/HiveJdbcSamlRedirectStrategy.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/saml/HiveJdbcSamlRedirectStrategy.java
@@ -20,16 +20,18 @@
 
 import com.google.common.base.Preconditions;
 import java.net.URI;
+
+import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
+import org.apache.hc.client5.http.protocol.RedirectStrategy;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hive.jdbc.saml.IJdbcBrowserClient.JdbcBrowserClientContext;
 import org.apache.hive.service.auth.saml.HiveSamlUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.ProtocolException;
-import org.apache.http.client.RedirectStrategy;
-import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.protocol.HttpContext;
 
 /**
  * This is an implementation of {@link RedirectStrategy} to intercept the HTTP redirect
@@ -51,9 +53,14 @@ public boolean isRedirected(
       final HttpRequest request,
       final HttpResponse response,
       final HttpContext context) throws ProtocolException {
-    int status = response.getStatusLine().getStatusCode();
+    int status = response.getCode();
     if (status == HttpStatus.SC_MOVED_TEMPORARILY || status == HttpStatus.SC_SEE_OTHER) {
-      URI locationUri = getLocationURI(request, response, context);
+      URI locationUri = null;
+      try {
+        locationUri = getLocationURI(request, response, context);
+      } catch (HttpException e) {
+        throw new ProtocolException(e.getMessage(), e);
+      }
       Header clientIdentifier = response
           .getFirstHeader(HiveSamlUtils.SSO_CLIENT_IDENTIFIER);
       IJdbcBrowserClient.JdbcBrowserClientContext browserClientContext = new JdbcBrowserClientContext(
@@ -64,7 +71,7 @@ public boolean isRedirected(
   }
 
   @Override
-  public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContext context) throws ProtocolException {
+  public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContext context) throws HttpException {
     // add our own check to super-call
     return checkSsoUri(super.getLocationURI(request, response, context));
   }
diff --git a/jdbc/src/java/org/apache/hive/jdbc/saml/HttpSamlAuthRequestInterceptor.java b/jdbc/src/java/org/apache/hive/jdbc/saml/HttpSamlAuthRequestInterceptor.java
index 430dc8d0ef03..8d431259297e 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/saml/HttpSamlAuthRequestInterceptor.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/saml/HttpSamlAuthRequestInterceptor.java
@@ -20,13 +20,14 @@
 
 import com.google.common.base.Preconditions;
 import java.util.Map;
+
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hive.jdbc.HttpRequestInterceptorBase;
 import org.apache.hive.service.auth.HttpAuthUtils;
 import org.apache.hive.service.auth.saml.HiveSamlUtils;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.client.CookieStore;
-import org.apache.http.protocol.HttpContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jdbc/src/test/org/apache/hive/jdbc/TestHttpRequestInterceptor.java b/jdbc/src/test/org/apache/hive/jdbc/TestHttpRequestInterceptor.java
index 4c56aa6e7b10..b600d1c9c34d 100644
--- a/jdbc/src/test/org/apache/hive/jdbc/TestHttpRequestInterceptor.java
+++ b/jdbc/src/test/org/apache/hive/jdbc/TestHttpRequestInterceptor.java
@@ -22,10 +22,10 @@
 import java.util.HashMap;
 
 import org.apache.hadoop.hive.conf.Constants;
-import org.apache.http.HttpException;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.BasicHttpContext;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -36,7 +36,7 @@ public void testRequestTrackHeader() throws HttpException, IOException {
     HttpRequestInterceptorBase requestInterceptor = getInterceptor();
     requestInterceptor.setRequestTrackingEnabled(true);
     requestInterceptor.sessionId(() -> "sessionId");
-    requestInterceptor.process(new BasicHttpRequest("POST", "uri"), new BasicHttpContext());
+    requestInterceptor.process(new BasicHttpRequest("POST", "uri"), null, HttpClientContext.create());
 
     Assert.assertTrue(requestInterceptor.additionalHeaders.containsKey(Constants.HTTP_HEADER_REQUEST_TRACK));
     Assert.assertEquals("HIVE_sessionId_00000000000000000001",
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 084cabce8adf..4f4330c50e6a 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -88,6 +88,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.tdunning</groupId>
diff --git a/metastore/pom.xml b/metastore/pom.xml
index 9c5fc6c32753..22eb7c71dd26 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -174,6 +174,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- test intra-project -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index 61b116042fe3..4f3d81b80be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,13 +149,11 @@
     <disruptor.version>3.3.7</disruptor.version>
     <hikaricp.version>4.0.3</hikaricp.version>
     <!-- httpcomponents are not always in version sync -->
-    <httpcomponents.client.version>4.5.13</httpcomponents.client.version>
-    <httpcomponents.core.version>4.4.13</httpcomponents.core.version>
+    <httpcomponents5.client.version>5.6.2</httpcomponents5.client.version>
+    <httpcomponents5.core.version>5.4.3</httpcomponents5.core.version>
     <!-- Upgrade roaringbit version whenever upgrading iceberg version -->
     <iceberg.version>1.11.0</iceberg.version>
     <immutables.version>2.9.2</immutables.version>
-    <httpcomponents5.core.version>5.3.4</httpcomponents5.core.version>
-    <httpcomponents5.client.version>5.5</httpcomponents5.client.version>
     <ivy.version>2.5.2</ivy.version>
     <jackson.version>2.18.6</jackson.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
@@ -180,7 +178,7 @@
     <kudu.version>1.17.0</kudu.version>
     <!-- Leaving libfb303 at 0.9.3 regardless of libthrift: As per THRIFT-4613 The Apache Thrift project does not publish items related to fb303 at this point -->
     <libfb303.version>0.9.3</libfb303.version>
-    <libthrift.version>0.16.0</libthrift.version>
+    <libthrift.version>0.23.0</libthrift.version>
     <log4j2.version>2.25.3</log4j2.version>
     <mariadb.version>2.5.0</mariadb.version>
     <mssql.version>6.2.1.jre8</mssql.version>
@@ -591,16 +589,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>${httpcomponents.client.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>${httpcomponents.core.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents.client5</groupId>
         <artifactId>httpclient5</artifactId>
@@ -707,6 +695,16 @@
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
         <version>${libthrift.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
@@ -1826,15 +1824,6 @@
                   </bannedImports>
                   <includeTestCode>true</includeTestCode>
                 </restrictImports>
-                <!-- To prevent unintentional usage of HTTP Components 5, e.g., via transitive dependencies -->
-                <restrictImports implementation="de.skuzzle.enforcer.restrictimports.RestrictImports">
-                  <reason>Do not use httpcore5/httpclient5 classes until Hive is not upgraded to httpcore5/httpclient5</reason>
-                  <bannedImports>
-                    <bannedImport>org.apache.hc.client5.**</bannedImport>
-                    <bannedImport>org.apache.hc.core5.**</bannedImport>
-                  </bannedImports>
-                  <includeTestCode>true</includeTestCode>
-                </restrictImports>
               </rules>
             </configuration>
           </execution>
diff --git a/ql/pom.xml b/ql/pom.xml
index 41799b8531c6..8df2c85abc9a 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -378,6 +378,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
diff --git a/serde/pom.xml b/serde/pom.xml
index f68c13b838e5..5179d9a10bfa 100644
--- a/serde/pom.xml
+++ b/serde/pom.xml
@@ -86,6 +86,14 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/serde/src/gen/thrift/gen-cpp/complex_types.cpp b/serde/src/gen/thrift/gen-cpp/complex_types.cpp
index ff7fcf712635..51df6558a903 100644
--- a/serde/src/gen/thrift/gen-cpp/complex_types.cpp
+++ b/serde/src/gen/thrift/gen-cpp/complex_types.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -17,6 +17,13 @@
 PropValueUnion::~PropValueUnion() noexcept {
 }
 
+PropValueUnion::PropValueUnion() noexcept
+   : intValue(0),
+     longValue(0),
+     stringValue(),
+     doubleValue(0),
+     flag(0) {
+}
 
 void PropValueUnion::__set_intValue(const int32_t val) {
   this->intValue = val;
@@ -237,7 +244,7 @@ uint32_t PropValueUnion::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(PropValueUnion &a, PropValueUnion &b) {
+void swap(PropValueUnion &a, PropValueUnion &b) noexcept {
   using ::std::swap;
   swap(a.intValue, b.intValue);
   swap(a.longValue, b.longValue);
@@ -249,6 +256,39 @@ void swap(PropValueUnion &a, PropValueUnion &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PropValueUnion::operator==(const PropValueUnion & rhs) const
+{
+  if (__isset.intValue != rhs.__isset.intValue)
+    return false;
+  else if (__isset.intValue && !(intValue == rhs.intValue))
+    return false;
+  if (__isset.longValue != rhs.__isset.longValue)
+    return false;
+  else if (__isset.longValue && !(longValue == rhs.longValue))
+    return false;
+  if (__isset.stringValue != rhs.__isset.stringValue)
+    return false;
+  else if (__isset.stringValue && !(stringValue == rhs.stringValue))
+    return false;
+  if (__isset.doubleValue != rhs.__isset.doubleValue)
+    return false;
+  else if (__isset.doubleValue && !(doubleValue == rhs.doubleValue))
+    return false;
+  if (__isset.flag != rhs.__isset.flag)
+    return false;
+  else if (__isset.flag && !(flag == rhs.flag))
+    return false;
+  if (__isset.lString != rhs.__isset.lString)
+    return false;
+  else if (__isset.lString && !(lString == rhs.lString))
+    return false;
+  if (__isset.unionMStringString != rhs.__isset.unionMStringString)
+    return false;
+  else if (__isset.unionMStringString && !(unionMStringString == rhs.unionMStringString))
+    return false;
+  return true;
+}
+
 PropValueUnion::PropValueUnion(const PropValueUnion& other14) {
   intValue = other14.intValue;
   longValue = other14.longValue;
@@ -287,6 +327,11 @@ void PropValueUnion::printTo(std::ostream& out) const {
 IntString::~IntString() noexcept {
 }
 
+IntString::IntString() noexcept
+   : myint(0),
+     myString(),
+     underscore_int(0) {
+}
 
 void IntString::__set_myint(const int32_t val) {
   this->myint = val;
@@ -385,7 +430,7 @@ uint32_t IntString::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(IntString &a, IntString &b) {
+void swap(IntString &a, IntString &b) noexcept {
   using ::std::swap;
   swap(a.myint, b.myint);
   swap(a.myString, b.myString);
@@ -393,6 +438,17 @@ void swap(IntString &a, IntString &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool IntString::operator==(const IntString & rhs) const
+{
+  if (!(myint == rhs.myint))
+    return false;
+  if (!(myString == rhs.myString))
+    return false;
+  if (!(underscore_int == rhs.underscore_int))
+    return false;
+  return true;
+}
+
 IntString::IntString(const IntString& other16) {
   myint = other16.myint;
   myString = other16.myString;
@@ -419,6 +475,10 @@ void IntString::printTo(std::ostream& out) const {
 Complex::~Complex() noexcept {
 }
 
+Complex::Complex() noexcept
+   : aint(0),
+     aString() {
+}
 
 void Complex::__set_aint(const int32_t val) {
   this->aint = val;
@@ -785,7 +845,7 @@ uint32_t Complex::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Complex &a, Complex &b) {
+void swap(Complex &a, Complex &b) noexcept {
   using ::std::swap;
   swap(a.aint, b.aint);
   swap(a.aString, b.aString);
@@ -800,6 +860,31 @@ void swap(Complex &a, Complex &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Complex::operator==(const Complex & rhs) const
+{
+  if (!(aint == rhs.aint))
+    return false;
+  if (!(aString == rhs.aString))
+    return false;
+  if (!(lint == rhs.lint))
+    return false;
+  if (!(lString == rhs.lString))
+    return false;
+  if (!(lintString == rhs.lintString))
+    return false;
+  if (!(mStringString == rhs.mStringString))
+    return false;
+  if (!(attributes == rhs.attributes))
+    return false;
+  if (!(unionField1 == rhs.unionField1))
+    return false;
+  if (!(unionField2 == rhs.unionField2))
+    return false;
+  if (!(unionField3 == rhs.unionField3))
+    return false;
+  return true;
+}
+
 Complex::Complex(const Complex& other68) {
   aint = other68.aint;
   aString = other68.aString;
@@ -847,6 +932,9 @@ void Complex::printTo(std::ostream& out) const {
 SetIntString::~SetIntString() noexcept {
 }
 
+SetIntString::SetIntString() noexcept
+   : aString() {
+}
 
 void SetIntString::__set_sIntString(const std::set<IntString> & val) {
   this->sIntString = val;
@@ -950,13 +1038,22 @@ uint32_t SetIntString::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(SetIntString &a, SetIntString &b) {
+void swap(SetIntString &a, SetIntString &b) noexcept {
   using ::std::swap;
   swap(a.sIntString, b.sIntString);
   swap(a.aString, b.aString);
   swap(a.__isset, b.__isset);
 }
 
+bool SetIntString::operator==(const SetIntString & rhs) const
+{
+  if (!(sIntString == rhs.sIntString))
+    return false;
+  if (!(aString == rhs.aString))
+    return false;
+  return true;
+}
+
 SetIntString::SetIntString(const SetIntString& other77) {
   sIntString = other77.sIntString;
   aString = other77.aString;
diff --git a/serde/src/gen/thrift/gen-cpp/complex_types.h b/serde/src/gen/thrift/gen-cpp/complex_types.h
index df0826e661a2..5429b855ce31 100644
--- a/serde/src/gen/thrift/gen-cpp/complex_types.h
+++ b/serde/src/gen/thrift/gen-cpp/complex_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,13 +45,7 @@ class PropValueUnion : public virtual ::apache::thrift::TBase {
 
   PropValueUnion(const PropValueUnion&);
   PropValueUnion& operator=(const PropValueUnion&);
-  PropValueUnion() noexcept
-                 : intValue(0),
-                   longValue(0),
-                   stringValue(),
-                   doubleValue(0),
-                   flag(0) {
-  }
+  PropValueUnion() noexcept;
 
   virtual ~PropValueUnion() noexcept;
   int32_t intValue;
@@ -78,38 +72,7 @@ class PropValueUnion : public virtual ::apache::thrift::TBase {
 
   void __set_unionMStringString(const std::map<std::string, std::string> & val);
 
-  bool operator == (const PropValueUnion & rhs) const
-  {
-    if (__isset.intValue != rhs.__isset.intValue)
-      return false;
-    else if (__isset.intValue && !(intValue == rhs.intValue))
-      return false;
-    if (__isset.longValue != rhs.__isset.longValue)
-      return false;
-    else if (__isset.longValue && !(longValue == rhs.longValue))
-      return false;
-    if (__isset.stringValue != rhs.__isset.stringValue)
-      return false;
-    else if (__isset.stringValue && !(stringValue == rhs.stringValue))
-      return false;
-    if (__isset.doubleValue != rhs.__isset.doubleValue)
-      return false;
-    else if (__isset.doubleValue && !(doubleValue == rhs.doubleValue))
-      return false;
-    if (__isset.flag != rhs.__isset.flag)
-      return false;
-    else if (__isset.flag && !(flag == rhs.flag))
-      return false;
-    if (__isset.lString != rhs.__isset.lString)
-      return false;
-    else if (__isset.lString && !(lString == rhs.lString))
-      return false;
-    if (__isset.unionMStringString != rhs.__isset.unionMStringString)
-      return false;
-    else if (__isset.unionMStringString && !(unionMStringString == rhs.unionMStringString))
-      return false;
-    return true;
-  }
+  bool operator == (const PropValueUnion & rhs) const;
   bool operator != (const PropValueUnion &rhs) const {
     return !(*this == rhs);
   }
@@ -122,7 +85,7 @@ class PropValueUnion : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PropValueUnion &a, PropValueUnion &b);
+void swap(PropValueUnion &a, PropValueUnion &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PropValueUnion& obj);
 
@@ -138,11 +101,7 @@ class IntString : public virtual ::apache::thrift::TBase {
 
   IntString(const IntString&);
   IntString& operator=(const IntString&);
-  IntString() noexcept
-            : myint(0),
-              myString(),
-              underscore_int(0) {
-  }
+  IntString() noexcept;
 
   virtual ~IntString() noexcept;
   int32_t myint;
@@ -157,16 +116,7 @@ class IntString : public virtual ::apache::thrift::TBase {
 
   void __set_underscore_int(const int32_t val);
 
-  bool operator == (const IntString & rhs) const
-  {
-    if (!(myint == rhs.myint))
-      return false;
-    if (!(myString == rhs.myString))
-      return false;
-    if (!(underscore_int == rhs.underscore_int))
-      return false;
-    return true;
-  }
+  bool operator == (const IntString & rhs) const;
   bool operator != (const IntString &rhs) const {
     return !(*this == rhs);
   }
@@ -179,7 +129,7 @@ class IntString : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(IntString &a, IntString &b);
+void swap(IntString &a, IntString &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const IntString& obj);
 
@@ -202,10 +152,7 @@ class Complex : public virtual ::apache::thrift::TBase {
 
   Complex(const Complex&);
   Complex& operator=(const Complex&);
-  Complex() noexcept
-          : aint(0),
-            aString() {
-  }
+  Complex() noexcept;
 
   virtual ~Complex() noexcept;
   int32_t aint;
@@ -241,30 +188,7 @@ class Complex : public virtual ::apache::thrift::TBase {
 
   void __set_unionField3(const PropValueUnion& val);
 
-  bool operator == (const Complex & rhs) const
-  {
-    if (!(aint == rhs.aint))
-      return false;
-    if (!(aString == rhs.aString))
-      return false;
-    if (!(lint == rhs.lint))
-      return false;
-    if (!(lString == rhs.lString))
-      return false;
-    if (!(lintString == rhs.lintString))
-      return false;
-    if (!(mStringString == rhs.mStringString))
-      return false;
-    if (!(attributes == rhs.attributes))
-      return false;
-    if (!(unionField1 == rhs.unionField1))
-      return false;
-    if (!(unionField2 == rhs.unionField2))
-      return false;
-    if (!(unionField3 == rhs.unionField3))
-      return false;
-    return true;
-  }
+  bool operator == (const Complex & rhs) const;
   bool operator != (const Complex &rhs) const {
     return !(*this == rhs);
   }
@@ -277,7 +201,7 @@ class Complex : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Complex &a, Complex &b);
+void swap(Complex &a, Complex &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Complex& obj);
 
@@ -292,9 +216,7 @@ class SetIntString : public virtual ::apache::thrift::TBase {
 
   SetIntString(const SetIntString&);
   SetIntString& operator=(const SetIntString&);
-  SetIntString() noexcept
-               : aString() {
-  }
+  SetIntString() noexcept;
 
   virtual ~SetIntString() noexcept;
   std::set<IntString>  sIntString;
@@ -306,14 +228,7 @@ class SetIntString : public virtual ::apache::thrift::TBase {
 
   void __set_aString(const std::string& val);
 
-  bool operator == (const SetIntString & rhs) const
-  {
-    if (!(sIntString == rhs.sIntString))
-      return false;
-    if (!(aString == rhs.aString))
-      return false;
-    return true;
-  }
+  bool operator == (const SetIntString & rhs) const;
   bool operator != (const SetIntString &rhs) const {
     return !(*this == rhs);
   }
@@ -326,7 +241,7 @@ class SetIntString : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SetIntString &a, SetIntString &b);
+void swap(SetIntString &a, SetIntString &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SetIntString& obj);
 
diff --git a/serde/src/gen/thrift/gen-cpp/megastruct_types.cpp b/serde/src/gen/thrift/gen-cpp/megastruct_types.cpp
index e0e6bb73311c..c7afe2eacb0f 100644
--- a/serde/src/gen/thrift/gen-cpp/megastruct_types.cpp
+++ b/serde/src/gen/thrift/gen-cpp/megastruct_types.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -46,6 +46,10 @@ std::string to_string(const MyEnum::type& val) {
 MiniStruct::~MiniStruct() noexcept {
 }
 
+MiniStruct::MiniStruct() noexcept
+   : my_string(),
+     my_enum(static_cast<MyEnum::type>(0)) {
+}
 
 void MiniStruct::__set_my_string(const std::string& val) {
   this->my_string = val;
@@ -134,13 +138,26 @@ uint32_t MiniStruct::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(MiniStruct &a, MiniStruct &b) {
+void swap(MiniStruct &a, MiniStruct &b) noexcept {
   using ::std::swap;
   swap(a.my_string, b.my_string);
   swap(a.my_enum, b.my_enum);
   swap(a.__isset, b.__isset);
 }
 
+bool MiniStruct::operator==(const MiniStruct & rhs) const
+{
+  if (__isset.my_string != rhs.__isset.my_string)
+    return false;
+  else if (__isset.my_string && !(my_string == rhs.my_string))
+    return false;
+  if (__isset.my_enum != rhs.__isset.my_enum)
+    return false;
+  else if (__isset.my_enum && !(my_enum == rhs.my_enum))
+    return false;
+  return true;
+}
+
 MiniStruct::MiniStruct(const MiniStruct& other1) {
   my_string = other1.my_string;
   my_enum = other1.my_enum;
@@ -164,6 +181,16 @@ void MiniStruct::printTo(std::ostream& out) const {
 MegaStruct::~MegaStruct() noexcept {
 }
 
+MegaStruct::MegaStruct() noexcept
+   : my_bool(0),
+     my_byte(0),
+     my_16bit_int(0),
+     my_32bit_int(0),
+     my_64bit_int(0),
+     my_double(0),
+     my_string(),
+     my_binary() {
+}
 
 void MegaStruct::__set_my_bool(const bool val) {
   this->my_bool = val;
@@ -895,7 +922,7 @@ uint32_t MegaStruct::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(MegaStruct &a, MegaStruct &b) {
+void swap(MegaStruct &a, MegaStruct &b) noexcept {
   using ::std::swap;
   swap(a.my_bool, b.my_bool);
   swap(a.my_byte, b.my_byte);
@@ -920,6 +947,91 @@ void swap(MegaStruct &a, MegaStruct &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool MegaStruct::operator==(const MegaStruct & rhs) const
+{
+  if (__isset.my_bool != rhs.__isset.my_bool)
+    return false;
+  else if (__isset.my_bool && !(my_bool == rhs.my_bool))
+    return false;
+  if (__isset.my_byte != rhs.__isset.my_byte)
+    return false;
+  else if (__isset.my_byte && !(my_byte == rhs.my_byte))
+    return false;
+  if (__isset.my_16bit_int != rhs.__isset.my_16bit_int)
+    return false;
+  else if (__isset.my_16bit_int && !(my_16bit_int == rhs.my_16bit_int))
+    return false;
+  if (__isset.my_32bit_int != rhs.__isset.my_32bit_int)
+    return false;
+  else if (__isset.my_32bit_int && !(my_32bit_int == rhs.my_32bit_int))
+    return false;
+  if (__isset.my_64bit_int != rhs.__isset.my_64bit_int)
+    return false;
+  else if (__isset.my_64bit_int && !(my_64bit_int == rhs.my_64bit_int))
+    return false;
+  if (__isset.my_double != rhs.__isset.my_double)
+    return false;
+  else if (__isset.my_double && !(my_double == rhs.my_double))
+    return false;
+  if (__isset.my_string != rhs.__isset.my_string)
+    return false;
+  else if (__isset.my_string && !(my_string == rhs.my_string))
+    return false;
+  if (__isset.my_binary != rhs.__isset.my_binary)
+    return false;
+  else if (__isset.my_binary && !(my_binary == rhs.my_binary))
+    return false;
+  if (__isset.my_string_string_map != rhs.__isset.my_string_string_map)
+    return false;
+  else if (__isset.my_string_string_map && !(my_string_string_map == rhs.my_string_string_map))
+    return false;
+  if (__isset.my_string_enum_map != rhs.__isset.my_string_enum_map)
+    return false;
+  else if (__isset.my_string_enum_map && !(my_string_enum_map == rhs.my_string_enum_map))
+    return false;
+  if (__isset.my_enum_string_map != rhs.__isset.my_enum_string_map)
+    return false;
+  else if (__isset.my_enum_string_map && !(my_enum_string_map == rhs.my_enum_string_map))
+    return false;
+  if (__isset.my_enum_struct_map != rhs.__isset.my_enum_struct_map)
+    return false;
+  else if (__isset.my_enum_struct_map && !(my_enum_struct_map == rhs.my_enum_struct_map))
+    return false;
+  if (__isset.my_enum_stringlist_map != rhs.__isset.my_enum_stringlist_map)
+    return false;
+  else if (__isset.my_enum_stringlist_map && !(my_enum_stringlist_map == rhs.my_enum_stringlist_map))
+    return false;
+  if (__isset.my_enum_structlist_map != rhs.__isset.my_enum_structlist_map)
+    return false;
+  else if (__isset.my_enum_structlist_map && !(my_enum_structlist_map == rhs.my_enum_structlist_map))
+    return false;
+  if (__isset.my_stringlist != rhs.__isset.my_stringlist)
+    return false;
+  else if (__isset.my_stringlist && !(my_stringlist == rhs.my_stringlist))
+    return false;
+  if (__isset.my_structlist != rhs.__isset.my_structlist)
+    return false;
+  else if (__isset.my_structlist && !(my_structlist == rhs.my_structlist))
+    return false;
+  if (__isset.my_enumlist != rhs.__isset.my_enumlist)
+    return false;
+  else if (__isset.my_enumlist && !(my_enumlist == rhs.my_enumlist))
+    return false;
+  if (__isset.my_stringset != rhs.__isset.my_stringset)
+    return false;
+  else if (__isset.my_stringset && !(my_stringset == rhs.my_stringset))
+    return false;
+  if (__isset.my_enumset != rhs.__isset.my_enumset)
+    return false;
+  else if (__isset.my_enumset && !(my_enumset == rhs.my_enumset))
+    return false;
+  if (__isset.my_structset != rhs.__isset.my_structset)
+    return false;
+  else if (__isset.my_structset && !(my_structset == rhs.my_structset))
+    return false;
+  return true;
+}
+
 MegaStruct::MegaStruct(const MegaStruct& other109) {
   my_bool = other109.my_bool;
   my_byte = other109.my_byte;
diff --git a/serde/src/gen/thrift/gen-cpp/megastruct_types.h b/serde/src/gen/thrift/gen-cpp/megastruct_types.h
index 64666a31ebd5..cc0b27ef9b34 100644
--- a/serde/src/gen/thrift/gen-cpp/megastruct_types.h
+++ b/serde/src/gen/thrift/gen-cpp/megastruct_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -49,10 +49,7 @@ class MiniStruct : public virtual ::apache::thrift::TBase {
 
   MiniStruct(const MiniStruct&);
   MiniStruct& operator=(const MiniStruct&);
-  MiniStruct() noexcept
-             : my_string(),
-               my_enum(static_cast<MyEnum::type>(0)) {
-  }
+  MiniStruct() noexcept;
 
   virtual ~MiniStruct() noexcept;
   std::string my_string;
@@ -68,18 +65,7 @@ class MiniStruct : public virtual ::apache::thrift::TBase {
 
   void __set_my_enum(const MyEnum::type val);
 
-  bool operator == (const MiniStruct & rhs) const
-  {
-    if (__isset.my_string != rhs.__isset.my_string)
-      return false;
-    else if (__isset.my_string && !(my_string == rhs.my_string))
-      return false;
-    if (__isset.my_enum != rhs.__isset.my_enum)
-      return false;
-    else if (__isset.my_enum && !(my_enum == rhs.my_enum))
-      return false;
-    return true;
-  }
+  bool operator == (const MiniStruct & rhs) const;
   bool operator != (const MiniStruct &rhs) const {
     return !(*this == rhs);
   }
@@ -92,7 +78,7 @@ class MiniStruct : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(MiniStruct &a, MiniStruct &b);
+void swap(MiniStruct &a, MiniStruct &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MiniStruct& obj);
 
@@ -125,16 +111,7 @@ class MegaStruct : public virtual ::apache::thrift::TBase {
 
   MegaStruct(const MegaStruct&);
   MegaStruct& operator=(const MegaStruct&);
-  MegaStruct() noexcept
-             : my_bool(0),
-               my_byte(0),
-               my_16bit_int(0),
-               my_32bit_int(0),
-               my_64bit_int(0),
-               my_double(0),
-               my_string(),
-               my_binary() {
-  }
+  MegaStruct() noexcept;
 
   virtual ~MegaStruct() noexcept;
   bool my_bool;
@@ -200,90 +177,7 @@ class MegaStruct : public virtual ::apache::thrift::TBase {
 
   void __set_my_structset(const std::set<MiniStruct> & val);
 
-  bool operator == (const MegaStruct & rhs) const
-  {
-    if (__isset.my_bool != rhs.__isset.my_bool)
-      return false;
-    else if (__isset.my_bool && !(my_bool == rhs.my_bool))
-      return false;
-    if (__isset.my_byte != rhs.__isset.my_byte)
-      return false;
-    else if (__isset.my_byte && !(my_byte == rhs.my_byte))
-      return false;
-    if (__isset.my_16bit_int != rhs.__isset.my_16bit_int)
-      return false;
-    else if (__isset.my_16bit_int && !(my_16bit_int == rhs.my_16bit_int))
-      return false;
-    if (__isset.my_32bit_int != rhs.__isset.my_32bit_int)
-      return false;
-    else if (__isset.my_32bit_int && !(my_32bit_int == rhs.my_32bit_int))
-      return false;
-    if (__isset.my_64bit_int != rhs.__isset.my_64bit_int)
-      return false;
-    else if (__isset.my_64bit_int && !(my_64bit_int == rhs.my_64bit_int))
-      return false;
-    if (__isset.my_double != rhs.__isset.my_double)
-      return false;
-    else if (__isset.my_double && !(my_double == rhs.my_double))
-      return false;
-    if (__isset.my_string != rhs.__isset.my_string)
-      return false;
-    else if (__isset.my_string && !(my_string == rhs.my_string))
-      return false;
-    if (__isset.my_binary != rhs.__isset.my_binary)
-      return false;
-    else if (__isset.my_binary && !(my_binary == rhs.my_binary))
-      return false;
-    if (__isset.my_string_string_map != rhs.__isset.my_string_string_map)
-      return false;
-    else if (__isset.my_string_string_map && !(my_string_string_map == rhs.my_string_string_map))
-      return false;
-    if (__isset.my_string_enum_map != rhs.__isset.my_string_enum_map)
-      return false;
-    else if (__isset.my_string_enum_map && !(my_string_enum_map == rhs.my_string_enum_map))
-      return false;
-    if (__isset.my_enum_string_map != rhs.__isset.my_enum_string_map)
-      return false;
-    else if (__isset.my_enum_string_map && !(my_enum_string_map == rhs.my_enum_string_map))
-      return false;
-    if (__isset.my_enum_struct_map != rhs.__isset.my_enum_struct_map)
-      return false;
-    else if (__isset.my_enum_struct_map && !(my_enum_struct_map == rhs.my_enum_struct_map))
-      return false;
-    if (__isset.my_enum_stringlist_map != rhs.__isset.my_enum_stringlist_map)
-      return false;
-    else if (__isset.my_enum_stringlist_map && !(my_enum_stringlist_map == rhs.my_enum_stringlist_map))
-      return false;
-    if (__isset.my_enum_structlist_map != rhs.__isset.my_enum_structlist_map)
-      return false;
-    else if (__isset.my_enum_structlist_map && !(my_enum_structlist_map == rhs.my_enum_structlist_map))
-      return false;
-    if (__isset.my_stringlist != rhs.__isset.my_stringlist)
-      return false;
-    else if (__isset.my_stringlist && !(my_stringlist == rhs.my_stringlist))
-      return false;
-    if (__isset.my_structlist != rhs.__isset.my_structlist)
-      return false;
-    else if (__isset.my_structlist && !(my_structlist == rhs.my_structlist))
-      return false;
-    if (__isset.my_enumlist != rhs.__isset.my_enumlist)
-      return false;
-    else if (__isset.my_enumlist && !(my_enumlist == rhs.my_enumlist))
-      return false;
-    if (__isset.my_stringset != rhs.__isset.my_stringset)
-      return false;
-    else if (__isset.my_stringset && !(my_stringset == rhs.my_stringset))
-      return false;
-    if (__isset.my_enumset != rhs.__isset.my_enumset)
-      return false;
-    else if (__isset.my_enumset && !(my_enumset == rhs.my_enumset))
-      return false;
-    if (__isset.my_structset != rhs.__isset.my_structset)
-      return false;
-    else if (__isset.my_structset && !(my_structset == rhs.my_structset))
-      return false;
-    return true;
-  }
+  bool operator == (const MegaStruct & rhs) const;
   bool operator != (const MegaStruct &rhs) const {
     return !(*this == rhs);
   }
@@ -296,7 +190,7 @@ class MegaStruct : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(MegaStruct &a, MegaStruct &b);
+void swap(MegaStruct &a, MegaStruct &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MegaStruct& obj);
 
diff --git a/serde/src/gen/thrift/gen-cpp/serde_constants.cpp b/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
index 840d27103f36..34fb8e70782d 100644
--- a/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
+++ b/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-cpp/serde_constants.h b/serde/src/gen/thrift/gen-cpp/serde_constants.h
index 94440348bdb7..eb82606327ff 100644
--- a/serde/src/gen/thrift/gen-cpp/serde_constants.h
+++ b/serde/src/gen/thrift/gen-cpp/serde_constants.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-cpp/serde_types.h b/serde/src/gen/thrift/gen-cpp/serde_types.h
index c6e0f642e73a..457b5b78c4a1 100644
--- a/serde/src/gen/thrift/gen-cpp/serde_types.h
+++ b/serde/src/gen/thrift/gen-cpp/serde_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-cpp/testthrift_types.cpp b/serde/src/gen/thrift/gen-cpp/testthrift_types.cpp
index ddb9b391388e..202f9bdf6eeb 100644
--- a/serde/src/gen/thrift/gen-cpp/testthrift_types.cpp
+++ b/serde/src/gen/thrift/gen-cpp/testthrift_types.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -17,6 +17,9 @@
 InnerStruct::~InnerStruct() noexcept {
 }
 
+InnerStruct::InnerStruct() noexcept
+   : field0(0) {
+}
 
 void InnerStruct::__set_field0(const int32_t val) {
   this->field0 = val;
@@ -83,12 +86,19 @@ uint32_t InnerStruct::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(InnerStruct &a, InnerStruct &b) {
+void swap(InnerStruct &a, InnerStruct &b) noexcept {
   using ::std::swap;
   swap(a.field0, b.field0);
   swap(a.__isset, b.__isset);
 }
 
+bool InnerStruct::operator==(const InnerStruct & rhs) const
+{
+  if (!(field0 == rhs.field0))
+    return false;
+  return true;
+}
+
 InnerStruct::InnerStruct(const InnerStruct& other0) noexcept {
   field0 = other0.field0;
   __isset = other0.__isset;
@@ -109,6 +119,10 @@ void InnerStruct::printTo(std::ostream& out) const {
 ThriftTestObj::~ThriftTestObj() noexcept {
 }
 
+ThriftTestObj::ThriftTestObj() noexcept
+   : field1(0),
+     field2() {
+}
 
 void ThriftTestObj::__set_field1(const int32_t val) {
   this->field1 = val;
@@ -227,7 +241,7 @@ uint32_t ThriftTestObj::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(ThriftTestObj &a, ThriftTestObj &b) {
+void swap(ThriftTestObj &a, ThriftTestObj &b) noexcept {
   using ::std::swap;
   swap(a.field1, b.field1);
   swap(a.field2, b.field2);
@@ -235,6 +249,17 @@ void swap(ThriftTestObj &a, ThriftTestObj &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ThriftTestObj::operator==(const ThriftTestObj & rhs) const
+{
+  if (!(field1 == rhs.field1))
+    return false;
+  if (!(field2 == rhs.field2))
+    return false;
+  if (!(field3 == rhs.field3))
+    return false;
+  return true;
+}
+
 ThriftTestObj::ThriftTestObj(const ThriftTestObj& other8) {
   field1 = other8.field1;
   field2 = other8.field2;
diff --git a/serde/src/gen/thrift/gen-cpp/testthrift_types.h b/serde/src/gen/thrift/gen-cpp/testthrift_types.h
index 6f82808d84d5..e6d35e9bfdfa 100644
--- a/serde/src/gen/thrift/gen-cpp/testthrift_types.h
+++ b/serde/src/gen/thrift/gen-cpp/testthrift_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -35,9 +35,7 @@ class InnerStruct : public virtual ::apache::thrift::TBase {
 
   InnerStruct(const InnerStruct&) noexcept;
   InnerStruct& operator=(const InnerStruct&) noexcept;
-  InnerStruct() noexcept
-              : field0(0) {
-  }
+  InnerStruct() noexcept;
 
   virtual ~InnerStruct() noexcept;
   int32_t field0;
@@ -46,12 +44,7 @@ class InnerStruct : public virtual ::apache::thrift::TBase {
 
   void __set_field0(const int32_t val);
 
-  bool operator == (const InnerStruct & rhs) const
-  {
-    if (!(field0 == rhs.field0))
-      return false;
-    return true;
-  }
+  bool operator == (const InnerStruct & rhs) const;
   bool operator != (const InnerStruct &rhs) const {
     return !(*this == rhs);
   }
@@ -64,7 +57,7 @@ class InnerStruct : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(InnerStruct &a, InnerStruct &b);
+void swap(InnerStruct &a, InnerStruct &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const InnerStruct& obj);
 
@@ -80,10 +73,7 @@ class ThriftTestObj : public virtual ::apache::thrift::TBase {
 
   ThriftTestObj(const ThriftTestObj&);
   ThriftTestObj& operator=(const ThriftTestObj&);
-  ThriftTestObj() noexcept
-                : field1(0),
-                  field2() {
-  }
+  ThriftTestObj() noexcept;
 
   virtual ~ThriftTestObj() noexcept;
   int32_t field1;
@@ -98,16 +88,7 @@ class ThriftTestObj : public virtual ::apache::thrift::TBase {
 
   void __set_field3(const std::vector<InnerStruct> & val);
 
-  bool operator == (const ThriftTestObj & rhs) const
-  {
-    if (!(field1 == rhs.field1))
-      return false;
-    if (!(field2 == rhs.field2))
-      return false;
-    if (!(field3 == rhs.field3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftTestObj & rhs) const;
   bool operator != (const ThriftTestObj &rhs) const {
     return !(*this == rhs);
   }
@@ -120,7 +101,7 @@ class ThriftTestObj : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ThriftTestObj &a, ThriftTestObj &b);
+void swap(ThriftTestObj &a, ThriftTestObj &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ThriftTestObj& obj);
 
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
index 7788976aa643..099f6980b9b9 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
index 2f3c7d56373a..b4bc9df84868 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class InnerStruct implements org.apache.thrift.TBase<InnerStruct, InnerStruct._Fields>, java.io.Serializable, Cloneable, Comparable<InnerStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerStruct");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public InnerStruct(InnerStruct other) {
     this.field0 = other.field0;
   }
 
+  @Override
   public InnerStruct deepCopy() {
     return new InnerStruct(this);
   }
@@ -141,6 +144,7 @@ public void setField0IsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FIELD0_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FIELD0:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELD0:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(InnerStruct other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -281,6 +290,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class InnerStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InnerStructStandardScheme getScheme() {
       return new InnerStructStandardScheme();
     }
@@ -288,33 +298,40 @@ public InnerStructStandardScheme getScheme() {
 
   private static class InnerStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<InnerStruct> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, InnerStruct 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 1: // FIELD0
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.field0 = iprot.readI32();
-              struct.setField0IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // FIELD0
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.field0 = iprot.readI32();
+                struct.setField0IsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, InnerStruct struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -329,6 +346,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InnerStruct struct
   }
 
   private static class InnerStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InnerStructTupleScheme getScheme() {
       return new InnerStructTupleScheme();
     }
@@ -351,11 +369,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InnerStruct struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InnerStruct 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.field0 = iprot.readI32();
-        struct.setField0IsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.field0 = iprot.readI32();
+          struct.setField0IsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
index 60b9caf456f3..45a0752889f1 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class ThriftTestObj implements org.apache.thrift.TBase<ThriftTestObj, ThriftTestObj._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftTestObj> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftTestObj");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,6 +140,7 @@ public ThriftTestObj(ThriftTestObj other) {
     }
   }
 
+  @Override
   public ThriftTestObj deepCopy() {
     return new ThriftTestObj(this);
   }
@@ -236,6 +239,7 @@ public void setField3IsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FIELD1:
@@ -266,6 +270,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELD1:
@@ -282,6 +287,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -400,14 +406,17 @@ public int compareTo(ThriftTestObj other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -464,6 +473,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ThriftTestObjStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ThriftTestObjStandardScheme getScheme() {
       return new ThriftTestObjStandardScheme();
     }
@@ -471,60 +481,67 @@ public ThriftTestObjStandardScheme getScheme() {
 
   private static class ThriftTestObjStandardScheme extends org.apache.thrift.scheme.StandardScheme<ThriftTestObj> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ThriftTestObj 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 1: // FIELD1
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.field1 = iprot.readI32();
-              struct.setField1IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FIELD2
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.field2 = iprot.readString();
-              struct.setField2IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // FIELD3
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.field3 = new java.util.ArrayList<InnerStruct>(_list0.size);
-                @org.apache.thrift.annotation.Nullable InnerStruct _elem1;
-                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+          }
+          switch (schemeField.id) {
+            case 1: // FIELD1
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.field1 = iprot.readI32();
+                struct.setField1IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // FIELD2
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.field2 = iprot.readString();
+                struct.setField2IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // FIELD3
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1 = new InnerStruct();
-                  _elem1.read(iprot);
-                  struct.field3.add(_elem1);
+                  org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+                  struct.field3 = new java.util.ArrayList<InnerStruct>(_list0.size);
+                  @org.apache.thrift.annotation.Nullable InnerStruct _elem1;
+                  for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+                  {
+                    _elem1 = new InnerStruct();
+                    _elem1.read(iprot);
+                    struct.field3.add(_elem1);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setField3IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setField3IsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ThriftTestObj struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -556,6 +573,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ThriftTestObj stru
   }
 
   private static class ThriftTestObjTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ThriftTestObjTupleScheme getScheme() {
       return new ThriftTestObjTupleScheme();
     }
@@ -596,29 +614,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ThriftTestObj struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ThriftTestObj 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.field1 = iprot.readI32();
-        struct.setField1IsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.field2 = iprot.readString();
-        struct.setField2IsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.field3 = new java.util.ArrayList<InnerStruct>(_list5.size);
-          @org.apache.thrift.annotation.Nullable InnerStruct _elem6;
-          for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.field1 = iprot.readI32();
+          struct.setField1IsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.field2 = iprot.readString();
+          struct.setField2IsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem6 = new InnerStruct();
-            _elem6.read(iprot);
-            struct.field3.add(_elem6);
+            org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.field3 = new java.util.ArrayList<InnerStruct>(_list5.size);
+            @org.apache.thrift.annotation.Nullable InnerStruct _elem6;
+            for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+            {
+              _elem6 = new InnerStruct();
+              _elem6.read(iprot);
+              struct.field3.add(_elem6);
+            }
           }
+          struct.setField3IsSet(true);
         }
-        struct.setField3IsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
index 9826a985f94d..c1f5ec4ba9e5 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields>, java.io.Serializable, Cloneable, Comparable<Complex> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Complex");
 
@@ -114,10 +114,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -269,6 +271,7 @@ public Complex(Complex other) {
     }
   }
 
+  @Override
   public Complex deepCopy() {
     return new Complex(this);
   }
@@ -596,6 +599,7 @@ public void setUnionField3IsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case AINT:
@@ -682,6 +686,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AINT:
@@ -719,6 +724,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1012,14 +1018,17 @@ public int compareTo(Complex other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1132,6 +1141,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ComplexStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ComplexStandardScheme getScheme() {
       return new ComplexStandardScheme();
     }
@@ -1139,188 +1149,195 @@ public ComplexStandardScheme getScheme() {
 
   private static class ComplexStandardScheme extends org.apache.thrift.scheme.StandardScheme<Complex> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Complex 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 1: // AINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.aint = iprot.readI32();
-              struct.setAintIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // A_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.aString = iprot.readString();
-              struct.setAStringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // LINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list18 = iprot.readListBegin();
-                struct.lint = new java.util.ArrayList<java.lang.Integer>(_list18.size);
-                int _elem19;
-                for (int _i20 = 0; _i20 < _list18.size; ++_i20)
+          }
+          switch (schemeField.id) {
+            case 1: // AINT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.aint = iprot.readI32();
+                struct.setAintIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // A_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.aString = iprot.readString();
+                struct.setAStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // LINT
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem19 = iprot.readI32();
-                  struct.lint.add(_elem19);
+                  org.apache.thrift.protocol.TList _list18 = iprot.readListBegin();
+                  struct.lint = new java.util.ArrayList<java.lang.Integer>(_list18.size);
+                  int _elem19;
+                  for (int _i20 = 0; _i20 < _list18.size; ++_i20)
+                  {
+                    _elem19 = iprot.readI32();
+                    struct.lint.add(_elem19);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setLintIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setLintIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // L_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list21 = iprot.readListBegin();
-                struct.lString = new java.util.ArrayList<java.lang.String>(_list21.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem22;
-                for (int _i23 = 0; _i23 < _list21.size; ++_i23)
+              break;
+            case 4: // L_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem22 = iprot.readString();
-                  struct.lString.add(_elem22);
+                  org.apache.thrift.protocol.TList _list21 = iprot.readListBegin();
+                  struct.lString = new java.util.ArrayList<java.lang.String>(_list21.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem22;
+                  for (int _i23 = 0; _i23 < _list21.size; ++_i23)
+                  {
+                    _elem22 = iprot.readString();
+                    struct.lString.add(_elem22);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setLStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setLStringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // LINT_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
-                struct.lintString = new java.util.ArrayList<IntString>(_list24.size);
-                @org.apache.thrift.annotation.Nullable IntString _elem25;
-                for (int _i26 = 0; _i26 < _list24.size; ++_i26)
+              break;
+            case 5: // LINT_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem25 = new IntString();
-                  _elem25.read(iprot);
-                  struct.lintString.add(_elem25);
+                  org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
+                  struct.lintString = new java.util.ArrayList<IntString>(_list24.size);
+                  @org.apache.thrift.annotation.Nullable IntString _elem25;
+                  for (int _i26 = 0; _i26 < _list24.size; ++_i26)
+                  {
+                    _elem25 = new IntString();
+                    _elem25.read(iprot);
+                    struct.lintString.add(_elem25);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setLintStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setLintStringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // M_STRING_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map27 = iprot.readMapBegin();
-                struct.mStringString = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map27.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key28;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val29;
-                for (int _i30 = 0; _i30 < _map27.size; ++_i30)
+              break;
+            case 6: // M_STRING_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key28 = iprot.readString();
-                  _val29 = iprot.readString();
-                  struct.mStringString.put(_key28, _val29);
+                  org.apache.thrift.protocol.TMap _map27 = iprot.readMapBegin();
+                  struct.mStringString = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map27.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key28;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val29;
+                  for (int _i30 = 0; _i30 < _map27.size; ++_i30)
+                  {
+                    _key28 = iprot.readString();
+                    _val29 = iprot.readString();
+                    struct.mStringString.put(_key28, _val29);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMStringStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMStringStringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ATTRIBUTES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map31 = iprot.readMapBegin();
-                struct.attributes = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>>(2*_map31.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key32;
-                @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>> _val33;
-                for (int _i34 = 0; _i34 < _map31.size; ++_i34)
+              break;
+            case 7: // ATTRIBUTES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key32 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map31 = iprot.readMapBegin();
+                  struct.attributes = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>>(2*_map31.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key32;
+                  @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>> _val33;
+                  for (int _i34 = 0; _i34 < _map31.size; ++_i34)
                   {
-                    org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin();
-                    _val33 = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>(2*_map35.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _key36;
-                    @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,PropValueUnion> _val37;
-                    for (int _i38 = 0; _i38 < _map35.size; ++_i38)
+                    _key32 = iprot.readString();
                     {
-                      _key36 = iprot.readString();
+                      org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin();
+                      _val33 = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>(2*_map35.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _key36;
+                      @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,PropValueUnion> _val37;
+                      for (int _i38 = 0; _i38 < _map35.size; ++_i38)
                       {
-                        org.apache.thrift.protocol.TMap _map39 = iprot.readMapBegin();
-                        _val37 = new java.util.HashMap<java.lang.String,PropValueUnion>(2*_map39.size);
-                        @org.apache.thrift.annotation.Nullable java.lang.String _key40;
-                        @org.apache.thrift.annotation.Nullable PropValueUnion _val41;
-                        for (int _i42 = 0; _i42 < _map39.size; ++_i42)
+                        _key36 = iprot.readString();
                         {
-                          _key40 = iprot.readString();
-                          _val41 = new PropValueUnion();
-                          _val41.read(iprot);
-                          _val37.put(_key40, _val41);
+                          org.apache.thrift.protocol.TMap _map39 = iprot.readMapBegin();
+                          _val37 = new java.util.HashMap<java.lang.String,PropValueUnion>(2*_map39.size);
+                          @org.apache.thrift.annotation.Nullable java.lang.String _key40;
+                          @org.apache.thrift.annotation.Nullable PropValueUnion _val41;
+                          for (int _i42 = 0; _i42 < _map39.size; ++_i42)
+                          {
+                            _key40 = iprot.readString();
+                            _val41 = new PropValueUnion();
+                            _val41.read(iprot);
+                            _val37.put(_key40, _val41);
+                          }
+                          iprot.readMapEnd();
                         }
-                        iprot.readMapEnd();
+                        _val33.put(_key36, _val37);
                       }
-                      _val33.put(_key36, _val37);
+                      iprot.readMapEnd();
                     }
-                    iprot.readMapEnd();
+                    struct.attributes.put(_key32, _val33);
                   }
-                  struct.attributes.put(_key32, _val33);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setAttributesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setAttributesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // UNION_FIELD1
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.unionField1 = new PropValueUnion();
-              struct.unionField1.read(iprot);
-              struct.setUnionField1IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // UNION_FIELD2
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.unionField2 = new PropValueUnion();
-              struct.unionField2.read(iprot);
-              struct.setUnionField2IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // UNION_FIELD3
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.unionField3 = new PropValueUnion();
-              struct.unionField3.read(iprot);
-              struct.setUnionField3IsSet(true);
-            } else { 
+              break;
+            case 8: // UNION_FIELD1
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.unionField1 = new PropValueUnion();
+                struct.unionField1.read(iprot);
+                struct.setUnionField1IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // UNION_FIELD2
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.unionField2 = new PropValueUnion();
+                struct.unionField2.read(iprot);
+                struct.setUnionField2IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // UNION_FIELD3
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.unionField3 = new PropValueUnion();
+                struct.unionField3.read(iprot);
+                struct.setUnionField3IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Complex struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1433,6 +1450,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Complex struct) th
   }
 
   private static class ComplexTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ComplexTupleScheme getScheme() {
       return new ComplexTupleScheme();
     }
@@ -1555,123 +1573,128 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Complex struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Complex struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(10);
-      if (incoming.get(0)) {
-        struct.aint = iprot.readI32();
-        struct.setAintIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.aString = iprot.readString();
-        struct.setAStringIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list57 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
-          struct.lint = new java.util.ArrayList<java.lang.Integer>(_list57.size);
-          int _elem58;
-          for (int _i59 = 0; _i59 < _list57.size; ++_i59)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(10);
+        if (incoming.get(0)) {
+          struct.aint = iprot.readI32();
+          struct.setAintIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.aString = iprot.readString();
+          struct.setAStringIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem58 = iprot.readI32();
-            struct.lint.add(_elem58);
+            org.apache.thrift.protocol.TList _list57 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+            struct.lint = new java.util.ArrayList<java.lang.Integer>(_list57.size);
+            int _elem58;
+            for (int _i59 = 0; _i59 < _list57.size; ++_i59)
+            {
+              _elem58 = iprot.readI32();
+              struct.lint.add(_elem58);
+            }
           }
+          struct.setLintIsSet(true);
         }
-        struct.setLintIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list60 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.lString = new java.util.ArrayList<java.lang.String>(_list60.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem61;
-          for (int _i62 = 0; _i62 < _list60.size; ++_i62)
+        if (incoming.get(3)) {
           {
-            _elem61 = iprot.readString();
-            struct.lString.add(_elem61);
+            org.apache.thrift.protocol.TList _list60 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.lString = new java.util.ArrayList<java.lang.String>(_list60.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem61;
+            for (int _i62 = 0; _i62 < _list60.size; ++_i62)
+            {
+              _elem61 = iprot.readString();
+              struct.lString.add(_elem61);
+            }
           }
+          struct.setLStringIsSet(true);
         }
-        struct.setLStringIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list63 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.lintString = new java.util.ArrayList<IntString>(_list63.size);
-          @org.apache.thrift.annotation.Nullable IntString _elem64;
-          for (int _i65 = 0; _i65 < _list63.size; ++_i65)
+        if (incoming.get(4)) {
           {
-            _elem64 = new IntString();
-            _elem64.read(iprot);
-            struct.lintString.add(_elem64);
+            org.apache.thrift.protocol.TList _list63 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.lintString = new java.util.ArrayList<IntString>(_list63.size);
+            @org.apache.thrift.annotation.Nullable IntString _elem64;
+            for (int _i65 = 0; _i65 < _list63.size; ++_i65)
+            {
+              _elem64 = new IntString();
+              _elem64.read(iprot);
+              struct.lintString.add(_elem64);
+            }
           }
+          struct.setLintStringIsSet(true);
         }
-        struct.setLintStringIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TMap _map66 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.mStringString = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map66.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key67;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val68;
-          for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+        if (incoming.get(5)) {
           {
-            _key67 = iprot.readString();
-            _val68 = iprot.readString();
-            struct.mStringString.put(_key67, _val68);
+            org.apache.thrift.protocol.TMap _map66 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.mStringString = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map66.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key67;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val68;
+            for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+            {
+              _key67 = iprot.readString();
+              _val68 = iprot.readString();
+              struct.mStringString.put(_key67, _val68);
+            }
           }
+          struct.setMStringStringIsSet(true);
         }
-        struct.setMStringStringIsSet(true);
-      }
-      if (incoming.get(6)) {
-        {
-          org.apache.thrift.protocol.TMap _map70 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
-          struct.attributes = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>>(2*_map70.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key71;
-          @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>> _val72;
-          for (int _i73 = 0; _i73 < _map70.size; ++_i73)
+        if (incoming.get(6)) {
           {
-            _key71 = iprot.readString();
+            org.apache.thrift.protocol.TMap _map70 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
+            struct.attributes = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>>(2*_map70.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key71;
+            @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>> _val72;
+            for (int _i73 = 0; _i73 < _map70.size; ++_i73)
             {
-              org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
-              _val72 = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>(2*_map74.size);
-              @org.apache.thrift.annotation.Nullable java.lang.String _key75;
-              @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,PropValueUnion> _val76;
-              for (int _i77 = 0; _i77 < _map74.size; ++_i77)
+              _key71 = iprot.readString();
               {
-                _key75 = iprot.readString();
+                org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
+                _val72 = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,PropValueUnion>>(2*_map74.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _key75;
+                @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,PropValueUnion> _val76;
+                for (int _i77 = 0; _i77 < _map74.size; ++_i77)
                 {
-                  org.apache.thrift.protocol.TMap _map78 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
-                  _val76 = new java.util.HashMap<java.lang.String,PropValueUnion>(2*_map78.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key79;
-                  @org.apache.thrift.annotation.Nullable PropValueUnion _val80;
-                  for (int _i81 = 0; _i81 < _map78.size; ++_i81)
+                  _key75 = iprot.readString();
                   {
-                    _key79 = iprot.readString();
-                    _val80 = new PropValueUnion();
-                    _val80.read(iprot);
-                    _val76.put(_key79, _val80);
+                    org.apache.thrift.protocol.TMap _map78 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+                    _val76 = new java.util.HashMap<java.lang.String,PropValueUnion>(2*_map78.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key79;
+                    @org.apache.thrift.annotation.Nullable PropValueUnion _val80;
+                    for (int _i81 = 0; _i81 < _map78.size; ++_i81)
+                    {
+                      _key79 = iprot.readString();
+                      _val80 = new PropValueUnion();
+                      _val80.read(iprot);
+                      _val76.put(_key79, _val80);
+                    }
                   }
+                  _val72.put(_key75, _val76);
                 }
-                _val72.put(_key75, _val76);
               }
+              struct.attributes.put(_key71, _val72);
             }
-            struct.attributes.put(_key71, _val72);
           }
+          struct.setAttributesIsSet(true);
         }
-        struct.setAttributesIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.unionField1 = new PropValueUnion();
-        struct.unionField1.read(iprot);
-        struct.setUnionField1IsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.unionField2 = new PropValueUnion();
-        struct.unionField2.read(iprot);
-        struct.setUnionField2IsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.unionField3 = new PropValueUnion();
-        struct.unionField3.read(iprot);
-        struct.setUnionField3IsSet(true);
+        if (incoming.get(7)) {
+          struct.unionField1 = new PropValueUnion();
+          struct.unionField1.read(iprot);
+          struct.setUnionField1IsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.unionField2 = new PropValueUnion();
+          struct.unionField2.read(iprot);
+          struct.setUnionField2IsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.unionField3 = new PropValueUnion();
+          struct.unionField3.read(iprot);
+          struct.setUnionField3IsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
index dbe7b760a311..518d7fa09f7f 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class IntString implements org.apache.thrift.TBase<IntString, IntString._Fields>, java.io.Serializable, Cloneable, Comparable<IntString> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IntString");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -133,6 +135,7 @@ public IntString(IntString other) {
     this.underscore_int = other.underscore_int;
   }
 
+  @Override
   public IntString deepCopy() {
     return new IntString(this);
   }
@@ -214,6 +217,7 @@ public void setUnderscore_intIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UNDERSCORE_INT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MYINT:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MYINT:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -376,14 +382,17 @@ public int compareTo(IntString other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -436,6 +445,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class IntStringStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public IntStringStandardScheme getScheme() {
       return new IntStringStandardScheme();
     }
@@ -443,49 +453,56 @@ public IntStringStandardScheme getScheme() {
 
   private static class IntStringStandardScheme extends org.apache.thrift.scheme.StandardScheme<IntString> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, IntString 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 1: // MYINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.myint = iprot.readI32();
-              struct.setMyintIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // MY_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.myString = iprot.readString();
-              struct.setMyStringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // UNDERSCORE_INT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.underscore_int = iprot.readI32();
-              struct.setUnderscore_intIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MYINT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.myint = iprot.readI32();
+                struct.setMyintIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MY_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.myString = iprot.readString();
+                struct.setMyStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // UNDERSCORE_INT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.underscore_int = iprot.readI32();
+                struct.setUnderscore_intIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, IntString struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -508,6 +525,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, IntString struct)
   }
 
   private static class IntStringTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public IntStringTupleScheme getScheme() {
       return new IntStringTupleScheme();
     }
@@ -542,19 +560,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, IntString struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, IntString 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.myint = iprot.readI32();
-        struct.setMyintIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.myString = iprot.readString();
-        struct.setMyStringIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.underscore_int = iprot.readI32();
-        struct.setUnderscore_intIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.myint = iprot.readI32();
+          struct.setMyintIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.myString = iprot.readString();
+          struct.setMyStringIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.underscore_int = iprot.readI32();
+          struct.setUnderscore_intIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
index 9b244d8af318..62d45ef94759 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruct._Fields>, java.io.Serializable, Cloneable, Comparable<MegaStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MegaStruct");
 
@@ -164,10 +164,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -181,7 +183,7 @@ public java.lang.String getFieldName() {
   private static final int __MY_64BIT_INT_ISSET_ID = 4;
   private static final int __MY_DOUBLE_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MY_BOOL,_Fields.MY_BYTE,_Fields.MY_16BIT_INT,_Fields.MY_32BIT_INT,_Fields.MY_64BIT_INT,_Fields.MY_DOUBLE,_Fields.MY_STRING,_Fields.MY_BINARY,_Fields.MY_STRING_STRING_MAP,_Fields.MY_STRING_ENUM_MAP,_Fields.MY_ENUM_STRING_MAP,_Fields.MY_ENUM_STRUCT_MAP,_Fields.MY_ENUM_STRINGLIST_MAP,_Fields.MY_ENUM_STRUCTLIST_MAP,_Fields.MY_STRINGLIST,_Fields.MY_STRUCTLIST,_Fields.MY_ENUMLIST,_Fields.MY_STRINGSET,_Fields.MY_ENUMSET,_Fields.MY_STRUCTSET};
+  private static final _Fields[] optionals = {_Fields.MY_BOOL,_Fields.MY_BYTE,_Fields.MY_16BIT_INT,_Fields.MY_32BIT_INT,_Fields.MY_64BIT_INT,_Fields.MY_DOUBLE,_Fields.MY_STRING,_Fields.MY_BINARY,_Fields.MY_STRING_STRING_MAP,_Fields.MY_STRING_ENUM_MAP,_Fields.MY_ENUM_STRING_MAP,_Fields.MY_ENUM_STRUCT_MAP,_Fields.MY_ENUM_STRINGLIST_MAP,_Fields.MY_ENUM_STRUCTLIST_MAP,_Fields.MY_STRINGLIST,_Fields.MY_STRUCTLIST,_Fields.MY_ENUMLIST,_Fields.MY_STRINGSET,_Fields.MY_ENUMSET,_Fields.MY_STRUCTSET};
   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);
@@ -389,6 +391,7 @@ public MegaStruct(MegaStruct other) {
     }
   }
 
+  @Override
   public MegaStruct deepCopy() {
     return new MegaStruct(this);
   }
@@ -1061,6 +1064,7 @@ public void setMy_structsetIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MY_BOOL:
@@ -1231,6 +1235,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MY_BOOL:
@@ -1298,6 +1303,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1843,14 +1849,17 @@ public int compareTo(MegaStruct other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -2063,6 +2072,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MegaStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MegaStructStandardScheme getScheme() {
       return new MegaStructStandardScheme();
     }
@@ -2070,359 +2080,366 @@ public MegaStructStandardScheme getScheme() {
 
   private static class MegaStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<MegaStruct> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MegaStruct 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 1: // MY_BOOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.my_bool = iprot.readBool();
-              struct.setMy_boolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // MY_BYTE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
-              struct.my_byte = iprot.readByte();
-              struct.setMy_byteIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // MY_16BIT_INT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.my_16bit_int = iprot.readI16();
-              struct.setMy_16bit_intIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // MY_32BIT_INT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.my_32bit_int = iprot.readI32();
-              struct.setMy_32bit_intIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // MY_64BIT_INT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.my_64bit_int = iprot.readI64();
-              struct.setMy_64bit_intIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // MY_DOUBLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.my_double = iprot.readDouble();
-              struct.setMy_doubleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // MY_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.my_string = iprot.readString();
-              struct.setMy_stringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // MY_BINARY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.my_binary = iprot.readBinary();
-              struct.setMy_binaryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // MY_STRING_STRING_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
-                struct.my_string_string_map = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map0.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val2;
-                for (int _i3 = 0; _i3 < _map0.size; ++_i3)
-                {
-                  _key1 = iprot.readString();
-                  _val2 = iprot.readString();
-                  struct.my_string_string_map.put(_key1, _val2);
-                }
-                iprot.readMapEnd();
+          }
+          switch (schemeField.id) {
+            case 1: // MY_BOOL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.my_bool = iprot.readBool();
+                struct.setMy_boolIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_string_string_mapIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // MY_STRING_ENUM_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin();
-                struct.my_string_enum_map = new java.util.HashMap<java.lang.String,MyEnum>(2*_map4.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key5;
-                @org.apache.thrift.annotation.Nullable MyEnum _val6;
-                for (int _i7 = 0; _i7 < _map4.size; ++_i7)
-                {
-                  _key5 = iprot.readString();
-                  _val6 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-                  struct.my_string_enum_map.put(_key5, _val6);
-                }
-                iprot.readMapEnd();
+              break;
+            case 2: // MY_BYTE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
+                struct.my_byte = iprot.readByte();
+                struct.setMy_byteIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_string_enum_mapIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // MY_ENUM_STRING_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin();
-                struct.my_enum_string_map = new java.util.EnumMap<MyEnum,java.lang.String>(MyEnum.class);
-                @org.apache.thrift.annotation.Nullable MyEnum _key9;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val10;
-                for (int _i11 = 0; _i11 < _map8.size; ++_i11)
+              break;
+            case 3: // MY_16BIT_INT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.my_16bit_int = iprot.readI16();
+                struct.setMy_16bit_intIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // MY_32BIT_INT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.my_32bit_int = iprot.readI32();
+                struct.setMy_32bit_intIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // MY_64BIT_INT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.my_64bit_int = iprot.readI64();
+                struct.setMy_64bit_intIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // MY_DOUBLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.my_double = iprot.readDouble();
+                struct.setMy_doubleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // MY_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.my_string = iprot.readString();
+                struct.setMy_stringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // MY_BINARY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.my_binary = iprot.readBinary();
+                struct.setMy_binaryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // MY_STRING_STRING_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key9 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-                  _val10 = iprot.readString();
-                  if (_key9 != null)
+                  org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
+                  struct.my_string_string_map = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map0.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val2;
+                  for (int _i3 = 0; _i3 < _map0.size; ++_i3)
                   {
-                    struct.my_enum_string_map.put(_key9, _val10);
+                    _key1 = iprot.readString();
+                    _val2 = iprot.readString();
+                    struct.my_string_string_map.put(_key1, _val2);
                   }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMy_string_string_mapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_enum_string_mapIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // MY_ENUM_STRUCT_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
-                struct.my_enum_struct_map = new java.util.EnumMap<MyEnum,MiniStruct>(MyEnum.class);
-                @org.apache.thrift.annotation.Nullable MyEnum _key13;
-                @org.apache.thrift.annotation.Nullable MiniStruct _val14;
-                for (int _i15 = 0; _i15 < _map12.size; ++_i15)
+              break;
+            case 10: // MY_STRING_ENUM_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key13 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-                  _val14 = new MiniStruct();
-                  _val14.read(iprot);
-                  if (_key13 != null)
+                  org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin();
+                  struct.my_string_enum_map = new java.util.HashMap<java.lang.String,MyEnum>(2*_map4.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key5;
+                  @org.apache.thrift.annotation.Nullable MyEnum _val6;
+                  for (int _i7 = 0; _i7 < _map4.size; ++_i7)
                   {
-                    struct.my_enum_struct_map.put(_key13, _val14);
+                    _key5 = iprot.readString();
+                    _val6 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                    struct.my_string_enum_map.put(_key5, _val6);
                   }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMy_string_enum_mapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_enum_struct_mapIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // MY_ENUM_STRINGLIST_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
-                struct.my_enum_stringlist_map = new java.util.EnumMap<MyEnum,java.util.List<java.lang.String>>(MyEnum.class);
-                @org.apache.thrift.annotation.Nullable MyEnum _key17;
-                @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _val18;
-                for (int _i19 = 0; _i19 < _map16.size; ++_i19)
+              break;
+            case 11: // MY_ENUM_STRING_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key17 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin();
+                  struct.my_enum_string_map = new java.util.EnumMap<MyEnum,java.lang.String>(MyEnum.class);
+                  @org.apache.thrift.annotation.Nullable MyEnum _key9;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val10;
+                  for (int _i11 = 0; _i11 < _map8.size; ++_i11)
                   {
-                    org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
-                    _val18 = new java.util.ArrayList<java.lang.String>(_list20.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _elem21;
-                    for (int _i22 = 0; _i22 < _list20.size; ++_i22)
+                    _key9 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                    _val10 = iprot.readString();
+                    if (_key9 != null)
                     {
-                      _elem21 = iprot.readString();
-                      _val18.add(_elem21);
+                      struct.my_enum_string_map.put(_key9, _val10);
                     }
-                    iprot.readListEnd();
                   }
-                  if (_key17 != null)
+                  iprot.readMapEnd();
+                }
+                struct.setMy_enum_string_mapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // MY_ENUM_STRUCT_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+                {
+                  org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
+                  struct.my_enum_struct_map = new java.util.EnumMap<MyEnum,MiniStruct>(MyEnum.class);
+                  @org.apache.thrift.annotation.Nullable MyEnum _key13;
+                  @org.apache.thrift.annotation.Nullable MiniStruct _val14;
+                  for (int _i15 = 0; _i15 < _map12.size; ++_i15)
                   {
-                    struct.my_enum_stringlist_map.put(_key17, _val18);
+                    _key13 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                    _val14 = new MiniStruct();
+                    _val14.read(iprot);
+                    if (_key13 != null)
+                    {
+                      struct.my_enum_struct_map.put(_key13, _val14);
+                    }
                   }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMy_enum_struct_mapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_enum_stringlist_mapIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // MY_ENUM_STRUCTLIST_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map23 = iprot.readMapBegin();
-                struct.my_enum_structlist_map = new java.util.EnumMap<MyEnum,java.util.List<MiniStruct>>(MyEnum.class);
-                @org.apache.thrift.annotation.Nullable MyEnum _key24;
-                @org.apache.thrift.annotation.Nullable java.util.List<MiniStruct> _val25;
-                for (int _i26 = 0; _i26 < _map23.size; ++_i26)
+              break;
+            case 13: // MY_ENUM_STRINGLIST_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key24 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
+                  struct.my_enum_stringlist_map = new java.util.EnumMap<MyEnum,java.util.List<java.lang.String>>(MyEnum.class);
+                  @org.apache.thrift.annotation.Nullable MyEnum _key17;
+                  @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _val18;
+                  for (int _i19 = 0; _i19 < _map16.size; ++_i19)
                   {
-                    org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
-                    _val25 = new java.util.ArrayList<MiniStruct>(_list27.size);
-                    @org.apache.thrift.annotation.Nullable MiniStruct _elem28;
-                    for (int _i29 = 0; _i29 < _list27.size; ++_i29)
+                    _key17 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
                     {
-                      _elem28 = new MiniStruct();
-                      _elem28.read(iprot);
-                      _val25.add(_elem28);
+                      org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
+                      _val18 = new java.util.ArrayList<java.lang.String>(_list20.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _elem21;
+                      for (int _i22 = 0; _i22 < _list20.size; ++_i22)
+                      {
+                        _elem21 = iprot.readString();
+                        _val18.add(_elem21);
+                      }
+                      iprot.readListEnd();
+                    }
+                    if (_key17 != null)
+                    {
+                      struct.my_enum_stringlist_map.put(_key17, _val18);
                     }
-                    iprot.readListEnd();
                   }
-                  if (_key24 != null)
+                  iprot.readMapEnd();
+                }
+                struct.setMy_enum_stringlist_mapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 14: // MY_ENUM_STRUCTLIST_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+                {
+                  org.apache.thrift.protocol.TMap _map23 = iprot.readMapBegin();
+                  struct.my_enum_structlist_map = new java.util.EnumMap<MyEnum,java.util.List<MiniStruct>>(MyEnum.class);
+                  @org.apache.thrift.annotation.Nullable MyEnum _key24;
+                  @org.apache.thrift.annotation.Nullable java.util.List<MiniStruct> _val25;
+                  for (int _i26 = 0; _i26 < _map23.size; ++_i26)
                   {
-                    struct.my_enum_structlist_map.put(_key24, _val25);
+                    _key24 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                    {
+                      org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
+                      _val25 = new java.util.ArrayList<MiniStruct>(_list27.size);
+                      @org.apache.thrift.annotation.Nullable MiniStruct _elem28;
+                      for (int _i29 = 0; _i29 < _list27.size; ++_i29)
+                      {
+                        _elem28 = new MiniStruct();
+                        _elem28.read(iprot);
+                        _val25.add(_elem28);
+                      }
+                      iprot.readListEnd();
+                    }
+                    if (_key24 != null)
+                    {
+                      struct.my_enum_structlist_map.put(_key24, _val25);
+                    }
                   }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMy_enum_structlist_mapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_enum_structlist_mapIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // MY_STRINGLIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
-                struct.my_stringlist = new java.util.ArrayList<java.lang.String>(_list30.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem31;
-                for (int _i32 = 0; _i32 < _list30.size; ++_i32)
+              break;
+            case 15: // MY_STRINGLIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem31 = iprot.readString();
-                  struct.my_stringlist.add(_elem31);
+                  org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
+                  struct.my_stringlist = new java.util.ArrayList<java.lang.String>(_list30.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem31;
+                  for (int _i32 = 0; _i32 < _list30.size; ++_i32)
+                  {
+                    _elem31 = iprot.readString();
+                    struct.my_stringlist.add(_elem31);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setMy_stringlistIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_stringlistIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 16: // MY_STRUCTLIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list33 = iprot.readListBegin();
-                struct.my_structlist = new java.util.ArrayList<MiniStruct>(_list33.size);
-                @org.apache.thrift.annotation.Nullable MiniStruct _elem34;
-                for (int _i35 = 0; _i35 < _list33.size; ++_i35)
+              break;
+            case 16: // MY_STRUCTLIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem34 = new MiniStruct();
-                  _elem34.read(iprot);
-                  struct.my_structlist.add(_elem34);
+                  org.apache.thrift.protocol.TList _list33 = iprot.readListBegin();
+                  struct.my_structlist = new java.util.ArrayList<MiniStruct>(_list33.size);
+                  @org.apache.thrift.annotation.Nullable MiniStruct _elem34;
+                  for (int _i35 = 0; _i35 < _list33.size; ++_i35)
+                  {
+                    _elem34 = new MiniStruct();
+                    _elem34.read(iprot);
+                    struct.my_structlist.add(_elem34);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setMy_structlistIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_structlistIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 17: // MY_ENUMLIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list36 = iprot.readListBegin();
-                struct.my_enumlist = new java.util.ArrayList<MyEnum>(_list36.size);
-                @org.apache.thrift.annotation.Nullable MyEnum _elem37;
-                for (int _i38 = 0; _i38 < _list36.size; ++_i38)
+              break;
+            case 17: // MY_ENUMLIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem37 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-                  if (_elem37 != null)
+                  org.apache.thrift.protocol.TList _list36 = iprot.readListBegin();
+                  struct.my_enumlist = new java.util.ArrayList<MyEnum>(_list36.size);
+                  @org.apache.thrift.annotation.Nullable MyEnum _elem37;
+                  for (int _i38 = 0; _i38 < _list36.size; ++_i38)
                   {
-                    struct.my_enumlist.add(_elem37);
+                    _elem37 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                    if (_elem37 != null)
+                    {
+                      struct.my_enumlist.add(_elem37);
+                    }
                   }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setMy_enumlistIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_enumlistIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 18: // MY_STRINGSET
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set39 = iprot.readSetBegin();
-                struct.my_stringset = new java.util.HashSet<java.lang.String>(2*_set39.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem40;
-                for (int _i41 = 0; _i41 < _set39.size; ++_i41)
+              break;
+            case 18: // MY_STRINGSET
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem40 = iprot.readString();
-                  struct.my_stringset.add(_elem40);
+                  org.apache.thrift.protocol.TSet _set39 = iprot.readSetBegin();
+                  struct.my_stringset = new java.util.HashSet<java.lang.String>(2*_set39.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem40;
+                  for (int _i41 = 0; _i41 < _set39.size; ++_i41)
+                  {
+                    _elem40 = iprot.readString();
+                    struct.my_stringset.add(_elem40);
+                  }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setMy_stringsetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_stringsetIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 19: // MY_ENUMSET
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set42 = iprot.readSetBegin();
-                struct.my_enumset = java.util.EnumSet.noneOf(MyEnum.class);
-                @org.apache.thrift.annotation.Nullable MyEnum _elem43;
-                for (int _i44 = 0; _i44 < _set42.size; ++_i44)
+              break;
+            case 19: // MY_ENUMSET
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem43 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-                  if (_elem43 != null)
+                  org.apache.thrift.protocol.TSet _set42 = iprot.readSetBegin();
+                  struct.my_enumset = java.util.EnumSet.noneOf(MyEnum.class);
+                  @org.apache.thrift.annotation.Nullable MyEnum _elem43;
+                  for (int _i44 = 0; _i44 < _set42.size; ++_i44)
                   {
-                    struct.my_enumset.add(_elem43);
+                    _elem43 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                    if (_elem43 != null)
+                    {
+                      struct.my_enumset.add(_elem43);
+                    }
                   }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setMy_enumsetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_enumsetIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 20: // MY_STRUCTSET
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set45 = iprot.readSetBegin();
-                struct.my_structset = new java.util.HashSet<MiniStruct>(2*_set45.size);
-                @org.apache.thrift.annotation.Nullable MiniStruct _elem46;
-                for (int _i47 = 0; _i47 < _set45.size; ++_i47)
+              break;
+            case 20: // MY_STRUCTSET
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem46 = new MiniStruct();
-                  _elem46.read(iprot);
-                  struct.my_structset.add(_elem46);
+                  org.apache.thrift.protocol.TSet _set45 = iprot.readSetBegin();
+                  struct.my_structset = new java.util.HashSet<MiniStruct>(2*_set45.size);
+                  @org.apache.thrift.annotation.Nullable MiniStruct _elem46;
+                  for (int _i47 = 0; _i47 < _set45.size; ++_i47)
+                  {
+                    _elem46 = new MiniStruct();
+                    _elem46.read(iprot);
+                    struct.my_structset.add(_elem46);
+                  }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setMy_structsetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMy_structsetIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MegaStruct struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -2666,6 +2683,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MegaStruct struct)
   }
 
   private static class MegaStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MegaStructTupleScheme getScheme() {
       return new MegaStructTupleScheme();
     }
@@ -2892,247 +2910,252 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MegaStruct struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MegaStruct struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(20);
-      if (incoming.get(0)) {
-        struct.my_bool = iprot.readBool();
-        struct.setMy_boolIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.my_byte = iprot.readByte();
-        struct.setMy_byteIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.my_16bit_int = iprot.readI16();
-        struct.setMy_16bit_intIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.my_32bit_int = iprot.readI32();
-        struct.setMy_32bit_intIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.my_64bit_int = iprot.readI64();
-        struct.setMy_64bit_intIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.my_double = iprot.readDouble();
-        struct.setMy_doubleIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.my_string = iprot.readString();
-        struct.setMy_stringIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.my_binary = iprot.readBinary();
-        struct.setMy_binaryIsSet(true);
-      }
-      if (incoming.get(8)) {
-        {
-          org.apache.thrift.protocol.TMap _map76 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.my_string_string_map = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map76.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key77;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val78;
-          for (int _i79 = 0; _i79 < _map76.size; ++_i79)
-          {
-            _key77 = iprot.readString();
-            _val78 = iprot.readString();
-            struct.my_string_string_map.put(_key77, _val78);
-          }
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(20);
+        if (incoming.get(0)) {
+          struct.my_bool = iprot.readBool();
+          struct.setMy_boolIsSet(true);
         }
-        struct.setMy_string_string_mapIsSet(true);
-      }
-      if (incoming.get(9)) {
-        {
-          org.apache.thrift.protocol.TMap _map80 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32); 
-          struct.my_string_enum_map = new java.util.HashMap<java.lang.String,MyEnum>(2*_map80.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key81;
-          @org.apache.thrift.annotation.Nullable MyEnum _val82;
-          for (int _i83 = 0; _i83 < _map80.size; ++_i83)
-          {
-            _key81 = iprot.readString();
-            _val82 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-            struct.my_string_enum_map.put(_key81, _val82);
-          }
+        if (incoming.get(1)) {
+          struct.my_byte = iprot.readByte();
+          struct.setMy_byteIsSet(true);
         }
-        struct.setMy_string_enum_mapIsSet(true);
-      }
-      if (incoming.get(10)) {
-        {
-          org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING); 
-          struct.my_enum_string_map = new java.util.EnumMap<MyEnum,java.lang.String>(MyEnum.class);
-          @org.apache.thrift.annotation.Nullable MyEnum _key85;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val86;
-          for (int _i87 = 0; _i87 < _map84.size; ++_i87)
+        if (incoming.get(2)) {
+          struct.my_16bit_int = iprot.readI16();
+          struct.setMy_16bit_intIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.my_32bit_int = iprot.readI32();
+          struct.setMy_32bit_intIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.my_64bit_int = iprot.readI64();
+          struct.setMy_64bit_intIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.my_double = iprot.readDouble();
+          struct.setMy_doubleIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.my_string = iprot.readString();
+          struct.setMy_stringIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.my_binary = iprot.readBinary();
+          struct.setMy_binaryIsSet(true);
+        }
+        if (incoming.get(8)) {
           {
-            _key85 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-            _val86 = iprot.readString();
-            if (_key85 != null)
+            org.apache.thrift.protocol.TMap _map76 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.my_string_string_map = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map76.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key77;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val78;
+            for (int _i79 = 0; _i79 < _map76.size; ++_i79)
             {
-              struct.my_enum_string_map.put(_key85, _val86);
+              _key77 = iprot.readString();
+              _val78 = iprot.readString();
+              struct.my_string_string_map.put(_key77, _val78);
             }
           }
+          struct.setMy_string_string_mapIsSet(true);
         }
-        struct.setMy_enum_string_mapIsSet(true);
-      }
-      if (incoming.get(11)) {
-        {
-          org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT); 
-          struct.my_enum_struct_map = new java.util.EnumMap<MyEnum,MiniStruct>(MyEnum.class);
-          @org.apache.thrift.annotation.Nullable MyEnum _key89;
-          @org.apache.thrift.annotation.Nullable MiniStruct _val90;
-          for (int _i91 = 0; _i91 < _map88.size; ++_i91)
+        if (incoming.get(9)) {
           {
-            _key89 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-            _val90 = new MiniStruct();
-            _val90.read(iprot);
-            if (_key89 != null)
+            org.apache.thrift.protocol.TMap _map80 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32); 
+            struct.my_string_enum_map = new java.util.HashMap<java.lang.String,MyEnum>(2*_map80.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key81;
+            @org.apache.thrift.annotation.Nullable MyEnum _val82;
+            for (int _i83 = 0; _i83 < _map80.size; ++_i83)
             {
-              struct.my_enum_struct_map.put(_key89, _val90);
+              _key81 = iprot.readString();
+              _val82 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              struct.my_string_enum_map.put(_key81, _val82);
             }
           }
+          struct.setMy_string_enum_mapIsSet(true);
         }
-        struct.setMy_enum_struct_mapIsSet(true);
-      }
-      if (incoming.get(12)) {
-        {
-          org.apache.thrift.protocol.TMap _map92 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST); 
-          struct.my_enum_stringlist_map = new java.util.EnumMap<MyEnum,java.util.List<java.lang.String>>(MyEnum.class);
-          @org.apache.thrift.annotation.Nullable MyEnum _key93;
-          @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _val94;
-          for (int _i95 = 0; _i95 < _map92.size; ++_i95)
+        if (incoming.get(10)) {
           {
-            _key93 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING); 
+            struct.my_enum_string_map = new java.util.EnumMap<MyEnum,java.lang.String>(MyEnum.class);
+            @org.apache.thrift.annotation.Nullable MyEnum _key85;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val86;
+            for (int _i87 = 0; _i87 < _map84.size; ++_i87)
             {
-              org.apache.thrift.protocol.TList _list96 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-              _val94 = new java.util.ArrayList<java.lang.String>(_list96.size);
-              @org.apache.thrift.annotation.Nullable java.lang.String _elem97;
-              for (int _i98 = 0; _i98 < _list96.size; ++_i98)
+              _key85 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              _val86 = iprot.readString();
+              if (_key85 != null)
               {
-                _elem97 = iprot.readString();
-                _val94.add(_elem97);
+                struct.my_enum_string_map.put(_key85, _val86);
               }
             }
-            if (_key93 != null)
+          }
+          struct.setMy_enum_string_mapIsSet(true);
+        }
+        if (incoming.get(11)) {
+          {
+            org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT); 
+            struct.my_enum_struct_map = new java.util.EnumMap<MyEnum,MiniStruct>(MyEnum.class);
+            @org.apache.thrift.annotation.Nullable MyEnum _key89;
+            @org.apache.thrift.annotation.Nullable MiniStruct _val90;
+            for (int _i91 = 0; _i91 < _map88.size; ++_i91)
             {
-              struct.my_enum_stringlist_map.put(_key93, _val94);
+              _key89 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              _val90 = new MiniStruct();
+              _val90.read(iprot);
+              if (_key89 != null)
+              {
+                struct.my_enum_struct_map.put(_key89, _val90);
+              }
             }
           }
+          struct.setMy_enum_struct_mapIsSet(true);
         }
-        struct.setMy_enum_stringlist_mapIsSet(true);
-      }
-      if (incoming.get(13)) {
-        {
-          org.apache.thrift.protocol.TMap _map99 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST); 
-          struct.my_enum_structlist_map = new java.util.EnumMap<MyEnum,java.util.List<MiniStruct>>(MyEnum.class);
-          @org.apache.thrift.annotation.Nullable MyEnum _key100;
-          @org.apache.thrift.annotation.Nullable java.util.List<MiniStruct> _val101;
-          for (int _i102 = 0; _i102 < _map99.size; ++_i102)
+        if (incoming.get(12)) {
           {
-            _key100 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            org.apache.thrift.protocol.TMap _map92 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST); 
+            struct.my_enum_stringlist_map = new java.util.EnumMap<MyEnum,java.util.List<java.lang.String>>(MyEnum.class);
+            @org.apache.thrift.annotation.Nullable MyEnum _key93;
+            @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _val94;
+            for (int _i95 = 0; _i95 < _map92.size; ++_i95)
             {
-              org.apache.thrift.protocol.TList _list103 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-              _val101 = new java.util.ArrayList<MiniStruct>(_list103.size);
-              @org.apache.thrift.annotation.Nullable MiniStruct _elem104;
-              for (int _i105 = 0; _i105 < _list103.size; ++_i105)
+              _key93 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              {
+                org.apache.thrift.protocol.TList _list96 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+                _val94 = new java.util.ArrayList<java.lang.String>(_list96.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem97;
+                for (int _i98 = 0; _i98 < _list96.size; ++_i98)
+                {
+                  _elem97 = iprot.readString();
+                  _val94.add(_elem97);
+                }
+              }
+              if (_key93 != null)
               {
-                _elem104 = new MiniStruct();
-                _elem104.read(iprot);
-                _val101.add(_elem104);
+                struct.my_enum_stringlist_map.put(_key93, _val94);
               }
             }
-            if (_key100 != null)
+          }
+          struct.setMy_enum_stringlist_mapIsSet(true);
+        }
+        if (incoming.get(13)) {
+          {
+            org.apache.thrift.protocol.TMap _map99 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST); 
+            struct.my_enum_structlist_map = new java.util.EnumMap<MyEnum,java.util.List<MiniStruct>>(MyEnum.class);
+            @org.apache.thrift.annotation.Nullable MyEnum _key100;
+            @org.apache.thrift.annotation.Nullable java.util.List<MiniStruct> _val101;
+            for (int _i102 = 0; _i102 < _map99.size; ++_i102)
             {
-              struct.my_enum_structlist_map.put(_key100, _val101);
+              _key100 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              {
+                org.apache.thrift.protocol.TList _list103 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+                _val101 = new java.util.ArrayList<MiniStruct>(_list103.size);
+                @org.apache.thrift.annotation.Nullable MiniStruct _elem104;
+                for (int _i105 = 0; _i105 < _list103.size; ++_i105)
+                {
+                  _elem104 = new MiniStruct();
+                  _elem104.read(iprot);
+                  _val101.add(_elem104);
+                }
+              }
+              if (_key100 != null)
+              {
+                struct.my_enum_structlist_map.put(_key100, _val101);
+              }
             }
           }
+          struct.setMy_enum_structlist_mapIsSet(true);
         }
-        struct.setMy_enum_structlist_mapIsSet(true);
-      }
-      if (incoming.get(14)) {
-        {
-          org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.my_stringlist = new java.util.ArrayList<java.lang.String>(_list106.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem107;
-          for (int _i108 = 0; _i108 < _list106.size; ++_i108)
+        if (incoming.get(14)) {
           {
-            _elem107 = iprot.readString();
-            struct.my_stringlist.add(_elem107);
+            org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.my_stringlist = new java.util.ArrayList<java.lang.String>(_list106.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem107;
+            for (int _i108 = 0; _i108 < _list106.size; ++_i108)
+            {
+              _elem107 = iprot.readString();
+              struct.my_stringlist.add(_elem107);
+            }
           }
+          struct.setMy_stringlistIsSet(true);
         }
-        struct.setMy_stringlistIsSet(true);
-      }
-      if (incoming.get(15)) {
-        {
-          org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.my_structlist = new java.util.ArrayList<MiniStruct>(_list109.size);
-          @org.apache.thrift.annotation.Nullable MiniStruct _elem110;
-          for (int _i111 = 0; _i111 < _list109.size; ++_i111)
+        if (incoming.get(15)) {
           {
-            _elem110 = new MiniStruct();
-            _elem110.read(iprot);
-            struct.my_structlist.add(_elem110);
+            org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.my_structlist = new java.util.ArrayList<MiniStruct>(_list109.size);
+            @org.apache.thrift.annotation.Nullable MiniStruct _elem110;
+            for (int _i111 = 0; _i111 < _list109.size; ++_i111)
+            {
+              _elem110 = new MiniStruct();
+              _elem110.read(iprot);
+              struct.my_structlist.add(_elem110);
+            }
           }
+          struct.setMy_structlistIsSet(true);
         }
-        struct.setMy_structlistIsSet(true);
-      }
-      if (incoming.get(16)) {
-        {
-          org.apache.thrift.protocol.TList _list112 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
-          struct.my_enumlist = new java.util.ArrayList<MyEnum>(_list112.size);
-          @org.apache.thrift.annotation.Nullable MyEnum _elem113;
-          for (int _i114 = 0; _i114 < _list112.size; ++_i114)
+        if (incoming.get(16)) {
           {
-            _elem113 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-            if (_elem113 != null)
+            org.apache.thrift.protocol.TList _list112 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+            struct.my_enumlist = new java.util.ArrayList<MyEnum>(_list112.size);
+            @org.apache.thrift.annotation.Nullable MyEnum _elem113;
+            for (int _i114 = 0; _i114 < _list112.size; ++_i114)
             {
-              struct.my_enumlist.add(_elem113);
+              _elem113 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              if (_elem113 != null)
+              {
+                struct.my_enumlist.add(_elem113);
+              }
             }
           }
+          struct.setMy_enumlistIsSet(true);
         }
-        struct.setMy_enumlistIsSet(true);
-      }
-      if (incoming.get(17)) {
-        {
-          org.apache.thrift.protocol.TSet _set115 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.my_stringset = new java.util.HashSet<java.lang.String>(2*_set115.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem116;
-          for (int _i117 = 0; _i117 < _set115.size; ++_i117)
+        if (incoming.get(17)) {
           {
-            _elem116 = iprot.readString();
-            struct.my_stringset.add(_elem116);
+            org.apache.thrift.protocol.TSet _set115 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.my_stringset = new java.util.HashSet<java.lang.String>(2*_set115.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem116;
+            for (int _i117 = 0; _i117 < _set115.size; ++_i117)
+            {
+              _elem116 = iprot.readString();
+              struct.my_stringset.add(_elem116);
+            }
           }
+          struct.setMy_stringsetIsSet(true);
         }
-        struct.setMy_stringsetIsSet(true);
-      }
-      if (incoming.get(18)) {
-        {
-          org.apache.thrift.protocol.TSet _set118 = iprot.readSetBegin(org.apache.thrift.protocol.TType.I32);
-          struct.my_enumset = java.util.EnumSet.noneOf(MyEnum.class);
-          @org.apache.thrift.annotation.Nullable MyEnum _elem119;
-          for (int _i120 = 0; _i120 < _set118.size; ++_i120)
+        if (incoming.get(18)) {
           {
-            _elem119 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-            if (_elem119 != null)
+            org.apache.thrift.protocol.TSet _set118 = iprot.readSetBegin(org.apache.thrift.protocol.TType.I32);
+            struct.my_enumset = java.util.EnumSet.noneOf(MyEnum.class);
+            @org.apache.thrift.annotation.Nullable MyEnum _elem119;
+            for (int _i120 = 0; _i120 < _set118.size; ++_i120)
             {
-              struct.my_enumset.add(_elem119);
+              _elem119 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+              if (_elem119 != null)
+              {
+                struct.my_enumset.add(_elem119);
+              }
             }
           }
+          struct.setMy_enumsetIsSet(true);
         }
-        struct.setMy_enumsetIsSet(true);
-      }
-      if (incoming.get(19)) {
-        {
-          org.apache.thrift.protocol.TSet _set121 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.my_structset = new java.util.HashSet<MiniStruct>(2*_set121.size);
-          @org.apache.thrift.annotation.Nullable MiniStruct _elem122;
-          for (int _i123 = 0; _i123 < _set121.size; ++_i123)
+        if (incoming.get(19)) {
           {
-            _elem122 = new MiniStruct();
-            _elem122.read(iprot);
-            struct.my_structset.add(_elem122);
+            org.apache.thrift.protocol.TSet _set121 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.my_structset = new java.util.HashSet<MiniStruct>(2*_set121.size);
+            @org.apache.thrift.annotation.Nullable MiniStruct _elem122;
+            for (int _i123 = 0; _i123 < _set121.size; ++_i123)
+            {
+              _elem122 = new MiniStruct();
+              _elem122.read(iprot);
+              struct.my_structset.add(_elem122);
+            }
           }
+          struct.setMy_structsetIsSet(true);
         }
-        struct.setMy_structsetIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MiniStruct.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MiniStruct.java
index 03b2d29dcc4e..2ef92b07a633 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MiniStruct.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MiniStruct.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class MiniStruct implements org.apache.thrift.TBase<MiniStruct, MiniStruct._Fields>, java.io.Serializable, Cloneable, Comparable<MiniStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MiniStruct");
 
@@ -78,17 +78,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.MY_STRING,_Fields.MY_ENUM};
+  private static final _Fields[] optionals = {_Fields.MY_STRING,_Fields.MY_ENUM};
   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);
@@ -115,6 +117,7 @@ public MiniStruct(MiniStruct other) {
     }
   }
 
+  @Override
   public MiniStruct deepCopy() {
     return new MiniStruct(this);
   }
@@ -181,6 +184,7 @@ public void setMy_enumIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MY_STRING:
@@ -203,6 +207,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MY_STRING:
@@ -216,6 +221,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -311,14 +317,17 @@ public int compareTo(MiniStruct other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -373,6 +382,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MiniStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MiniStructStandardScheme getScheme() {
       return new MiniStructStandardScheme();
     }
@@ -380,41 +390,48 @@ public MiniStructStandardScheme getScheme() {
 
   private static class MiniStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<MiniStruct> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MiniStruct 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 1: // MY_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.my_string = iprot.readString();
-              struct.setMy_stringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // MY_ENUM
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.my_enum = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-              struct.setMy_enumIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MY_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.my_string = iprot.readString();
+                struct.setMy_stringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MY_ENUM
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.my_enum = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                struct.setMy_enumIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MiniStruct struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -440,6 +457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MiniStruct struct)
   }
 
   private static class MiniStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MiniStructTupleScheme getScheme() {
       return new MiniStructTupleScheme();
     }
@@ -468,15 +486,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MiniStruct struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MiniStruct 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.my_string = iprot.readString();
-        struct.setMy_stringIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.my_enum = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
-        struct.setMy_enumIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.my_string = iprot.readString();
+          struct.setMy_stringIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.my_enum = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+          struct.setMy_enumIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MyEnum.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MyEnum.java
index f50156d3a13a..cd30cb168097 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MyEnum.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MyEnum.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum MyEnum implements org.apache.thrift.TEnum {
   LLAMA(1),
   ALPACA(2);
@@ -21,6 +21,7 @@ private MyEnum(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java
index ec207dfbcfa1..138903740911 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class PropValueUnion extends org.apache.thrift.TUnion<PropValueUnion, PropValueUnion._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropValueUnion");
   private static final org.apache.thrift.protocol.TField INT_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("intValue", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -87,10 +87,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public PropValueUnion(_Fields setField, java.lang.Object value) {
   public PropValueUnion(PropValueUnion other) {
     super(other);
   }
+  @Override
   public PropValueUnion deepCopy() {
     return new PropValueUnion(this);
   }
@@ -518,6 +521,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java
index ca0ca4fc8ee0..90e192385b26 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.serde2.thrift.test;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public class SetIntString implements org.apache.thrift.TBase<SetIntString, SetIntString._Fields>, java.io.Serializable, Cloneable, Comparable<SetIntString> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetIntString");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public SetIntString(SetIntString other) {
     }
   }
 
+  @Override
   public SetIntString deepCopy() {
     return new SetIntString(this);
   }
@@ -198,6 +201,7 @@ public void setAStringIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case S_INT_STRING:
@@ -220,6 +224,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case S_INT_STRING:
@@ -233,6 +238,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -328,14 +334,17 @@ public int compareTo(SetIntString other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -386,6 +395,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SetIntStringStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetIntStringStandardScheme getScheme() {
       return new SetIntStringStandardScheme();
     }
@@ -393,52 +403,59 @@ public SetIntStringStandardScheme getScheme() {
 
   private static class SetIntStringStandardScheme extends org.apache.thrift.scheme.StandardScheme<SetIntString> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SetIntString 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 1: // S_INT_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set82 = iprot.readSetBegin();
-                struct.sIntString = new java.util.HashSet<IntString>(2*_set82.size);
-                @org.apache.thrift.annotation.Nullable IntString _elem83;
-                for (int _i84 = 0; _i84 < _set82.size; ++_i84)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // S_INT_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem83 = new IntString();
-                  _elem83.read(iprot);
-                  struct.sIntString.add(_elem83);
+                  org.apache.thrift.protocol.TSet _set82 = iprot.readSetBegin();
+                  struct.sIntString = new java.util.HashSet<IntString>(2*_set82.size);
+                  @org.apache.thrift.annotation.Nullable IntString _elem83;
+                  for (int _i84 = 0; _i84 < _set82.size; ++_i84)
+                  {
+                    _elem83 = new IntString();
+                    _elem83.read(iprot);
+                    struct.sIntString.add(_elem83);
+                  }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setSIntStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSIntStringIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // A_STRING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.aString = iprot.readString();
-              struct.setAStringIsSet(true);
-            } else { 
+              break;
+            case 2: // A_STRING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.aString = iprot.readString();
+                struct.setAStringIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SetIntString struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -467,6 +484,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SetIntString struc
   }
 
   private static class SetIntStringTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetIntStringTupleScheme getScheme() {
       return new SetIntStringTupleScheme();
     }
@@ -501,25 +519,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SetIntString struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SetIntString struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TSet _set87 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.sIntString = new java.util.HashSet<IntString>(2*_set87.size);
-          @org.apache.thrift.annotation.Nullable IntString _elem88;
-          for (int _i89 = 0; _i89 < _set87.size; ++_i89)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
           {
-            _elem88 = new IntString();
-            _elem88.read(iprot);
-            struct.sIntString.add(_elem88);
+            org.apache.thrift.protocol.TSet _set87 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.sIntString = new java.util.HashSet<IntString>(2*_set87.size);
+            @org.apache.thrift.annotation.Nullable IntString _elem88;
+            for (int _i89 = 0; _i89 < _set87.size; ++_i89)
+            {
+              _elem88 = new IntString();
+              _elem88.read(iprot);
+              struct.sIntString.add(_elem88);
+            }
           }
+          struct.setSIntStringIsSet(true);
         }
-        struct.setSIntStringIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.aString = iprot.readString();
-        struct.setAStringIsSet(true);
+        if (incoming.get(1)) {
+          struct.aString = iprot.readString();
+          struct.setAStringIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/serde/src/gen/thrift/gen-php/Complex.php b/serde/src/gen/thrift/gen-php/Complex.php
index 63b5dfc4afb9..7e4c20f8e11c 100644
--- a/serde/src/gen/thrift/gen-php/Complex.php
+++ b/serde/src/gen/thrift/gen-php/Complex.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/InnerStruct.php b/serde/src/gen/thrift/gen-php/InnerStruct.php
index 26ff09559091..954ec506280f 100644
--- a/serde/src/gen/thrift/gen-php/InnerStruct.php
+++ b/serde/src/gen/thrift/gen-php/InnerStruct.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/IntString.php b/serde/src/gen/thrift/gen-php/IntString.php
index bae9cd9df813..149c9f195207 100644
--- a/serde/src/gen/thrift/gen-php/IntString.php
+++ b/serde/src/gen/thrift/gen-php/IntString.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/MegaStruct.php b/serde/src/gen/thrift/gen-php/MegaStruct.php
index 08ef72affbe5..edc344c2d55f 100644
--- a/serde/src/gen/thrift/gen-php/MegaStruct.php
+++ b/serde/src/gen/thrift/gen-php/MegaStruct.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/MiniStruct.php b/serde/src/gen/thrift/gen-php/MiniStruct.php
index d1e043de2825..f231bf32efd0 100644
--- a/serde/src/gen/thrift/gen-php/MiniStruct.php
+++ b/serde/src/gen/thrift/gen-php/MiniStruct.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/MyEnum.php b/serde/src/gen/thrift/gen-php/MyEnum.php
index bc7d66470ae1..b6704271b6a2 100644
--- a/serde/src/gen/thrift/gen-php/MyEnum.php
+++ b/serde/src/gen/thrift/gen-php/MyEnum.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/PropValueUnion.php b/serde/src/gen/thrift/gen-php/PropValueUnion.php
index 95cf6e1dd35e..114e7e285d14 100644
--- a/serde/src/gen/thrift/gen-php/PropValueUnion.php
+++ b/serde/src/gen/thrift/gen-php/PropValueUnion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/SetIntString.php b/serde/src/gen/thrift/gen-php/SetIntString.php
index b56936b5bfc7..8e9f6d36e76c 100644
--- a/serde/src/gen/thrift/gen-php/SetIntString.php
+++ b/serde/src/gen/thrift/gen-php/SetIntString.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/ThriftTestObj.php b/serde/src/gen/thrift/gen-php/ThriftTestObj.php
index 72b909b1bf69..10706bdc5f85 100644
--- a/serde/src/gen/thrift/gen-php/ThriftTestObj.php
+++ b/serde/src/gen/thrift/gen-php/ThriftTestObj.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Constant.php b/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Constant.php
index 5b61d84a2110..824358f4e260 100644
--- a/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Constant.php
+++ b/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Constant.php
@@ -2,7 +2,7 @@
 namespace org\apache\hadoop\hive\serde;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/serde/src/gen/thrift/gen-py/complex/constants.py b/serde/src/gen/thrift/gen-py/complex/constants.py
index 82c674e0529b..4c25e111aa7c 100644
--- a/serde/src/gen/thrift/gen-py/complex/constants.py
+++ b/serde/src/gen/thrift/gen-py/complex/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 from .ttypes import *
diff --git a/serde/src/gen/thrift/gen-py/complex/ttypes.py b/serde/src/gen/thrift/gen-py/complex/ttypes.py
index 035e3647529b..daf46df31bd7 100644
--- a/serde/src/gen/thrift/gen-py/complex/ttypes.py
+++ b/serde/src/gen/thrift/gen-py/complex/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 
@@ -28,9 +29,10 @@ class PropValueUnion(object):
      - unionMStringString
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, intValue=None, longValue=None, stringValue=None, doubleValue=None, flag=None, lString=None, unionMStringString=None,):
+    def __init__(self, intValue = None, longValue = None, stringValue = None, doubleValue = None, flag = None, lString = None, unionMStringString = None,):
         self.intValue = intValue
         self.longValue = longValue
         self.stringValue = stringValue
@@ -100,6 +102,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -165,9 +168,10 @@ class IntString(object):
      - underscore_int
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, myint=None, myString=None, underscore_int=None,):
+    def __init__(self, myint = None, myString = None, underscore_int = None,):
         self.myint = myint
         self.myString = myString
         self.underscore_int = underscore_int
@@ -202,6 +206,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -251,9 +256,10 @@ class Complex(object):
      - unionField3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, aint=None, aString=None, lint=None, lString=None, lintString=None, mStringString=None, attributes=None, unionField1=None, unionField2=None, unionField3=None,):
+    def __init__(self, aint = None, aString = None, lint = None, lString = None, lintString = None, mStringString = None, attributes = None, unionField1 = None, unionField2 = None, unionField3 = None,):
         self.aint = aint
         self.aString = aString
         self.lint = lint
@@ -374,6 +380,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -468,9 +475,10 @@ class SetIntString(object):
      - aString
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sIntString=None, aString=None,):
+    def __init__(self, sIntString = None, aString = None,):
         self.sIntString = sIntString
         self.aString = aString
 
@@ -505,6 +513,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
diff --git a/serde/src/gen/thrift/gen-py/megastruct/constants.py b/serde/src/gen/thrift/gen-py/megastruct/constants.py
index 82c674e0529b..4c25e111aa7c 100644
--- a/serde/src/gen/thrift/gen-py/megastruct/constants.py
+++ b/serde/src/gen/thrift/gen-py/megastruct/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 from .ttypes import *
diff --git a/serde/src/gen/thrift/gen-py/megastruct/ttypes.py b/serde/src/gen/thrift/gen-py/megastruct/ttypes.py
index d94d054ea9f8..eb271a918f66 100644
--- a/serde/src/gen/thrift/gen-py/megastruct/ttypes.py
+++ b/serde/src/gen/thrift/gen-py/megastruct/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 
@@ -38,9 +39,10 @@ class MiniStruct(object):
      - my_enum
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, my_string=None, my_enum=None,):
+    def __init__(self, my_string = None, my_enum = None,):
         self.my_string = my_string
         self.my_enum = my_enum
 
@@ -69,6 +71,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -124,9 +127,10 @@ class MegaStruct(object):
      - my_structset
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, my_bool=None, my_byte=None, my_16bit_int=None, my_32bit_int=None, my_64bit_int=None, my_double=None, my_string=None, my_binary=None, my_string_string_map=None, my_string_enum_map=None, my_enum_string_map=None, my_enum_struct_map=None, my_enum_stringlist_map=None, my_enum_structlist_map=None, my_stringlist=None, my_structlist=None, my_enumlist=None, my_stringset=None, my_enumset=None, my_structset=None,):
+    def __init__(self, my_bool = None, my_byte = None, my_16bit_int = None, my_32bit_int = None, my_64bit_int = None, my_double = None, my_string = None, my_binary = None, my_string_string_map = None, my_string_enum_map = None, my_enum_string_map = None, my_enum_struct_map = None, my_enum_stringlist_map = None, my_enum_structlist_map = None, my_stringlist = None, my_structlist = None, my_enumlist = None, my_stringset = None, my_enumset = None, my_structset = None,):
         self.my_bool = my_bool
         self.my_byte = my_byte
         self.my_16bit_int = my_16bit_int
@@ -343,6 +347,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
diff --git a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
index 0bce689cb2f3..1d7cf8d3d72b 100644
--- a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
+++ b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 from .ttypes import *
diff --git a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py
index 7e42d87c2d23..d281fa8966fe 100644
--- a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py
+++ b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 
diff --git a/serde/src/gen/thrift/gen-py/testthrift/constants.py b/serde/src/gen/thrift/gen-py/testthrift/constants.py
index 82c674e0529b..4c25e111aa7c 100644
--- a/serde/src/gen/thrift/gen-py/testthrift/constants.py
+++ b/serde/src/gen/thrift/gen-py/testthrift/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 from .ttypes import *
diff --git a/serde/src/gen/thrift/gen-py/testthrift/ttypes.py b/serde/src/gen/thrift/gen-py/testthrift/ttypes.py
index 719b1b352a6c..574e2232c61c 100644
--- a/serde/src/gen/thrift/gen-py/testthrift/ttypes.py
+++ b/serde/src/gen/thrift/gen-py/testthrift/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 
@@ -22,9 +23,10 @@ class InnerStruct(object):
      - field0
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, field0=None,):
+    def __init__(self, field0 = None,):
         self.field0 = field0
 
     def read(self, iprot):
@@ -47,6 +49,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -81,9 +84,10 @@ class ThriftTestObj(object):
      - field3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, field1=None, field2=None, field3=None,):
+    def __init__(self, field1 = None, field2 = None, field3 = None,):
         self.field1 = field1
         self.field2 = field2
         self.field3 = field3
@@ -124,6 +128,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
diff --git a/serde/src/gen/thrift/gen-rb/complex_constants.rb b/serde/src/gen/thrift/gen-rb/complex_constants.rb
index 80f550f48ba2..a6bbe4363bc3 100644
--- a/serde/src/gen/thrift/gen-rb/complex_constants.rb
+++ b/serde/src/gen/thrift/gen-rb/complex_constants.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/serde/src/gen/thrift/gen-rb/complex_types.rb b/serde/src/gen/thrift/gen-rb/complex_types.rb
index 35196a8710ac..1cfeededc774 100644
--- a/serde/src/gen/thrift/gen-rb/complex_types.rb
+++ b/serde/src/gen/thrift/gen-rb/complex_types.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -67,7 +67,7 @@ def unionMStringString(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
diff --git a/serde/src/gen/thrift/gen-rb/megastruct_constants.rb b/serde/src/gen/thrift/gen-rb/megastruct_constants.rb
index 87e08f0d7bdc..62d5ae5a163b 100644
--- a/serde/src/gen/thrift/gen-rb/megastruct_constants.rb
+++ b/serde/src/gen/thrift/gen-rb/megastruct_constants.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/serde/src/gen/thrift/gen-rb/megastruct_types.rb b/serde/src/gen/thrift/gen-rb/megastruct_types.rb
index eb33e1cf3747..c682a054f986 100644
--- a/serde/src/gen/thrift/gen-rb/megastruct_types.rb
+++ b/serde/src/gen/thrift/gen-rb/megastruct_types.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -31,7 +31,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @my_enum.nil? || ::MyEnum::VALID_VALUES.include?(@my_enum)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field my_enum!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field my_enum!')
     end
   end
 
diff --git a/serde/src/gen/thrift/gen-rb/serde_constants.rb b/serde/src/gen/thrift/gen-rb/serde_constants.rb
index 443c76f963a2..2a42cfb43665 100644
--- a/serde/src/gen/thrift/gen-rb/serde_constants.rb
+++ b/serde/src/gen/thrift/gen-rb/serde_constants.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/serde/src/gen/thrift/gen-rb/serde_types.rb b/serde/src/gen/thrift/gen-rb/serde_types.rb
index 8016cca3af94..235e91e3221c 100644
--- a/serde/src/gen/thrift/gen-rb/serde_types.rb
+++ b/serde/src/gen/thrift/gen-rb/serde_types.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/serde/src/gen/thrift/gen-rb/testthrift_constants.rb b/serde/src/gen/thrift/gen-rb/testthrift_constants.rb
index 3fa46c0bf240..bb706bc248f9 100644
--- a/serde/src/gen/thrift/gen-rb/testthrift_constants.rb
+++ b/serde/src/gen/thrift/gen-rb/testthrift_constants.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/serde/src/gen/thrift/gen-rb/testthrift_types.rb b/serde/src/gen/thrift/gen-rb/testthrift_types.rb
index 0dad83cdd482..29422cb2026b 100644
--- a/serde/src/gen/thrift/gen-rb/testthrift_types.rb
+++ b/serde/src/gen/thrift/gen-rb/testthrift_types.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java b/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
index d49dc43a6b02..29e67fd78111 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
@@ -22,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Properties;
+import java.util.UUID;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -298,6 +299,11 @@ public void writeI64(long i64) throws TException {
     writeRawBytes(i64out, 0, 8);
   }
 
+  @Override
+  public void writeUuid(UUID uuid) throws TException {
+    writeString(uuid.toString());
+  }
+
   @Override
   public void writeDouble(double dub) throws TException {
     long i64 = Double.doubleToLongBits(dub);
@@ -577,6 +583,11 @@ public long readI64() throws TException {
         | ((i64rd[7] & 0xff));
   }
 
+  @Override
+  public UUID readUuid() throws TException {
+    return UUID.fromString(readString());
+  }
+
   @Override
   public double readDouble() throws TException {
     if (readIsNull()) {
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java b/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java
index d4590fccfa49..0f06fa31e820 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java
@@ -25,6 +25,7 @@
 import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -586,6 +587,11 @@ public void writeI64(long i64) throws TException {
     writeString(String.valueOf(i64));
   }
 
+  @Override
+  public void writeUuid(UUID uuid) throws TException {
+    writeString(uuid.toString());
+  }
+
   @Override
   public void writeDouble(double dub) throws TException {
     writeString(String.valueOf(dub));
@@ -821,6 +827,11 @@ public long readI64() throws TException {
     }
   }
 
+  @Override
+  public UUID readUuid() throws TException {
+    return UUID.fromString(readString());
+  }
+
   @Override
   public double readDouble() throws TException {
     String val = readString();
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 6f3da75a21a8..ef4f90ef3d05 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -25,6 +25,7 @@
   <name>Hive Service RPC</name>
   <properties>
     <hive.path.to.root>..</hive.path.to.root>
+    <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
   </properties>
   <dependencies>
     <!-- inter-project -->
@@ -37,12 +38,23 @@
       <artifactId>commons-cli</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libfb303</artifactId>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${javax.annotation-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- test inter-project -->
     <dependency>
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService.cpp b/service-rpc/src/gen/thrift/gen-cpp/TCLIService.cpp
index e44412551253..a2de61fae0bc 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService.cpp
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -12,6 +12,8 @@ namespace apache { namespace hive { namespace service { namespace rpc { namespac
 TCLIService_OpenSession_args::~TCLIService_OpenSession_args() noexcept {
 }
 
+TCLIService_OpenSession_args::TCLIService_OpenSession_args() noexcept {
+}
 
 uint32_t TCLIService_OpenSession_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -91,6 +93,8 @@ uint32_t TCLIService_OpenSession_pargs::write(::apache::thrift::protocol::TProto
 TCLIService_OpenSession_result::~TCLIService_OpenSession_result() noexcept {
 }
 
+TCLIService_OpenSession_result::TCLIService_OpenSession_result() noexcept {
+}
 
 uint32_t TCLIService_OpenSession_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -199,6 +203,8 @@ uint32_t TCLIService_OpenSession_presult::read(::apache::thrift::protocol::TProt
 TCLIService_CloseSession_args::~TCLIService_CloseSession_args() noexcept {
 }
 
+TCLIService_CloseSession_args::TCLIService_CloseSession_args() noexcept {
+}
 
 uint32_t TCLIService_CloseSession_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -278,6 +284,8 @@ uint32_t TCLIService_CloseSession_pargs::write(::apache::thrift::protocol::TProt
 TCLIService_CloseSession_result::~TCLIService_CloseSession_result() noexcept {
 }
 
+TCLIService_CloseSession_result::TCLIService_CloseSession_result() noexcept {
+}
 
 uint32_t TCLIService_CloseSession_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -386,6 +394,8 @@ uint32_t TCLIService_CloseSession_presult::read(::apache::thrift::protocol::TPro
 TCLIService_GetInfo_args::~TCLIService_GetInfo_args() noexcept {
 }
 
+TCLIService_GetInfo_args::TCLIService_GetInfo_args() noexcept {
+}
 
 uint32_t TCLIService_GetInfo_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -465,6 +475,8 @@ uint32_t TCLIService_GetInfo_pargs::write(::apache::thrift::protocol::TProtocol*
 TCLIService_GetInfo_result::~TCLIService_GetInfo_result() noexcept {
 }
 
+TCLIService_GetInfo_result::TCLIService_GetInfo_result() noexcept {
+}
 
 uint32_t TCLIService_GetInfo_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -573,6 +585,8 @@ uint32_t TCLIService_GetInfo_presult::read(::apache::thrift::protocol::TProtocol
 TCLIService_ExecuteStatement_args::~TCLIService_ExecuteStatement_args() noexcept {
 }
 
+TCLIService_ExecuteStatement_args::TCLIService_ExecuteStatement_args() noexcept {
+}
 
 uint32_t TCLIService_ExecuteStatement_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -652,6 +666,8 @@ uint32_t TCLIService_ExecuteStatement_pargs::write(::apache::thrift::protocol::T
 TCLIService_ExecuteStatement_result::~TCLIService_ExecuteStatement_result() noexcept {
 }
 
+TCLIService_ExecuteStatement_result::TCLIService_ExecuteStatement_result() noexcept {
+}
 
 uint32_t TCLIService_ExecuteStatement_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -760,6 +776,8 @@ uint32_t TCLIService_ExecuteStatement_presult::read(::apache::thrift::protocol::
 TCLIService_GetTypeInfo_args::~TCLIService_GetTypeInfo_args() noexcept {
 }
 
+TCLIService_GetTypeInfo_args::TCLIService_GetTypeInfo_args() noexcept {
+}
 
 uint32_t TCLIService_GetTypeInfo_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -839,6 +857,8 @@ uint32_t TCLIService_GetTypeInfo_pargs::write(::apache::thrift::protocol::TProto
 TCLIService_GetTypeInfo_result::~TCLIService_GetTypeInfo_result() noexcept {
 }
 
+TCLIService_GetTypeInfo_result::TCLIService_GetTypeInfo_result() noexcept {
+}
 
 uint32_t TCLIService_GetTypeInfo_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -947,6 +967,8 @@ uint32_t TCLIService_GetTypeInfo_presult::read(::apache::thrift::protocol::TProt
 TCLIService_GetCatalogs_args::~TCLIService_GetCatalogs_args() noexcept {
 }
 
+TCLIService_GetCatalogs_args::TCLIService_GetCatalogs_args() noexcept {
+}
 
 uint32_t TCLIService_GetCatalogs_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1026,6 +1048,8 @@ uint32_t TCLIService_GetCatalogs_pargs::write(::apache::thrift::protocol::TProto
 TCLIService_GetCatalogs_result::~TCLIService_GetCatalogs_result() noexcept {
 }
 
+TCLIService_GetCatalogs_result::TCLIService_GetCatalogs_result() noexcept {
+}
 
 uint32_t TCLIService_GetCatalogs_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1134,6 +1158,8 @@ uint32_t TCLIService_GetCatalogs_presult::read(::apache::thrift::protocol::TProt
 TCLIService_GetSchemas_args::~TCLIService_GetSchemas_args() noexcept {
 }
 
+TCLIService_GetSchemas_args::TCLIService_GetSchemas_args() noexcept {
+}
 
 uint32_t TCLIService_GetSchemas_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1213,6 +1239,8 @@ uint32_t TCLIService_GetSchemas_pargs::write(::apache::thrift::protocol::TProtoc
 TCLIService_GetSchemas_result::~TCLIService_GetSchemas_result() noexcept {
 }
 
+TCLIService_GetSchemas_result::TCLIService_GetSchemas_result() noexcept {
+}
 
 uint32_t TCLIService_GetSchemas_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1321,6 +1349,8 @@ uint32_t TCLIService_GetSchemas_presult::read(::apache::thrift::protocol::TProto
 TCLIService_GetTables_args::~TCLIService_GetTables_args() noexcept {
 }
 
+TCLIService_GetTables_args::TCLIService_GetTables_args() noexcept {
+}
 
 uint32_t TCLIService_GetTables_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1400,6 +1430,8 @@ uint32_t TCLIService_GetTables_pargs::write(::apache::thrift::protocol::TProtoco
 TCLIService_GetTables_result::~TCLIService_GetTables_result() noexcept {
 }
 
+TCLIService_GetTables_result::TCLIService_GetTables_result() noexcept {
+}
 
 uint32_t TCLIService_GetTables_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1508,6 +1540,8 @@ uint32_t TCLIService_GetTables_presult::read(::apache::thrift::protocol::TProtoc
 TCLIService_GetTableTypes_args::~TCLIService_GetTableTypes_args() noexcept {
 }
 
+TCLIService_GetTableTypes_args::TCLIService_GetTableTypes_args() noexcept {
+}
 
 uint32_t TCLIService_GetTableTypes_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1587,6 +1621,8 @@ uint32_t TCLIService_GetTableTypes_pargs::write(::apache::thrift::protocol::TPro
 TCLIService_GetTableTypes_result::~TCLIService_GetTableTypes_result() noexcept {
 }
 
+TCLIService_GetTableTypes_result::TCLIService_GetTableTypes_result() noexcept {
+}
 
 uint32_t TCLIService_GetTableTypes_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1695,6 +1731,8 @@ uint32_t TCLIService_GetTableTypes_presult::read(::apache::thrift::protocol::TPr
 TCLIService_GetColumns_args::~TCLIService_GetColumns_args() noexcept {
 }
 
+TCLIService_GetColumns_args::TCLIService_GetColumns_args() noexcept {
+}
 
 uint32_t TCLIService_GetColumns_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1774,6 +1812,8 @@ uint32_t TCLIService_GetColumns_pargs::write(::apache::thrift::protocol::TProtoc
 TCLIService_GetColumns_result::~TCLIService_GetColumns_result() noexcept {
 }
 
+TCLIService_GetColumns_result::TCLIService_GetColumns_result() noexcept {
+}
 
 uint32_t TCLIService_GetColumns_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1882,6 +1922,8 @@ uint32_t TCLIService_GetColumns_presult::read(::apache::thrift::protocol::TProto
 TCLIService_GetFunctions_args::~TCLIService_GetFunctions_args() noexcept {
 }
 
+TCLIService_GetFunctions_args::TCLIService_GetFunctions_args() noexcept {
+}
 
 uint32_t TCLIService_GetFunctions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1961,6 +2003,8 @@ uint32_t TCLIService_GetFunctions_pargs::write(::apache::thrift::protocol::TProt
 TCLIService_GetFunctions_result::~TCLIService_GetFunctions_result() noexcept {
 }
 
+TCLIService_GetFunctions_result::TCLIService_GetFunctions_result() noexcept {
+}
 
 uint32_t TCLIService_GetFunctions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2069,6 +2113,8 @@ uint32_t TCLIService_GetFunctions_presult::read(::apache::thrift::protocol::TPro
 TCLIService_GetPrimaryKeys_args::~TCLIService_GetPrimaryKeys_args() noexcept {
 }
 
+TCLIService_GetPrimaryKeys_args::TCLIService_GetPrimaryKeys_args() noexcept {
+}
 
 uint32_t TCLIService_GetPrimaryKeys_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2148,6 +2194,8 @@ uint32_t TCLIService_GetPrimaryKeys_pargs::write(::apache::thrift::protocol::TPr
 TCLIService_GetPrimaryKeys_result::~TCLIService_GetPrimaryKeys_result() noexcept {
 }
 
+TCLIService_GetPrimaryKeys_result::TCLIService_GetPrimaryKeys_result() noexcept {
+}
 
 uint32_t TCLIService_GetPrimaryKeys_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2256,6 +2304,8 @@ uint32_t TCLIService_GetPrimaryKeys_presult::read(::apache::thrift::protocol::TP
 TCLIService_GetCrossReference_args::~TCLIService_GetCrossReference_args() noexcept {
 }
 
+TCLIService_GetCrossReference_args::TCLIService_GetCrossReference_args() noexcept {
+}
 
 uint32_t TCLIService_GetCrossReference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2335,6 +2385,8 @@ uint32_t TCLIService_GetCrossReference_pargs::write(::apache::thrift::protocol::
 TCLIService_GetCrossReference_result::~TCLIService_GetCrossReference_result() noexcept {
 }
 
+TCLIService_GetCrossReference_result::TCLIService_GetCrossReference_result() noexcept {
+}
 
 uint32_t TCLIService_GetCrossReference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2443,6 +2495,8 @@ uint32_t TCLIService_GetCrossReference_presult::read(::apache::thrift::protocol:
 TCLIService_GetOperationStatus_args::~TCLIService_GetOperationStatus_args() noexcept {
 }
 
+TCLIService_GetOperationStatus_args::TCLIService_GetOperationStatus_args() noexcept {
+}
 
 uint32_t TCLIService_GetOperationStatus_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2522,6 +2576,8 @@ uint32_t TCLIService_GetOperationStatus_pargs::write(::apache::thrift::protocol:
 TCLIService_GetOperationStatus_result::~TCLIService_GetOperationStatus_result() noexcept {
 }
 
+TCLIService_GetOperationStatus_result::TCLIService_GetOperationStatus_result() noexcept {
+}
 
 uint32_t TCLIService_GetOperationStatus_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2630,6 +2686,8 @@ uint32_t TCLIService_GetOperationStatus_presult::read(::apache::thrift::protocol
 TCLIService_CancelOperation_args::~TCLIService_CancelOperation_args() noexcept {
 }
 
+TCLIService_CancelOperation_args::TCLIService_CancelOperation_args() noexcept {
+}
 
 uint32_t TCLIService_CancelOperation_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2709,6 +2767,8 @@ uint32_t TCLIService_CancelOperation_pargs::write(::apache::thrift::protocol::TP
 TCLIService_CancelOperation_result::~TCLIService_CancelOperation_result() noexcept {
 }
 
+TCLIService_CancelOperation_result::TCLIService_CancelOperation_result() noexcept {
+}
 
 uint32_t TCLIService_CancelOperation_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2817,6 +2877,8 @@ uint32_t TCLIService_CancelOperation_presult::read(::apache::thrift::protocol::T
 TCLIService_CloseOperation_args::~TCLIService_CloseOperation_args() noexcept {
 }
 
+TCLIService_CloseOperation_args::TCLIService_CloseOperation_args() noexcept {
+}
 
 uint32_t TCLIService_CloseOperation_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2896,6 +2958,8 @@ uint32_t TCLIService_CloseOperation_pargs::write(::apache::thrift::protocol::TPr
 TCLIService_CloseOperation_result::~TCLIService_CloseOperation_result() noexcept {
 }
 
+TCLIService_CloseOperation_result::TCLIService_CloseOperation_result() noexcept {
+}
 
 uint32_t TCLIService_CloseOperation_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3004,6 +3068,8 @@ uint32_t TCLIService_CloseOperation_presult::read(::apache::thrift::protocol::TP
 TCLIService_GetResultSetMetadata_args::~TCLIService_GetResultSetMetadata_args() noexcept {
 }
 
+TCLIService_GetResultSetMetadata_args::TCLIService_GetResultSetMetadata_args() noexcept {
+}
 
 uint32_t TCLIService_GetResultSetMetadata_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3083,6 +3149,8 @@ uint32_t TCLIService_GetResultSetMetadata_pargs::write(::apache::thrift::protoco
 TCLIService_GetResultSetMetadata_result::~TCLIService_GetResultSetMetadata_result() noexcept {
 }
 
+TCLIService_GetResultSetMetadata_result::TCLIService_GetResultSetMetadata_result() noexcept {
+}
 
 uint32_t TCLIService_GetResultSetMetadata_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3191,6 +3259,8 @@ uint32_t TCLIService_GetResultSetMetadata_presult::read(::apache::thrift::protoc
 TCLIService_FetchResults_args::~TCLIService_FetchResults_args() noexcept {
 }
 
+TCLIService_FetchResults_args::TCLIService_FetchResults_args() noexcept {
+}
 
 uint32_t TCLIService_FetchResults_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3270,6 +3340,8 @@ uint32_t TCLIService_FetchResults_pargs::write(::apache::thrift::protocol::TProt
 TCLIService_FetchResults_result::~TCLIService_FetchResults_result() noexcept {
 }
 
+TCLIService_FetchResults_result::TCLIService_FetchResults_result() noexcept {
+}
 
 uint32_t TCLIService_FetchResults_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3378,6 +3450,8 @@ uint32_t TCLIService_FetchResults_presult::read(::apache::thrift::protocol::TPro
 TCLIService_GetDelegationToken_args::~TCLIService_GetDelegationToken_args() noexcept {
 }
 
+TCLIService_GetDelegationToken_args::TCLIService_GetDelegationToken_args() noexcept {
+}
 
 uint32_t TCLIService_GetDelegationToken_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3457,6 +3531,8 @@ uint32_t TCLIService_GetDelegationToken_pargs::write(::apache::thrift::protocol:
 TCLIService_GetDelegationToken_result::~TCLIService_GetDelegationToken_result() noexcept {
 }
 
+TCLIService_GetDelegationToken_result::TCLIService_GetDelegationToken_result() noexcept {
+}
 
 uint32_t TCLIService_GetDelegationToken_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3565,6 +3641,8 @@ uint32_t TCLIService_GetDelegationToken_presult::read(::apache::thrift::protocol
 TCLIService_CancelDelegationToken_args::~TCLIService_CancelDelegationToken_args() noexcept {
 }
 
+TCLIService_CancelDelegationToken_args::TCLIService_CancelDelegationToken_args() noexcept {
+}
 
 uint32_t TCLIService_CancelDelegationToken_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3644,6 +3722,8 @@ uint32_t TCLIService_CancelDelegationToken_pargs::write(::apache::thrift::protoc
 TCLIService_CancelDelegationToken_result::~TCLIService_CancelDelegationToken_result() noexcept {
 }
 
+TCLIService_CancelDelegationToken_result::TCLIService_CancelDelegationToken_result() noexcept {
+}
 
 uint32_t TCLIService_CancelDelegationToken_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3752,6 +3832,8 @@ uint32_t TCLIService_CancelDelegationToken_presult::read(::apache::thrift::proto
 TCLIService_RenewDelegationToken_args::~TCLIService_RenewDelegationToken_args() noexcept {
 }
 
+TCLIService_RenewDelegationToken_args::TCLIService_RenewDelegationToken_args() noexcept {
+}
 
 uint32_t TCLIService_RenewDelegationToken_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3831,6 +3913,8 @@ uint32_t TCLIService_RenewDelegationToken_pargs::write(::apache::thrift::protoco
 TCLIService_RenewDelegationToken_result::~TCLIService_RenewDelegationToken_result() noexcept {
 }
 
+TCLIService_RenewDelegationToken_result::TCLIService_RenewDelegationToken_result() noexcept {
+}
 
 uint32_t TCLIService_RenewDelegationToken_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3939,6 +4023,8 @@ uint32_t TCLIService_RenewDelegationToken_presult::read(::apache::thrift::protoc
 TCLIService_GetQueryId_args::~TCLIService_GetQueryId_args() noexcept {
 }
 
+TCLIService_GetQueryId_args::TCLIService_GetQueryId_args() noexcept {
+}
 
 uint32_t TCLIService_GetQueryId_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4018,6 +4104,8 @@ uint32_t TCLIService_GetQueryId_pargs::write(::apache::thrift::protocol::TProtoc
 TCLIService_GetQueryId_result::~TCLIService_GetQueryId_result() noexcept {
 }
 
+TCLIService_GetQueryId_result::TCLIService_GetQueryId_result() noexcept {
+}
 
 uint32_t TCLIService_GetQueryId_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4126,6 +4214,8 @@ uint32_t TCLIService_GetQueryId_presult::read(::apache::thrift::protocol::TProto
 TCLIService_SetClientInfo_args::~TCLIService_SetClientInfo_args() noexcept {
 }
 
+TCLIService_SetClientInfo_args::TCLIService_SetClientInfo_args() noexcept {
+}
 
 uint32_t TCLIService_SetClientInfo_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4205,6 +4295,8 @@ uint32_t TCLIService_SetClientInfo_pargs::write(::apache::thrift::protocol::TPro
 TCLIService_SetClientInfo_result::~TCLIService_SetClientInfo_result() noexcept {
 }
 
+TCLIService_SetClientInfo_result::TCLIService_SetClientInfo_result() noexcept {
+}
 
 uint32_t TCLIService_SetClientInfo_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4313,6 +4405,8 @@ uint32_t TCLIService_SetClientInfo_presult::read(::apache::thrift::protocol::TPr
 TCLIService_UploadData_args::~TCLIService_UploadData_args() noexcept {
 }
 
+TCLIService_UploadData_args::TCLIService_UploadData_args() noexcept {
+}
 
 uint32_t TCLIService_UploadData_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4392,6 +4486,8 @@ uint32_t TCLIService_UploadData_pargs::write(::apache::thrift::protocol::TProtoc
 TCLIService_UploadData_result::~TCLIService_UploadData_result() noexcept {
 }
 
+TCLIService_UploadData_result::TCLIService_UploadData_result() noexcept {
+}
 
 uint32_t TCLIService_UploadData_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4500,6 +4596,8 @@ uint32_t TCLIService_UploadData_presult::read(::apache::thrift::protocol::TProto
 TCLIService_DownloadData_args::~TCLIService_DownloadData_args() noexcept {
 }
 
+TCLIService_DownloadData_args::TCLIService_DownloadData_args() noexcept {
+}
 
 uint32_t TCLIService_DownloadData_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4579,6 +4677,8 @@ uint32_t TCLIService_DownloadData_pargs::write(::apache::thrift::protocol::TProt
 TCLIService_DownloadData_result::~TCLIService_DownloadData_result() noexcept {
 }
 
+TCLIService_DownloadData_result::TCLIService_DownloadData_result() noexcept {
+}
 
 uint32_t TCLIService_DownloadData_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService.h b/service-rpc/src/gen/thrift/gen-cpp/TCLIService.h
index ac5f1d2719db..2c6c2fd64649 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService.h
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -163,8 +163,7 @@ class TCLIService_OpenSession_args {
 
   TCLIService_OpenSession_args(const TCLIService_OpenSession_args&);
   TCLIService_OpenSession_args& operator=(const TCLIService_OpenSession_args&);
-  TCLIService_OpenSession_args() noexcept {
-  }
+  TCLIService_OpenSession_args() noexcept;
 
   virtual ~TCLIService_OpenSession_args() noexcept;
   TOpenSessionReq req;
@@ -173,12 +172,7 @@ class TCLIService_OpenSession_args {
 
   void __set_req(const TOpenSessionReq& val);
 
-  bool operator == (const TCLIService_OpenSession_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_OpenSession_args & rhs) const;
   bool operator != (const TCLIService_OpenSession_args &rhs) const {
     return !(*this == rhs);
   }
@@ -212,8 +206,7 @@ class TCLIService_OpenSession_result {
 
   TCLIService_OpenSession_result(const TCLIService_OpenSession_result&);
   TCLIService_OpenSession_result& operator=(const TCLIService_OpenSession_result&);
-  TCLIService_OpenSession_result() noexcept {
-  }
+  TCLIService_OpenSession_result() noexcept;
 
   virtual ~TCLIService_OpenSession_result() noexcept;
   TOpenSessionResp success;
@@ -222,12 +215,7 @@ class TCLIService_OpenSession_result {
 
   void __set_success(const TOpenSessionResp& val);
 
-  bool operator == (const TCLIService_OpenSession_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_OpenSession_result & rhs) const;
   bool operator != (const TCLIService_OpenSession_result &rhs) const {
     return !(*this == rhs);
   }
@@ -267,8 +255,7 @@ class TCLIService_CloseSession_args {
 
   TCLIService_CloseSession_args(const TCLIService_CloseSession_args&);
   TCLIService_CloseSession_args& operator=(const TCLIService_CloseSession_args&);
-  TCLIService_CloseSession_args() noexcept {
-  }
+  TCLIService_CloseSession_args() noexcept;
 
   virtual ~TCLIService_CloseSession_args() noexcept;
   TCloseSessionReq req;
@@ -277,12 +264,7 @@ class TCLIService_CloseSession_args {
 
   void __set_req(const TCloseSessionReq& val);
 
-  bool operator == (const TCLIService_CloseSession_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CloseSession_args & rhs) const;
   bool operator != (const TCLIService_CloseSession_args &rhs) const {
     return !(*this == rhs);
   }
@@ -316,8 +298,7 @@ class TCLIService_CloseSession_result {
 
   TCLIService_CloseSession_result(const TCLIService_CloseSession_result&);
   TCLIService_CloseSession_result& operator=(const TCLIService_CloseSession_result&);
-  TCLIService_CloseSession_result() noexcept {
-  }
+  TCLIService_CloseSession_result() noexcept;
 
   virtual ~TCLIService_CloseSession_result() noexcept;
   TCloseSessionResp success;
@@ -326,12 +307,7 @@ class TCLIService_CloseSession_result {
 
   void __set_success(const TCloseSessionResp& val);
 
-  bool operator == (const TCLIService_CloseSession_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CloseSession_result & rhs) const;
   bool operator != (const TCLIService_CloseSession_result &rhs) const {
     return !(*this == rhs);
   }
@@ -371,8 +347,7 @@ class TCLIService_GetInfo_args {
 
   TCLIService_GetInfo_args(const TCLIService_GetInfo_args&);
   TCLIService_GetInfo_args& operator=(const TCLIService_GetInfo_args&);
-  TCLIService_GetInfo_args() noexcept {
-  }
+  TCLIService_GetInfo_args() noexcept;
 
   virtual ~TCLIService_GetInfo_args() noexcept;
   TGetInfoReq req;
@@ -381,12 +356,7 @@ class TCLIService_GetInfo_args {
 
   void __set_req(const TGetInfoReq& val);
 
-  bool operator == (const TCLIService_GetInfo_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetInfo_args & rhs) const;
   bool operator != (const TCLIService_GetInfo_args &rhs) const {
     return !(*this == rhs);
   }
@@ -420,8 +390,7 @@ class TCLIService_GetInfo_result {
 
   TCLIService_GetInfo_result(const TCLIService_GetInfo_result&);
   TCLIService_GetInfo_result& operator=(const TCLIService_GetInfo_result&);
-  TCLIService_GetInfo_result() noexcept {
-  }
+  TCLIService_GetInfo_result() noexcept;
 
   virtual ~TCLIService_GetInfo_result() noexcept;
   TGetInfoResp success;
@@ -430,12 +399,7 @@ class TCLIService_GetInfo_result {
 
   void __set_success(const TGetInfoResp& val);
 
-  bool operator == (const TCLIService_GetInfo_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetInfo_result & rhs) const;
   bool operator != (const TCLIService_GetInfo_result &rhs) const {
     return !(*this == rhs);
   }
@@ -475,8 +439,7 @@ class TCLIService_ExecuteStatement_args {
 
   TCLIService_ExecuteStatement_args(const TCLIService_ExecuteStatement_args&);
   TCLIService_ExecuteStatement_args& operator=(const TCLIService_ExecuteStatement_args&);
-  TCLIService_ExecuteStatement_args() noexcept {
-  }
+  TCLIService_ExecuteStatement_args() noexcept;
 
   virtual ~TCLIService_ExecuteStatement_args() noexcept;
   TExecuteStatementReq req;
@@ -485,12 +448,7 @@ class TCLIService_ExecuteStatement_args {
 
   void __set_req(const TExecuteStatementReq& val);
 
-  bool operator == (const TCLIService_ExecuteStatement_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_ExecuteStatement_args & rhs) const;
   bool operator != (const TCLIService_ExecuteStatement_args &rhs) const {
     return !(*this == rhs);
   }
@@ -524,8 +482,7 @@ class TCLIService_ExecuteStatement_result {
 
   TCLIService_ExecuteStatement_result(const TCLIService_ExecuteStatement_result&);
   TCLIService_ExecuteStatement_result& operator=(const TCLIService_ExecuteStatement_result&);
-  TCLIService_ExecuteStatement_result() noexcept {
-  }
+  TCLIService_ExecuteStatement_result() noexcept;
 
   virtual ~TCLIService_ExecuteStatement_result() noexcept;
   TExecuteStatementResp success;
@@ -534,12 +491,7 @@ class TCLIService_ExecuteStatement_result {
 
   void __set_success(const TExecuteStatementResp& val);
 
-  bool operator == (const TCLIService_ExecuteStatement_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_ExecuteStatement_result & rhs) const;
   bool operator != (const TCLIService_ExecuteStatement_result &rhs) const {
     return !(*this == rhs);
   }
@@ -579,8 +531,7 @@ class TCLIService_GetTypeInfo_args {
 
   TCLIService_GetTypeInfo_args(const TCLIService_GetTypeInfo_args&);
   TCLIService_GetTypeInfo_args& operator=(const TCLIService_GetTypeInfo_args&);
-  TCLIService_GetTypeInfo_args() noexcept {
-  }
+  TCLIService_GetTypeInfo_args() noexcept;
 
   virtual ~TCLIService_GetTypeInfo_args() noexcept;
   TGetTypeInfoReq req;
@@ -589,12 +540,7 @@ class TCLIService_GetTypeInfo_args {
 
   void __set_req(const TGetTypeInfoReq& val);
 
-  bool operator == (const TCLIService_GetTypeInfo_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetTypeInfo_args & rhs) const;
   bool operator != (const TCLIService_GetTypeInfo_args &rhs) const {
     return !(*this == rhs);
   }
@@ -628,8 +574,7 @@ class TCLIService_GetTypeInfo_result {
 
   TCLIService_GetTypeInfo_result(const TCLIService_GetTypeInfo_result&);
   TCLIService_GetTypeInfo_result& operator=(const TCLIService_GetTypeInfo_result&);
-  TCLIService_GetTypeInfo_result() noexcept {
-  }
+  TCLIService_GetTypeInfo_result() noexcept;
 
   virtual ~TCLIService_GetTypeInfo_result() noexcept;
   TGetTypeInfoResp success;
@@ -638,12 +583,7 @@ class TCLIService_GetTypeInfo_result {
 
   void __set_success(const TGetTypeInfoResp& val);
 
-  bool operator == (const TCLIService_GetTypeInfo_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetTypeInfo_result & rhs) const;
   bool operator != (const TCLIService_GetTypeInfo_result &rhs) const {
     return !(*this == rhs);
   }
@@ -683,8 +623,7 @@ class TCLIService_GetCatalogs_args {
 
   TCLIService_GetCatalogs_args(const TCLIService_GetCatalogs_args&);
   TCLIService_GetCatalogs_args& operator=(const TCLIService_GetCatalogs_args&);
-  TCLIService_GetCatalogs_args() noexcept {
-  }
+  TCLIService_GetCatalogs_args() noexcept;
 
   virtual ~TCLIService_GetCatalogs_args() noexcept;
   TGetCatalogsReq req;
@@ -693,12 +632,7 @@ class TCLIService_GetCatalogs_args {
 
   void __set_req(const TGetCatalogsReq& val);
 
-  bool operator == (const TCLIService_GetCatalogs_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetCatalogs_args & rhs) const;
   bool operator != (const TCLIService_GetCatalogs_args &rhs) const {
     return !(*this == rhs);
   }
@@ -732,8 +666,7 @@ class TCLIService_GetCatalogs_result {
 
   TCLIService_GetCatalogs_result(const TCLIService_GetCatalogs_result&);
   TCLIService_GetCatalogs_result& operator=(const TCLIService_GetCatalogs_result&);
-  TCLIService_GetCatalogs_result() noexcept {
-  }
+  TCLIService_GetCatalogs_result() noexcept;
 
   virtual ~TCLIService_GetCatalogs_result() noexcept;
   TGetCatalogsResp success;
@@ -742,12 +675,7 @@ class TCLIService_GetCatalogs_result {
 
   void __set_success(const TGetCatalogsResp& val);
 
-  bool operator == (const TCLIService_GetCatalogs_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetCatalogs_result & rhs) const;
   bool operator != (const TCLIService_GetCatalogs_result &rhs) const {
     return !(*this == rhs);
   }
@@ -787,8 +715,7 @@ class TCLIService_GetSchemas_args {
 
   TCLIService_GetSchemas_args(const TCLIService_GetSchemas_args&);
   TCLIService_GetSchemas_args& operator=(const TCLIService_GetSchemas_args&);
-  TCLIService_GetSchemas_args() noexcept {
-  }
+  TCLIService_GetSchemas_args() noexcept;
 
   virtual ~TCLIService_GetSchemas_args() noexcept;
   TGetSchemasReq req;
@@ -797,12 +724,7 @@ class TCLIService_GetSchemas_args {
 
   void __set_req(const TGetSchemasReq& val);
 
-  bool operator == (const TCLIService_GetSchemas_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetSchemas_args & rhs) const;
   bool operator != (const TCLIService_GetSchemas_args &rhs) const {
     return !(*this == rhs);
   }
@@ -836,8 +758,7 @@ class TCLIService_GetSchemas_result {
 
   TCLIService_GetSchemas_result(const TCLIService_GetSchemas_result&);
   TCLIService_GetSchemas_result& operator=(const TCLIService_GetSchemas_result&);
-  TCLIService_GetSchemas_result() noexcept {
-  }
+  TCLIService_GetSchemas_result() noexcept;
 
   virtual ~TCLIService_GetSchemas_result() noexcept;
   TGetSchemasResp success;
@@ -846,12 +767,7 @@ class TCLIService_GetSchemas_result {
 
   void __set_success(const TGetSchemasResp& val);
 
-  bool operator == (const TCLIService_GetSchemas_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetSchemas_result & rhs) const;
   bool operator != (const TCLIService_GetSchemas_result &rhs) const {
     return !(*this == rhs);
   }
@@ -891,8 +807,7 @@ class TCLIService_GetTables_args {
 
   TCLIService_GetTables_args(const TCLIService_GetTables_args&);
   TCLIService_GetTables_args& operator=(const TCLIService_GetTables_args&);
-  TCLIService_GetTables_args() noexcept {
-  }
+  TCLIService_GetTables_args() noexcept;
 
   virtual ~TCLIService_GetTables_args() noexcept;
   TGetTablesReq req;
@@ -901,12 +816,7 @@ class TCLIService_GetTables_args {
 
   void __set_req(const TGetTablesReq& val);
 
-  bool operator == (const TCLIService_GetTables_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetTables_args & rhs) const;
   bool operator != (const TCLIService_GetTables_args &rhs) const {
     return !(*this == rhs);
   }
@@ -940,8 +850,7 @@ class TCLIService_GetTables_result {
 
   TCLIService_GetTables_result(const TCLIService_GetTables_result&);
   TCLIService_GetTables_result& operator=(const TCLIService_GetTables_result&);
-  TCLIService_GetTables_result() noexcept {
-  }
+  TCLIService_GetTables_result() noexcept;
 
   virtual ~TCLIService_GetTables_result() noexcept;
   TGetTablesResp success;
@@ -950,12 +859,7 @@ class TCLIService_GetTables_result {
 
   void __set_success(const TGetTablesResp& val);
 
-  bool operator == (const TCLIService_GetTables_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetTables_result & rhs) const;
   bool operator != (const TCLIService_GetTables_result &rhs) const {
     return !(*this == rhs);
   }
@@ -995,8 +899,7 @@ class TCLIService_GetTableTypes_args {
 
   TCLIService_GetTableTypes_args(const TCLIService_GetTableTypes_args&);
   TCLIService_GetTableTypes_args& operator=(const TCLIService_GetTableTypes_args&);
-  TCLIService_GetTableTypes_args() noexcept {
-  }
+  TCLIService_GetTableTypes_args() noexcept;
 
   virtual ~TCLIService_GetTableTypes_args() noexcept;
   TGetTableTypesReq req;
@@ -1005,12 +908,7 @@ class TCLIService_GetTableTypes_args {
 
   void __set_req(const TGetTableTypesReq& val);
 
-  bool operator == (const TCLIService_GetTableTypes_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetTableTypes_args & rhs) const;
   bool operator != (const TCLIService_GetTableTypes_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1044,8 +942,7 @@ class TCLIService_GetTableTypes_result {
 
   TCLIService_GetTableTypes_result(const TCLIService_GetTableTypes_result&);
   TCLIService_GetTableTypes_result& operator=(const TCLIService_GetTableTypes_result&);
-  TCLIService_GetTableTypes_result() noexcept {
-  }
+  TCLIService_GetTableTypes_result() noexcept;
 
   virtual ~TCLIService_GetTableTypes_result() noexcept;
   TGetTableTypesResp success;
@@ -1054,12 +951,7 @@ class TCLIService_GetTableTypes_result {
 
   void __set_success(const TGetTableTypesResp& val);
 
-  bool operator == (const TCLIService_GetTableTypes_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetTableTypes_result & rhs) const;
   bool operator != (const TCLIService_GetTableTypes_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1099,8 +991,7 @@ class TCLIService_GetColumns_args {
 
   TCLIService_GetColumns_args(const TCLIService_GetColumns_args&);
   TCLIService_GetColumns_args& operator=(const TCLIService_GetColumns_args&);
-  TCLIService_GetColumns_args() noexcept {
-  }
+  TCLIService_GetColumns_args() noexcept;
 
   virtual ~TCLIService_GetColumns_args() noexcept;
   TGetColumnsReq req;
@@ -1109,12 +1000,7 @@ class TCLIService_GetColumns_args {
 
   void __set_req(const TGetColumnsReq& val);
 
-  bool operator == (const TCLIService_GetColumns_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetColumns_args & rhs) const;
   bool operator != (const TCLIService_GetColumns_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1148,8 +1034,7 @@ class TCLIService_GetColumns_result {
 
   TCLIService_GetColumns_result(const TCLIService_GetColumns_result&);
   TCLIService_GetColumns_result& operator=(const TCLIService_GetColumns_result&);
-  TCLIService_GetColumns_result() noexcept {
-  }
+  TCLIService_GetColumns_result() noexcept;
 
   virtual ~TCLIService_GetColumns_result() noexcept;
   TGetColumnsResp success;
@@ -1158,12 +1043,7 @@ class TCLIService_GetColumns_result {
 
   void __set_success(const TGetColumnsResp& val);
 
-  bool operator == (const TCLIService_GetColumns_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetColumns_result & rhs) const;
   bool operator != (const TCLIService_GetColumns_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1203,8 +1083,7 @@ class TCLIService_GetFunctions_args {
 
   TCLIService_GetFunctions_args(const TCLIService_GetFunctions_args&);
   TCLIService_GetFunctions_args& operator=(const TCLIService_GetFunctions_args&);
-  TCLIService_GetFunctions_args() noexcept {
-  }
+  TCLIService_GetFunctions_args() noexcept;
 
   virtual ~TCLIService_GetFunctions_args() noexcept;
   TGetFunctionsReq req;
@@ -1213,12 +1092,7 @@ class TCLIService_GetFunctions_args {
 
   void __set_req(const TGetFunctionsReq& val);
 
-  bool operator == (const TCLIService_GetFunctions_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetFunctions_args & rhs) const;
   bool operator != (const TCLIService_GetFunctions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1252,8 +1126,7 @@ class TCLIService_GetFunctions_result {
 
   TCLIService_GetFunctions_result(const TCLIService_GetFunctions_result&);
   TCLIService_GetFunctions_result& operator=(const TCLIService_GetFunctions_result&);
-  TCLIService_GetFunctions_result() noexcept {
-  }
+  TCLIService_GetFunctions_result() noexcept;
 
   virtual ~TCLIService_GetFunctions_result() noexcept;
   TGetFunctionsResp success;
@@ -1262,12 +1135,7 @@ class TCLIService_GetFunctions_result {
 
   void __set_success(const TGetFunctionsResp& val);
 
-  bool operator == (const TCLIService_GetFunctions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetFunctions_result & rhs) const;
   bool operator != (const TCLIService_GetFunctions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1307,8 +1175,7 @@ class TCLIService_GetPrimaryKeys_args {
 
   TCLIService_GetPrimaryKeys_args(const TCLIService_GetPrimaryKeys_args&);
   TCLIService_GetPrimaryKeys_args& operator=(const TCLIService_GetPrimaryKeys_args&);
-  TCLIService_GetPrimaryKeys_args() noexcept {
-  }
+  TCLIService_GetPrimaryKeys_args() noexcept;
 
   virtual ~TCLIService_GetPrimaryKeys_args() noexcept;
   TGetPrimaryKeysReq req;
@@ -1317,12 +1184,7 @@ class TCLIService_GetPrimaryKeys_args {
 
   void __set_req(const TGetPrimaryKeysReq& val);
 
-  bool operator == (const TCLIService_GetPrimaryKeys_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetPrimaryKeys_args & rhs) const;
   bool operator != (const TCLIService_GetPrimaryKeys_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1356,8 +1218,7 @@ class TCLIService_GetPrimaryKeys_result {
 
   TCLIService_GetPrimaryKeys_result(const TCLIService_GetPrimaryKeys_result&);
   TCLIService_GetPrimaryKeys_result& operator=(const TCLIService_GetPrimaryKeys_result&);
-  TCLIService_GetPrimaryKeys_result() noexcept {
-  }
+  TCLIService_GetPrimaryKeys_result() noexcept;
 
   virtual ~TCLIService_GetPrimaryKeys_result() noexcept;
   TGetPrimaryKeysResp success;
@@ -1366,12 +1227,7 @@ class TCLIService_GetPrimaryKeys_result {
 
   void __set_success(const TGetPrimaryKeysResp& val);
 
-  bool operator == (const TCLIService_GetPrimaryKeys_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetPrimaryKeys_result & rhs) const;
   bool operator != (const TCLIService_GetPrimaryKeys_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1411,8 +1267,7 @@ class TCLIService_GetCrossReference_args {
 
   TCLIService_GetCrossReference_args(const TCLIService_GetCrossReference_args&);
   TCLIService_GetCrossReference_args& operator=(const TCLIService_GetCrossReference_args&);
-  TCLIService_GetCrossReference_args() noexcept {
-  }
+  TCLIService_GetCrossReference_args() noexcept;
 
   virtual ~TCLIService_GetCrossReference_args() noexcept;
   TGetCrossReferenceReq req;
@@ -1421,12 +1276,7 @@ class TCLIService_GetCrossReference_args {
 
   void __set_req(const TGetCrossReferenceReq& val);
 
-  bool operator == (const TCLIService_GetCrossReference_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetCrossReference_args & rhs) const;
   bool operator != (const TCLIService_GetCrossReference_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1460,8 +1310,7 @@ class TCLIService_GetCrossReference_result {
 
   TCLIService_GetCrossReference_result(const TCLIService_GetCrossReference_result&);
   TCLIService_GetCrossReference_result& operator=(const TCLIService_GetCrossReference_result&);
-  TCLIService_GetCrossReference_result() noexcept {
-  }
+  TCLIService_GetCrossReference_result() noexcept;
 
   virtual ~TCLIService_GetCrossReference_result() noexcept;
   TGetCrossReferenceResp success;
@@ -1470,12 +1319,7 @@ class TCLIService_GetCrossReference_result {
 
   void __set_success(const TGetCrossReferenceResp& val);
 
-  bool operator == (const TCLIService_GetCrossReference_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetCrossReference_result & rhs) const;
   bool operator != (const TCLIService_GetCrossReference_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1515,8 +1359,7 @@ class TCLIService_GetOperationStatus_args {
 
   TCLIService_GetOperationStatus_args(const TCLIService_GetOperationStatus_args&);
   TCLIService_GetOperationStatus_args& operator=(const TCLIService_GetOperationStatus_args&);
-  TCLIService_GetOperationStatus_args() noexcept {
-  }
+  TCLIService_GetOperationStatus_args() noexcept;
 
   virtual ~TCLIService_GetOperationStatus_args() noexcept;
   TGetOperationStatusReq req;
@@ -1525,12 +1368,7 @@ class TCLIService_GetOperationStatus_args {
 
   void __set_req(const TGetOperationStatusReq& val);
 
-  bool operator == (const TCLIService_GetOperationStatus_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetOperationStatus_args & rhs) const;
   bool operator != (const TCLIService_GetOperationStatus_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1564,8 +1402,7 @@ class TCLIService_GetOperationStatus_result {
 
   TCLIService_GetOperationStatus_result(const TCLIService_GetOperationStatus_result&);
   TCLIService_GetOperationStatus_result& operator=(const TCLIService_GetOperationStatus_result&);
-  TCLIService_GetOperationStatus_result() noexcept {
-  }
+  TCLIService_GetOperationStatus_result() noexcept;
 
   virtual ~TCLIService_GetOperationStatus_result() noexcept;
   TGetOperationStatusResp success;
@@ -1574,12 +1411,7 @@ class TCLIService_GetOperationStatus_result {
 
   void __set_success(const TGetOperationStatusResp& val);
 
-  bool operator == (const TCLIService_GetOperationStatus_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetOperationStatus_result & rhs) const;
   bool operator != (const TCLIService_GetOperationStatus_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1619,8 +1451,7 @@ class TCLIService_CancelOperation_args {
 
   TCLIService_CancelOperation_args(const TCLIService_CancelOperation_args&);
   TCLIService_CancelOperation_args& operator=(const TCLIService_CancelOperation_args&);
-  TCLIService_CancelOperation_args() noexcept {
-  }
+  TCLIService_CancelOperation_args() noexcept;
 
   virtual ~TCLIService_CancelOperation_args() noexcept;
   TCancelOperationReq req;
@@ -1629,12 +1460,7 @@ class TCLIService_CancelOperation_args {
 
   void __set_req(const TCancelOperationReq& val);
 
-  bool operator == (const TCLIService_CancelOperation_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CancelOperation_args & rhs) const;
   bool operator != (const TCLIService_CancelOperation_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1668,8 +1494,7 @@ class TCLIService_CancelOperation_result {
 
   TCLIService_CancelOperation_result(const TCLIService_CancelOperation_result&);
   TCLIService_CancelOperation_result& operator=(const TCLIService_CancelOperation_result&);
-  TCLIService_CancelOperation_result() noexcept {
-  }
+  TCLIService_CancelOperation_result() noexcept;
 
   virtual ~TCLIService_CancelOperation_result() noexcept;
   TCancelOperationResp success;
@@ -1678,12 +1503,7 @@ class TCLIService_CancelOperation_result {
 
   void __set_success(const TCancelOperationResp& val);
 
-  bool operator == (const TCLIService_CancelOperation_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CancelOperation_result & rhs) const;
   bool operator != (const TCLIService_CancelOperation_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1723,8 +1543,7 @@ class TCLIService_CloseOperation_args {
 
   TCLIService_CloseOperation_args(const TCLIService_CloseOperation_args&);
   TCLIService_CloseOperation_args& operator=(const TCLIService_CloseOperation_args&);
-  TCLIService_CloseOperation_args() noexcept {
-  }
+  TCLIService_CloseOperation_args() noexcept;
 
   virtual ~TCLIService_CloseOperation_args() noexcept;
   TCloseOperationReq req;
@@ -1733,12 +1552,7 @@ class TCLIService_CloseOperation_args {
 
   void __set_req(const TCloseOperationReq& val);
 
-  bool operator == (const TCLIService_CloseOperation_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CloseOperation_args & rhs) const;
   bool operator != (const TCLIService_CloseOperation_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1772,8 +1586,7 @@ class TCLIService_CloseOperation_result {
 
   TCLIService_CloseOperation_result(const TCLIService_CloseOperation_result&);
   TCLIService_CloseOperation_result& operator=(const TCLIService_CloseOperation_result&);
-  TCLIService_CloseOperation_result() noexcept {
-  }
+  TCLIService_CloseOperation_result() noexcept;
 
   virtual ~TCLIService_CloseOperation_result() noexcept;
   TCloseOperationResp success;
@@ -1782,12 +1595,7 @@ class TCLIService_CloseOperation_result {
 
   void __set_success(const TCloseOperationResp& val);
 
-  bool operator == (const TCLIService_CloseOperation_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CloseOperation_result & rhs) const;
   bool operator != (const TCLIService_CloseOperation_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1827,8 +1635,7 @@ class TCLIService_GetResultSetMetadata_args {
 
   TCLIService_GetResultSetMetadata_args(const TCLIService_GetResultSetMetadata_args&);
   TCLIService_GetResultSetMetadata_args& operator=(const TCLIService_GetResultSetMetadata_args&);
-  TCLIService_GetResultSetMetadata_args() noexcept {
-  }
+  TCLIService_GetResultSetMetadata_args() noexcept;
 
   virtual ~TCLIService_GetResultSetMetadata_args() noexcept;
   TGetResultSetMetadataReq req;
@@ -1837,12 +1644,7 @@ class TCLIService_GetResultSetMetadata_args {
 
   void __set_req(const TGetResultSetMetadataReq& val);
 
-  bool operator == (const TCLIService_GetResultSetMetadata_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetResultSetMetadata_args & rhs) const;
   bool operator != (const TCLIService_GetResultSetMetadata_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1876,8 +1678,7 @@ class TCLIService_GetResultSetMetadata_result {
 
   TCLIService_GetResultSetMetadata_result(const TCLIService_GetResultSetMetadata_result&);
   TCLIService_GetResultSetMetadata_result& operator=(const TCLIService_GetResultSetMetadata_result&);
-  TCLIService_GetResultSetMetadata_result() noexcept {
-  }
+  TCLIService_GetResultSetMetadata_result() noexcept;
 
   virtual ~TCLIService_GetResultSetMetadata_result() noexcept;
   TGetResultSetMetadataResp success;
@@ -1886,12 +1687,7 @@ class TCLIService_GetResultSetMetadata_result {
 
   void __set_success(const TGetResultSetMetadataResp& val);
 
-  bool operator == (const TCLIService_GetResultSetMetadata_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetResultSetMetadata_result & rhs) const;
   bool operator != (const TCLIService_GetResultSetMetadata_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1931,8 +1727,7 @@ class TCLIService_FetchResults_args {
 
   TCLIService_FetchResults_args(const TCLIService_FetchResults_args&);
   TCLIService_FetchResults_args& operator=(const TCLIService_FetchResults_args&);
-  TCLIService_FetchResults_args() noexcept {
-  }
+  TCLIService_FetchResults_args() noexcept;
 
   virtual ~TCLIService_FetchResults_args() noexcept;
   TFetchResultsReq req;
@@ -1941,12 +1736,7 @@ class TCLIService_FetchResults_args {
 
   void __set_req(const TFetchResultsReq& val);
 
-  bool operator == (const TCLIService_FetchResults_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_FetchResults_args & rhs) const;
   bool operator != (const TCLIService_FetchResults_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1980,8 +1770,7 @@ class TCLIService_FetchResults_result {
 
   TCLIService_FetchResults_result(const TCLIService_FetchResults_result&);
   TCLIService_FetchResults_result& operator=(const TCLIService_FetchResults_result&);
-  TCLIService_FetchResults_result() noexcept {
-  }
+  TCLIService_FetchResults_result() noexcept;
 
   virtual ~TCLIService_FetchResults_result() noexcept;
   TFetchResultsResp success;
@@ -1990,12 +1779,7 @@ class TCLIService_FetchResults_result {
 
   void __set_success(const TFetchResultsResp& val);
 
-  bool operator == (const TCLIService_FetchResults_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_FetchResults_result & rhs) const;
   bool operator != (const TCLIService_FetchResults_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2035,8 +1819,7 @@ class TCLIService_GetDelegationToken_args {
 
   TCLIService_GetDelegationToken_args(const TCLIService_GetDelegationToken_args&);
   TCLIService_GetDelegationToken_args& operator=(const TCLIService_GetDelegationToken_args&);
-  TCLIService_GetDelegationToken_args() noexcept {
-  }
+  TCLIService_GetDelegationToken_args() noexcept;
 
   virtual ~TCLIService_GetDelegationToken_args() noexcept;
   TGetDelegationTokenReq req;
@@ -2045,12 +1828,7 @@ class TCLIService_GetDelegationToken_args {
 
   void __set_req(const TGetDelegationTokenReq& val);
 
-  bool operator == (const TCLIService_GetDelegationToken_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetDelegationToken_args & rhs) const;
   bool operator != (const TCLIService_GetDelegationToken_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2084,8 +1862,7 @@ class TCLIService_GetDelegationToken_result {
 
   TCLIService_GetDelegationToken_result(const TCLIService_GetDelegationToken_result&);
   TCLIService_GetDelegationToken_result& operator=(const TCLIService_GetDelegationToken_result&);
-  TCLIService_GetDelegationToken_result() noexcept {
-  }
+  TCLIService_GetDelegationToken_result() noexcept;
 
   virtual ~TCLIService_GetDelegationToken_result() noexcept;
   TGetDelegationTokenResp success;
@@ -2094,12 +1871,7 @@ class TCLIService_GetDelegationToken_result {
 
   void __set_success(const TGetDelegationTokenResp& val);
 
-  bool operator == (const TCLIService_GetDelegationToken_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetDelegationToken_result & rhs) const;
   bool operator != (const TCLIService_GetDelegationToken_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2139,8 +1911,7 @@ class TCLIService_CancelDelegationToken_args {
 
   TCLIService_CancelDelegationToken_args(const TCLIService_CancelDelegationToken_args&);
   TCLIService_CancelDelegationToken_args& operator=(const TCLIService_CancelDelegationToken_args&);
-  TCLIService_CancelDelegationToken_args() noexcept {
-  }
+  TCLIService_CancelDelegationToken_args() noexcept;
 
   virtual ~TCLIService_CancelDelegationToken_args() noexcept;
   TCancelDelegationTokenReq req;
@@ -2149,12 +1920,7 @@ class TCLIService_CancelDelegationToken_args {
 
   void __set_req(const TCancelDelegationTokenReq& val);
 
-  bool operator == (const TCLIService_CancelDelegationToken_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CancelDelegationToken_args & rhs) const;
   bool operator != (const TCLIService_CancelDelegationToken_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2188,8 +1954,7 @@ class TCLIService_CancelDelegationToken_result {
 
   TCLIService_CancelDelegationToken_result(const TCLIService_CancelDelegationToken_result&);
   TCLIService_CancelDelegationToken_result& operator=(const TCLIService_CancelDelegationToken_result&);
-  TCLIService_CancelDelegationToken_result() noexcept {
-  }
+  TCLIService_CancelDelegationToken_result() noexcept;
 
   virtual ~TCLIService_CancelDelegationToken_result() noexcept;
   TCancelDelegationTokenResp success;
@@ -2198,12 +1963,7 @@ class TCLIService_CancelDelegationToken_result {
 
   void __set_success(const TCancelDelegationTokenResp& val);
 
-  bool operator == (const TCLIService_CancelDelegationToken_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_CancelDelegationToken_result & rhs) const;
   bool operator != (const TCLIService_CancelDelegationToken_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2243,8 +2003,7 @@ class TCLIService_RenewDelegationToken_args {
 
   TCLIService_RenewDelegationToken_args(const TCLIService_RenewDelegationToken_args&);
   TCLIService_RenewDelegationToken_args& operator=(const TCLIService_RenewDelegationToken_args&);
-  TCLIService_RenewDelegationToken_args() noexcept {
-  }
+  TCLIService_RenewDelegationToken_args() noexcept;
 
   virtual ~TCLIService_RenewDelegationToken_args() noexcept;
   TRenewDelegationTokenReq req;
@@ -2253,12 +2012,7 @@ class TCLIService_RenewDelegationToken_args {
 
   void __set_req(const TRenewDelegationTokenReq& val);
 
-  bool operator == (const TCLIService_RenewDelegationToken_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_RenewDelegationToken_args & rhs) const;
   bool operator != (const TCLIService_RenewDelegationToken_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2292,8 +2046,7 @@ class TCLIService_RenewDelegationToken_result {
 
   TCLIService_RenewDelegationToken_result(const TCLIService_RenewDelegationToken_result&);
   TCLIService_RenewDelegationToken_result& operator=(const TCLIService_RenewDelegationToken_result&);
-  TCLIService_RenewDelegationToken_result() noexcept {
-  }
+  TCLIService_RenewDelegationToken_result() noexcept;
 
   virtual ~TCLIService_RenewDelegationToken_result() noexcept;
   TRenewDelegationTokenResp success;
@@ -2302,12 +2055,7 @@ class TCLIService_RenewDelegationToken_result {
 
   void __set_success(const TRenewDelegationTokenResp& val);
 
-  bool operator == (const TCLIService_RenewDelegationToken_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_RenewDelegationToken_result & rhs) const;
   bool operator != (const TCLIService_RenewDelegationToken_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2347,8 +2095,7 @@ class TCLIService_GetQueryId_args {
 
   TCLIService_GetQueryId_args(const TCLIService_GetQueryId_args&);
   TCLIService_GetQueryId_args& operator=(const TCLIService_GetQueryId_args&);
-  TCLIService_GetQueryId_args() noexcept {
-  }
+  TCLIService_GetQueryId_args() noexcept;
 
   virtual ~TCLIService_GetQueryId_args() noexcept;
   TGetQueryIdReq req;
@@ -2357,12 +2104,7 @@ class TCLIService_GetQueryId_args {
 
   void __set_req(const TGetQueryIdReq& val);
 
-  bool operator == (const TCLIService_GetQueryId_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetQueryId_args & rhs) const;
   bool operator != (const TCLIService_GetQueryId_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2396,8 +2138,7 @@ class TCLIService_GetQueryId_result {
 
   TCLIService_GetQueryId_result(const TCLIService_GetQueryId_result&);
   TCLIService_GetQueryId_result& operator=(const TCLIService_GetQueryId_result&);
-  TCLIService_GetQueryId_result() noexcept {
-  }
+  TCLIService_GetQueryId_result() noexcept;
 
   virtual ~TCLIService_GetQueryId_result() noexcept;
   TGetQueryIdResp success;
@@ -2406,12 +2147,7 @@ class TCLIService_GetQueryId_result {
 
   void __set_success(const TGetQueryIdResp& val);
 
-  bool operator == (const TCLIService_GetQueryId_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_GetQueryId_result & rhs) const;
   bool operator != (const TCLIService_GetQueryId_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2451,8 +2187,7 @@ class TCLIService_SetClientInfo_args {
 
   TCLIService_SetClientInfo_args(const TCLIService_SetClientInfo_args&);
   TCLIService_SetClientInfo_args& operator=(const TCLIService_SetClientInfo_args&);
-  TCLIService_SetClientInfo_args() noexcept {
-  }
+  TCLIService_SetClientInfo_args() noexcept;
 
   virtual ~TCLIService_SetClientInfo_args() noexcept;
   TSetClientInfoReq req;
@@ -2461,12 +2196,7 @@ class TCLIService_SetClientInfo_args {
 
   void __set_req(const TSetClientInfoReq& val);
 
-  bool operator == (const TCLIService_SetClientInfo_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_SetClientInfo_args & rhs) const;
   bool operator != (const TCLIService_SetClientInfo_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2500,8 +2230,7 @@ class TCLIService_SetClientInfo_result {
 
   TCLIService_SetClientInfo_result(const TCLIService_SetClientInfo_result&);
   TCLIService_SetClientInfo_result& operator=(const TCLIService_SetClientInfo_result&);
-  TCLIService_SetClientInfo_result() noexcept {
-  }
+  TCLIService_SetClientInfo_result() noexcept;
 
   virtual ~TCLIService_SetClientInfo_result() noexcept;
   TSetClientInfoResp success;
@@ -2510,12 +2239,7 @@ class TCLIService_SetClientInfo_result {
 
   void __set_success(const TSetClientInfoResp& val);
 
-  bool operator == (const TCLIService_SetClientInfo_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_SetClientInfo_result & rhs) const;
   bool operator != (const TCLIService_SetClientInfo_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2555,8 +2279,7 @@ class TCLIService_UploadData_args {
 
   TCLIService_UploadData_args(const TCLIService_UploadData_args&);
   TCLIService_UploadData_args& operator=(const TCLIService_UploadData_args&);
-  TCLIService_UploadData_args() noexcept {
-  }
+  TCLIService_UploadData_args() noexcept;
 
   virtual ~TCLIService_UploadData_args() noexcept;
   TUploadDataReq req;
@@ -2565,12 +2288,7 @@ class TCLIService_UploadData_args {
 
   void __set_req(const TUploadDataReq& val);
 
-  bool operator == (const TCLIService_UploadData_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_UploadData_args & rhs) const;
   bool operator != (const TCLIService_UploadData_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2604,8 +2322,7 @@ class TCLIService_UploadData_result {
 
   TCLIService_UploadData_result(const TCLIService_UploadData_result&);
   TCLIService_UploadData_result& operator=(const TCLIService_UploadData_result&);
-  TCLIService_UploadData_result() noexcept {
-  }
+  TCLIService_UploadData_result() noexcept;
 
   virtual ~TCLIService_UploadData_result() noexcept;
   TUploadDataResp success;
@@ -2614,12 +2331,7 @@ class TCLIService_UploadData_result {
 
   void __set_success(const TUploadDataResp& val);
 
-  bool operator == (const TCLIService_UploadData_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_UploadData_result & rhs) const;
   bool operator != (const TCLIService_UploadData_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2659,8 +2371,7 @@ class TCLIService_DownloadData_args {
 
   TCLIService_DownloadData_args(const TCLIService_DownloadData_args&);
   TCLIService_DownloadData_args& operator=(const TCLIService_DownloadData_args&);
-  TCLIService_DownloadData_args() noexcept {
-  }
+  TCLIService_DownloadData_args() noexcept;
 
   virtual ~TCLIService_DownloadData_args() noexcept;
   TDownloadDataReq req;
@@ -2669,12 +2380,7 @@ class TCLIService_DownloadData_args {
 
   void __set_req(const TDownloadDataReq& val);
 
-  bool operator == (const TCLIService_DownloadData_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_DownloadData_args & rhs) const;
   bool operator != (const TCLIService_DownloadData_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2708,8 +2414,7 @@ class TCLIService_DownloadData_result {
 
   TCLIService_DownloadData_result(const TCLIService_DownloadData_result&);
   TCLIService_DownloadData_result& operator=(const TCLIService_DownloadData_result&);
-  TCLIService_DownloadData_result() noexcept {
-  }
+  TCLIService_DownloadData_result() noexcept;
 
   virtual ~TCLIService_DownloadData_result() noexcept;
   TDownloadDataResp success;
@@ -2718,12 +2423,7 @@ class TCLIService_DownloadData_result {
 
   void __set_success(const TDownloadDataResp& val);
 
-  bool operator == (const TCLIService_DownloadData_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const TCLIService_DownloadData_result & rhs) const;
   bool operator != (const TCLIService_DownloadData_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3206,11 +2906,11 @@ class TCLIServiceMultiface : virtual public TCLIServiceIf {
 // only be used when you need to share a connection among multiple threads
 class TCLIServiceConcurrentClient : virtual public TCLIServiceIf {
  public:
-  TCLIServiceConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot, std::shared_ptr<::apache::thrift::async::TConcurrentClientSyncInfo> sync) : sync_(sync)
+  TCLIServiceConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot, std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync) : sync_(sync)
 {
     setProtocol(prot);
   }
-  TCLIServiceConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot, std::shared_ptr<::apache::thrift::async::TConcurrentClientSyncInfo> sync) : sync_(sync)
+  TCLIServiceConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot, std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync) : sync_(sync)
 {
     setProtocol(iprot,oprot);
   }
@@ -3311,7 +3011,7 @@ class TCLIServiceConcurrentClient : virtual public TCLIServiceIf {
   std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
   ::apache::thrift::protocol::TProtocol* iprot_;
   ::apache::thrift::protocol::TProtocol* oprot_;
-  std::shared_ptr<::apache::thrift::async::TConcurrentClientSyncInfo> sync_;
+  std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync_;
 };
 
 #ifdef _MSC_VER
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.cpp b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.cpp
index ae0e3039f30b..31eff07b17ed 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.cpp
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -11,58 +11,58 @@ namespace apache { namespace hive { namespace service { namespace rpc { namespac
 const TCLIServiceConstants g_TCLIService_constants;
 
 TCLIServiceConstants::TCLIServiceConstants() {
-  PRIMITIVE_TYPES.insert((TTypeId::type)0);
-  PRIMITIVE_TYPES.insert((TTypeId::type)1);
-  PRIMITIVE_TYPES.insert((TTypeId::type)2);
-  PRIMITIVE_TYPES.insert((TTypeId::type)3);
-  PRIMITIVE_TYPES.insert((TTypeId::type)4);
-  PRIMITIVE_TYPES.insert((TTypeId::type)5);
-  PRIMITIVE_TYPES.insert((TTypeId::type)6);
-  PRIMITIVE_TYPES.insert((TTypeId::type)7);
-  PRIMITIVE_TYPES.insert((TTypeId::type)8);
-  PRIMITIVE_TYPES.insert((TTypeId::type)9);
-  PRIMITIVE_TYPES.insert((TTypeId::type)15);
-  PRIMITIVE_TYPES.insert((TTypeId::type)16);
-  PRIMITIVE_TYPES.insert((TTypeId::type)17);
-  PRIMITIVE_TYPES.insert((TTypeId::type)18);
-  PRIMITIVE_TYPES.insert((TTypeId::type)19);
-  PRIMITIVE_TYPES.insert((TTypeId::type)20);
-  PRIMITIVE_TYPES.insert((TTypeId::type)21);
-  PRIMITIVE_TYPES.insert((TTypeId::type)22);
-  PRIMITIVE_TYPES.insert((TTypeId::type)23);
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(0));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(1));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(2));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(3));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(4));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(5));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(6));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(7));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(8));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(9));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(15));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(16));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(17));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(18));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(19));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(20));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(21));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(22));
+  PRIMITIVE_TYPES.insert(static_cast<TTypeId::type>(23));
 
-  COMPLEX_TYPES.insert((TTypeId::type)10);
-  COMPLEX_TYPES.insert((TTypeId::type)11);
-  COMPLEX_TYPES.insert((TTypeId::type)12);
-  COMPLEX_TYPES.insert((TTypeId::type)13);
-  COMPLEX_TYPES.insert((TTypeId::type)14);
+  COMPLEX_TYPES.insert(static_cast<TTypeId::type>(10));
+  COMPLEX_TYPES.insert(static_cast<TTypeId::type>(11));
+  COMPLEX_TYPES.insert(static_cast<TTypeId::type>(12));
+  COMPLEX_TYPES.insert(static_cast<TTypeId::type>(13));
+  COMPLEX_TYPES.insert(static_cast<TTypeId::type>(14));
 
-  COLLECTION_TYPES.insert((TTypeId::type)10);
-  COLLECTION_TYPES.insert((TTypeId::type)11);
+  COLLECTION_TYPES.insert(static_cast<TTypeId::type>(10));
+  COLLECTION_TYPES.insert(static_cast<TTypeId::type>(11));
 
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)10, "ARRAY"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)4, "BIGINT"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)9, "BINARY"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)0, "BOOLEAN"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)19, "CHAR"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)17, "DATE"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)15, "DECIMAL"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)6, "DOUBLE"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)5, "FLOAT"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)21, "INTERVAL_DAY_TIME"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)20, "INTERVAL_YEAR_MONTH"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)3, "INT"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)11, "MAP"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)16, "NULL"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)2, "SMALLINT"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)7, "STRING"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)12, "STRUCT"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)22, "TIMESTAMP WITH LOCAL TIME ZONE"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)8, "TIMESTAMP"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)1, "TINYINT"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)13, "UNIONTYPE"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)23, "UNKNOWN"));
-  TYPE_NAMES.insert(std::make_pair((TTypeId::type)18, "VARCHAR"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(10), "ARRAY"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(4), "BIGINT"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(9), "BINARY"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(0), "BOOLEAN"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(19), "CHAR"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(17), "DATE"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(15), "DECIMAL"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(6), "DOUBLE"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(5), "FLOAT"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(21), "INTERVAL_DAY_TIME"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(20), "INTERVAL_YEAR_MONTH"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(3), "INT"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(11), "MAP"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(16), "NULL"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(2), "SMALLINT"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(7), "STRING"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(12), "STRUCT"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(22), "TIMESTAMP WITH LOCAL TIME ZONE"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(8), "TIMESTAMP"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(1), "TINYINT"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(13), "UNIONTYPE"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(23), "UNKNOWN"));
+  TYPE_NAMES.insert(std::make_pair(static_cast<TTypeId::type>(18), "VARCHAR"));
 
   CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength";
 
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.h b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.h
index c0c427d0b17a..fd8bdeb79c91 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.h
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_constants.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
index c8b96da3ed5b..de80d3ac0816 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -449,6 +449,10 @@ std::string to_string(const TJobExecutionStatus::type& val) {
 TTypeQualifierValue::~TTypeQualifierValue() noexcept {
 }
 
+TTypeQualifierValue::TTypeQualifierValue() noexcept
+   : i32Value(0),
+     stringValue() {
+}
 
 void TTypeQualifierValue::__set_i32Value(const int32_t val) {
   this->i32Value = val;
@@ -535,13 +539,26 @@ uint32_t TTypeQualifierValue::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TTypeQualifierValue &a, TTypeQualifierValue &b) {
+void swap(TTypeQualifierValue &a, TTypeQualifierValue &b) noexcept {
   using ::std::swap;
   swap(a.i32Value, b.i32Value);
   swap(a.stringValue, b.stringValue);
   swap(a.__isset, b.__isset);
 }
 
+bool TTypeQualifierValue::operator==(const TTypeQualifierValue & rhs) const
+{
+  if (__isset.i32Value != rhs.__isset.i32Value)
+    return false;
+  else if (__isset.i32Value && !(i32Value == rhs.i32Value))
+    return false;
+  if (__isset.stringValue != rhs.__isset.stringValue)
+    return false;
+  else if (__isset.stringValue && !(stringValue == rhs.stringValue))
+    return false;
+  return true;
+}
+
 TTypeQualifierValue::TTypeQualifierValue(const TTypeQualifierValue& other0) {
   i32Value = other0.i32Value;
   stringValue = other0.stringValue;
@@ -565,6 +582,8 @@ void TTypeQualifierValue::printTo(std::ostream& out) const {
 TTypeQualifiers::~TTypeQualifiers() noexcept {
 }
 
+TTypeQualifiers::TTypeQualifiers() noexcept {
+}
 
 void TTypeQualifiers::__set_qualifiers(const std::map<std::string, TTypeQualifierValue> & val) {
   this->qualifiers = val;
@@ -658,11 +677,18 @@ uint32_t TTypeQualifiers::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TTypeQualifiers &a, TTypeQualifiers &b) {
+void swap(TTypeQualifiers &a, TTypeQualifiers &b) noexcept {
   using ::std::swap;
   swap(a.qualifiers, b.qualifiers);
 }
 
+bool TTypeQualifiers::operator==(const TTypeQualifiers & rhs) const
+{
+  if (!(qualifiers == rhs.qualifiers))
+    return false;
+  return true;
+}
+
 TTypeQualifiers::TTypeQualifiers(const TTypeQualifiers& other10) {
   qualifiers = other10.qualifiers;
 }
@@ -681,6 +707,9 @@ void TTypeQualifiers::printTo(std::ostream& out) const {
 TPrimitiveTypeEntry::~TPrimitiveTypeEntry() noexcept {
 }
 
+TPrimitiveTypeEntry::TPrimitiveTypeEntry() noexcept
+   : type(static_cast<TTypeId::type>(0)) {
+}
 
 void TPrimitiveTypeEntry::__set_type(const TTypeId::type val) {
   this->type = val;
@@ -770,13 +799,24 @@ uint32_t TPrimitiveTypeEntry::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TPrimitiveTypeEntry &a, TPrimitiveTypeEntry &b) {
+void swap(TPrimitiveTypeEntry &a, TPrimitiveTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.type, b.type);
   swap(a.typeQualifiers, b.typeQualifiers);
   swap(a.__isset, b.__isset);
 }
 
+bool TPrimitiveTypeEntry::operator==(const TPrimitiveTypeEntry & rhs) const
+{
+  if (!(type == rhs.type))
+    return false;
+  if (__isset.typeQualifiers != rhs.__isset.typeQualifiers)
+    return false;
+  else if (__isset.typeQualifiers && !(typeQualifiers == rhs.typeQualifiers))
+    return false;
+  return true;
+}
+
 TPrimitiveTypeEntry::TPrimitiveTypeEntry(const TPrimitiveTypeEntry& other13) {
   type = other13.type;
   typeQualifiers = other13.typeQualifiers;
@@ -800,6 +840,9 @@ void TPrimitiveTypeEntry::printTo(std::ostream& out) const {
 TArrayTypeEntry::~TArrayTypeEntry() noexcept {
 }
 
+TArrayTypeEntry::TArrayTypeEntry() noexcept
+   : objectTypePtr(0) {
+}
 
 void TArrayTypeEntry::__set_objectTypePtr(const TTypeEntryPtr val) {
   this->objectTypePtr = val;
@@ -869,11 +912,18 @@ uint32_t TArrayTypeEntry::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TArrayTypeEntry &a, TArrayTypeEntry &b) {
+void swap(TArrayTypeEntry &a, TArrayTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.objectTypePtr, b.objectTypePtr);
 }
 
+bool TArrayTypeEntry::operator==(const TArrayTypeEntry & rhs) const
+{
+  if (!(objectTypePtr == rhs.objectTypePtr))
+    return false;
+  return true;
+}
+
 TArrayTypeEntry::TArrayTypeEntry(const TArrayTypeEntry& other15) noexcept {
   objectTypePtr = other15.objectTypePtr;
 }
@@ -892,6 +942,10 @@ void TArrayTypeEntry::printTo(std::ostream& out) const {
 TMapTypeEntry::~TMapTypeEntry() noexcept {
 }
 
+TMapTypeEntry::TMapTypeEntry() noexcept
+   : keyTypePtr(0),
+     valueTypePtr(0) {
+}
 
 void TMapTypeEntry::__set_keyTypePtr(const TTypeEntryPtr val) {
   this->keyTypePtr = val;
@@ -980,12 +1034,21 @@ uint32_t TMapTypeEntry::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(TMapTypeEntry &a, TMapTypeEntry &b) {
+void swap(TMapTypeEntry &a, TMapTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.keyTypePtr, b.keyTypePtr);
   swap(a.valueTypePtr, b.valueTypePtr);
 }
 
+bool TMapTypeEntry::operator==(const TMapTypeEntry & rhs) const
+{
+  if (!(keyTypePtr == rhs.keyTypePtr))
+    return false;
+  if (!(valueTypePtr == rhs.valueTypePtr))
+    return false;
+  return true;
+}
+
 TMapTypeEntry::TMapTypeEntry(const TMapTypeEntry& other17) noexcept {
   keyTypePtr = other17.keyTypePtr;
   valueTypePtr = other17.valueTypePtr;
@@ -1007,6 +1070,8 @@ void TMapTypeEntry::printTo(std::ostream& out) const {
 TStructTypeEntry::~TStructTypeEntry() noexcept {
 }
 
+TStructTypeEntry::TStructTypeEntry() noexcept {
+}
 
 void TStructTypeEntry::__set_nameToTypePtr(const std::map<std::string, TTypeEntryPtr> & val) {
   this->nameToTypePtr = val;
@@ -1100,11 +1165,18 @@ uint32_t TStructTypeEntry::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TStructTypeEntry &a, TStructTypeEntry &b) {
+void swap(TStructTypeEntry &a, TStructTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.nameToTypePtr, b.nameToTypePtr);
 }
 
+bool TStructTypeEntry::operator==(const TStructTypeEntry & rhs) const
+{
+  if (!(nameToTypePtr == rhs.nameToTypePtr))
+    return false;
+  return true;
+}
+
 TStructTypeEntry::TStructTypeEntry(const TStructTypeEntry& other27) {
   nameToTypePtr = other27.nameToTypePtr;
 }
@@ -1123,6 +1195,8 @@ void TStructTypeEntry::printTo(std::ostream& out) const {
 TUnionTypeEntry::~TUnionTypeEntry() noexcept {
 }
 
+TUnionTypeEntry::TUnionTypeEntry() noexcept {
+}
 
 void TUnionTypeEntry::__set_nameToTypePtr(const std::map<std::string, TTypeEntryPtr> & val) {
   this->nameToTypePtr = val;
@@ -1216,11 +1290,18 @@ uint32_t TUnionTypeEntry::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TUnionTypeEntry &a, TUnionTypeEntry &b) {
+void swap(TUnionTypeEntry &a, TUnionTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.nameToTypePtr, b.nameToTypePtr);
 }
 
+bool TUnionTypeEntry::operator==(const TUnionTypeEntry & rhs) const
+{
+  if (!(nameToTypePtr == rhs.nameToTypePtr))
+    return false;
+  return true;
+}
+
 TUnionTypeEntry::TUnionTypeEntry(const TUnionTypeEntry& other37) {
   nameToTypePtr = other37.nameToTypePtr;
 }
@@ -1239,6 +1320,9 @@ void TUnionTypeEntry::printTo(std::ostream& out) const {
 TUserDefinedTypeEntry::~TUserDefinedTypeEntry() noexcept {
 }
 
+TUserDefinedTypeEntry::TUserDefinedTypeEntry() noexcept
+   : typeClassName() {
+}
 
 void TUserDefinedTypeEntry::__set_typeClassName(const std::string& val) {
   this->typeClassName = val;
@@ -1308,11 +1392,18 @@ uint32_t TUserDefinedTypeEntry::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(TUserDefinedTypeEntry &a, TUserDefinedTypeEntry &b) {
+void swap(TUserDefinedTypeEntry &a, TUserDefinedTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.typeClassName, b.typeClassName);
 }
 
+bool TUserDefinedTypeEntry::operator==(const TUserDefinedTypeEntry & rhs) const
+{
+  if (!(typeClassName == rhs.typeClassName))
+    return false;
+  return true;
+}
+
 TUserDefinedTypeEntry::TUserDefinedTypeEntry(const TUserDefinedTypeEntry& other39) {
   typeClassName = other39.typeClassName;
 }
@@ -1331,6 +1422,8 @@ void TUserDefinedTypeEntry::printTo(std::ostream& out) const {
 TTypeEntry::~TTypeEntry() noexcept {
 }
 
+TTypeEntry::TTypeEntry() noexcept {
+}
 
 void TTypeEntry::__set_primitiveEntry(const TPrimitiveTypeEntry& val) {
   this->primitiveEntry = val;
@@ -1489,7 +1582,7 @@ uint32_t TTypeEntry::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TTypeEntry &a, TTypeEntry &b) {
+void swap(TTypeEntry &a, TTypeEntry &b) noexcept {
   using ::std::swap;
   swap(a.primitiveEntry, b.primitiveEntry);
   swap(a.arrayEntry, b.arrayEntry);
@@ -1500,6 +1593,35 @@ void swap(TTypeEntry &a, TTypeEntry &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TTypeEntry::operator==(const TTypeEntry & rhs) const
+{
+  if (__isset.primitiveEntry != rhs.__isset.primitiveEntry)
+    return false;
+  else if (__isset.primitiveEntry && !(primitiveEntry == rhs.primitiveEntry))
+    return false;
+  if (__isset.arrayEntry != rhs.__isset.arrayEntry)
+    return false;
+  else if (__isset.arrayEntry && !(arrayEntry == rhs.arrayEntry))
+    return false;
+  if (__isset.mapEntry != rhs.__isset.mapEntry)
+    return false;
+  else if (__isset.mapEntry && !(mapEntry == rhs.mapEntry))
+    return false;
+  if (__isset.structEntry != rhs.__isset.structEntry)
+    return false;
+  else if (__isset.structEntry && !(structEntry == rhs.structEntry))
+    return false;
+  if (__isset.unionEntry != rhs.__isset.unionEntry)
+    return false;
+  else if (__isset.unionEntry && !(unionEntry == rhs.unionEntry))
+    return false;
+  if (__isset.userDefinedTypeEntry != rhs.__isset.userDefinedTypeEntry)
+    return false;
+  else if (__isset.userDefinedTypeEntry && !(userDefinedTypeEntry == rhs.userDefinedTypeEntry))
+    return false;
+  return true;
+}
+
 TTypeEntry::TTypeEntry(const TTypeEntry& other41) {
   primitiveEntry = other41.primitiveEntry;
   arrayEntry = other41.arrayEntry;
@@ -1535,6 +1657,8 @@ void TTypeEntry::printTo(std::ostream& out) const {
 TTypeDesc::~TTypeDesc() noexcept {
 }
 
+TTypeDesc::TTypeDesc() noexcept {
+}
 
 void TTypeDesc::__set_types(const std::vector<TTypeEntry> & val) {
   this->types = val;
@@ -1624,11 +1748,18 @@ uint32_t TTypeDesc::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TTypeDesc &a, TTypeDesc &b) {
+void swap(TTypeDesc &a, TTypeDesc &b) noexcept {
   using ::std::swap;
   swap(a.types, b.types);
 }
 
+bool TTypeDesc::operator==(const TTypeDesc & rhs) const
+{
+  if (!(types == rhs.types))
+    return false;
+  return true;
+}
+
 TTypeDesc::TTypeDesc(const TTypeDesc& other49) {
   types = other49.types;
 }
@@ -1647,6 +1778,11 @@ void TTypeDesc::printTo(std::ostream& out) const {
 TColumnDesc::~TColumnDesc() noexcept {
 }
 
+TColumnDesc::TColumnDesc() noexcept
+   : columnName(),
+     position(0),
+     comment() {
+}
 
 void TColumnDesc::__set_columnName(const std::string& val) {
   this->columnName = val;
@@ -1772,7 +1908,7 @@ uint32_t TColumnDesc::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TColumnDesc &a, TColumnDesc &b) {
+void swap(TColumnDesc &a, TColumnDesc &b) noexcept {
   using ::std::swap;
   swap(a.columnName, b.columnName);
   swap(a.typeDesc, b.typeDesc);
@@ -1781,6 +1917,21 @@ void swap(TColumnDesc &a, TColumnDesc &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TColumnDesc::operator==(const TColumnDesc & rhs) const
+{
+  if (!(columnName == rhs.columnName))
+    return false;
+  if (!(typeDesc == rhs.typeDesc))
+    return false;
+  if (!(position == rhs.position))
+    return false;
+  if (__isset.comment != rhs.__isset.comment)
+    return false;
+  else if (__isset.comment && !(comment == rhs.comment))
+    return false;
+  return true;
+}
+
 TColumnDesc::TColumnDesc(const TColumnDesc& other51) {
   columnName = other51.columnName;
   typeDesc = other51.typeDesc;
@@ -1810,6 +1961,8 @@ void TColumnDesc::printTo(std::ostream& out) const {
 TTableSchema::~TTableSchema() noexcept {
 }
 
+TTableSchema::TTableSchema() noexcept {
+}
 
 void TTableSchema::__set_columns(const std::vector<TColumnDesc> & val) {
   this->columns = val;
@@ -1899,11 +2052,18 @@ uint32_t TTableSchema::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TTableSchema &a, TTableSchema &b) {
+void swap(TTableSchema &a, TTableSchema &b) noexcept {
   using ::std::swap;
   swap(a.columns, b.columns);
 }
 
+bool TTableSchema::operator==(const TTableSchema & rhs) const
+{
+  if (!(columns == rhs.columns))
+    return false;
+  return true;
+}
+
 TTableSchema::TTableSchema(const TTableSchema& other59) {
   columns = other59.columns;
 }
@@ -1922,6 +2082,9 @@ void TTableSchema::printTo(std::ostream& out) const {
 TBoolValue::~TBoolValue() noexcept {
 }
 
+TBoolValue::TBoolValue() noexcept
+   : value(0) {
+}
 
 void TBoolValue::__set_value(const bool val) {
   this->value = val;
@@ -1990,12 +2153,21 @@ uint32_t TBoolValue::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TBoolValue &a, TBoolValue &b) {
+void swap(TBoolValue &a, TBoolValue &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TBoolValue::operator==(const TBoolValue & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TBoolValue::TBoolValue(const TBoolValue& other61) noexcept {
   value = other61.value;
   __isset = other61.__isset;
@@ -2016,6 +2188,9 @@ void TBoolValue::printTo(std::ostream& out) const {
 TByteValue::~TByteValue() noexcept {
 }
 
+TByteValue::TByteValue() noexcept
+   : value(0) {
+}
 
 void TByteValue::__set_value(const int8_t val) {
   this->value = val;
@@ -2084,12 +2259,21 @@ uint32_t TByteValue::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TByteValue &a, TByteValue &b) {
+void swap(TByteValue &a, TByteValue &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TByteValue::operator==(const TByteValue & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TByteValue::TByteValue(const TByteValue& other63) noexcept {
   value = other63.value;
   __isset = other63.__isset;
@@ -2110,6 +2294,9 @@ void TByteValue::printTo(std::ostream& out) const {
 TI16Value::~TI16Value() noexcept {
 }
 
+TI16Value::TI16Value() noexcept
+   : value(0) {
+}
 
 void TI16Value::__set_value(const int16_t val) {
   this->value = val;
@@ -2178,12 +2365,21 @@ uint32_t TI16Value::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TI16Value &a, TI16Value &b) {
+void swap(TI16Value &a, TI16Value &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TI16Value::operator==(const TI16Value & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TI16Value::TI16Value(const TI16Value& other65) noexcept {
   value = other65.value;
   __isset = other65.__isset;
@@ -2204,6 +2400,9 @@ void TI16Value::printTo(std::ostream& out) const {
 TI32Value::~TI32Value() noexcept {
 }
 
+TI32Value::TI32Value() noexcept
+   : value(0) {
+}
 
 void TI32Value::__set_value(const int32_t val) {
   this->value = val;
@@ -2272,12 +2471,21 @@ uint32_t TI32Value::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TI32Value &a, TI32Value &b) {
+void swap(TI32Value &a, TI32Value &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TI32Value::operator==(const TI32Value & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TI32Value::TI32Value(const TI32Value& other67) noexcept {
   value = other67.value;
   __isset = other67.__isset;
@@ -2298,6 +2506,9 @@ void TI32Value::printTo(std::ostream& out) const {
 TI64Value::~TI64Value() noexcept {
 }
 
+TI64Value::TI64Value() noexcept
+   : value(0) {
+}
 
 void TI64Value::__set_value(const int64_t val) {
   this->value = val;
@@ -2366,12 +2577,21 @@ uint32_t TI64Value::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TI64Value &a, TI64Value &b) {
+void swap(TI64Value &a, TI64Value &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TI64Value::operator==(const TI64Value & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TI64Value::TI64Value(const TI64Value& other69) noexcept {
   value = other69.value;
   __isset = other69.__isset;
@@ -2392,6 +2612,9 @@ void TI64Value::printTo(std::ostream& out) const {
 TDoubleValue::~TDoubleValue() noexcept {
 }
 
+TDoubleValue::TDoubleValue() noexcept
+   : value(0) {
+}
 
 void TDoubleValue::__set_value(const double val) {
   this->value = val;
@@ -2460,12 +2683,21 @@ uint32_t TDoubleValue::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TDoubleValue &a, TDoubleValue &b) {
+void swap(TDoubleValue &a, TDoubleValue &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TDoubleValue::operator==(const TDoubleValue & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TDoubleValue::TDoubleValue(const TDoubleValue& other71) noexcept {
   value = other71.value;
   __isset = other71.__isset;
@@ -2486,6 +2718,9 @@ void TDoubleValue::printTo(std::ostream& out) const {
 TStringValue::~TStringValue() noexcept {
 }
 
+TStringValue::TStringValue() noexcept
+   : value() {
+}
 
 void TStringValue::__set_value(const std::string& val) {
   this->value = val;
@@ -2554,12 +2789,21 @@ uint32_t TStringValue::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TStringValue &a, TStringValue &b) {
+void swap(TStringValue &a, TStringValue &b) noexcept {
   using ::std::swap;
   swap(a.value, b.value);
   swap(a.__isset, b.__isset);
 }
 
+bool TStringValue::operator==(const TStringValue & rhs) const
+{
+  if (__isset.value != rhs.__isset.value)
+    return false;
+  else if (__isset.value && !(value == rhs.value))
+    return false;
+  return true;
+}
+
 TStringValue::TStringValue(const TStringValue& other73) {
   value = other73.value;
   __isset = other73.__isset;
@@ -2580,6 +2824,8 @@ void TStringValue::printTo(std::ostream& out) const {
 TColumnValue::~TColumnValue() noexcept {
 }
 
+TColumnValue::TColumnValue() noexcept {
+}
 
 void TColumnValue::__set_boolVal(const TBoolValue& val) {
   this->boolVal = val;
@@ -2756,7 +3002,7 @@ uint32_t TColumnValue::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TColumnValue &a, TColumnValue &b) {
+void swap(TColumnValue &a, TColumnValue &b) noexcept {
   using ::std::swap;
   swap(a.boolVal, b.boolVal);
   swap(a.byteVal, b.byteVal);
@@ -2768,6 +3014,39 @@ void swap(TColumnValue &a, TColumnValue &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TColumnValue::operator==(const TColumnValue & rhs) const
+{
+  if (__isset.boolVal != rhs.__isset.boolVal)
+    return false;
+  else if (__isset.boolVal && !(boolVal == rhs.boolVal))
+    return false;
+  if (__isset.byteVal != rhs.__isset.byteVal)
+    return false;
+  else if (__isset.byteVal && !(byteVal == rhs.byteVal))
+    return false;
+  if (__isset.i16Val != rhs.__isset.i16Val)
+    return false;
+  else if (__isset.i16Val && !(i16Val == rhs.i16Val))
+    return false;
+  if (__isset.i32Val != rhs.__isset.i32Val)
+    return false;
+  else if (__isset.i32Val && !(i32Val == rhs.i32Val))
+    return false;
+  if (__isset.i64Val != rhs.__isset.i64Val)
+    return false;
+  else if (__isset.i64Val && !(i64Val == rhs.i64Val))
+    return false;
+  if (__isset.doubleVal != rhs.__isset.doubleVal)
+    return false;
+  else if (__isset.doubleVal && !(doubleVal == rhs.doubleVal))
+    return false;
+  if (__isset.stringVal != rhs.__isset.stringVal)
+    return false;
+  else if (__isset.stringVal && !(stringVal == rhs.stringVal))
+    return false;
+  return true;
+}
+
 TColumnValue::TColumnValue(const TColumnValue& other75) {
   boolVal = other75.boolVal;
   byteVal = other75.byteVal;
@@ -2806,6 +3085,8 @@ void TColumnValue::printTo(std::ostream& out) const {
 TRow::~TRow() noexcept {
 }
 
+TRow::TRow() noexcept {
+}
 
 void TRow::__set_colVals(const std::vector<TColumnValue> & val) {
   this->colVals = val;
@@ -2895,11 +3176,18 @@ uint32_t TRow::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TRow &a, TRow &b) {
+void swap(TRow &a, TRow &b) noexcept {
   using ::std::swap;
   swap(a.colVals, b.colVals);
 }
 
+bool TRow::operator==(const TRow & rhs) const
+{
+  if (!(colVals == rhs.colVals))
+    return false;
+  return true;
+}
+
 TRow::TRow(const TRow& other83) {
   colVals = other83.colVals;
 }
@@ -2918,6 +3206,9 @@ void TRow::printTo(std::ostream& out) const {
 TBoolColumn::~TBoolColumn() noexcept {
 }
 
+TBoolColumn::TBoolColumn() noexcept
+   : nulls() {
+}
 
 void TBoolColumn::__set_values(const std::vector<bool> & val) {
   this->values = val;
@@ -3026,12 +3317,21 @@ uint32_t TBoolColumn::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TBoolColumn &a, TBoolColumn &b) {
+void swap(TBoolColumn &a, TBoolColumn &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TBoolColumn::operator==(const TBoolColumn & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TBoolColumn::TBoolColumn(const TBoolColumn& other91) {
   values = other91.values;
   nulls = other91.nulls;
@@ -3053,6 +3353,9 @@ void TBoolColumn::printTo(std::ostream& out) const {
 TByteColumn::~TByteColumn() noexcept {
 }
 
+TByteColumn::TByteColumn() noexcept
+   : nulls() {
+}
 
 void TByteColumn::__set_values(const std::vector<int8_t> & val) {
   this->values = val;
@@ -3161,12 +3464,21 @@ uint32_t TByteColumn::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TByteColumn &a, TByteColumn &b) {
+void swap(TByteColumn &a, TByteColumn &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TByteColumn::operator==(const TByteColumn & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TByteColumn::TByteColumn(const TByteColumn& other99) {
   values = other99.values;
   nulls = other99.nulls;
@@ -3188,6 +3500,9 @@ void TByteColumn::printTo(std::ostream& out) const {
 TI16Column::~TI16Column() noexcept {
 }
 
+TI16Column::TI16Column() noexcept
+   : nulls() {
+}
 
 void TI16Column::__set_values(const std::vector<int16_t> & val) {
   this->values = val;
@@ -3296,12 +3611,21 @@ uint32_t TI16Column::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TI16Column &a, TI16Column &b) {
+void swap(TI16Column &a, TI16Column &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TI16Column::operator==(const TI16Column & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TI16Column::TI16Column(const TI16Column& other107) {
   values = other107.values;
   nulls = other107.nulls;
@@ -3323,6 +3647,9 @@ void TI16Column::printTo(std::ostream& out) const {
 TI32Column::~TI32Column() noexcept {
 }
 
+TI32Column::TI32Column() noexcept
+   : nulls() {
+}
 
 void TI32Column::__set_values(const std::vector<int32_t> & val) {
   this->values = val;
@@ -3431,12 +3758,21 @@ uint32_t TI32Column::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TI32Column &a, TI32Column &b) {
+void swap(TI32Column &a, TI32Column &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TI32Column::operator==(const TI32Column & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TI32Column::TI32Column(const TI32Column& other115) {
   values = other115.values;
   nulls = other115.nulls;
@@ -3458,6 +3794,9 @@ void TI32Column::printTo(std::ostream& out) const {
 TI64Column::~TI64Column() noexcept {
 }
 
+TI64Column::TI64Column() noexcept
+   : nulls() {
+}
 
 void TI64Column::__set_values(const std::vector<int64_t> & val) {
   this->values = val;
@@ -3566,12 +3905,21 @@ uint32_t TI64Column::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TI64Column &a, TI64Column &b) {
+void swap(TI64Column &a, TI64Column &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TI64Column::operator==(const TI64Column & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TI64Column::TI64Column(const TI64Column& other123) {
   values = other123.values;
   nulls = other123.nulls;
@@ -3593,6 +3941,9 @@ void TI64Column::printTo(std::ostream& out) const {
 TDoubleColumn::~TDoubleColumn() noexcept {
 }
 
+TDoubleColumn::TDoubleColumn() noexcept
+   : nulls() {
+}
 
 void TDoubleColumn::__set_values(const std::vector<double> & val) {
   this->values = val;
@@ -3701,12 +4052,21 @@ uint32_t TDoubleColumn::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(TDoubleColumn &a, TDoubleColumn &b) {
+void swap(TDoubleColumn &a, TDoubleColumn &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TDoubleColumn::operator==(const TDoubleColumn & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TDoubleColumn::TDoubleColumn(const TDoubleColumn& other131) {
   values = other131.values;
   nulls = other131.nulls;
@@ -3728,6 +4088,9 @@ void TDoubleColumn::printTo(std::ostream& out) const {
 TStringColumn::~TStringColumn() noexcept {
 }
 
+TStringColumn::TStringColumn() noexcept
+   : nulls() {
+}
 
 void TStringColumn::__set_values(const std::vector<std::string> & val) {
   this->values = val;
@@ -3836,12 +4199,21 @@ uint32_t TStringColumn::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(TStringColumn &a, TStringColumn &b) {
+void swap(TStringColumn &a, TStringColumn &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TStringColumn::operator==(const TStringColumn & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TStringColumn::TStringColumn(const TStringColumn& other139) {
   values = other139.values;
   nulls = other139.nulls;
@@ -3863,6 +4235,9 @@ void TStringColumn::printTo(std::ostream& out) const {
 TBinaryColumn::~TBinaryColumn() noexcept {
 }
 
+TBinaryColumn::TBinaryColumn() noexcept
+   : nulls() {
+}
 
 void TBinaryColumn::__set_values(const std::vector<std::string> & val) {
   this->values = val;
@@ -3971,12 +4346,21 @@ uint32_t TBinaryColumn::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(TBinaryColumn &a, TBinaryColumn &b) {
+void swap(TBinaryColumn &a, TBinaryColumn &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.nulls, b.nulls);
 }
 
+bool TBinaryColumn::operator==(const TBinaryColumn & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(nulls == rhs.nulls))
+    return false;
+  return true;
+}
+
 TBinaryColumn::TBinaryColumn(const TBinaryColumn& other147) {
   values = other147.values;
   nulls = other147.nulls;
@@ -3998,6 +4382,8 @@ void TBinaryColumn::printTo(std::ostream& out) const {
 TColumn::~TColumn() noexcept {
 }
 
+TColumn::TColumn() noexcept {
+}
 
 void TColumn::__set_boolVal(const TBoolColumn& val) {
   this->boolVal = val;
@@ -4192,7 +4578,7 @@ uint32_t TColumn::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TColumn &a, TColumn &b) {
+void swap(TColumn &a, TColumn &b) noexcept {
   using ::std::swap;
   swap(a.boolVal, b.boolVal);
   swap(a.byteVal, b.byteVal);
@@ -4205,6 +4591,43 @@ void swap(TColumn &a, TColumn &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TColumn::operator==(const TColumn & rhs) const
+{
+  if (__isset.boolVal != rhs.__isset.boolVal)
+    return false;
+  else if (__isset.boolVal && !(boolVal == rhs.boolVal))
+    return false;
+  if (__isset.byteVal != rhs.__isset.byteVal)
+    return false;
+  else if (__isset.byteVal && !(byteVal == rhs.byteVal))
+    return false;
+  if (__isset.i16Val != rhs.__isset.i16Val)
+    return false;
+  else if (__isset.i16Val && !(i16Val == rhs.i16Val))
+    return false;
+  if (__isset.i32Val != rhs.__isset.i32Val)
+    return false;
+  else if (__isset.i32Val && !(i32Val == rhs.i32Val))
+    return false;
+  if (__isset.i64Val != rhs.__isset.i64Val)
+    return false;
+  else if (__isset.i64Val && !(i64Val == rhs.i64Val))
+    return false;
+  if (__isset.doubleVal != rhs.__isset.doubleVal)
+    return false;
+  else if (__isset.doubleVal && !(doubleVal == rhs.doubleVal))
+    return false;
+  if (__isset.stringVal != rhs.__isset.stringVal)
+    return false;
+  else if (__isset.stringVal && !(stringVal == rhs.stringVal))
+    return false;
+  if (__isset.binaryVal != rhs.__isset.binaryVal)
+    return false;
+  else if (__isset.binaryVal && !(binaryVal == rhs.binaryVal))
+    return false;
+  return true;
+}
+
 TColumn::TColumn(const TColumn& other149) {
   boolVal = other149.boolVal;
   byteVal = other149.byteVal;
@@ -4246,6 +4669,11 @@ void TColumn::printTo(std::ostream& out) const {
 TRowSet::~TRowSet() noexcept {
 }
 
+TRowSet::TRowSet() noexcept
+   : startRowOffset(0),
+     binaryColumns(),
+     columnCount(0) {
+}
 
 void TRowSet::__set_startRowOffset(const int64_t val) {
   this->startRowOffset = val;
@@ -4428,7 +4856,7 @@ uint32_t TRowSet::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TRowSet &a, TRowSet &b) {
+void swap(TRowSet &a, TRowSet &b) noexcept {
   using ::std::swap;
   swap(a.startRowOffset, b.startRowOffset);
   swap(a.rows, b.rows);
@@ -4438,6 +4866,27 @@ void swap(TRowSet &a, TRowSet &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TRowSet::operator==(const TRowSet & rhs) const
+{
+  if (!(startRowOffset == rhs.startRowOffset))
+    return false;
+  if (!(rows == rhs.rows))
+    return false;
+  if (__isset.columns != rhs.__isset.columns)
+    return false;
+  else if (__isset.columns && !(columns == rhs.columns))
+    return false;
+  if (__isset.binaryColumns != rhs.__isset.binaryColumns)
+    return false;
+  else if (__isset.binaryColumns && !(binaryColumns == rhs.binaryColumns))
+    return false;
+  if (__isset.columnCount != rhs.__isset.columnCount)
+    return false;
+  else if (__isset.columnCount && !(columnCount == rhs.columnCount))
+    return false;
+  return true;
+}
+
 TRowSet::TRowSet(const TRowSet& other163) {
   startRowOffset = other163.startRowOffset;
   rows = other163.rows;
@@ -4470,6 +4919,12 @@ void TRowSet::printTo(std::ostream& out) const {
 TStatus::~TStatus() noexcept {
 }
 
+TStatus::TStatus() noexcept
+   : statusCode(static_cast<TStatusCode::type>(0)),
+     sqlState(),
+     errorCode(0),
+     errorMessage() {
+}
 
 void TStatus::__set_statusCode(const TStatusCode::type val) {
   this->statusCode = val;
@@ -4633,7 +5088,7 @@ uint32_t TStatus::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TStatus &a, TStatus &b) {
+void swap(TStatus &a, TStatus &b) noexcept {
   using ::std::swap;
   swap(a.statusCode, b.statusCode);
   swap(a.infoMessages, b.infoMessages);
@@ -4643,6 +5098,29 @@ void swap(TStatus &a, TStatus &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TStatus::operator==(const TStatus & rhs) const
+{
+  if (!(statusCode == rhs.statusCode))
+    return false;
+  if (__isset.infoMessages != rhs.__isset.infoMessages)
+    return false;
+  else if (__isset.infoMessages && !(infoMessages == rhs.infoMessages))
+    return false;
+  if (__isset.sqlState != rhs.__isset.sqlState)
+    return false;
+  else if (__isset.sqlState && !(sqlState == rhs.sqlState))
+    return false;
+  if (__isset.errorCode != rhs.__isset.errorCode)
+    return false;
+  else if (__isset.errorCode && !(errorCode == rhs.errorCode))
+    return false;
+  if (__isset.errorMessage != rhs.__isset.errorMessage)
+    return false;
+  else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
+    return false;
+  return true;
+}
+
 TStatus::TStatus(const TStatus& other172) {
   statusCode = other172.statusCode;
   infoMessages = other172.infoMessages;
@@ -4675,6 +5153,10 @@ void TStatus::printTo(std::ostream& out) const {
 THandleIdentifier::~THandleIdentifier() noexcept {
 }
 
+THandleIdentifier::THandleIdentifier() noexcept
+   : guid(),
+     secret() {
+}
 
 void THandleIdentifier::__set_guid(const std::string& val) {
   this->guid = val;
@@ -4763,12 +5245,21 @@ uint32_t THandleIdentifier::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(THandleIdentifier &a, THandleIdentifier &b) {
+void swap(THandleIdentifier &a, THandleIdentifier &b) noexcept {
   using ::std::swap;
   swap(a.guid, b.guid);
   swap(a.secret, b.secret);
 }
 
+bool THandleIdentifier::operator==(const THandleIdentifier & rhs) const
+{
+  if (!(guid == rhs.guid))
+    return false;
+  if (!(secret == rhs.secret))
+    return false;
+  return true;
+}
+
 THandleIdentifier::THandleIdentifier(const THandleIdentifier& other174) {
   guid = other174.guid;
   secret = other174.secret;
@@ -4790,6 +5281,8 @@ void THandleIdentifier::printTo(std::ostream& out) const {
 TSessionHandle::~TSessionHandle() noexcept {
 }
 
+TSessionHandle::TSessionHandle() noexcept {
+}
 
 void TSessionHandle::__set_sessionId(const THandleIdentifier& val) {
   this->sessionId = val;
@@ -4859,11 +5352,18 @@ uint32_t TSessionHandle::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(TSessionHandle &a, TSessionHandle &b) {
+void swap(TSessionHandle &a, TSessionHandle &b) noexcept {
   using ::std::swap;
   swap(a.sessionId, b.sessionId);
 }
 
+bool TSessionHandle::operator==(const TSessionHandle & rhs) const
+{
+  if (!(sessionId == rhs.sessionId))
+    return false;
+  return true;
+}
+
 TSessionHandle::TSessionHandle(const TSessionHandle& other176) {
   sessionId = other176.sessionId;
 }
@@ -4882,6 +5382,11 @@ void TSessionHandle::printTo(std::ostream& out) const {
 TOperationHandle::~TOperationHandle() noexcept {
 }
 
+TOperationHandle::TOperationHandle() noexcept
+   : operationType(static_cast<TOperationType::type>(0)),
+     hasResultSet(0),
+     modifiedRowCount(0) {
+}
 
 void TOperationHandle::__set_operationId(const THandleIdentifier& val) {
   this->operationId = val;
@@ -5009,7 +5514,7 @@ uint32_t TOperationHandle::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TOperationHandle &a, TOperationHandle &b) {
+void swap(TOperationHandle &a, TOperationHandle &b) noexcept {
   using ::std::swap;
   swap(a.operationId, b.operationId);
   swap(a.operationType, b.operationType);
@@ -5018,6 +5523,21 @@ void swap(TOperationHandle &a, TOperationHandle &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TOperationHandle::operator==(const TOperationHandle & rhs) const
+{
+  if (!(operationId == rhs.operationId))
+    return false;
+  if (!(operationType == rhs.operationType))
+    return false;
+  if (!(hasResultSet == rhs.hasResultSet))
+    return false;
+  if (__isset.modifiedRowCount != rhs.__isset.modifiedRowCount)
+    return false;
+  else if (__isset.modifiedRowCount && !(modifiedRowCount == rhs.modifiedRowCount))
+    return false;
+  return true;
+}
+
 TOperationHandle::TOperationHandle(const TOperationHandle& other179) {
   operationId = other179.operationId;
   operationType = other179.operationType;
@@ -5047,6 +5567,11 @@ void TOperationHandle::printTo(std::ostream& out) const {
 TOpenSessionReq::~TOpenSessionReq() noexcept {
 }
 
+TOpenSessionReq::TOpenSessionReq() noexcept
+   : client_protocol(static_cast<TProtocolVersion::type>(9)),
+     username(),
+     password() {
+}
 
 void TOpenSessionReq::__set_client_protocol(const TProtocolVersion::type val) {
   this->client_protocol = val;
@@ -5196,7 +5721,7 @@ uint32_t TOpenSessionReq::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TOpenSessionReq &a, TOpenSessionReq &b) {
+void swap(TOpenSessionReq &a, TOpenSessionReq &b) noexcept {
   using ::std::swap;
   swap(a.client_protocol, b.client_protocol);
   swap(a.username, b.username);
@@ -5205,6 +5730,25 @@ void swap(TOpenSessionReq &a, TOpenSessionReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TOpenSessionReq::operator==(const TOpenSessionReq & rhs) const
+{
+  if (!(client_protocol == rhs.client_protocol))
+    return false;
+  if (__isset.username != rhs.__isset.username)
+    return false;
+  else if (__isset.username && !(username == rhs.username))
+    return false;
+  if (__isset.password != rhs.__isset.password)
+    return false;
+  else if (__isset.password && !(password == rhs.password))
+    return false;
+  if (__isset.configuration != rhs.__isset.configuration)
+    return false;
+  else if (__isset.configuration && !(configuration == rhs.configuration))
+    return false;
+  return true;
+}
+
 TOpenSessionReq::TOpenSessionReq(const TOpenSessionReq& other190) {
   client_protocol = other190.client_protocol;
   username = other190.username;
@@ -5234,6 +5778,9 @@ void TOpenSessionReq::printTo(std::ostream& out) const {
 TOpenSessionResp::~TOpenSessionResp() noexcept {
 }
 
+TOpenSessionResp::TOpenSessionResp() noexcept
+   : serverProtocolVersion(static_cast<TProtocolVersion::type>(9)) {
+}
 
 void TOpenSessionResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -5384,7 +5931,7 @@ uint32_t TOpenSessionResp::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TOpenSessionResp &a, TOpenSessionResp &b) {
+void swap(TOpenSessionResp &a, TOpenSessionResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.serverProtocolVersion, b.serverProtocolVersion);
@@ -5393,6 +5940,23 @@ void swap(TOpenSessionResp &a, TOpenSessionResp &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TOpenSessionResp::operator==(const TOpenSessionResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (!(serverProtocolVersion == rhs.serverProtocolVersion))
+    return false;
+  if (__isset.sessionHandle != rhs.__isset.sessionHandle)
+    return false;
+  else if (__isset.sessionHandle && !(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.configuration != rhs.__isset.configuration)
+    return false;
+  else if (__isset.configuration && !(configuration == rhs.configuration))
+    return false;
+  return true;
+}
+
 TOpenSessionResp::TOpenSessionResp(const TOpenSessionResp& other201) {
   status = other201.status;
   serverProtocolVersion = other201.serverProtocolVersion;
@@ -5422,6 +5986,8 @@ void TOpenSessionResp::printTo(std::ostream& out) const {
 TSetClientInfoReq::~TSetClientInfoReq() noexcept {
 }
 
+TSetClientInfoReq::TSetClientInfoReq() noexcept {
+}
 
 void TSetClientInfoReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -5533,13 +6099,24 @@ uint32_t TSetClientInfoReq::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TSetClientInfoReq &a, TSetClientInfoReq &b) {
+void swap(TSetClientInfoReq &a, TSetClientInfoReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.configuration, b.configuration);
   swap(a.__isset, b.__isset);
 }
 
+bool TSetClientInfoReq::operator==(const TSetClientInfoReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.configuration != rhs.__isset.configuration)
+    return false;
+  else if (__isset.configuration && !(configuration == rhs.configuration))
+    return false;
+  return true;
+}
+
 TSetClientInfoReq::TSetClientInfoReq(const TSetClientInfoReq& other211) {
   sessionHandle = other211.sessionHandle;
   configuration = other211.configuration;
@@ -5563,6 +6140,8 @@ void TSetClientInfoReq::printTo(std::ostream& out) const {
 TSetClientInfoResp::~TSetClientInfoResp() noexcept {
 }
 
+TSetClientInfoResp::TSetClientInfoResp() noexcept {
+}
 
 void TSetClientInfoResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -5632,11 +6211,18 @@ uint32_t TSetClientInfoResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TSetClientInfoResp &a, TSetClientInfoResp &b) {
+void swap(TSetClientInfoResp &a, TSetClientInfoResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
 }
 
+bool TSetClientInfoResp::operator==(const TSetClientInfoResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  return true;
+}
+
 TSetClientInfoResp::TSetClientInfoResp(const TSetClientInfoResp& other213) {
   status = other213.status;
 }
@@ -5655,6 +6241,8 @@ void TSetClientInfoResp::printTo(std::ostream& out) const {
 TCloseSessionReq::~TCloseSessionReq() noexcept {
 }
 
+TCloseSessionReq::TCloseSessionReq() noexcept {
+}
 
 void TCloseSessionReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -5724,11 +6312,18 @@ uint32_t TCloseSessionReq::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TCloseSessionReq &a, TCloseSessionReq &b) {
+void swap(TCloseSessionReq &a, TCloseSessionReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
 }
 
+bool TCloseSessionReq::operator==(const TCloseSessionReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  return true;
+}
+
 TCloseSessionReq::TCloseSessionReq(const TCloseSessionReq& other215) {
   sessionHandle = other215.sessionHandle;
 }
@@ -5747,6 +6342,8 @@ void TCloseSessionReq::printTo(std::ostream& out) const {
 TCloseSessionResp::~TCloseSessionResp() noexcept {
 }
 
+TCloseSessionResp::TCloseSessionResp() noexcept {
+}
 
 void TCloseSessionResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -5816,11 +6413,18 @@ uint32_t TCloseSessionResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TCloseSessionResp &a, TCloseSessionResp &b) {
+void swap(TCloseSessionResp &a, TCloseSessionResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
 }
 
+bool TCloseSessionResp::operator==(const TCloseSessionResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  return true;
+}
+
 TCloseSessionResp::TCloseSessionResp(const TCloseSessionResp& other217) {
   status = other217.status;
 }
@@ -5839,6 +6443,14 @@ void TCloseSessionResp::printTo(std::ostream& out) const {
 TGetInfoValue::~TGetInfoValue() noexcept {
 }
 
+TGetInfoValue::TGetInfoValue() noexcept
+   : stringValue(),
+     smallIntValue(0),
+     integerBitmask(0),
+     integerFlag(0),
+     binaryValue(0),
+     lenValue(0) {
+}
 
 void TGetInfoValue::__set_stringValue(const std::string& val) {
   this->stringValue = val;
@@ -5997,7 +6609,7 @@ uint32_t TGetInfoValue::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(TGetInfoValue &a, TGetInfoValue &b) {
+void swap(TGetInfoValue &a, TGetInfoValue &b) noexcept {
   using ::std::swap;
   swap(a.stringValue, b.stringValue);
   swap(a.smallIntValue, b.smallIntValue);
@@ -6008,6 +6620,35 @@ void swap(TGetInfoValue &a, TGetInfoValue &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetInfoValue::operator==(const TGetInfoValue & rhs) const
+{
+  if (__isset.stringValue != rhs.__isset.stringValue)
+    return false;
+  else if (__isset.stringValue && !(stringValue == rhs.stringValue))
+    return false;
+  if (__isset.smallIntValue != rhs.__isset.smallIntValue)
+    return false;
+  else if (__isset.smallIntValue && !(smallIntValue == rhs.smallIntValue))
+    return false;
+  if (__isset.integerBitmask != rhs.__isset.integerBitmask)
+    return false;
+  else if (__isset.integerBitmask && !(integerBitmask == rhs.integerBitmask))
+    return false;
+  if (__isset.integerFlag != rhs.__isset.integerFlag)
+    return false;
+  else if (__isset.integerFlag && !(integerFlag == rhs.integerFlag))
+    return false;
+  if (__isset.binaryValue != rhs.__isset.binaryValue)
+    return false;
+  else if (__isset.binaryValue && !(binaryValue == rhs.binaryValue))
+    return false;
+  if (__isset.lenValue != rhs.__isset.lenValue)
+    return false;
+  else if (__isset.lenValue && !(lenValue == rhs.lenValue))
+    return false;
+  return true;
+}
+
 TGetInfoValue::TGetInfoValue(const TGetInfoValue& other219) {
   stringValue = other219.stringValue;
   smallIntValue = other219.smallIntValue;
@@ -6043,6 +6684,9 @@ void TGetInfoValue::printTo(std::ostream& out) const {
 TGetInfoReq::~TGetInfoReq() noexcept {
 }
 
+TGetInfoReq::TGetInfoReq() noexcept
+   : infoType(static_cast<TGetInfoType::type>(0)) {
+}
 
 void TGetInfoReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -6133,12 +6777,21 @@ uint32_t TGetInfoReq::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TGetInfoReq &a, TGetInfoReq &b) {
+void swap(TGetInfoReq &a, TGetInfoReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.infoType, b.infoType);
 }
 
+bool TGetInfoReq::operator==(const TGetInfoReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (!(infoType == rhs.infoType))
+    return false;
+  return true;
+}
+
 TGetInfoReq::TGetInfoReq(const TGetInfoReq& other222) {
   sessionHandle = other222.sessionHandle;
   infoType = other222.infoType;
@@ -6160,6 +6813,8 @@ void TGetInfoReq::printTo(std::ostream& out) const {
 TGetInfoResp::~TGetInfoResp() noexcept {
 }
 
+TGetInfoResp::TGetInfoResp() noexcept {
+}
 
 void TGetInfoResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -6248,12 +6903,21 @@ uint32_t TGetInfoResp::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TGetInfoResp &a, TGetInfoResp &b) {
+void swap(TGetInfoResp &a, TGetInfoResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.infoValue, b.infoValue);
 }
 
+bool TGetInfoResp::operator==(const TGetInfoResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (!(infoValue == rhs.infoValue))
+    return false;
+  return true;
+}
+
 TGetInfoResp::TGetInfoResp(const TGetInfoResp& other224) {
   status = other224.status;
   infoValue = other224.infoValue;
@@ -6275,6 +6939,11 @@ void TGetInfoResp::printTo(std::ostream& out) const {
 TExecuteStatementReq::~TExecuteStatementReq() noexcept {
 }
 
+TExecuteStatementReq::TExecuteStatementReq() noexcept
+   : statement(),
+     runAsync(false),
+     queryTimeout(0LL) {
+}
 
 void TExecuteStatementReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -6441,7 +7110,7 @@ uint32_t TExecuteStatementReq::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(TExecuteStatementReq &a, TExecuteStatementReq &b) {
+void swap(TExecuteStatementReq &a, TExecuteStatementReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.statement, b.statement);
@@ -6451,6 +7120,27 @@ void swap(TExecuteStatementReq &a, TExecuteStatementReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TExecuteStatementReq::operator==(const TExecuteStatementReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (!(statement == rhs.statement))
+    return false;
+  if (__isset.confOverlay != rhs.__isset.confOverlay)
+    return false;
+  else if (__isset.confOverlay && !(confOverlay == rhs.confOverlay))
+    return false;
+  if (__isset.runAsync != rhs.__isset.runAsync)
+    return false;
+  else if (__isset.runAsync && !(runAsync == rhs.runAsync))
+    return false;
+  if (__isset.queryTimeout != rhs.__isset.queryTimeout)
+    return false;
+  else if (__isset.queryTimeout && !(queryTimeout == rhs.queryTimeout))
+    return false;
+  return true;
+}
+
 TExecuteStatementReq::TExecuteStatementReq(const TExecuteStatementReq& other234) {
   sessionHandle = other234.sessionHandle;
   statement = other234.statement;
@@ -6483,6 +7173,8 @@ void TExecuteStatementReq::printTo(std::ostream& out) const {
 TExecuteStatementResp::~TExecuteStatementResp() noexcept {
 }
 
+TExecuteStatementResp::TExecuteStatementResp() noexcept {
+}
 
 void TExecuteStatementResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -6570,13 +7262,24 @@ uint32_t TExecuteStatementResp::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(TExecuteStatementResp &a, TExecuteStatementResp &b) {
+void swap(TExecuteStatementResp &a, TExecuteStatementResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TExecuteStatementResp::operator==(const TExecuteStatementResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TExecuteStatementResp::TExecuteStatementResp(const TExecuteStatementResp& other236) {
   status = other236.status;
   operationHandle = other236.operationHandle;
@@ -6600,6 +7303,8 @@ void TExecuteStatementResp::printTo(std::ostream& out) const {
 TGetTypeInfoReq::~TGetTypeInfoReq() noexcept {
 }
 
+TGetTypeInfoReq::TGetTypeInfoReq() noexcept {
+}
 
 void TGetTypeInfoReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -6669,11 +7374,18 @@ uint32_t TGetTypeInfoReq::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TGetTypeInfoReq &a, TGetTypeInfoReq &b) {
+void swap(TGetTypeInfoReq &a, TGetTypeInfoReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
 }
 
+bool TGetTypeInfoReq::operator==(const TGetTypeInfoReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  return true;
+}
+
 TGetTypeInfoReq::TGetTypeInfoReq(const TGetTypeInfoReq& other238) {
   sessionHandle = other238.sessionHandle;
 }
@@ -6692,6 +7404,8 @@ void TGetTypeInfoReq::printTo(std::ostream& out) const {
 TGetTypeInfoResp::~TGetTypeInfoResp() noexcept {
 }
 
+TGetTypeInfoResp::TGetTypeInfoResp() noexcept {
+}
 
 void TGetTypeInfoResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -6779,13 +7493,24 @@ uint32_t TGetTypeInfoResp::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TGetTypeInfoResp &a, TGetTypeInfoResp &b) {
+void swap(TGetTypeInfoResp &a, TGetTypeInfoResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetTypeInfoResp::operator==(const TGetTypeInfoResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetTypeInfoResp::TGetTypeInfoResp(const TGetTypeInfoResp& other240) {
   status = other240.status;
   operationHandle = other240.operationHandle;
@@ -6809,6 +7534,11 @@ void TGetTypeInfoResp::printTo(std::ostream& out) const {
 TUploadDataReq::~TUploadDataReq() noexcept {
 }
 
+TUploadDataReq::TUploadDataReq() noexcept
+   : tableName(),
+     path(),
+     values() {
+}
 
 void TUploadDataReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -6933,7 +7663,7 @@ uint32_t TUploadDataReq::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(TUploadDataReq &a, TUploadDataReq &b) {
+void swap(TUploadDataReq &a, TUploadDataReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.tableName, b.tableName);
@@ -6942,6 +7672,23 @@ void swap(TUploadDataReq &a, TUploadDataReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TUploadDataReq::operator==(const TUploadDataReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  if (__isset.path != rhs.__isset.path)
+    return false;
+  else if (__isset.path && !(path == rhs.path))
+    return false;
+  if (!(values == rhs.values))
+    return false;
+  return true;
+}
+
 TUploadDataReq::TUploadDataReq(const TUploadDataReq& other242) {
   sessionHandle = other242.sessionHandle;
   tableName = other242.tableName;
@@ -6971,6 +7718,8 @@ void TUploadDataReq::printTo(std::ostream& out) const {
 TUploadDataResp::~TUploadDataResp() noexcept {
 }
 
+TUploadDataResp::TUploadDataResp() noexcept {
+}
 
 void TUploadDataResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -7059,12 +7808,21 @@ uint32_t TUploadDataResp::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TUploadDataResp &a, TUploadDataResp &b) {
+void swap(TUploadDataResp &a, TUploadDataResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
 }
 
+bool TUploadDataResp::operator==(const TUploadDataResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TUploadDataResp::TUploadDataResp(const TUploadDataResp& other244) {
   status = other244.status;
   operationHandle = other244.operationHandle;
@@ -7086,6 +7844,11 @@ void TUploadDataResp::printTo(std::ostream& out) const {
 TDownloadDataReq::~TDownloadDataReq() noexcept {
 }
 
+TDownloadDataReq::TDownloadDataReq() noexcept
+   : tableName(),
+     query(),
+     format() {
+}
 
 void TDownloadDataReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -7251,7 +8014,7 @@ uint32_t TDownloadDataReq::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TDownloadDataReq &a, TDownloadDataReq &b) {
+void swap(TDownloadDataReq &a, TDownloadDataReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.tableName, b.tableName);
@@ -7261,6 +8024,29 @@ void swap(TDownloadDataReq &a, TDownloadDataReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TDownloadDataReq::operator==(const TDownloadDataReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  if (__isset.query != rhs.__isset.query)
+    return false;
+  else if (__isset.query && !(query == rhs.query))
+    return false;
+  if (__isset.format != rhs.__isset.format)
+    return false;
+  else if (__isset.format && !(format == rhs.format))
+    return false;
+  if (__isset.downloadOptions != rhs.__isset.downloadOptions)
+    return false;
+  else if (__isset.downloadOptions && !(downloadOptions == rhs.downloadOptions))
+    return false;
+  return true;
+}
+
 TDownloadDataReq::TDownloadDataReq(const TDownloadDataReq& other254) {
   sessionHandle = other254.sessionHandle;
   tableName = other254.tableName;
@@ -7293,6 +8079,8 @@ void TDownloadDataReq::printTo(std::ostream& out) const {
 TDownloadDataResp::~TDownloadDataResp() noexcept {
 }
 
+TDownloadDataResp::TDownloadDataResp() noexcept {
+}
 
 void TDownloadDataResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -7381,12 +8169,21 @@ uint32_t TDownloadDataResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TDownloadDataResp &a, TDownloadDataResp &b) {
+void swap(TDownloadDataResp &a, TDownloadDataResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
 }
 
+bool TDownloadDataResp::operator==(const TDownloadDataResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TDownloadDataResp::TDownloadDataResp(const TDownloadDataResp& other256) {
   status = other256.status;
   operationHandle = other256.operationHandle;
@@ -7408,6 +8205,8 @@ void TDownloadDataResp::printTo(std::ostream& out) const {
 TGetCatalogsReq::~TGetCatalogsReq() noexcept {
 }
 
+TGetCatalogsReq::TGetCatalogsReq() noexcept {
+}
 
 void TGetCatalogsReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -7477,11 +8276,18 @@ uint32_t TGetCatalogsReq::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TGetCatalogsReq &a, TGetCatalogsReq &b) {
+void swap(TGetCatalogsReq &a, TGetCatalogsReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
 }
 
+bool TGetCatalogsReq::operator==(const TGetCatalogsReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  return true;
+}
+
 TGetCatalogsReq::TGetCatalogsReq(const TGetCatalogsReq& other258) {
   sessionHandle = other258.sessionHandle;
 }
@@ -7500,6 +8306,8 @@ void TGetCatalogsReq::printTo(std::ostream& out) const {
 TGetCatalogsResp::~TGetCatalogsResp() noexcept {
 }
 
+TGetCatalogsResp::TGetCatalogsResp() noexcept {
+}
 
 void TGetCatalogsResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -7587,13 +8395,24 @@ uint32_t TGetCatalogsResp::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TGetCatalogsResp &a, TGetCatalogsResp &b) {
+void swap(TGetCatalogsResp &a, TGetCatalogsResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetCatalogsResp::operator==(const TGetCatalogsResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetCatalogsResp::TGetCatalogsResp(const TGetCatalogsResp& other260) {
   status = other260.status;
   operationHandle = other260.operationHandle;
@@ -7617,6 +8436,10 @@ void TGetCatalogsResp::printTo(std::ostream& out) const {
 TGetSchemasReq::~TGetSchemasReq() noexcept {
 }
 
+TGetSchemasReq::TGetSchemasReq() noexcept
+   : catalogName(),
+     schemaName() {
+}
 
 void TGetSchemasReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -7722,7 +8545,7 @@ uint32_t TGetSchemasReq::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(TGetSchemasReq &a, TGetSchemasReq &b) {
+void swap(TGetSchemasReq &a, TGetSchemasReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.catalogName, b.catalogName);
@@ -7730,6 +8553,21 @@ void swap(TGetSchemasReq &a, TGetSchemasReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetSchemasReq::operator==(const TGetSchemasReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.schemaName != rhs.__isset.schemaName)
+    return false;
+  else if (__isset.schemaName && !(schemaName == rhs.schemaName))
+    return false;
+  return true;
+}
+
 TGetSchemasReq::TGetSchemasReq(const TGetSchemasReq& other262) {
   sessionHandle = other262.sessionHandle;
   catalogName = other262.catalogName;
@@ -7756,6 +8594,8 @@ void TGetSchemasReq::printTo(std::ostream& out) const {
 TGetSchemasResp::~TGetSchemasResp() noexcept {
 }
 
+TGetSchemasResp::TGetSchemasResp() noexcept {
+}
 
 void TGetSchemasResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -7843,13 +8683,24 @@ uint32_t TGetSchemasResp::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TGetSchemasResp &a, TGetSchemasResp &b) {
+void swap(TGetSchemasResp &a, TGetSchemasResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetSchemasResp::operator==(const TGetSchemasResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetSchemasResp::TGetSchemasResp(const TGetSchemasResp& other264) {
   status = other264.status;
   operationHandle = other264.operationHandle;
@@ -7873,6 +8724,11 @@ void TGetSchemasResp::printTo(std::ostream& out) const {
 TGetTablesReq::~TGetTablesReq() noexcept {
 }
 
+TGetTablesReq::TGetTablesReq() noexcept
+   : catalogName(),
+     schemaName(),
+     tableName() {
+}
 
 void TGetTablesReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -8034,7 +8890,7 @@ uint32_t TGetTablesReq::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(TGetTablesReq &a, TGetTablesReq &b) {
+void swap(TGetTablesReq &a, TGetTablesReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.catalogName, b.catalogName);
@@ -8044,6 +8900,29 @@ void swap(TGetTablesReq &a, TGetTablesReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetTablesReq::operator==(const TGetTablesReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.schemaName != rhs.__isset.schemaName)
+    return false;
+  else if (__isset.schemaName && !(schemaName == rhs.schemaName))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  if (__isset.tableTypes != rhs.__isset.tableTypes)
+    return false;
+  else if (__isset.tableTypes && !(tableTypes == rhs.tableTypes))
+    return false;
+  return true;
+}
+
 TGetTablesReq::TGetTablesReq(const TGetTablesReq& other272) {
   sessionHandle = other272.sessionHandle;
   catalogName = other272.catalogName;
@@ -8076,6 +8955,8 @@ void TGetTablesReq::printTo(std::ostream& out) const {
 TGetTablesResp::~TGetTablesResp() noexcept {
 }
 
+TGetTablesResp::TGetTablesResp() noexcept {
+}
 
 void TGetTablesResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -8163,13 +9044,24 @@ uint32_t TGetTablesResp::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(TGetTablesResp &a, TGetTablesResp &b) {
+void swap(TGetTablesResp &a, TGetTablesResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetTablesResp::operator==(const TGetTablesResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetTablesResp::TGetTablesResp(const TGetTablesResp& other274) {
   status = other274.status;
   operationHandle = other274.operationHandle;
@@ -8193,6 +9085,8 @@ void TGetTablesResp::printTo(std::ostream& out) const {
 TGetTableTypesReq::~TGetTableTypesReq() noexcept {
 }
 
+TGetTableTypesReq::TGetTableTypesReq() noexcept {
+}
 
 void TGetTableTypesReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -8262,11 +9156,18 @@ uint32_t TGetTableTypesReq::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TGetTableTypesReq &a, TGetTableTypesReq &b) {
+void swap(TGetTableTypesReq &a, TGetTableTypesReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
 }
 
+bool TGetTableTypesReq::operator==(const TGetTableTypesReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  return true;
+}
+
 TGetTableTypesReq::TGetTableTypesReq(const TGetTableTypesReq& other276) {
   sessionHandle = other276.sessionHandle;
 }
@@ -8285,6 +9186,8 @@ void TGetTableTypesReq::printTo(std::ostream& out) const {
 TGetTableTypesResp::~TGetTableTypesResp() noexcept {
 }
 
+TGetTableTypesResp::TGetTableTypesResp() noexcept {
+}
 
 void TGetTableTypesResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -8372,13 +9275,24 @@ uint32_t TGetTableTypesResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TGetTableTypesResp &a, TGetTableTypesResp &b) {
+void swap(TGetTableTypesResp &a, TGetTableTypesResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetTableTypesResp::operator==(const TGetTableTypesResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetTableTypesResp::TGetTableTypesResp(const TGetTableTypesResp& other278) {
   status = other278.status;
   operationHandle = other278.operationHandle;
@@ -8402,6 +9316,12 @@ void TGetTableTypesResp::printTo(std::ostream& out) const {
 TGetColumnsReq::~TGetColumnsReq() noexcept {
 }
 
+TGetColumnsReq::TGetColumnsReq() noexcept
+   : catalogName(),
+     schemaName(),
+     tableName(),
+     columnName() {
+}
 
 void TGetColumnsReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -8543,7 +9463,7 @@ uint32_t TGetColumnsReq::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(TGetColumnsReq &a, TGetColumnsReq &b) {
+void swap(TGetColumnsReq &a, TGetColumnsReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.catalogName, b.catalogName);
@@ -8553,6 +9473,29 @@ void swap(TGetColumnsReq &a, TGetColumnsReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetColumnsReq::operator==(const TGetColumnsReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.schemaName != rhs.__isset.schemaName)
+    return false;
+  else if (__isset.schemaName && !(schemaName == rhs.schemaName))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  if (__isset.columnName != rhs.__isset.columnName)
+    return false;
+  else if (__isset.columnName && !(columnName == rhs.columnName))
+    return false;
+  return true;
+}
+
 TGetColumnsReq::TGetColumnsReq(const TGetColumnsReq& other280) {
   sessionHandle = other280.sessionHandle;
   catalogName = other280.catalogName;
@@ -8585,6 +9528,8 @@ void TGetColumnsReq::printTo(std::ostream& out) const {
 TGetColumnsResp::~TGetColumnsResp() noexcept {
 }
 
+TGetColumnsResp::TGetColumnsResp() noexcept {
+}
 
 void TGetColumnsResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -8672,13 +9617,24 @@ uint32_t TGetColumnsResp::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TGetColumnsResp &a, TGetColumnsResp &b) {
+void swap(TGetColumnsResp &a, TGetColumnsResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetColumnsResp::operator==(const TGetColumnsResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetColumnsResp::TGetColumnsResp(const TGetColumnsResp& other282) {
   status = other282.status;
   operationHandle = other282.operationHandle;
@@ -8702,6 +9658,11 @@ void TGetColumnsResp::printTo(std::ostream& out) const {
 TGetFunctionsReq::~TGetFunctionsReq() noexcept {
 }
 
+TGetFunctionsReq::TGetFunctionsReq() noexcept
+   : catalogName(),
+     schemaName(),
+     functionName() {
+}
 
 void TGetFunctionsReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -8826,7 +9787,7 @@ uint32_t TGetFunctionsReq::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TGetFunctionsReq &a, TGetFunctionsReq &b) {
+void swap(TGetFunctionsReq &a, TGetFunctionsReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.catalogName, b.catalogName);
@@ -8835,6 +9796,23 @@ void swap(TGetFunctionsReq &a, TGetFunctionsReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetFunctionsReq::operator==(const TGetFunctionsReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.schemaName != rhs.__isset.schemaName)
+    return false;
+  else if (__isset.schemaName && !(schemaName == rhs.schemaName))
+    return false;
+  if (!(functionName == rhs.functionName))
+    return false;
+  return true;
+}
+
 TGetFunctionsReq::TGetFunctionsReq(const TGetFunctionsReq& other284) {
   sessionHandle = other284.sessionHandle;
   catalogName = other284.catalogName;
@@ -8864,6 +9842,8 @@ void TGetFunctionsReq::printTo(std::ostream& out) const {
 TGetFunctionsResp::~TGetFunctionsResp() noexcept {
 }
 
+TGetFunctionsResp::TGetFunctionsResp() noexcept {
+}
 
 void TGetFunctionsResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -8951,13 +9931,24 @@ uint32_t TGetFunctionsResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TGetFunctionsResp &a, TGetFunctionsResp &b) {
+void swap(TGetFunctionsResp &a, TGetFunctionsResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetFunctionsResp::operator==(const TGetFunctionsResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetFunctionsResp::TGetFunctionsResp(const TGetFunctionsResp& other286) {
   status = other286.status;
   operationHandle = other286.operationHandle;
@@ -8981,6 +9972,11 @@ void TGetFunctionsResp::printTo(std::ostream& out) const {
 TGetPrimaryKeysReq::~TGetPrimaryKeysReq() noexcept {
 }
 
+TGetPrimaryKeysReq::TGetPrimaryKeysReq() noexcept
+   : catalogName(),
+     schemaName(),
+     tableName() {
+}
 
 void TGetPrimaryKeysReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -9104,7 +10100,7 @@ uint32_t TGetPrimaryKeysReq::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TGetPrimaryKeysReq &a, TGetPrimaryKeysReq &b) {
+void swap(TGetPrimaryKeysReq &a, TGetPrimaryKeysReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.catalogName, b.catalogName);
@@ -9113,6 +10109,25 @@ void swap(TGetPrimaryKeysReq &a, TGetPrimaryKeysReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetPrimaryKeysReq::operator==(const TGetPrimaryKeysReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.schemaName != rhs.__isset.schemaName)
+    return false;
+  else if (__isset.schemaName && !(schemaName == rhs.schemaName))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  return true;
+}
+
 TGetPrimaryKeysReq::TGetPrimaryKeysReq(const TGetPrimaryKeysReq& other288) {
   sessionHandle = other288.sessionHandle;
   catalogName = other288.catalogName;
@@ -9142,6 +10157,8 @@ void TGetPrimaryKeysReq::printTo(std::ostream& out) const {
 TGetPrimaryKeysResp::~TGetPrimaryKeysResp() noexcept {
 }
 
+TGetPrimaryKeysResp::TGetPrimaryKeysResp() noexcept {
+}
 
 void TGetPrimaryKeysResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -9229,13 +10246,24 @@ uint32_t TGetPrimaryKeysResp::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TGetPrimaryKeysResp &a, TGetPrimaryKeysResp &b) {
+void swap(TGetPrimaryKeysResp &a, TGetPrimaryKeysResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetPrimaryKeysResp::operator==(const TGetPrimaryKeysResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetPrimaryKeysResp::TGetPrimaryKeysResp(const TGetPrimaryKeysResp& other290) {
   status = other290.status;
   operationHandle = other290.operationHandle;
@@ -9259,6 +10287,14 @@ void TGetPrimaryKeysResp::printTo(std::ostream& out) const {
 TGetCrossReferenceReq::~TGetCrossReferenceReq() noexcept {
 }
 
+TGetCrossReferenceReq::TGetCrossReferenceReq() noexcept
+   : parentCatalogName(),
+     parentSchemaName(),
+     parentTableName(),
+     foreignCatalogName(),
+     foreignSchemaName(),
+     foreignTableName() {
+}
 
 void TGetCrossReferenceReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -9436,7 +10472,7 @@ uint32_t TGetCrossReferenceReq::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(TGetCrossReferenceReq &a, TGetCrossReferenceReq &b) {
+void swap(TGetCrossReferenceReq &a, TGetCrossReferenceReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.parentCatalogName, b.parentCatalogName);
@@ -9448,6 +10484,37 @@ void swap(TGetCrossReferenceReq &a, TGetCrossReferenceReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetCrossReferenceReq::operator==(const TGetCrossReferenceReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (__isset.parentCatalogName != rhs.__isset.parentCatalogName)
+    return false;
+  else if (__isset.parentCatalogName && !(parentCatalogName == rhs.parentCatalogName))
+    return false;
+  if (__isset.parentSchemaName != rhs.__isset.parentSchemaName)
+    return false;
+  else if (__isset.parentSchemaName && !(parentSchemaName == rhs.parentSchemaName))
+    return false;
+  if (__isset.parentTableName != rhs.__isset.parentTableName)
+    return false;
+  else if (__isset.parentTableName && !(parentTableName == rhs.parentTableName))
+    return false;
+  if (__isset.foreignCatalogName != rhs.__isset.foreignCatalogName)
+    return false;
+  else if (__isset.foreignCatalogName && !(foreignCatalogName == rhs.foreignCatalogName))
+    return false;
+  if (__isset.foreignSchemaName != rhs.__isset.foreignSchemaName)
+    return false;
+  else if (__isset.foreignSchemaName && !(foreignSchemaName == rhs.foreignSchemaName))
+    return false;
+  if (__isset.foreignTableName != rhs.__isset.foreignTableName)
+    return false;
+  else if (__isset.foreignTableName && !(foreignTableName == rhs.foreignTableName))
+    return false;
+  return true;
+}
+
 TGetCrossReferenceReq::TGetCrossReferenceReq(const TGetCrossReferenceReq& other292) {
   sessionHandle = other292.sessionHandle;
   parentCatalogName = other292.parentCatalogName;
@@ -9486,6 +10553,8 @@ void TGetCrossReferenceReq::printTo(std::ostream& out) const {
 TGetCrossReferenceResp::~TGetCrossReferenceResp() noexcept {
 }
 
+TGetCrossReferenceResp::TGetCrossReferenceResp() noexcept {
+}
 
 void TGetCrossReferenceResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -9573,13 +10642,24 @@ uint32_t TGetCrossReferenceResp::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(TGetCrossReferenceResp &a, TGetCrossReferenceResp &b) {
+void swap(TGetCrossReferenceResp &a, TGetCrossReferenceResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationHandle, b.operationHandle);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetCrossReferenceResp::operator==(const TGetCrossReferenceResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationHandle != rhs.__isset.operationHandle)
+    return false;
+  else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetCrossReferenceResp::TGetCrossReferenceResp(const TGetCrossReferenceResp& other294) {
   status = other294.status;
   operationHandle = other294.operationHandle;
@@ -9603,6 +10683,9 @@ void TGetCrossReferenceResp::printTo(std::ostream& out) const {
 TGetOperationStatusReq::~TGetOperationStatusReq() noexcept {
 }
 
+TGetOperationStatusReq::TGetOperationStatusReq() noexcept
+   : getProgressUpdate(0) {
+}
 
 void TGetOperationStatusReq::__set_operationHandle(const TOperationHandle& val) {
   this->operationHandle = val;
@@ -9690,13 +10773,24 @@ uint32_t TGetOperationStatusReq::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(TGetOperationStatusReq &a, TGetOperationStatusReq &b) {
+void swap(TGetOperationStatusReq &a, TGetOperationStatusReq &b) noexcept {
   using ::std::swap;
   swap(a.operationHandle, b.operationHandle);
   swap(a.getProgressUpdate, b.getProgressUpdate);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetOperationStatusReq::operator==(const TGetOperationStatusReq & rhs) const
+{
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  if (__isset.getProgressUpdate != rhs.__isset.getProgressUpdate)
+    return false;
+  else if (__isset.getProgressUpdate && !(getProgressUpdate == rhs.getProgressUpdate))
+    return false;
+  return true;
+}
+
 TGetOperationStatusReq::TGetOperationStatusReq(const TGetOperationStatusReq& other296) {
   operationHandle = other296.operationHandle;
   getProgressUpdate = other296.getProgressUpdate;
@@ -9720,6 +10814,17 @@ void TGetOperationStatusReq::printTo(std::ostream& out) const {
 TGetOperationStatusResp::~TGetOperationStatusResp() noexcept {
 }
 
+TGetOperationStatusResp::TGetOperationStatusResp() noexcept
+   : operationState(static_cast<TOperationState::type>(0)),
+     sqlState(),
+     errorCode(0),
+     errorMessage(),
+     taskStatus(),
+     operationStarted(0),
+     operationCompleted(0),
+     hasResultSet(0),
+     numModifiedRows(0) {
+}
 
 void TGetOperationStatusResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -9971,7 +11076,7 @@ uint32_t TGetOperationStatusResp::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(TGetOperationStatusResp &a, TGetOperationStatusResp &b) {
+void swap(TGetOperationStatusResp &a, TGetOperationStatusResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.operationState, b.operationState);
@@ -9987,6 +11092,53 @@ void swap(TGetOperationStatusResp &a, TGetOperationStatusResp &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TGetOperationStatusResp::operator==(const TGetOperationStatusResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.operationState != rhs.__isset.operationState)
+    return false;
+  else if (__isset.operationState && !(operationState == rhs.operationState))
+    return false;
+  if (__isset.sqlState != rhs.__isset.sqlState)
+    return false;
+  else if (__isset.sqlState && !(sqlState == rhs.sqlState))
+    return false;
+  if (__isset.errorCode != rhs.__isset.errorCode)
+    return false;
+  else if (__isset.errorCode && !(errorCode == rhs.errorCode))
+    return false;
+  if (__isset.errorMessage != rhs.__isset.errorMessage)
+    return false;
+  else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
+    return false;
+  if (__isset.taskStatus != rhs.__isset.taskStatus)
+    return false;
+  else if (__isset.taskStatus && !(taskStatus == rhs.taskStatus))
+    return false;
+  if (__isset.operationStarted != rhs.__isset.operationStarted)
+    return false;
+  else if (__isset.operationStarted && !(operationStarted == rhs.operationStarted))
+    return false;
+  if (__isset.operationCompleted != rhs.__isset.operationCompleted)
+    return false;
+  else if (__isset.operationCompleted && !(operationCompleted == rhs.operationCompleted))
+    return false;
+  if (__isset.hasResultSet != rhs.__isset.hasResultSet)
+    return false;
+  else if (__isset.hasResultSet && !(hasResultSet == rhs.hasResultSet))
+    return false;
+  if (__isset.progressUpdateResponse != rhs.__isset.progressUpdateResponse)
+    return false;
+  else if (__isset.progressUpdateResponse && !(progressUpdateResponse == rhs.progressUpdateResponse))
+    return false;
+  if (__isset.numModifiedRows != rhs.__isset.numModifiedRows)
+    return false;
+  else if (__isset.numModifiedRows && !(numModifiedRows == rhs.numModifiedRows))
+    return false;
+  return true;
+}
+
 TGetOperationStatusResp::TGetOperationStatusResp(const TGetOperationStatusResp& other299) {
   status = other299.status;
   operationState = other299.operationState;
@@ -10037,6 +11189,8 @@ void TGetOperationStatusResp::printTo(std::ostream& out) const {
 TCancelOperationReq::~TCancelOperationReq() noexcept {
 }
 
+TCancelOperationReq::TCancelOperationReq() noexcept {
+}
 
 void TCancelOperationReq::__set_operationHandle(const TOperationHandle& val) {
   this->operationHandle = val;
@@ -10106,11 +11260,18 @@ uint32_t TCancelOperationReq::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TCancelOperationReq &a, TCancelOperationReq &b) {
+void swap(TCancelOperationReq &a, TCancelOperationReq &b) noexcept {
   using ::std::swap;
   swap(a.operationHandle, b.operationHandle);
 }
 
+bool TCancelOperationReq::operator==(const TCancelOperationReq & rhs) const
+{
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TCancelOperationReq::TCancelOperationReq(const TCancelOperationReq& other301) {
   operationHandle = other301.operationHandle;
 }
@@ -10129,6 +11290,8 @@ void TCancelOperationReq::printTo(std::ostream& out) const {
 TCancelOperationResp::~TCancelOperationResp() noexcept {
 }
 
+TCancelOperationResp::TCancelOperationResp() noexcept {
+}
 
 void TCancelOperationResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -10198,11 +11361,18 @@ uint32_t TCancelOperationResp::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(TCancelOperationResp &a, TCancelOperationResp &b) {
+void swap(TCancelOperationResp &a, TCancelOperationResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
 }
 
+bool TCancelOperationResp::operator==(const TCancelOperationResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  return true;
+}
+
 TCancelOperationResp::TCancelOperationResp(const TCancelOperationResp& other303) {
   status = other303.status;
 }
@@ -10221,6 +11391,8 @@ void TCancelOperationResp::printTo(std::ostream& out) const {
 TCloseOperationReq::~TCloseOperationReq() noexcept {
 }
 
+TCloseOperationReq::TCloseOperationReq() noexcept {
+}
 
 void TCloseOperationReq::__set_operationHandle(const TOperationHandle& val) {
   this->operationHandle = val;
@@ -10290,11 +11462,18 @@ uint32_t TCloseOperationReq::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TCloseOperationReq &a, TCloseOperationReq &b) {
+void swap(TCloseOperationReq &a, TCloseOperationReq &b) noexcept {
   using ::std::swap;
   swap(a.operationHandle, b.operationHandle);
 }
 
+bool TCloseOperationReq::operator==(const TCloseOperationReq & rhs) const
+{
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TCloseOperationReq::TCloseOperationReq(const TCloseOperationReq& other305) {
   operationHandle = other305.operationHandle;
 }
@@ -10313,6 +11492,8 @@ void TCloseOperationReq::printTo(std::ostream& out) const {
 TCloseOperationResp::~TCloseOperationResp() noexcept {
 }
 
+TCloseOperationResp::TCloseOperationResp() noexcept {
+}
 
 void TCloseOperationResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -10382,11 +11563,18 @@ uint32_t TCloseOperationResp::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TCloseOperationResp &a, TCloseOperationResp &b) {
+void swap(TCloseOperationResp &a, TCloseOperationResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
 }
 
+bool TCloseOperationResp::operator==(const TCloseOperationResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  return true;
+}
+
 TCloseOperationResp::TCloseOperationResp(const TCloseOperationResp& other307) {
   status = other307.status;
 }
@@ -10405,6 +11593,8 @@ void TCloseOperationResp::printTo(std::ostream& out) const {
 TGetResultSetMetadataReq::~TGetResultSetMetadataReq() noexcept {
 }
 
+TGetResultSetMetadataReq::TGetResultSetMetadataReq() noexcept {
+}
 
 void TGetResultSetMetadataReq::__set_operationHandle(const TOperationHandle& val) {
   this->operationHandle = val;
@@ -10474,11 +11664,18 @@ uint32_t TGetResultSetMetadataReq::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(TGetResultSetMetadataReq &a, TGetResultSetMetadataReq &b) {
+void swap(TGetResultSetMetadataReq &a, TGetResultSetMetadataReq &b) noexcept {
   using ::std::swap;
   swap(a.operationHandle, b.operationHandle);
 }
 
+bool TGetResultSetMetadataReq::operator==(const TGetResultSetMetadataReq & rhs) const
+{
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetResultSetMetadataReq::TGetResultSetMetadataReq(const TGetResultSetMetadataReq& other309) {
   operationHandle = other309.operationHandle;
 }
@@ -10497,6 +11694,8 @@ void TGetResultSetMetadataReq::printTo(std::ostream& out) const {
 TGetResultSetMetadataResp::~TGetResultSetMetadataResp() noexcept {
 }
 
+TGetResultSetMetadataResp::TGetResultSetMetadataResp() noexcept {
+}
 
 void TGetResultSetMetadataResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -10584,13 +11783,24 @@ uint32_t TGetResultSetMetadataResp::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(TGetResultSetMetadataResp &a, TGetResultSetMetadataResp &b) {
+void swap(TGetResultSetMetadataResp &a, TGetResultSetMetadataResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.schema, b.schema);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetResultSetMetadataResp::operator==(const TGetResultSetMetadataResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.schema != rhs.__isset.schema)
+    return false;
+  else if (__isset.schema && !(schema == rhs.schema))
+    return false;
+  return true;
+}
+
 TGetResultSetMetadataResp::TGetResultSetMetadataResp(const TGetResultSetMetadataResp& other311) {
   status = other311.status;
   schema = other311.schema;
@@ -10614,6 +11824,11 @@ void TGetResultSetMetadataResp::printTo(std::ostream& out) const {
 TFetchResultsReq::~TFetchResultsReq() noexcept {
 }
 
+TFetchResultsReq::TFetchResultsReq() noexcept
+   : orientation(static_cast<TFetchOrientation::type>(0)),
+     maxRows(0),
+     fetchType(0) {
+}
 
 void TFetchResultsReq::__set_operationHandle(const TOperationHandle& val) {
   this->operationHandle = val;
@@ -10741,7 +11956,7 @@ uint32_t TFetchResultsReq::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TFetchResultsReq &a, TFetchResultsReq &b) {
+void swap(TFetchResultsReq &a, TFetchResultsReq &b) noexcept {
   using ::std::swap;
   swap(a.operationHandle, b.operationHandle);
   swap(a.orientation, b.orientation);
@@ -10750,6 +11965,21 @@ void swap(TFetchResultsReq &a, TFetchResultsReq &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TFetchResultsReq::operator==(const TFetchResultsReq & rhs) const
+{
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  if (!(orientation == rhs.orientation))
+    return false;
+  if (!(maxRows == rhs.maxRows))
+    return false;
+  if (__isset.fetchType != rhs.__isset.fetchType)
+    return false;
+  else if (__isset.fetchType && !(fetchType == rhs.fetchType))
+    return false;
+  return true;
+}
+
 TFetchResultsReq::TFetchResultsReq(const TFetchResultsReq& other314) {
   operationHandle = other314.operationHandle;
   orientation = other314.orientation;
@@ -10779,6 +12009,9 @@ void TFetchResultsReq::printTo(std::ostream& out) const {
 TFetchResultsResp::~TFetchResultsResp() noexcept {
 }
 
+TFetchResultsResp::TFetchResultsResp() noexcept
+   : hasMoreRows(0) {
+}
 
 void TFetchResultsResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -10884,7 +12117,7 @@ uint32_t TFetchResultsResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TFetchResultsResp &a, TFetchResultsResp &b) {
+void swap(TFetchResultsResp &a, TFetchResultsResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.hasMoreRows, b.hasMoreRows);
@@ -10892,6 +12125,21 @@ void swap(TFetchResultsResp &a, TFetchResultsResp &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TFetchResultsResp::operator==(const TFetchResultsResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.hasMoreRows != rhs.__isset.hasMoreRows)
+    return false;
+  else if (__isset.hasMoreRows && !(hasMoreRows == rhs.hasMoreRows))
+    return false;
+  if (__isset.results != rhs.__isset.results)
+    return false;
+  else if (__isset.results && !(results == rhs.results))
+    return false;
+  return true;
+}
+
 TFetchResultsResp::TFetchResultsResp(const TFetchResultsResp& other316) {
   status = other316.status;
   hasMoreRows = other316.hasMoreRows;
@@ -10918,6 +12166,10 @@ void TFetchResultsResp::printTo(std::ostream& out) const {
 TGetDelegationTokenReq::~TGetDelegationTokenReq() noexcept {
 }
 
+TGetDelegationTokenReq::TGetDelegationTokenReq() noexcept
+   : owner(),
+     renewer() {
+}
 
 void TGetDelegationTokenReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -11025,13 +12277,24 @@ uint32_t TGetDelegationTokenReq::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(TGetDelegationTokenReq &a, TGetDelegationTokenReq &b) {
+void swap(TGetDelegationTokenReq &a, TGetDelegationTokenReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.owner, b.owner);
   swap(a.renewer, b.renewer);
 }
 
+bool TGetDelegationTokenReq::operator==(const TGetDelegationTokenReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (!(owner == rhs.owner))
+    return false;
+  if (!(renewer == rhs.renewer))
+    return false;
+  return true;
+}
+
 TGetDelegationTokenReq::TGetDelegationTokenReq(const TGetDelegationTokenReq& other318) {
   sessionHandle = other318.sessionHandle;
   owner = other318.owner;
@@ -11056,6 +12319,9 @@ void TGetDelegationTokenReq::printTo(std::ostream& out) const {
 TGetDelegationTokenResp::~TGetDelegationTokenResp() noexcept {
 }
 
+TGetDelegationTokenResp::TGetDelegationTokenResp() noexcept
+   : delegationToken() {
+}
 
 void TGetDelegationTokenResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -11143,13 +12409,24 @@ uint32_t TGetDelegationTokenResp::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(TGetDelegationTokenResp &a, TGetDelegationTokenResp &b) {
+void swap(TGetDelegationTokenResp &a, TGetDelegationTokenResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
   swap(a.delegationToken, b.delegationToken);
   swap(a.__isset, b.__isset);
 }
 
+bool TGetDelegationTokenResp::operator==(const TGetDelegationTokenResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  if (__isset.delegationToken != rhs.__isset.delegationToken)
+    return false;
+  else if (__isset.delegationToken && !(delegationToken == rhs.delegationToken))
+    return false;
+  return true;
+}
+
 TGetDelegationTokenResp::TGetDelegationTokenResp(const TGetDelegationTokenResp& other320) {
   status = other320.status;
   delegationToken = other320.delegationToken;
@@ -11173,6 +12450,9 @@ void TGetDelegationTokenResp::printTo(std::ostream& out) const {
 TCancelDelegationTokenReq::~TCancelDelegationTokenReq() noexcept {
 }
 
+TCancelDelegationTokenReq::TCancelDelegationTokenReq() noexcept
+   : delegationToken() {
+}
 
 void TCancelDelegationTokenReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -11261,12 +12541,21 @@ uint32_t TCancelDelegationTokenReq::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(TCancelDelegationTokenReq &a, TCancelDelegationTokenReq &b) {
+void swap(TCancelDelegationTokenReq &a, TCancelDelegationTokenReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.delegationToken, b.delegationToken);
 }
 
+bool TCancelDelegationTokenReq::operator==(const TCancelDelegationTokenReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (!(delegationToken == rhs.delegationToken))
+    return false;
+  return true;
+}
+
 TCancelDelegationTokenReq::TCancelDelegationTokenReq(const TCancelDelegationTokenReq& other322) {
   sessionHandle = other322.sessionHandle;
   delegationToken = other322.delegationToken;
@@ -11288,6 +12577,8 @@ void TCancelDelegationTokenReq::printTo(std::ostream& out) const {
 TCancelDelegationTokenResp::~TCancelDelegationTokenResp() noexcept {
 }
 
+TCancelDelegationTokenResp::TCancelDelegationTokenResp() noexcept {
+}
 
 void TCancelDelegationTokenResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -11357,11 +12648,18 @@ uint32_t TCancelDelegationTokenResp::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(TCancelDelegationTokenResp &a, TCancelDelegationTokenResp &b) {
+void swap(TCancelDelegationTokenResp &a, TCancelDelegationTokenResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
 }
 
+bool TCancelDelegationTokenResp::operator==(const TCancelDelegationTokenResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  return true;
+}
+
 TCancelDelegationTokenResp::TCancelDelegationTokenResp(const TCancelDelegationTokenResp& other324) {
   status = other324.status;
 }
@@ -11380,6 +12678,9 @@ void TCancelDelegationTokenResp::printTo(std::ostream& out) const {
 TRenewDelegationTokenReq::~TRenewDelegationTokenReq() noexcept {
 }
 
+TRenewDelegationTokenReq::TRenewDelegationTokenReq() noexcept
+   : delegationToken() {
+}
 
 void TRenewDelegationTokenReq::__set_sessionHandle(const TSessionHandle& val) {
   this->sessionHandle = val;
@@ -11468,12 +12769,21 @@ uint32_t TRenewDelegationTokenReq::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(TRenewDelegationTokenReq &a, TRenewDelegationTokenReq &b) {
+void swap(TRenewDelegationTokenReq &a, TRenewDelegationTokenReq &b) noexcept {
   using ::std::swap;
   swap(a.sessionHandle, b.sessionHandle);
   swap(a.delegationToken, b.delegationToken);
 }
 
+bool TRenewDelegationTokenReq::operator==(const TRenewDelegationTokenReq & rhs) const
+{
+  if (!(sessionHandle == rhs.sessionHandle))
+    return false;
+  if (!(delegationToken == rhs.delegationToken))
+    return false;
+  return true;
+}
+
 TRenewDelegationTokenReq::TRenewDelegationTokenReq(const TRenewDelegationTokenReq& other326) {
   sessionHandle = other326.sessionHandle;
   delegationToken = other326.delegationToken;
@@ -11495,6 +12805,8 @@ void TRenewDelegationTokenReq::printTo(std::ostream& out) const {
 TRenewDelegationTokenResp::~TRenewDelegationTokenResp() noexcept {
 }
 
+TRenewDelegationTokenResp::TRenewDelegationTokenResp() noexcept {
+}
 
 void TRenewDelegationTokenResp::__set_status(const TStatus& val) {
   this->status = val;
@@ -11564,11 +12876,18 @@ uint32_t TRenewDelegationTokenResp::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(TRenewDelegationTokenResp &a, TRenewDelegationTokenResp &b) {
+void swap(TRenewDelegationTokenResp &a, TRenewDelegationTokenResp &b) noexcept {
   using ::std::swap;
   swap(a.status, b.status);
 }
 
+bool TRenewDelegationTokenResp::operator==(const TRenewDelegationTokenResp & rhs) const
+{
+  if (!(status == rhs.status))
+    return false;
+  return true;
+}
+
 TRenewDelegationTokenResp::TRenewDelegationTokenResp(const TRenewDelegationTokenResp& other328) {
   status = other328.status;
 }
@@ -11587,6 +12906,12 @@ void TRenewDelegationTokenResp::printTo(std::ostream& out) const {
 TProgressUpdateResp::~TProgressUpdateResp() noexcept {
 }
 
+TProgressUpdateResp::TProgressUpdateResp() noexcept
+   : progressedPercentage(0),
+     status(static_cast<TJobExecutionStatus::type>(0)),
+     footerSummary(),
+     startTime(0) {
+}
 
 void TProgressUpdateResp::__set_headerNames(const std::vector<std::string> & val) {
   this->headerNames = val;
@@ -11813,7 +13138,7 @@ uint32_t TProgressUpdateResp::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TProgressUpdateResp &a, TProgressUpdateResp &b) {
+void swap(TProgressUpdateResp &a, TProgressUpdateResp &b) noexcept {
   using ::std::swap;
   swap(a.headerNames, b.headerNames);
   swap(a.rows, b.rows);
@@ -11823,6 +13148,23 @@ void swap(TProgressUpdateResp &a, TProgressUpdateResp &b) {
   swap(a.startTime, b.startTime);
 }
 
+bool TProgressUpdateResp::operator==(const TProgressUpdateResp & rhs) const
+{
+  if (!(headerNames == rhs.headerNames))
+    return false;
+  if (!(rows == rhs.rows))
+    return false;
+  if (!(progressedPercentage == rhs.progressedPercentage))
+    return false;
+  if (!(status == rhs.status))
+    return false;
+  if (!(footerSummary == rhs.footerSummary))
+    return false;
+  if (!(startTime == rhs.startTime))
+    return false;
+  return true;
+}
+
 TProgressUpdateResp::TProgressUpdateResp(const TProgressUpdateResp& other349) {
   headerNames = other349.headerNames;
   rows = other349.rows;
@@ -11856,6 +13198,8 @@ void TProgressUpdateResp::printTo(std::ostream& out) const {
 TGetQueryIdReq::~TGetQueryIdReq() noexcept {
 }
 
+TGetQueryIdReq::TGetQueryIdReq() noexcept {
+}
 
 void TGetQueryIdReq::__set_operationHandle(const TOperationHandle& val) {
   this->operationHandle = val;
@@ -11925,11 +13269,18 @@ uint32_t TGetQueryIdReq::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(TGetQueryIdReq &a, TGetQueryIdReq &b) {
+void swap(TGetQueryIdReq &a, TGetQueryIdReq &b) noexcept {
   using ::std::swap;
   swap(a.operationHandle, b.operationHandle);
 }
 
+bool TGetQueryIdReq::operator==(const TGetQueryIdReq & rhs) const
+{
+  if (!(operationHandle == rhs.operationHandle))
+    return false;
+  return true;
+}
+
 TGetQueryIdReq::TGetQueryIdReq(const TGetQueryIdReq& other351) {
   operationHandle = other351.operationHandle;
 }
@@ -11948,6 +13299,9 @@ void TGetQueryIdReq::printTo(std::ostream& out) const {
 TGetQueryIdResp::~TGetQueryIdResp() noexcept {
 }
 
+TGetQueryIdResp::TGetQueryIdResp() noexcept
+   : queryId() {
+}
 
 void TGetQueryIdResp::__set_queryId(const std::string& val) {
   this->queryId = val;
@@ -12017,11 +13371,18 @@ uint32_t TGetQueryIdResp::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(TGetQueryIdResp &a, TGetQueryIdResp &b) {
+void swap(TGetQueryIdResp &a, TGetQueryIdResp &b) noexcept {
   using ::std::swap;
   swap(a.queryId, b.queryId);
 }
 
+bool TGetQueryIdResp::operator==(const TGetQueryIdResp & rhs) const
+{
+  if (!(queryId == rhs.queryId))
+    return false;
+  return true;
+}
+
 TGetQueryIdResp::TGetQueryIdResp(const TGetQueryIdResp& other353) {
   queryId = other353.queryId;
 }
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
index b80d355e03a9..5245a729c5c7 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -418,10 +418,7 @@ class TTypeQualifierValue : public virtual ::apache::thrift::TBase {
 
   TTypeQualifierValue(const TTypeQualifierValue&);
   TTypeQualifierValue& operator=(const TTypeQualifierValue&);
-  TTypeQualifierValue() noexcept
-                      : i32Value(0),
-                        stringValue() {
-  }
+  TTypeQualifierValue() noexcept;
 
   virtual ~TTypeQualifierValue() noexcept;
   int32_t i32Value;
@@ -433,18 +430,7 @@ class TTypeQualifierValue : public virtual ::apache::thrift::TBase {
 
   void __set_stringValue(const std::string& val);
 
-  bool operator == (const TTypeQualifierValue & rhs) const
-  {
-    if (__isset.i32Value != rhs.__isset.i32Value)
-      return false;
-    else if (__isset.i32Value && !(i32Value == rhs.i32Value))
-      return false;
-    if (__isset.stringValue != rhs.__isset.stringValue)
-      return false;
-    else if (__isset.stringValue && !(stringValue == rhs.stringValue))
-      return false;
-    return true;
-  }
+  bool operator == (const TTypeQualifierValue & rhs) const;
   bool operator != (const TTypeQualifierValue &rhs) const {
     return !(*this == rhs);
   }
@@ -457,7 +443,7 @@ class TTypeQualifierValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TTypeQualifierValue &a, TTypeQualifierValue &b);
+void swap(TTypeQualifierValue &a, TTypeQualifierValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TTypeQualifierValue& obj);
 
@@ -467,20 +453,14 @@ class TTypeQualifiers : public virtual ::apache::thrift::TBase {
 
   TTypeQualifiers(const TTypeQualifiers&);
   TTypeQualifiers& operator=(const TTypeQualifiers&);
-  TTypeQualifiers() noexcept {
-  }
+  TTypeQualifiers() noexcept;
 
   virtual ~TTypeQualifiers() noexcept;
   std::map<std::string, TTypeQualifierValue>  qualifiers;
 
   void __set_qualifiers(const std::map<std::string, TTypeQualifierValue> & val);
 
-  bool operator == (const TTypeQualifiers & rhs) const
-  {
-    if (!(qualifiers == rhs.qualifiers))
-      return false;
-    return true;
-  }
+  bool operator == (const TTypeQualifiers & rhs) const;
   bool operator != (const TTypeQualifiers &rhs) const {
     return !(*this == rhs);
   }
@@ -493,7 +473,7 @@ class TTypeQualifiers : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TTypeQualifiers &a, TTypeQualifiers &b);
+void swap(TTypeQualifiers &a, TTypeQualifiers &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TTypeQualifiers& obj);
 
@@ -507,9 +487,7 @@ class TPrimitiveTypeEntry : public virtual ::apache::thrift::TBase {
 
   TPrimitiveTypeEntry(const TPrimitiveTypeEntry&);
   TPrimitiveTypeEntry& operator=(const TPrimitiveTypeEntry&);
-  TPrimitiveTypeEntry() noexcept
-                      : type(static_cast<TTypeId::type>(0)) {
-  }
+  TPrimitiveTypeEntry() noexcept;
 
   virtual ~TPrimitiveTypeEntry() noexcept;
   /**
@@ -525,16 +503,7 @@ class TPrimitiveTypeEntry : public virtual ::apache::thrift::TBase {
 
   void __set_typeQualifiers(const TTypeQualifiers& val);
 
-  bool operator == (const TPrimitiveTypeEntry & rhs) const
-  {
-    if (!(type == rhs.type))
-      return false;
-    if (__isset.typeQualifiers != rhs.__isset.typeQualifiers)
-      return false;
-    else if (__isset.typeQualifiers && !(typeQualifiers == rhs.typeQualifiers))
-      return false;
-    return true;
-  }
+  bool operator == (const TPrimitiveTypeEntry & rhs) const;
   bool operator != (const TPrimitiveTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -547,7 +516,7 @@ class TPrimitiveTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TPrimitiveTypeEntry &a, TPrimitiveTypeEntry &b);
+void swap(TPrimitiveTypeEntry &a, TPrimitiveTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TPrimitiveTypeEntry& obj);
 
@@ -557,21 +526,14 @@ class TArrayTypeEntry : public virtual ::apache::thrift::TBase {
 
   TArrayTypeEntry(const TArrayTypeEntry&) noexcept;
   TArrayTypeEntry& operator=(const TArrayTypeEntry&) noexcept;
-  TArrayTypeEntry() noexcept
-                  : objectTypePtr(0) {
-  }
+  TArrayTypeEntry() noexcept;
 
   virtual ~TArrayTypeEntry() noexcept;
   TTypeEntryPtr objectTypePtr;
 
   void __set_objectTypePtr(const TTypeEntryPtr val);
 
-  bool operator == (const TArrayTypeEntry & rhs) const
-  {
-    if (!(objectTypePtr == rhs.objectTypePtr))
-      return false;
-    return true;
-  }
+  bool operator == (const TArrayTypeEntry & rhs) const;
   bool operator != (const TArrayTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -584,7 +546,7 @@ class TArrayTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TArrayTypeEntry &a, TArrayTypeEntry &b);
+void swap(TArrayTypeEntry &a, TArrayTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TArrayTypeEntry& obj);
 
@@ -594,10 +556,7 @@ class TMapTypeEntry : public virtual ::apache::thrift::TBase {
 
   TMapTypeEntry(const TMapTypeEntry&) noexcept;
   TMapTypeEntry& operator=(const TMapTypeEntry&) noexcept;
-  TMapTypeEntry() noexcept
-                : keyTypePtr(0),
-                  valueTypePtr(0) {
-  }
+  TMapTypeEntry() noexcept;
 
   virtual ~TMapTypeEntry() noexcept;
   TTypeEntryPtr keyTypePtr;
@@ -607,14 +566,7 @@ class TMapTypeEntry : public virtual ::apache::thrift::TBase {
 
   void __set_valueTypePtr(const TTypeEntryPtr val);
 
-  bool operator == (const TMapTypeEntry & rhs) const
-  {
-    if (!(keyTypePtr == rhs.keyTypePtr))
-      return false;
-    if (!(valueTypePtr == rhs.valueTypePtr))
-      return false;
-    return true;
-  }
+  bool operator == (const TMapTypeEntry & rhs) const;
   bool operator != (const TMapTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -627,7 +579,7 @@ class TMapTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TMapTypeEntry &a, TMapTypeEntry &b);
+void swap(TMapTypeEntry &a, TMapTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TMapTypeEntry& obj);
 
@@ -637,20 +589,14 @@ class TStructTypeEntry : public virtual ::apache::thrift::TBase {
 
   TStructTypeEntry(const TStructTypeEntry&);
   TStructTypeEntry& operator=(const TStructTypeEntry&);
-  TStructTypeEntry() noexcept {
-  }
+  TStructTypeEntry() noexcept;
 
   virtual ~TStructTypeEntry() noexcept;
   std::map<std::string, TTypeEntryPtr>  nameToTypePtr;
 
   void __set_nameToTypePtr(const std::map<std::string, TTypeEntryPtr> & val);
 
-  bool operator == (const TStructTypeEntry & rhs) const
-  {
-    if (!(nameToTypePtr == rhs.nameToTypePtr))
-      return false;
-    return true;
-  }
+  bool operator == (const TStructTypeEntry & rhs) const;
   bool operator != (const TStructTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -663,7 +609,7 @@ class TStructTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TStructTypeEntry &a, TStructTypeEntry &b);
+void swap(TStructTypeEntry &a, TStructTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TStructTypeEntry& obj);
 
@@ -673,20 +619,14 @@ class TUnionTypeEntry : public virtual ::apache::thrift::TBase {
 
   TUnionTypeEntry(const TUnionTypeEntry&);
   TUnionTypeEntry& operator=(const TUnionTypeEntry&);
-  TUnionTypeEntry() noexcept {
-  }
+  TUnionTypeEntry() noexcept;
 
   virtual ~TUnionTypeEntry() noexcept;
   std::map<std::string, TTypeEntryPtr>  nameToTypePtr;
 
   void __set_nameToTypePtr(const std::map<std::string, TTypeEntryPtr> & val);
 
-  bool operator == (const TUnionTypeEntry & rhs) const
-  {
-    if (!(nameToTypePtr == rhs.nameToTypePtr))
-      return false;
-    return true;
-  }
+  bool operator == (const TUnionTypeEntry & rhs) const;
   bool operator != (const TUnionTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -699,7 +639,7 @@ class TUnionTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TUnionTypeEntry &a, TUnionTypeEntry &b);
+void swap(TUnionTypeEntry &a, TUnionTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TUnionTypeEntry& obj);
 
@@ -709,21 +649,14 @@ class TUserDefinedTypeEntry : public virtual ::apache::thrift::TBase {
 
   TUserDefinedTypeEntry(const TUserDefinedTypeEntry&);
   TUserDefinedTypeEntry& operator=(const TUserDefinedTypeEntry&);
-  TUserDefinedTypeEntry() noexcept
-                        : typeClassName() {
-  }
+  TUserDefinedTypeEntry() noexcept;
 
   virtual ~TUserDefinedTypeEntry() noexcept;
   std::string typeClassName;
 
   void __set_typeClassName(const std::string& val);
 
-  bool operator == (const TUserDefinedTypeEntry & rhs) const
-  {
-    if (!(typeClassName == rhs.typeClassName))
-      return false;
-    return true;
-  }
+  bool operator == (const TUserDefinedTypeEntry & rhs) const;
   bool operator != (const TUserDefinedTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -736,7 +669,7 @@ class TUserDefinedTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TUserDefinedTypeEntry &a, TUserDefinedTypeEntry &b);
+void swap(TUserDefinedTypeEntry &a, TUserDefinedTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TUserDefinedTypeEntry& obj);
 
@@ -755,8 +688,7 @@ class TTypeEntry : public virtual ::apache::thrift::TBase {
 
   TTypeEntry(const TTypeEntry&);
   TTypeEntry& operator=(const TTypeEntry&);
-  TTypeEntry() noexcept {
-  }
+  TTypeEntry() noexcept;
 
   virtual ~TTypeEntry() noexcept;
   TPrimitiveTypeEntry primitiveEntry;
@@ -780,34 +712,7 @@ class TTypeEntry : public virtual ::apache::thrift::TBase {
 
   void __set_userDefinedTypeEntry(const TUserDefinedTypeEntry& val);
 
-  bool operator == (const TTypeEntry & rhs) const
-  {
-    if (__isset.primitiveEntry != rhs.__isset.primitiveEntry)
-      return false;
-    else if (__isset.primitiveEntry && !(primitiveEntry == rhs.primitiveEntry))
-      return false;
-    if (__isset.arrayEntry != rhs.__isset.arrayEntry)
-      return false;
-    else if (__isset.arrayEntry && !(arrayEntry == rhs.arrayEntry))
-      return false;
-    if (__isset.mapEntry != rhs.__isset.mapEntry)
-      return false;
-    else if (__isset.mapEntry && !(mapEntry == rhs.mapEntry))
-      return false;
-    if (__isset.structEntry != rhs.__isset.structEntry)
-      return false;
-    else if (__isset.structEntry && !(structEntry == rhs.structEntry))
-      return false;
-    if (__isset.unionEntry != rhs.__isset.unionEntry)
-      return false;
-    else if (__isset.unionEntry && !(unionEntry == rhs.unionEntry))
-      return false;
-    if (__isset.userDefinedTypeEntry != rhs.__isset.userDefinedTypeEntry)
-      return false;
-    else if (__isset.userDefinedTypeEntry && !(userDefinedTypeEntry == rhs.userDefinedTypeEntry))
-      return false;
-    return true;
-  }
+  bool operator == (const TTypeEntry & rhs) const;
   bool operator != (const TTypeEntry &rhs) const {
     return !(*this == rhs);
   }
@@ -820,7 +725,7 @@ class TTypeEntry : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TTypeEntry &a, TTypeEntry &b);
+void swap(TTypeEntry &a, TTypeEntry &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TTypeEntry& obj);
 
@@ -830,20 +735,14 @@ class TTypeDesc : public virtual ::apache::thrift::TBase {
 
   TTypeDesc(const TTypeDesc&);
   TTypeDesc& operator=(const TTypeDesc&);
-  TTypeDesc() noexcept {
-  }
+  TTypeDesc() noexcept;
 
   virtual ~TTypeDesc() noexcept;
   std::vector<TTypeEntry>  types;
 
   void __set_types(const std::vector<TTypeEntry> & val);
 
-  bool operator == (const TTypeDesc & rhs) const
-  {
-    if (!(types == rhs.types))
-      return false;
-    return true;
-  }
+  bool operator == (const TTypeDesc & rhs) const;
   bool operator != (const TTypeDesc &rhs) const {
     return !(*this == rhs);
   }
@@ -856,7 +755,7 @@ class TTypeDesc : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TTypeDesc &a, TTypeDesc &b);
+void swap(TTypeDesc &a, TTypeDesc &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TTypeDesc& obj);
 
@@ -870,11 +769,7 @@ class TColumnDesc : public virtual ::apache::thrift::TBase {
 
   TColumnDesc(const TColumnDesc&);
   TColumnDesc& operator=(const TColumnDesc&);
-  TColumnDesc() noexcept
-              : columnName(),
-                position(0),
-                comment() {
-  }
+  TColumnDesc() noexcept;
 
   virtual ~TColumnDesc() noexcept;
   std::string columnName;
@@ -892,20 +787,7 @@ class TColumnDesc : public virtual ::apache::thrift::TBase {
 
   void __set_comment(const std::string& val);
 
-  bool operator == (const TColumnDesc & rhs) const
-  {
-    if (!(columnName == rhs.columnName))
-      return false;
-    if (!(typeDesc == rhs.typeDesc))
-      return false;
-    if (!(position == rhs.position))
-      return false;
-    if (__isset.comment != rhs.__isset.comment)
-      return false;
-    else if (__isset.comment && !(comment == rhs.comment))
-      return false;
-    return true;
-  }
+  bool operator == (const TColumnDesc & rhs) const;
   bool operator != (const TColumnDesc &rhs) const {
     return !(*this == rhs);
   }
@@ -918,7 +800,7 @@ class TColumnDesc : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TColumnDesc &a, TColumnDesc &b);
+void swap(TColumnDesc &a, TColumnDesc &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TColumnDesc& obj);
 
@@ -928,20 +810,14 @@ class TTableSchema : public virtual ::apache::thrift::TBase {
 
   TTableSchema(const TTableSchema&);
   TTableSchema& operator=(const TTableSchema&);
-  TTableSchema() noexcept {
-  }
+  TTableSchema() noexcept;
 
   virtual ~TTableSchema() noexcept;
   std::vector<TColumnDesc>  columns;
 
   void __set_columns(const std::vector<TColumnDesc> & val);
 
-  bool operator == (const TTableSchema & rhs) const
-  {
-    if (!(columns == rhs.columns))
-      return false;
-    return true;
-  }
+  bool operator == (const TTableSchema & rhs) const;
   bool operator != (const TTableSchema &rhs) const {
     return !(*this == rhs);
   }
@@ -954,7 +830,7 @@ class TTableSchema : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TTableSchema &a, TTableSchema &b);
+void swap(TTableSchema &a, TTableSchema &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TTableSchema& obj);
 
@@ -968,9 +844,7 @@ class TBoolValue : public virtual ::apache::thrift::TBase {
 
   TBoolValue(const TBoolValue&) noexcept;
   TBoolValue& operator=(const TBoolValue&) noexcept;
-  TBoolValue() noexcept
-             : value(0) {
-  }
+  TBoolValue() noexcept;
 
   virtual ~TBoolValue() noexcept;
   bool value;
@@ -979,14 +853,7 @@ class TBoolValue : public virtual ::apache::thrift::TBase {
 
   void __set_value(const bool val);
 
-  bool operator == (const TBoolValue & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TBoolValue & rhs) const;
   bool operator != (const TBoolValue &rhs) const {
     return !(*this == rhs);
   }
@@ -999,7 +866,7 @@ class TBoolValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TBoolValue &a, TBoolValue &b);
+void swap(TBoolValue &a, TBoolValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TBoolValue& obj);
 
@@ -1013,9 +880,7 @@ class TByteValue : public virtual ::apache::thrift::TBase {
 
   TByteValue(const TByteValue&) noexcept;
   TByteValue& operator=(const TByteValue&) noexcept;
-  TByteValue() noexcept
-             : value(0) {
-  }
+  TByteValue() noexcept;
 
   virtual ~TByteValue() noexcept;
   int8_t value;
@@ -1024,14 +889,7 @@ class TByteValue : public virtual ::apache::thrift::TBase {
 
   void __set_value(const int8_t val);
 
-  bool operator == (const TByteValue & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TByteValue & rhs) const;
   bool operator != (const TByteValue &rhs) const {
     return !(*this == rhs);
   }
@@ -1044,7 +902,7 @@ class TByteValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TByteValue &a, TByteValue &b);
+void swap(TByteValue &a, TByteValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TByteValue& obj);
 
@@ -1058,9 +916,7 @@ class TI16Value : public virtual ::apache::thrift::TBase {
 
   TI16Value(const TI16Value&) noexcept;
   TI16Value& operator=(const TI16Value&) noexcept;
-  TI16Value() noexcept
-            : value(0) {
-  }
+  TI16Value() noexcept;
 
   virtual ~TI16Value() noexcept;
   int16_t value;
@@ -1069,14 +925,7 @@ class TI16Value : public virtual ::apache::thrift::TBase {
 
   void __set_value(const int16_t val);
 
-  bool operator == (const TI16Value & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TI16Value & rhs) const;
   bool operator != (const TI16Value &rhs) const {
     return !(*this == rhs);
   }
@@ -1089,7 +938,7 @@ class TI16Value : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TI16Value &a, TI16Value &b);
+void swap(TI16Value &a, TI16Value &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TI16Value& obj);
 
@@ -1103,9 +952,7 @@ class TI32Value : public virtual ::apache::thrift::TBase {
 
   TI32Value(const TI32Value&) noexcept;
   TI32Value& operator=(const TI32Value&) noexcept;
-  TI32Value() noexcept
-            : value(0) {
-  }
+  TI32Value() noexcept;
 
   virtual ~TI32Value() noexcept;
   int32_t value;
@@ -1114,14 +961,7 @@ class TI32Value : public virtual ::apache::thrift::TBase {
 
   void __set_value(const int32_t val);
 
-  bool operator == (const TI32Value & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TI32Value & rhs) const;
   bool operator != (const TI32Value &rhs) const {
     return !(*this == rhs);
   }
@@ -1134,7 +974,7 @@ class TI32Value : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TI32Value &a, TI32Value &b);
+void swap(TI32Value &a, TI32Value &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TI32Value& obj);
 
@@ -1148,9 +988,7 @@ class TI64Value : public virtual ::apache::thrift::TBase {
 
   TI64Value(const TI64Value&) noexcept;
   TI64Value& operator=(const TI64Value&) noexcept;
-  TI64Value() noexcept
-            : value(0) {
-  }
+  TI64Value() noexcept;
 
   virtual ~TI64Value() noexcept;
   int64_t value;
@@ -1159,14 +997,7 @@ class TI64Value : public virtual ::apache::thrift::TBase {
 
   void __set_value(const int64_t val);
 
-  bool operator == (const TI64Value & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TI64Value & rhs) const;
   bool operator != (const TI64Value &rhs) const {
     return !(*this == rhs);
   }
@@ -1179,7 +1010,7 @@ class TI64Value : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TI64Value &a, TI64Value &b);
+void swap(TI64Value &a, TI64Value &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TI64Value& obj);
 
@@ -1193,9 +1024,7 @@ class TDoubleValue : public virtual ::apache::thrift::TBase {
 
   TDoubleValue(const TDoubleValue&) noexcept;
   TDoubleValue& operator=(const TDoubleValue&) noexcept;
-  TDoubleValue() noexcept
-               : value(0) {
-  }
+  TDoubleValue() noexcept;
 
   virtual ~TDoubleValue() noexcept;
   double value;
@@ -1204,14 +1033,7 @@ class TDoubleValue : public virtual ::apache::thrift::TBase {
 
   void __set_value(const double val);
 
-  bool operator == (const TDoubleValue & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TDoubleValue & rhs) const;
   bool operator != (const TDoubleValue &rhs) const {
     return !(*this == rhs);
   }
@@ -1224,7 +1046,7 @@ class TDoubleValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TDoubleValue &a, TDoubleValue &b);
+void swap(TDoubleValue &a, TDoubleValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TDoubleValue& obj);
 
@@ -1238,9 +1060,7 @@ class TStringValue : public virtual ::apache::thrift::TBase {
 
   TStringValue(const TStringValue&);
   TStringValue& operator=(const TStringValue&);
-  TStringValue() noexcept
-               : value() {
-  }
+  TStringValue() noexcept;
 
   virtual ~TStringValue() noexcept;
   std::string value;
@@ -1249,14 +1069,7 @@ class TStringValue : public virtual ::apache::thrift::TBase {
 
   void __set_value(const std::string& val);
 
-  bool operator == (const TStringValue & rhs) const
-  {
-    if (__isset.value != rhs.__isset.value)
-      return false;
-    else if (__isset.value && !(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const TStringValue & rhs) const;
   bool operator != (const TStringValue &rhs) const {
     return !(*this == rhs);
   }
@@ -1269,7 +1082,7 @@ class TStringValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TStringValue &a, TStringValue &b);
+void swap(TStringValue &a, TStringValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TStringValue& obj);
 
@@ -1289,8 +1102,7 @@ class TColumnValue : public virtual ::apache::thrift::TBase {
 
   TColumnValue(const TColumnValue&);
   TColumnValue& operator=(const TColumnValue&);
-  TColumnValue() noexcept {
-  }
+  TColumnValue() noexcept;
 
   virtual ~TColumnValue() noexcept;
   TBoolValue boolVal;
@@ -1317,38 +1129,7 @@ class TColumnValue : public virtual ::apache::thrift::TBase {
 
   void __set_stringVal(const TStringValue& val);
 
-  bool operator == (const TColumnValue & rhs) const
-  {
-    if (__isset.boolVal != rhs.__isset.boolVal)
-      return false;
-    else if (__isset.boolVal && !(boolVal == rhs.boolVal))
-      return false;
-    if (__isset.byteVal != rhs.__isset.byteVal)
-      return false;
-    else if (__isset.byteVal && !(byteVal == rhs.byteVal))
-      return false;
-    if (__isset.i16Val != rhs.__isset.i16Val)
-      return false;
-    else if (__isset.i16Val && !(i16Val == rhs.i16Val))
-      return false;
-    if (__isset.i32Val != rhs.__isset.i32Val)
-      return false;
-    else if (__isset.i32Val && !(i32Val == rhs.i32Val))
-      return false;
-    if (__isset.i64Val != rhs.__isset.i64Val)
-      return false;
-    else if (__isset.i64Val && !(i64Val == rhs.i64Val))
-      return false;
-    if (__isset.doubleVal != rhs.__isset.doubleVal)
-      return false;
-    else if (__isset.doubleVal && !(doubleVal == rhs.doubleVal))
-      return false;
-    if (__isset.stringVal != rhs.__isset.stringVal)
-      return false;
-    else if (__isset.stringVal && !(stringVal == rhs.stringVal))
-      return false;
-    return true;
-  }
+  bool operator == (const TColumnValue & rhs) const;
   bool operator != (const TColumnValue &rhs) const {
     return !(*this == rhs);
   }
@@ -1361,7 +1142,7 @@ class TColumnValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TColumnValue &a, TColumnValue &b);
+void swap(TColumnValue &a, TColumnValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TColumnValue& obj);
 
@@ -1371,20 +1152,14 @@ class TRow : public virtual ::apache::thrift::TBase {
 
   TRow(const TRow&);
   TRow& operator=(const TRow&);
-  TRow() noexcept {
-  }
+  TRow() noexcept;
 
   virtual ~TRow() noexcept;
   std::vector<TColumnValue>  colVals;
 
   void __set_colVals(const std::vector<TColumnValue> & val);
 
-  bool operator == (const TRow & rhs) const
-  {
-    if (!(colVals == rhs.colVals))
-      return false;
-    return true;
-  }
+  bool operator == (const TRow & rhs) const;
   bool operator != (const TRow &rhs) const {
     return !(*this == rhs);
   }
@@ -1397,7 +1172,7 @@ class TRow : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TRow &a, TRow &b);
+void swap(TRow &a, TRow &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TRow& obj);
 
@@ -1407,9 +1182,7 @@ class TBoolColumn : public virtual ::apache::thrift::TBase {
 
   TBoolColumn(const TBoolColumn&);
   TBoolColumn& operator=(const TBoolColumn&);
-  TBoolColumn() noexcept
-              : nulls() {
-  }
+  TBoolColumn() noexcept;
 
   virtual ~TBoolColumn() noexcept;
   std::vector<bool>  values;
@@ -1419,14 +1192,7 @@ class TBoolColumn : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TBoolColumn & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TBoolColumn & rhs) const;
   bool operator != (const TBoolColumn &rhs) const {
     return !(*this == rhs);
   }
@@ -1439,7 +1205,7 @@ class TBoolColumn : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TBoolColumn &a, TBoolColumn &b);
+void swap(TBoolColumn &a, TBoolColumn &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TBoolColumn& obj);
 
@@ -1449,9 +1215,7 @@ class TByteColumn : public virtual ::apache::thrift::TBase {
 
   TByteColumn(const TByteColumn&);
   TByteColumn& operator=(const TByteColumn&);
-  TByteColumn() noexcept
-              : nulls() {
-  }
+  TByteColumn() noexcept;
 
   virtual ~TByteColumn() noexcept;
   std::vector<int8_t>  values;
@@ -1461,14 +1225,7 @@ class TByteColumn : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TByteColumn & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TByteColumn & rhs) const;
   bool operator != (const TByteColumn &rhs) const {
     return !(*this == rhs);
   }
@@ -1481,7 +1238,7 @@ class TByteColumn : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TByteColumn &a, TByteColumn &b);
+void swap(TByteColumn &a, TByteColumn &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TByteColumn& obj);
 
@@ -1491,9 +1248,7 @@ class TI16Column : public virtual ::apache::thrift::TBase {
 
   TI16Column(const TI16Column&);
   TI16Column& operator=(const TI16Column&);
-  TI16Column() noexcept
-             : nulls() {
-  }
+  TI16Column() noexcept;
 
   virtual ~TI16Column() noexcept;
   std::vector<int16_t>  values;
@@ -1503,14 +1258,7 @@ class TI16Column : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TI16Column & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TI16Column & rhs) const;
   bool operator != (const TI16Column &rhs) const {
     return !(*this == rhs);
   }
@@ -1523,7 +1271,7 @@ class TI16Column : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TI16Column &a, TI16Column &b);
+void swap(TI16Column &a, TI16Column &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TI16Column& obj);
 
@@ -1533,9 +1281,7 @@ class TI32Column : public virtual ::apache::thrift::TBase {
 
   TI32Column(const TI32Column&);
   TI32Column& operator=(const TI32Column&);
-  TI32Column() noexcept
-             : nulls() {
-  }
+  TI32Column() noexcept;
 
   virtual ~TI32Column() noexcept;
   std::vector<int32_t>  values;
@@ -1545,14 +1291,7 @@ class TI32Column : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TI32Column & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TI32Column & rhs) const;
   bool operator != (const TI32Column &rhs) const {
     return !(*this == rhs);
   }
@@ -1565,7 +1304,7 @@ class TI32Column : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TI32Column &a, TI32Column &b);
+void swap(TI32Column &a, TI32Column &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TI32Column& obj);
 
@@ -1575,9 +1314,7 @@ class TI64Column : public virtual ::apache::thrift::TBase {
 
   TI64Column(const TI64Column&);
   TI64Column& operator=(const TI64Column&);
-  TI64Column() noexcept
-             : nulls() {
-  }
+  TI64Column() noexcept;
 
   virtual ~TI64Column() noexcept;
   std::vector<int64_t>  values;
@@ -1587,14 +1324,7 @@ class TI64Column : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TI64Column & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TI64Column & rhs) const;
   bool operator != (const TI64Column &rhs) const {
     return !(*this == rhs);
   }
@@ -1607,7 +1337,7 @@ class TI64Column : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TI64Column &a, TI64Column &b);
+void swap(TI64Column &a, TI64Column &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TI64Column& obj);
 
@@ -1617,9 +1347,7 @@ class TDoubleColumn : public virtual ::apache::thrift::TBase {
 
   TDoubleColumn(const TDoubleColumn&);
   TDoubleColumn& operator=(const TDoubleColumn&);
-  TDoubleColumn() noexcept
-                : nulls() {
-  }
+  TDoubleColumn() noexcept;
 
   virtual ~TDoubleColumn() noexcept;
   std::vector<double>  values;
@@ -1629,14 +1357,7 @@ class TDoubleColumn : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TDoubleColumn & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TDoubleColumn & rhs) const;
   bool operator != (const TDoubleColumn &rhs) const {
     return !(*this == rhs);
   }
@@ -1649,7 +1370,7 @@ class TDoubleColumn : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TDoubleColumn &a, TDoubleColumn &b);
+void swap(TDoubleColumn &a, TDoubleColumn &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TDoubleColumn& obj);
 
@@ -1659,9 +1380,7 @@ class TStringColumn : public virtual ::apache::thrift::TBase {
 
   TStringColumn(const TStringColumn&);
   TStringColumn& operator=(const TStringColumn&);
-  TStringColumn() noexcept
-                : nulls() {
-  }
+  TStringColumn() noexcept;
 
   virtual ~TStringColumn() noexcept;
   std::vector<std::string>  values;
@@ -1671,14 +1390,7 @@ class TStringColumn : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TStringColumn & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TStringColumn & rhs) const;
   bool operator != (const TStringColumn &rhs) const {
     return !(*this == rhs);
   }
@@ -1691,7 +1403,7 @@ class TStringColumn : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TStringColumn &a, TStringColumn &b);
+void swap(TStringColumn &a, TStringColumn &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TStringColumn& obj);
 
@@ -1701,9 +1413,7 @@ class TBinaryColumn : public virtual ::apache::thrift::TBase {
 
   TBinaryColumn(const TBinaryColumn&);
   TBinaryColumn& operator=(const TBinaryColumn&);
-  TBinaryColumn() noexcept
-                : nulls() {
-  }
+  TBinaryColumn() noexcept;
 
   virtual ~TBinaryColumn() noexcept;
   std::vector<std::string>  values;
@@ -1713,14 +1423,7 @@ class TBinaryColumn : public virtual ::apache::thrift::TBase {
 
   void __set_nulls(const std::string& val);
 
-  bool operator == (const TBinaryColumn & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(nulls == rhs.nulls))
-      return false;
-    return true;
-  }
+  bool operator == (const TBinaryColumn & rhs) const;
   bool operator != (const TBinaryColumn &rhs) const {
     return !(*this == rhs);
   }
@@ -1733,7 +1436,7 @@ class TBinaryColumn : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TBinaryColumn &a, TBinaryColumn &b);
+void swap(TBinaryColumn &a, TBinaryColumn &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TBinaryColumn& obj);
 
@@ -1754,8 +1457,7 @@ class TColumn : public virtual ::apache::thrift::TBase {
 
   TColumn(const TColumn&);
   TColumn& operator=(const TColumn&);
-  TColumn() noexcept {
-  }
+  TColumn() noexcept;
 
   virtual ~TColumn() noexcept;
   TBoolColumn boolVal;
@@ -1785,42 +1487,7 @@ class TColumn : public virtual ::apache::thrift::TBase {
 
   void __set_binaryVal(const TBinaryColumn& val);
 
-  bool operator == (const TColumn & rhs) const
-  {
-    if (__isset.boolVal != rhs.__isset.boolVal)
-      return false;
-    else if (__isset.boolVal && !(boolVal == rhs.boolVal))
-      return false;
-    if (__isset.byteVal != rhs.__isset.byteVal)
-      return false;
-    else if (__isset.byteVal && !(byteVal == rhs.byteVal))
-      return false;
-    if (__isset.i16Val != rhs.__isset.i16Val)
-      return false;
-    else if (__isset.i16Val && !(i16Val == rhs.i16Val))
-      return false;
-    if (__isset.i32Val != rhs.__isset.i32Val)
-      return false;
-    else if (__isset.i32Val && !(i32Val == rhs.i32Val))
-      return false;
-    if (__isset.i64Val != rhs.__isset.i64Val)
-      return false;
-    else if (__isset.i64Val && !(i64Val == rhs.i64Val))
-      return false;
-    if (__isset.doubleVal != rhs.__isset.doubleVal)
-      return false;
-    else if (__isset.doubleVal && !(doubleVal == rhs.doubleVal))
-      return false;
-    if (__isset.stringVal != rhs.__isset.stringVal)
-      return false;
-    else if (__isset.stringVal && !(stringVal == rhs.stringVal))
-      return false;
-    if (__isset.binaryVal != rhs.__isset.binaryVal)
-      return false;
-    else if (__isset.binaryVal && !(binaryVal == rhs.binaryVal))
-      return false;
-    return true;
-  }
+  bool operator == (const TColumn & rhs) const;
   bool operator != (const TColumn &rhs) const {
     return !(*this == rhs);
   }
@@ -1833,7 +1500,7 @@ class TColumn : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TColumn &a, TColumn &b);
+void swap(TColumn &a, TColumn &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TColumn& obj);
 
@@ -1849,11 +1516,7 @@ class TRowSet : public virtual ::apache::thrift::TBase {
 
   TRowSet(const TRowSet&);
   TRowSet& operator=(const TRowSet&);
-  TRowSet() noexcept
-          : startRowOffset(0),
-            binaryColumns(),
-            columnCount(0) {
-  }
+  TRowSet() noexcept;
 
   virtual ~TRowSet() noexcept;
   int64_t startRowOffset;
@@ -1874,26 +1537,7 @@ class TRowSet : public virtual ::apache::thrift::TBase {
 
   void __set_columnCount(const int32_t val);
 
-  bool operator == (const TRowSet & rhs) const
-  {
-    if (!(startRowOffset == rhs.startRowOffset))
-      return false;
-    if (!(rows == rhs.rows))
-      return false;
-    if (__isset.columns != rhs.__isset.columns)
-      return false;
-    else if (__isset.columns && !(columns == rhs.columns))
-      return false;
-    if (__isset.binaryColumns != rhs.__isset.binaryColumns)
-      return false;
-    else if (__isset.binaryColumns && !(binaryColumns == rhs.binaryColumns))
-      return false;
-    if (__isset.columnCount != rhs.__isset.columnCount)
-      return false;
-    else if (__isset.columnCount && !(columnCount == rhs.columnCount))
-      return false;
-    return true;
-  }
+  bool operator == (const TRowSet & rhs) const;
   bool operator != (const TRowSet &rhs) const {
     return !(*this == rhs);
   }
@@ -1906,7 +1550,7 @@ class TRowSet : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TRowSet &a, TRowSet &b);
+void swap(TRowSet &a, TRowSet &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TRowSet& obj);
 
@@ -1923,12 +1567,7 @@ class TStatus : public virtual ::apache::thrift::TBase {
 
   TStatus(const TStatus&);
   TStatus& operator=(const TStatus&);
-  TStatus() noexcept
-          : statusCode(static_cast<TStatusCode::type>(0)),
-            sqlState(),
-            errorCode(0),
-            errorMessage() {
-  }
+  TStatus() noexcept;
 
   virtual ~TStatus() noexcept;
   /**
@@ -1953,28 +1592,7 @@ class TStatus : public virtual ::apache::thrift::TBase {
 
   void __set_errorMessage(const std::string& val);
 
-  bool operator == (const TStatus & rhs) const
-  {
-    if (!(statusCode == rhs.statusCode))
-      return false;
-    if (__isset.infoMessages != rhs.__isset.infoMessages)
-      return false;
-    else if (__isset.infoMessages && !(infoMessages == rhs.infoMessages))
-      return false;
-    if (__isset.sqlState != rhs.__isset.sqlState)
-      return false;
-    else if (__isset.sqlState && !(sqlState == rhs.sqlState))
-      return false;
-    if (__isset.errorCode != rhs.__isset.errorCode)
-      return false;
-    else if (__isset.errorCode && !(errorCode == rhs.errorCode))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    return true;
-  }
+  bool operator == (const TStatus & rhs) const;
   bool operator != (const TStatus &rhs) const {
     return !(*this == rhs);
   }
@@ -1987,7 +1605,7 @@ class TStatus : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TStatus &a, TStatus &b);
+void swap(TStatus &a, TStatus &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TStatus& obj);
 
@@ -1997,10 +1615,7 @@ class THandleIdentifier : public virtual ::apache::thrift::TBase {
 
   THandleIdentifier(const THandleIdentifier&);
   THandleIdentifier& operator=(const THandleIdentifier&);
-  THandleIdentifier() noexcept
-                    : guid(),
-                      secret() {
-  }
+  THandleIdentifier() noexcept;
 
   virtual ~THandleIdentifier() noexcept;
   std::string guid;
@@ -2010,14 +1625,7 @@ class THandleIdentifier : public virtual ::apache::thrift::TBase {
 
   void __set_secret(const std::string& val);
 
-  bool operator == (const THandleIdentifier & rhs) const
-  {
-    if (!(guid == rhs.guid))
-      return false;
-    if (!(secret == rhs.secret))
-      return false;
-    return true;
-  }
+  bool operator == (const THandleIdentifier & rhs) const;
   bool operator != (const THandleIdentifier &rhs) const {
     return !(*this == rhs);
   }
@@ -2030,7 +1638,7 @@ class THandleIdentifier : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(THandleIdentifier &a, THandleIdentifier &b);
+void swap(THandleIdentifier &a, THandleIdentifier &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const THandleIdentifier& obj);
 
@@ -2040,20 +1648,14 @@ class TSessionHandle : public virtual ::apache::thrift::TBase {
 
   TSessionHandle(const TSessionHandle&);
   TSessionHandle& operator=(const TSessionHandle&);
-  TSessionHandle() noexcept {
-  }
+  TSessionHandle() noexcept;
 
   virtual ~TSessionHandle() noexcept;
   THandleIdentifier sessionId;
 
   void __set_sessionId(const THandleIdentifier& val);
 
-  bool operator == (const TSessionHandle & rhs) const
-  {
-    if (!(sessionId == rhs.sessionId))
-      return false;
-    return true;
-  }
+  bool operator == (const TSessionHandle & rhs) const;
   bool operator != (const TSessionHandle &rhs) const {
     return !(*this == rhs);
   }
@@ -2066,7 +1668,7 @@ class TSessionHandle : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TSessionHandle &a, TSessionHandle &b);
+void swap(TSessionHandle &a, TSessionHandle &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TSessionHandle& obj);
 
@@ -2080,11 +1682,7 @@ class TOperationHandle : public virtual ::apache::thrift::TBase {
 
   TOperationHandle(const TOperationHandle&);
   TOperationHandle& operator=(const TOperationHandle&);
-  TOperationHandle() noexcept
-                   : operationType(static_cast<TOperationType::type>(0)),
-                     hasResultSet(0),
-                     modifiedRowCount(0) {
-  }
+  TOperationHandle() noexcept;
 
   virtual ~TOperationHandle() noexcept;
   THandleIdentifier operationId;
@@ -2106,20 +1704,7 @@ class TOperationHandle : public virtual ::apache::thrift::TBase {
 
   void __set_modifiedRowCount(const double val);
 
-  bool operator == (const TOperationHandle & rhs) const
-  {
-    if (!(operationId == rhs.operationId))
-      return false;
-    if (!(operationType == rhs.operationType))
-      return false;
-    if (!(hasResultSet == rhs.hasResultSet))
-      return false;
-    if (__isset.modifiedRowCount != rhs.__isset.modifiedRowCount)
-      return false;
-    else if (__isset.modifiedRowCount && !(modifiedRowCount == rhs.modifiedRowCount))
-      return false;
-    return true;
-  }
+  bool operator == (const TOperationHandle & rhs) const;
   bool operator != (const TOperationHandle &rhs) const {
     return !(*this == rhs);
   }
@@ -2132,7 +1717,7 @@ class TOperationHandle : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TOperationHandle &a, TOperationHandle &b);
+void swap(TOperationHandle &a, TOperationHandle &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TOperationHandle& obj);
 
@@ -2148,13 +1733,7 @@ class TOpenSessionReq : public virtual ::apache::thrift::TBase {
 
   TOpenSessionReq(const TOpenSessionReq&);
   TOpenSessionReq& operator=(const TOpenSessionReq&);
-  TOpenSessionReq() noexcept
-                  : client_protocol((TProtocolVersion::type)9),
-                    username(),
-                    password() {
-    client_protocol = (TProtocolVersion::type)9;
-
-  }
+  TOpenSessionReq() noexcept;
 
   virtual ~TOpenSessionReq() noexcept;
   /**
@@ -2176,24 +1755,7 @@ class TOpenSessionReq : public virtual ::apache::thrift::TBase {
 
   void __set_configuration(const std::map<std::string, std::string> & val);
 
-  bool operator == (const TOpenSessionReq & rhs) const
-  {
-    if (!(client_protocol == rhs.client_protocol))
-      return false;
-    if (__isset.username != rhs.__isset.username)
-      return false;
-    else if (__isset.username && !(username == rhs.username))
-      return false;
-    if (__isset.password != rhs.__isset.password)
-      return false;
-    else if (__isset.password && !(password == rhs.password))
-      return false;
-    if (__isset.configuration != rhs.__isset.configuration)
-      return false;
-    else if (__isset.configuration && !(configuration == rhs.configuration))
-      return false;
-    return true;
-  }
+  bool operator == (const TOpenSessionReq & rhs) const;
   bool operator != (const TOpenSessionReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2206,7 +1768,7 @@ class TOpenSessionReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TOpenSessionReq &a, TOpenSessionReq &b);
+void swap(TOpenSessionReq &a, TOpenSessionReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TOpenSessionReq& obj);
 
@@ -2221,11 +1783,7 @@ class TOpenSessionResp : public virtual ::apache::thrift::TBase {
 
   TOpenSessionResp(const TOpenSessionResp&);
   TOpenSessionResp& operator=(const TOpenSessionResp&);
-  TOpenSessionResp() noexcept
-                   : serverProtocolVersion((TProtocolVersion::type)9) {
-    serverProtocolVersion = (TProtocolVersion::type)9;
-
-  }
+  TOpenSessionResp() noexcept;
 
   virtual ~TOpenSessionResp() noexcept;
   TStatus status;
@@ -2247,22 +1805,7 @@ class TOpenSessionResp : public virtual ::apache::thrift::TBase {
 
   void __set_configuration(const std::map<std::string, std::string> & val);
 
-  bool operator == (const TOpenSessionResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (!(serverProtocolVersion == rhs.serverProtocolVersion))
-      return false;
-    if (__isset.sessionHandle != rhs.__isset.sessionHandle)
-      return false;
-    else if (__isset.sessionHandle && !(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.configuration != rhs.__isset.configuration)
-      return false;
-    else if (__isset.configuration && !(configuration == rhs.configuration))
-      return false;
-    return true;
-  }
+  bool operator == (const TOpenSessionResp & rhs) const;
   bool operator != (const TOpenSessionResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2275,7 +1818,7 @@ class TOpenSessionResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TOpenSessionResp &a, TOpenSessionResp &b);
+void swap(TOpenSessionResp &a, TOpenSessionResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TOpenSessionResp& obj);
 
@@ -2289,8 +1832,7 @@ class TSetClientInfoReq : public virtual ::apache::thrift::TBase {
 
   TSetClientInfoReq(const TSetClientInfoReq&);
   TSetClientInfoReq& operator=(const TSetClientInfoReq&);
-  TSetClientInfoReq() noexcept {
-  }
+  TSetClientInfoReq() noexcept;
 
   virtual ~TSetClientInfoReq() noexcept;
   TSessionHandle sessionHandle;
@@ -2302,16 +1844,7 @@ class TSetClientInfoReq : public virtual ::apache::thrift::TBase {
 
   void __set_configuration(const std::map<std::string, std::string> & val);
 
-  bool operator == (const TSetClientInfoReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.configuration != rhs.__isset.configuration)
-      return false;
-    else if (__isset.configuration && !(configuration == rhs.configuration))
-      return false;
-    return true;
-  }
+  bool operator == (const TSetClientInfoReq & rhs) const;
   bool operator != (const TSetClientInfoReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2324,7 +1857,7 @@ class TSetClientInfoReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TSetClientInfoReq &a, TSetClientInfoReq &b);
+void swap(TSetClientInfoReq &a, TSetClientInfoReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TSetClientInfoReq& obj);
 
@@ -2334,20 +1867,14 @@ class TSetClientInfoResp : public virtual ::apache::thrift::TBase {
 
   TSetClientInfoResp(const TSetClientInfoResp&);
   TSetClientInfoResp& operator=(const TSetClientInfoResp&);
-  TSetClientInfoResp() noexcept {
-  }
+  TSetClientInfoResp() noexcept;
 
   virtual ~TSetClientInfoResp() noexcept;
   TStatus status;
 
   void __set_status(const TStatus& val);
 
-  bool operator == (const TSetClientInfoResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    return true;
-  }
+  bool operator == (const TSetClientInfoResp & rhs) const;
   bool operator != (const TSetClientInfoResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2360,7 +1887,7 @@ class TSetClientInfoResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TSetClientInfoResp &a, TSetClientInfoResp &b);
+void swap(TSetClientInfoResp &a, TSetClientInfoResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TSetClientInfoResp& obj);
 
@@ -2370,20 +1897,14 @@ class TCloseSessionReq : public virtual ::apache::thrift::TBase {
 
   TCloseSessionReq(const TCloseSessionReq&);
   TCloseSessionReq& operator=(const TCloseSessionReq&);
-  TCloseSessionReq() noexcept {
-  }
+  TCloseSessionReq() noexcept;
 
   virtual ~TCloseSessionReq() noexcept;
   TSessionHandle sessionHandle;
 
   void __set_sessionHandle(const TSessionHandle& val);
 
-  bool operator == (const TCloseSessionReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TCloseSessionReq & rhs) const;
   bool operator != (const TCloseSessionReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2396,7 +1917,7 @@ class TCloseSessionReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCloseSessionReq &a, TCloseSessionReq &b);
+void swap(TCloseSessionReq &a, TCloseSessionReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCloseSessionReq& obj);
 
@@ -2406,20 +1927,14 @@ class TCloseSessionResp : public virtual ::apache::thrift::TBase {
 
   TCloseSessionResp(const TCloseSessionResp&);
   TCloseSessionResp& operator=(const TCloseSessionResp&);
-  TCloseSessionResp() noexcept {
-  }
+  TCloseSessionResp() noexcept;
 
   virtual ~TCloseSessionResp() noexcept;
   TStatus status;
 
   void __set_status(const TStatus& val);
 
-  bool operator == (const TCloseSessionResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    return true;
-  }
+  bool operator == (const TCloseSessionResp & rhs) const;
   bool operator != (const TCloseSessionResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2432,7 +1947,7 @@ class TCloseSessionResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCloseSessionResp &a, TCloseSessionResp &b);
+void swap(TCloseSessionResp &a, TCloseSessionResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCloseSessionResp& obj);
 
@@ -2451,14 +1966,7 @@ class TGetInfoValue : public virtual ::apache::thrift::TBase {
 
   TGetInfoValue(const TGetInfoValue&);
   TGetInfoValue& operator=(const TGetInfoValue&);
-  TGetInfoValue() noexcept
-                : stringValue(),
-                  smallIntValue(0),
-                  integerBitmask(0),
-                  integerFlag(0),
-                  binaryValue(0),
-                  lenValue(0) {
-  }
+  TGetInfoValue() noexcept;
 
   virtual ~TGetInfoValue() noexcept;
   std::string stringValue;
@@ -2482,34 +1990,7 @@ class TGetInfoValue : public virtual ::apache::thrift::TBase {
 
   void __set_lenValue(const int64_t val);
 
-  bool operator == (const TGetInfoValue & rhs) const
-  {
-    if (__isset.stringValue != rhs.__isset.stringValue)
-      return false;
-    else if (__isset.stringValue && !(stringValue == rhs.stringValue))
-      return false;
-    if (__isset.smallIntValue != rhs.__isset.smallIntValue)
-      return false;
-    else if (__isset.smallIntValue && !(smallIntValue == rhs.smallIntValue))
-      return false;
-    if (__isset.integerBitmask != rhs.__isset.integerBitmask)
-      return false;
-    else if (__isset.integerBitmask && !(integerBitmask == rhs.integerBitmask))
-      return false;
-    if (__isset.integerFlag != rhs.__isset.integerFlag)
-      return false;
-    else if (__isset.integerFlag && !(integerFlag == rhs.integerFlag))
-      return false;
-    if (__isset.binaryValue != rhs.__isset.binaryValue)
-      return false;
-    else if (__isset.binaryValue && !(binaryValue == rhs.binaryValue))
-      return false;
-    if (__isset.lenValue != rhs.__isset.lenValue)
-      return false;
-    else if (__isset.lenValue && !(lenValue == rhs.lenValue))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetInfoValue & rhs) const;
   bool operator != (const TGetInfoValue &rhs) const {
     return !(*this == rhs);
   }
@@ -2522,7 +2003,7 @@ class TGetInfoValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetInfoValue &a, TGetInfoValue &b);
+void swap(TGetInfoValue &a, TGetInfoValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetInfoValue& obj);
 
@@ -2532,9 +2013,7 @@ class TGetInfoReq : public virtual ::apache::thrift::TBase {
 
   TGetInfoReq(const TGetInfoReq&);
   TGetInfoReq& operator=(const TGetInfoReq&);
-  TGetInfoReq() noexcept
-              : infoType(static_cast<TGetInfoType::type>(0)) {
-  }
+  TGetInfoReq() noexcept;
 
   virtual ~TGetInfoReq() noexcept;
   TSessionHandle sessionHandle;
@@ -2548,14 +2027,7 @@ class TGetInfoReq : public virtual ::apache::thrift::TBase {
 
   void __set_infoType(const TGetInfoType::type val);
 
-  bool operator == (const TGetInfoReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (!(infoType == rhs.infoType))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetInfoReq & rhs) const;
   bool operator != (const TGetInfoReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2568,7 +2040,7 @@ class TGetInfoReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetInfoReq &a, TGetInfoReq &b);
+void swap(TGetInfoReq &a, TGetInfoReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetInfoReq& obj);
 
@@ -2578,8 +2050,7 @@ class TGetInfoResp : public virtual ::apache::thrift::TBase {
 
   TGetInfoResp(const TGetInfoResp&);
   TGetInfoResp& operator=(const TGetInfoResp&);
-  TGetInfoResp() noexcept {
-  }
+  TGetInfoResp() noexcept;
 
   virtual ~TGetInfoResp() noexcept;
   TStatus status;
@@ -2589,14 +2060,7 @@ class TGetInfoResp : public virtual ::apache::thrift::TBase {
 
   void __set_infoValue(const TGetInfoValue& val);
 
-  bool operator == (const TGetInfoResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (!(infoValue == rhs.infoValue))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetInfoResp & rhs) const;
   bool operator != (const TGetInfoResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2609,7 +2073,7 @@ class TGetInfoResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetInfoResp &a, TGetInfoResp &b);
+void swap(TGetInfoResp &a, TGetInfoResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetInfoResp& obj);
 
@@ -2625,11 +2089,7 @@ class TExecuteStatementReq : public virtual ::apache::thrift::TBase {
 
   TExecuteStatementReq(const TExecuteStatementReq&);
   TExecuteStatementReq& operator=(const TExecuteStatementReq&);
-  TExecuteStatementReq() noexcept
-                       : statement(),
-                         runAsync(false),
-                         queryTimeout(0LL) {
-  }
+  TExecuteStatementReq() noexcept;
 
   virtual ~TExecuteStatementReq() noexcept;
   TSessionHandle sessionHandle;
@@ -2650,26 +2110,7 @@ class TExecuteStatementReq : public virtual ::apache::thrift::TBase {
 
   void __set_queryTimeout(const int64_t val);
 
-  bool operator == (const TExecuteStatementReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (!(statement == rhs.statement))
-      return false;
-    if (__isset.confOverlay != rhs.__isset.confOverlay)
-      return false;
-    else if (__isset.confOverlay && !(confOverlay == rhs.confOverlay))
-      return false;
-    if (__isset.runAsync != rhs.__isset.runAsync)
-      return false;
-    else if (__isset.runAsync && !(runAsync == rhs.runAsync))
-      return false;
-    if (__isset.queryTimeout != rhs.__isset.queryTimeout)
-      return false;
-    else if (__isset.queryTimeout && !(queryTimeout == rhs.queryTimeout))
-      return false;
-    return true;
-  }
+  bool operator == (const TExecuteStatementReq & rhs) const;
   bool operator != (const TExecuteStatementReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2682,7 +2123,7 @@ class TExecuteStatementReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TExecuteStatementReq &a, TExecuteStatementReq &b);
+void swap(TExecuteStatementReq &a, TExecuteStatementReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TExecuteStatementReq& obj);
 
@@ -2696,8 +2137,7 @@ class TExecuteStatementResp : public virtual ::apache::thrift::TBase {
 
   TExecuteStatementResp(const TExecuteStatementResp&);
   TExecuteStatementResp& operator=(const TExecuteStatementResp&);
-  TExecuteStatementResp() noexcept {
-  }
+  TExecuteStatementResp() noexcept;
 
   virtual ~TExecuteStatementResp() noexcept;
   TStatus status;
@@ -2709,16 +2149,7 @@ class TExecuteStatementResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TExecuteStatementResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TExecuteStatementResp & rhs) const;
   bool operator != (const TExecuteStatementResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2731,7 +2162,7 @@ class TExecuteStatementResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TExecuteStatementResp &a, TExecuteStatementResp &b);
+void swap(TExecuteStatementResp &a, TExecuteStatementResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TExecuteStatementResp& obj);
 
@@ -2741,20 +2172,14 @@ class TGetTypeInfoReq : public virtual ::apache::thrift::TBase {
 
   TGetTypeInfoReq(const TGetTypeInfoReq&);
   TGetTypeInfoReq& operator=(const TGetTypeInfoReq&);
-  TGetTypeInfoReq() noexcept {
-  }
+  TGetTypeInfoReq() noexcept;
 
   virtual ~TGetTypeInfoReq() noexcept;
   TSessionHandle sessionHandle;
 
   void __set_sessionHandle(const TSessionHandle& val);
 
-  bool operator == (const TGetTypeInfoReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetTypeInfoReq & rhs) const;
   bool operator != (const TGetTypeInfoReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2767,7 +2192,7 @@ class TGetTypeInfoReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetTypeInfoReq &a, TGetTypeInfoReq &b);
+void swap(TGetTypeInfoReq &a, TGetTypeInfoReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetTypeInfoReq& obj);
 
@@ -2781,8 +2206,7 @@ class TGetTypeInfoResp : public virtual ::apache::thrift::TBase {
 
   TGetTypeInfoResp(const TGetTypeInfoResp&);
   TGetTypeInfoResp& operator=(const TGetTypeInfoResp&);
-  TGetTypeInfoResp() noexcept {
-  }
+  TGetTypeInfoResp() noexcept;
 
   virtual ~TGetTypeInfoResp() noexcept;
   TStatus status;
@@ -2794,16 +2218,7 @@ class TGetTypeInfoResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetTypeInfoResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetTypeInfoResp & rhs) const;
   bool operator != (const TGetTypeInfoResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2816,7 +2231,7 @@ class TGetTypeInfoResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetTypeInfoResp &a, TGetTypeInfoResp &b);
+void swap(TGetTypeInfoResp &a, TGetTypeInfoResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetTypeInfoResp& obj);
 
@@ -2831,11 +2246,7 @@ class TUploadDataReq : public virtual ::apache::thrift::TBase {
 
   TUploadDataReq(const TUploadDataReq&);
   TUploadDataReq& operator=(const TUploadDataReq&);
-  TUploadDataReq() noexcept
-                 : tableName(),
-                   path(),
-                   values() {
-  }
+  TUploadDataReq() noexcept;
 
   virtual ~TUploadDataReq() noexcept;
   TSessionHandle sessionHandle;
@@ -2853,22 +2264,7 @@ class TUploadDataReq : public virtual ::apache::thrift::TBase {
 
   void __set_values(const std::string& val);
 
-  bool operator == (const TUploadDataReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    if (__isset.path != rhs.__isset.path)
-      return false;
-    else if (__isset.path && !(path == rhs.path))
-      return false;
-    if (!(values == rhs.values))
-      return false;
-    return true;
-  }
+  bool operator == (const TUploadDataReq & rhs) const;
   bool operator != (const TUploadDataReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2881,7 +2277,7 @@ class TUploadDataReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TUploadDataReq &a, TUploadDataReq &b);
+void swap(TUploadDataReq &a, TUploadDataReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TUploadDataReq& obj);
 
@@ -2891,8 +2287,7 @@ class TUploadDataResp : public virtual ::apache::thrift::TBase {
 
   TUploadDataResp(const TUploadDataResp&);
   TUploadDataResp& operator=(const TUploadDataResp&);
-  TUploadDataResp() noexcept {
-  }
+  TUploadDataResp() noexcept;
 
   virtual ~TUploadDataResp() noexcept;
   TStatus status;
@@ -2902,14 +2297,7 @@ class TUploadDataResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TUploadDataResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TUploadDataResp & rhs) const;
   bool operator != (const TUploadDataResp &rhs) const {
     return !(*this == rhs);
   }
@@ -2922,7 +2310,7 @@ class TUploadDataResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TUploadDataResp &a, TUploadDataResp &b);
+void swap(TUploadDataResp &a, TUploadDataResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TUploadDataResp& obj);
 
@@ -2939,11 +2327,7 @@ class TDownloadDataReq : public virtual ::apache::thrift::TBase {
 
   TDownloadDataReq(const TDownloadDataReq&);
   TDownloadDataReq& operator=(const TDownloadDataReq&);
-  TDownloadDataReq() noexcept
-                   : tableName(),
-                     query(),
-                     format() {
-  }
+  TDownloadDataReq() noexcept;
 
   virtual ~TDownloadDataReq() noexcept;
   TSessionHandle sessionHandle;
@@ -2964,28 +2348,7 @@ class TDownloadDataReq : public virtual ::apache::thrift::TBase {
 
   void __set_downloadOptions(const std::map<std::string, std::string> & val);
 
-  bool operator == (const TDownloadDataReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    if (__isset.query != rhs.__isset.query)
-      return false;
-    else if (__isset.query && !(query == rhs.query))
-      return false;
-    if (__isset.format != rhs.__isset.format)
-      return false;
-    else if (__isset.format && !(format == rhs.format))
-      return false;
-    if (__isset.downloadOptions != rhs.__isset.downloadOptions)
-      return false;
-    else if (__isset.downloadOptions && !(downloadOptions == rhs.downloadOptions))
-      return false;
-    return true;
-  }
+  bool operator == (const TDownloadDataReq & rhs) const;
   bool operator != (const TDownloadDataReq &rhs) const {
     return !(*this == rhs);
   }
@@ -2998,7 +2361,7 @@ class TDownloadDataReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TDownloadDataReq &a, TDownloadDataReq &b);
+void swap(TDownloadDataReq &a, TDownloadDataReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TDownloadDataReq& obj);
 
@@ -3008,8 +2371,7 @@ class TDownloadDataResp : public virtual ::apache::thrift::TBase {
 
   TDownloadDataResp(const TDownloadDataResp&);
   TDownloadDataResp& operator=(const TDownloadDataResp&);
-  TDownloadDataResp() noexcept {
-  }
+  TDownloadDataResp() noexcept;
 
   virtual ~TDownloadDataResp() noexcept;
   TStatus status;
@@ -3019,14 +2381,7 @@ class TDownloadDataResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TDownloadDataResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TDownloadDataResp & rhs) const;
   bool operator != (const TDownloadDataResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3039,7 +2394,7 @@ class TDownloadDataResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TDownloadDataResp &a, TDownloadDataResp &b);
+void swap(TDownloadDataResp &a, TDownloadDataResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TDownloadDataResp& obj);
 
@@ -3049,20 +2404,14 @@ class TGetCatalogsReq : public virtual ::apache::thrift::TBase {
 
   TGetCatalogsReq(const TGetCatalogsReq&);
   TGetCatalogsReq& operator=(const TGetCatalogsReq&);
-  TGetCatalogsReq() noexcept {
-  }
+  TGetCatalogsReq() noexcept;
 
   virtual ~TGetCatalogsReq() noexcept;
   TSessionHandle sessionHandle;
 
   void __set_sessionHandle(const TSessionHandle& val);
 
-  bool operator == (const TGetCatalogsReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetCatalogsReq & rhs) const;
   bool operator != (const TGetCatalogsReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3075,7 +2424,7 @@ class TGetCatalogsReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetCatalogsReq &a, TGetCatalogsReq &b);
+void swap(TGetCatalogsReq &a, TGetCatalogsReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetCatalogsReq& obj);
 
@@ -3089,8 +2438,7 @@ class TGetCatalogsResp : public virtual ::apache::thrift::TBase {
 
   TGetCatalogsResp(const TGetCatalogsResp&);
   TGetCatalogsResp& operator=(const TGetCatalogsResp&);
-  TGetCatalogsResp() noexcept {
-  }
+  TGetCatalogsResp() noexcept;
 
   virtual ~TGetCatalogsResp() noexcept;
   TStatus status;
@@ -3102,16 +2450,7 @@ class TGetCatalogsResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetCatalogsResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetCatalogsResp & rhs) const;
   bool operator != (const TGetCatalogsResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3124,7 +2463,7 @@ class TGetCatalogsResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetCatalogsResp &a, TGetCatalogsResp &b);
+void swap(TGetCatalogsResp &a, TGetCatalogsResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetCatalogsResp& obj);
 
@@ -3139,10 +2478,7 @@ class TGetSchemasReq : public virtual ::apache::thrift::TBase {
 
   TGetSchemasReq(const TGetSchemasReq&);
   TGetSchemasReq& operator=(const TGetSchemasReq&);
-  TGetSchemasReq() noexcept
-                 : catalogName(),
-                   schemaName() {
-  }
+  TGetSchemasReq() noexcept;
 
   virtual ~TGetSchemasReq() noexcept;
   TSessionHandle sessionHandle;
@@ -3157,20 +2493,7 @@ class TGetSchemasReq : public virtual ::apache::thrift::TBase {
 
   void __set_schemaName(const TPatternOrIdentifier& val);
 
-  bool operator == (const TGetSchemasReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.schemaName != rhs.__isset.schemaName)
-      return false;
-    else if (__isset.schemaName && !(schemaName == rhs.schemaName))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetSchemasReq & rhs) const;
   bool operator != (const TGetSchemasReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3183,7 +2506,7 @@ class TGetSchemasReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetSchemasReq &a, TGetSchemasReq &b);
+void swap(TGetSchemasReq &a, TGetSchemasReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetSchemasReq& obj);
 
@@ -3197,8 +2520,7 @@ class TGetSchemasResp : public virtual ::apache::thrift::TBase {
 
   TGetSchemasResp(const TGetSchemasResp&);
   TGetSchemasResp& operator=(const TGetSchemasResp&);
-  TGetSchemasResp() noexcept {
-  }
+  TGetSchemasResp() noexcept;
 
   virtual ~TGetSchemasResp() noexcept;
   TStatus status;
@@ -3210,16 +2532,7 @@ class TGetSchemasResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetSchemasResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetSchemasResp & rhs) const;
   bool operator != (const TGetSchemasResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3232,7 +2545,7 @@ class TGetSchemasResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetSchemasResp &a, TGetSchemasResp &b);
+void swap(TGetSchemasResp &a, TGetSchemasResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetSchemasResp& obj);
 
@@ -3249,11 +2562,7 @@ class TGetTablesReq : public virtual ::apache::thrift::TBase {
 
   TGetTablesReq(const TGetTablesReq&);
   TGetTablesReq& operator=(const TGetTablesReq&);
-  TGetTablesReq() noexcept
-                : catalogName(),
-                  schemaName(),
-                  tableName() {
-  }
+  TGetTablesReq() noexcept;
 
   virtual ~TGetTablesReq() noexcept;
   TSessionHandle sessionHandle;
@@ -3274,28 +2583,7 @@ class TGetTablesReq : public virtual ::apache::thrift::TBase {
 
   void __set_tableTypes(const std::vector<std::string> & val);
 
-  bool operator == (const TGetTablesReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.schemaName != rhs.__isset.schemaName)
-      return false;
-    else if (__isset.schemaName && !(schemaName == rhs.schemaName))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    if (__isset.tableTypes != rhs.__isset.tableTypes)
-      return false;
-    else if (__isset.tableTypes && !(tableTypes == rhs.tableTypes))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetTablesReq & rhs) const;
   bool operator != (const TGetTablesReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3308,7 +2596,7 @@ class TGetTablesReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetTablesReq &a, TGetTablesReq &b);
+void swap(TGetTablesReq &a, TGetTablesReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetTablesReq& obj);
 
@@ -3322,8 +2610,7 @@ class TGetTablesResp : public virtual ::apache::thrift::TBase {
 
   TGetTablesResp(const TGetTablesResp&);
   TGetTablesResp& operator=(const TGetTablesResp&);
-  TGetTablesResp() noexcept {
-  }
+  TGetTablesResp() noexcept;
 
   virtual ~TGetTablesResp() noexcept;
   TStatus status;
@@ -3335,16 +2622,7 @@ class TGetTablesResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetTablesResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetTablesResp & rhs) const;
   bool operator != (const TGetTablesResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3357,7 +2635,7 @@ class TGetTablesResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetTablesResp &a, TGetTablesResp &b);
+void swap(TGetTablesResp &a, TGetTablesResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetTablesResp& obj);
 
@@ -3367,20 +2645,14 @@ class TGetTableTypesReq : public virtual ::apache::thrift::TBase {
 
   TGetTableTypesReq(const TGetTableTypesReq&);
   TGetTableTypesReq& operator=(const TGetTableTypesReq&);
-  TGetTableTypesReq() noexcept {
-  }
+  TGetTableTypesReq() noexcept;
 
   virtual ~TGetTableTypesReq() noexcept;
   TSessionHandle sessionHandle;
 
   void __set_sessionHandle(const TSessionHandle& val);
 
-  bool operator == (const TGetTableTypesReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetTableTypesReq & rhs) const;
   bool operator != (const TGetTableTypesReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3393,7 +2665,7 @@ class TGetTableTypesReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetTableTypesReq &a, TGetTableTypesReq &b);
+void swap(TGetTableTypesReq &a, TGetTableTypesReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetTableTypesReq& obj);
 
@@ -3407,8 +2679,7 @@ class TGetTableTypesResp : public virtual ::apache::thrift::TBase {
 
   TGetTableTypesResp(const TGetTableTypesResp&);
   TGetTableTypesResp& operator=(const TGetTableTypesResp&);
-  TGetTableTypesResp() noexcept {
-  }
+  TGetTableTypesResp() noexcept;
 
   virtual ~TGetTableTypesResp() noexcept;
   TStatus status;
@@ -3420,16 +2691,7 @@ class TGetTableTypesResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetTableTypesResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetTableTypesResp & rhs) const;
   bool operator != (const TGetTableTypesResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3442,7 +2704,7 @@ class TGetTableTypesResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetTableTypesResp &a, TGetTableTypesResp &b);
+void swap(TGetTableTypesResp &a, TGetTableTypesResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetTableTypesResp& obj);
 
@@ -3459,12 +2721,7 @@ class TGetColumnsReq : public virtual ::apache::thrift::TBase {
 
   TGetColumnsReq(const TGetColumnsReq&);
   TGetColumnsReq& operator=(const TGetColumnsReq&);
-  TGetColumnsReq() noexcept
-                 : catalogName(),
-                   schemaName(),
-                   tableName(),
-                   columnName() {
-  }
+  TGetColumnsReq() noexcept;
 
   virtual ~TGetColumnsReq() noexcept;
   TSessionHandle sessionHandle;
@@ -3485,28 +2742,7 @@ class TGetColumnsReq : public virtual ::apache::thrift::TBase {
 
   void __set_columnName(const TPatternOrIdentifier& val);
 
-  bool operator == (const TGetColumnsReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.schemaName != rhs.__isset.schemaName)
-      return false;
-    else if (__isset.schemaName && !(schemaName == rhs.schemaName))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    if (__isset.columnName != rhs.__isset.columnName)
-      return false;
-    else if (__isset.columnName && !(columnName == rhs.columnName))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetColumnsReq & rhs) const;
   bool operator != (const TGetColumnsReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3519,7 +2755,7 @@ class TGetColumnsReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetColumnsReq &a, TGetColumnsReq &b);
+void swap(TGetColumnsReq &a, TGetColumnsReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetColumnsReq& obj);
 
@@ -3533,8 +2769,7 @@ class TGetColumnsResp : public virtual ::apache::thrift::TBase {
 
   TGetColumnsResp(const TGetColumnsResp&);
   TGetColumnsResp& operator=(const TGetColumnsResp&);
-  TGetColumnsResp() noexcept {
-  }
+  TGetColumnsResp() noexcept;
 
   virtual ~TGetColumnsResp() noexcept;
   TStatus status;
@@ -3546,16 +2781,7 @@ class TGetColumnsResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetColumnsResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetColumnsResp & rhs) const;
   bool operator != (const TGetColumnsResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3568,7 +2794,7 @@ class TGetColumnsResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetColumnsResp &a, TGetColumnsResp &b);
+void swap(TGetColumnsResp &a, TGetColumnsResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetColumnsResp& obj);
 
@@ -3583,11 +2809,7 @@ class TGetFunctionsReq : public virtual ::apache::thrift::TBase {
 
   TGetFunctionsReq(const TGetFunctionsReq&);
   TGetFunctionsReq& operator=(const TGetFunctionsReq&);
-  TGetFunctionsReq() noexcept
-                   : catalogName(),
-                     schemaName(),
-                     functionName() {
-  }
+  TGetFunctionsReq() noexcept;
 
   virtual ~TGetFunctionsReq() noexcept;
   TSessionHandle sessionHandle;
@@ -3605,22 +2827,7 @@ class TGetFunctionsReq : public virtual ::apache::thrift::TBase {
 
   void __set_functionName(const TPatternOrIdentifier& val);
 
-  bool operator == (const TGetFunctionsReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.schemaName != rhs.__isset.schemaName)
-      return false;
-    else if (__isset.schemaName && !(schemaName == rhs.schemaName))
-      return false;
-    if (!(functionName == rhs.functionName))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetFunctionsReq & rhs) const;
   bool operator != (const TGetFunctionsReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3633,7 +2840,7 @@ class TGetFunctionsReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetFunctionsReq &a, TGetFunctionsReq &b);
+void swap(TGetFunctionsReq &a, TGetFunctionsReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetFunctionsReq& obj);
 
@@ -3647,8 +2854,7 @@ class TGetFunctionsResp : public virtual ::apache::thrift::TBase {
 
   TGetFunctionsResp(const TGetFunctionsResp&);
   TGetFunctionsResp& operator=(const TGetFunctionsResp&);
-  TGetFunctionsResp() noexcept {
-  }
+  TGetFunctionsResp() noexcept;
 
   virtual ~TGetFunctionsResp() noexcept;
   TStatus status;
@@ -3660,16 +2866,7 @@ class TGetFunctionsResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetFunctionsResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetFunctionsResp & rhs) const;
   bool operator != (const TGetFunctionsResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3682,7 +2879,7 @@ class TGetFunctionsResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetFunctionsResp &a, TGetFunctionsResp &b);
+void swap(TGetFunctionsResp &a, TGetFunctionsResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetFunctionsResp& obj);
 
@@ -3698,11 +2895,7 @@ class TGetPrimaryKeysReq : public virtual ::apache::thrift::TBase {
 
   TGetPrimaryKeysReq(const TGetPrimaryKeysReq&);
   TGetPrimaryKeysReq& operator=(const TGetPrimaryKeysReq&);
-  TGetPrimaryKeysReq() noexcept
-                     : catalogName(),
-                       schemaName(),
-                       tableName() {
-  }
+  TGetPrimaryKeysReq() noexcept;
 
   virtual ~TGetPrimaryKeysReq() noexcept;
   TSessionHandle sessionHandle;
@@ -3720,24 +2913,7 @@ class TGetPrimaryKeysReq : public virtual ::apache::thrift::TBase {
 
   void __set_tableName(const TIdentifier& val);
 
-  bool operator == (const TGetPrimaryKeysReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.schemaName != rhs.__isset.schemaName)
-      return false;
-    else if (__isset.schemaName && !(schemaName == rhs.schemaName))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetPrimaryKeysReq & rhs) const;
   bool operator != (const TGetPrimaryKeysReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3750,7 +2926,7 @@ class TGetPrimaryKeysReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetPrimaryKeysReq &a, TGetPrimaryKeysReq &b);
+void swap(TGetPrimaryKeysReq &a, TGetPrimaryKeysReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetPrimaryKeysReq& obj);
 
@@ -3764,8 +2940,7 @@ class TGetPrimaryKeysResp : public virtual ::apache::thrift::TBase {
 
   TGetPrimaryKeysResp(const TGetPrimaryKeysResp&);
   TGetPrimaryKeysResp& operator=(const TGetPrimaryKeysResp&);
-  TGetPrimaryKeysResp() noexcept {
-  }
+  TGetPrimaryKeysResp() noexcept;
 
   virtual ~TGetPrimaryKeysResp() noexcept;
   TStatus status;
@@ -3777,16 +2952,7 @@ class TGetPrimaryKeysResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetPrimaryKeysResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetPrimaryKeysResp & rhs) const;
   bool operator != (const TGetPrimaryKeysResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3799,7 +2965,7 @@ class TGetPrimaryKeysResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetPrimaryKeysResp &a, TGetPrimaryKeysResp &b);
+void swap(TGetPrimaryKeysResp &a, TGetPrimaryKeysResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetPrimaryKeysResp& obj);
 
@@ -3818,14 +2984,7 @@ class TGetCrossReferenceReq : public virtual ::apache::thrift::TBase {
 
   TGetCrossReferenceReq(const TGetCrossReferenceReq&);
   TGetCrossReferenceReq& operator=(const TGetCrossReferenceReq&);
-  TGetCrossReferenceReq() noexcept
-                        : parentCatalogName(),
-                          parentSchemaName(),
-                          parentTableName(),
-                          foreignCatalogName(),
-                          foreignSchemaName(),
-                          foreignTableName() {
-  }
+  TGetCrossReferenceReq() noexcept;
 
   virtual ~TGetCrossReferenceReq() noexcept;
   TSessionHandle sessionHandle;
@@ -3852,36 +3011,7 @@ class TGetCrossReferenceReq : public virtual ::apache::thrift::TBase {
 
   void __set_foreignTableName(const TIdentifier& val);
 
-  bool operator == (const TGetCrossReferenceReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (__isset.parentCatalogName != rhs.__isset.parentCatalogName)
-      return false;
-    else if (__isset.parentCatalogName && !(parentCatalogName == rhs.parentCatalogName))
-      return false;
-    if (__isset.parentSchemaName != rhs.__isset.parentSchemaName)
-      return false;
-    else if (__isset.parentSchemaName && !(parentSchemaName == rhs.parentSchemaName))
-      return false;
-    if (__isset.parentTableName != rhs.__isset.parentTableName)
-      return false;
-    else if (__isset.parentTableName && !(parentTableName == rhs.parentTableName))
-      return false;
-    if (__isset.foreignCatalogName != rhs.__isset.foreignCatalogName)
-      return false;
-    else if (__isset.foreignCatalogName && !(foreignCatalogName == rhs.foreignCatalogName))
-      return false;
-    if (__isset.foreignSchemaName != rhs.__isset.foreignSchemaName)
-      return false;
-    else if (__isset.foreignSchemaName && !(foreignSchemaName == rhs.foreignSchemaName))
-      return false;
-    if (__isset.foreignTableName != rhs.__isset.foreignTableName)
-      return false;
-    else if (__isset.foreignTableName && !(foreignTableName == rhs.foreignTableName))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetCrossReferenceReq & rhs) const;
   bool operator != (const TGetCrossReferenceReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3894,7 +3024,7 @@ class TGetCrossReferenceReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetCrossReferenceReq &a, TGetCrossReferenceReq &b);
+void swap(TGetCrossReferenceReq &a, TGetCrossReferenceReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetCrossReferenceReq& obj);
 
@@ -3908,8 +3038,7 @@ class TGetCrossReferenceResp : public virtual ::apache::thrift::TBase {
 
   TGetCrossReferenceResp(const TGetCrossReferenceResp&);
   TGetCrossReferenceResp& operator=(const TGetCrossReferenceResp&);
-  TGetCrossReferenceResp() noexcept {
-  }
+  TGetCrossReferenceResp() noexcept;
 
   virtual ~TGetCrossReferenceResp() noexcept;
   TStatus status;
@@ -3921,16 +3050,7 @@ class TGetCrossReferenceResp : public virtual ::apache::thrift::TBase {
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetCrossReferenceResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationHandle != rhs.__isset.operationHandle)
-      return false;
-    else if (__isset.operationHandle && !(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetCrossReferenceResp & rhs) const;
   bool operator != (const TGetCrossReferenceResp &rhs) const {
     return !(*this == rhs);
   }
@@ -3943,7 +3063,7 @@ class TGetCrossReferenceResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetCrossReferenceResp &a, TGetCrossReferenceResp &b);
+void swap(TGetCrossReferenceResp &a, TGetCrossReferenceResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetCrossReferenceResp& obj);
 
@@ -3957,9 +3077,7 @@ class TGetOperationStatusReq : public virtual ::apache::thrift::TBase {
 
   TGetOperationStatusReq(const TGetOperationStatusReq&);
   TGetOperationStatusReq& operator=(const TGetOperationStatusReq&);
-  TGetOperationStatusReq() noexcept
-                         : getProgressUpdate(0) {
-  }
+  TGetOperationStatusReq() noexcept;
 
   virtual ~TGetOperationStatusReq() noexcept;
   TOperationHandle operationHandle;
@@ -3971,16 +3089,7 @@ class TGetOperationStatusReq : public virtual ::apache::thrift::TBase {
 
   void __set_getProgressUpdate(const bool val);
 
-  bool operator == (const TGetOperationStatusReq & rhs) const
-  {
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    if (__isset.getProgressUpdate != rhs.__isset.getProgressUpdate)
-      return false;
-    else if (__isset.getProgressUpdate && !(getProgressUpdate == rhs.getProgressUpdate))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetOperationStatusReq & rhs) const;
   bool operator != (const TGetOperationStatusReq &rhs) const {
     return !(*this == rhs);
   }
@@ -3993,7 +3102,7 @@ class TGetOperationStatusReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetOperationStatusReq &a, TGetOperationStatusReq &b);
+void swap(TGetOperationStatusReq &a, TGetOperationStatusReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetOperationStatusReq& obj);
 
@@ -4016,17 +3125,7 @@ class TGetOperationStatusResp : public virtual ::apache::thrift::TBase {
 
   TGetOperationStatusResp(const TGetOperationStatusResp&);
   TGetOperationStatusResp& operator=(const TGetOperationStatusResp&);
-  TGetOperationStatusResp() noexcept
-                          : operationState(static_cast<TOperationState::type>(0)),
-                            sqlState(),
-                            errorCode(0),
-                            errorMessage(),
-                            taskStatus(),
-                            operationStarted(0),
-                            operationCompleted(0),
-                            hasResultSet(0),
-                            numModifiedRows(0) {
-  }
+  TGetOperationStatusResp() noexcept;
 
   virtual ~TGetOperationStatusResp() noexcept;
   TStatus status;
@@ -4069,52 +3168,7 @@ class TGetOperationStatusResp : public virtual ::apache::thrift::TBase {
 
   void __set_numModifiedRows(const int64_t val);
 
-  bool operator == (const TGetOperationStatusResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.operationState != rhs.__isset.operationState)
-      return false;
-    else if (__isset.operationState && !(operationState == rhs.operationState))
-      return false;
-    if (__isset.sqlState != rhs.__isset.sqlState)
-      return false;
-    else if (__isset.sqlState && !(sqlState == rhs.sqlState))
-      return false;
-    if (__isset.errorCode != rhs.__isset.errorCode)
-      return false;
-    else if (__isset.errorCode && !(errorCode == rhs.errorCode))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    if (__isset.taskStatus != rhs.__isset.taskStatus)
-      return false;
-    else if (__isset.taskStatus && !(taskStatus == rhs.taskStatus))
-      return false;
-    if (__isset.operationStarted != rhs.__isset.operationStarted)
-      return false;
-    else if (__isset.operationStarted && !(operationStarted == rhs.operationStarted))
-      return false;
-    if (__isset.operationCompleted != rhs.__isset.operationCompleted)
-      return false;
-    else if (__isset.operationCompleted && !(operationCompleted == rhs.operationCompleted))
-      return false;
-    if (__isset.hasResultSet != rhs.__isset.hasResultSet)
-      return false;
-    else if (__isset.hasResultSet && !(hasResultSet == rhs.hasResultSet))
-      return false;
-    if (__isset.progressUpdateResponse != rhs.__isset.progressUpdateResponse)
-      return false;
-    else if (__isset.progressUpdateResponse && !(progressUpdateResponse == rhs.progressUpdateResponse))
-      return false;
-    if (__isset.numModifiedRows != rhs.__isset.numModifiedRows)
-      return false;
-    else if (__isset.numModifiedRows && !(numModifiedRows == rhs.numModifiedRows))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetOperationStatusResp & rhs) const;
   bool operator != (const TGetOperationStatusResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4127,7 +3181,7 @@ class TGetOperationStatusResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetOperationStatusResp &a, TGetOperationStatusResp &b);
+void swap(TGetOperationStatusResp &a, TGetOperationStatusResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetOperationStatusResp& obj);
 
@@ -4137,20 +3191,14 @@ class TCancelOperationReq : public virtual ::apache::thrift::TBase {
 
   TCancelOperationReq(const TCancelOperationReq&);
   TCancelOperationReq& operator=(const TCancelOperationReq&);
-  TCancelOperationReq() noexcept {
-  }
+  TCancelOperationReq() noexcept;
 
   virtual ~TCancelOperationReq() noexcept;
   TOperationHandle operationHandle;
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TCancelOperationReq & rhs) const
-  {
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TCancelOperationReq & rhs) const;
   bool operator != (const TCancelOperationReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4163,7 +3211,7 @@ class TCancelOperationReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCancelOperationReq &a, TCancelOperationReq &b);
+void swap(TCancelOperationReq &a, TCancelOperationReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCancelOperationReq& obj);
 
@@ -4173,20 +3221,14 @@ class TCancelOperationResp : public virtual ::apache::thrift::TBase {
 
   TCancelOperationResp(const TCancelOperationResp&);
   TCancelOperationResp& operator=(const TCancelOperationResp&);
-  TCancelOperationResp() noexcept {
-  }
+  TCancelOperationResp() noexcept;
 
   virtual ~TCancelOperationResp() noexcept;
   TStatus status;
 
   void __set_status(const TStatus& val);
 
-  bool operator == (const TCancelOperationResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    return true;
-  }
+  bool operator == (const TCancelOperationResp & rhs) const;
   bool operator != (const TCancelOperationResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4199,7 +3241,7 @@ class TCancelOperationResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCancelOperationResp &a, TCancelOperationResp &b);
+void swap(TCancelOperationResp &a, TCancelOperationResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCancelOperationResp& obj);
 
@@ -4209,20 +3251,14 @@ class TCloseOperationReq : public virtual ::apache::thrift::TBase {
 
   TCloseOperationReq(const TCloseOperationReq&);
   TCloseOperationReq& operator=(const TCloseOperationReq&);
-  TCloseOperationReq() noexcept {
-  }
+  TCloseOperationReq() noexcept;
 
   virtual ~TCloseOperationReq() noexcept;
   TOperationHandle operationHandle;
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TCloseOperationReq & rhs) const
-  {
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TCloseOperationReq & rhs) const;
   bool operator != (const TCloseOperationReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4235,7 +3271,7 @@ class TCloseOperationReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCloseOperationReq &a, TCloseOperationReq &b);
+void swap(TCloseOperationReq &a, TCloseOperationReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCloseOperationReq& obj);
 
@@ -4245,20 +3281,14 @@ class TCloseOperationResp : public virtual ::apache::thrift::TBase {
 
   TCloseOperationResp(const TCloseOperationResp&);
   TCloseOperationResp& operator=(const TCloseOperationResp&);
-  TCloseOperationResp() noexcept {
-  }
+  TCloseOperationResp() noexcept;
 
   virtual ~TCloseOperationResp() noexcept;
   TStatus status;
 
   void __set_status(const TStatus& val);
 
-  bool operator == (const TCloseOperationResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    return true;
-  }
+  bool operator == (const TCloseOperationResp & rhs) const;
   bool operator != (const TCloseOperationResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4271,7 +3301,7 @@ class TCloseOperationResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCloseOperationResp &a, TCloseOperationResp &b);
+void swap(TCloseOperationResp &a, TCloseOperationResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCloseOperationResp& obj);
 
@@ -4281,20 +3311,14 @@ class TGetResultSetMetadataReq : public virtual ::apache::thrift::TBase {
 
   TGetResultSetMetadataReq(const TGetResultSetMetadataReq&);
   TGetResultSetMetadataReq& operator=(const TGetResultSetMetadataReq&);
-  TGetResultSetMetadataReq() noexcept {
-  }
+  TGetResultSetMetadataReq() noexcept;
 
   virtual ~TGetResultSetMetadataReq() noexcept;
   TOperationHandle operationHandle;
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetResultSetMetadataReq & rhs) const
-  {
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetResultSetMetadataReq & rhs) const;
   bool operator != (const TGetResultSetMetadataReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4307,7 +3331,7 @@ class TGetResultSetMetadataReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetResultSetMetadataReq &a, TGetResultSetMetadataReq &b);
+void swap(TGetResultSetMetadataReq &a, TGetResultSetMetadataReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetResultSetMetadataReq& obj);
 
@@ -4321,8 +3345,7 @@ class TGetResultSetMetadataResp : public virtual ::apache::thrift::TBase {
 
   TGetResultSetMetadataResp(const TGetResultSetMetadataResp&);
   TGetResultSetMetadataResp& operator=(const TGetResultSetMetadataResp&);
-  TGetResultSetMetadataResp() noexcept {
-  }
+  TGetResultSetMetadataResp() noexcept;
 
   virtual ~TGetResultSetMetadataResp() noexcept;
   TStatus status;
@@ -4334,16 +3357,7 @@ class TGetResultSetMetadataResp : public virtual ::apache::thrift::TBase {
 
   void __set_schema(const TTableSchema& val);
 
-  bool operator == (const TGetResultSetMetadataResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.schema != rhs.__isset.schema)
-      return false;
-    else if (__isset.schema && !(schema == rhs.schema))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetResultSetMetadataResp & rhs) const;
   bool operator != (const TGetResultSetMetadataResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4356,7 +3370,7 @@ class TGetResultSetMetadataResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetResultSetMetadataResp &a, TGetResultSetMetadataResp &b);
+void swap(TGetResultSetMetadataResp &a, TGetResultSetMetadataResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetResultSetMetadataResp& obj);
 
@@ -4370,13 +3384,7 @@ class TFetchResultsReq : public virtual ::apache::thrift::TBase {
 
   TFetchResultsReq(const TFetchResultsReq&);
   TFetchResultsReq& operator=(const TFetchResultsReq&);
-  TFetchResultsReq() noexcept
-                   : orientation((TFetchOrientation::type)0),
-                     maxRows(0),
-                     fetchType(0) {
-    orientation = (TFetchOrientation::type)0;
-
-  }
+  TFetchResultsReq() noexcept;
 
   virtual ~TFetchResultsReq() noexcept;
   TOperationHandle operationHandle;
@@ -4398,20 +3406,7 @@ class TFetchResultsReq : public virtual ::apache::thrift::TBase {
 
   void __set_fetchType(const int16_t val);
 
-  bool operator == (const TFetchResultsReq & rhs) const
-  {
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    if (!(orientation == rhs.orientation))
-      return false;
-    if (!(maxRows == rhs.maxRows))
-      return false;
-    if (__isset.fetchType != rhs.__isset.fetchType)
-      return false;
-    else if (__isset.fetchType && !(fetchType == rhs.fetchType))
-      return false;
-    return true;
-  }
+  bool operator == (const TFetchResultsReq & rhs) const;
   bool operator != (const TFetchResultsReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4424,7 +3419,7 @@ class TFetchResultsReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TFetchResultsReq &a, TFetchResultsReq &b);
+void swap(TFetchResultsReq &a, TFetchResultsReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TFetchResultsReq& obj);
 
@@ -4439,9 +3434,7 @@ class TFetchResultsResp : public virtual ::apache::thrift::TBase {
 
   TFetchResultsResp(const TFetchResultsResp&);
   TFetchResultsResp& operator=(const TFetchResultsResp&);
-  TFetchResultsResp() noexcept
-                    : hasMoreRows(0) {
-  }
+  TFetchResultsResp() noexcept;
 
   virtual ~TFetchResultsResp() noexcept;
   TStatus status;
@@ -4456,20 +3449,7 @@ class TFetchResultsResp : public virtual ::apache::thrift::TBase {
 
   void __set_results(const TRowSet& val);
 
-  bool operator == (const TFetchResultsResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.hasMoreRows != rhs.__isset.hasMoreRows)
-      return false;
-    else if (__isset.hasMoreRows && !(hasMoreRows == rhs.hasMoreRows))
-      return false;
-    if (__isset.results != rhs.__isset.results)
-      return false;
-    else if (__isset.results && !(results == rhs.results))
-      return false;
-    return true;
-  }
+  bool operator == (const TFetchResultsResp & rhs) const;
   bool operator != (const TFetchResultsResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4482,7 +3462,7 @@ class TFetchResultsResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TFetchResultsResp &a, TFetchResultsResp &b);
+void swap(TFetchResultsResp &a, TFetchResultsResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TFetchResultsResp& obj);
 
@@ -4492,10 +3472,7 @@ class TGetDelegationTokenReq : public virtual ::apache::thrift::TBase {
 
   TGetDelegationTokenReq(const TGetDelegationTokenReq&);
   TGetDelegationTokenReq& operator=(const TGetDelegationTokenReq&);
-  TGetDelegationTokenReq() noexcept
-                         : owner(),
-                           renewer() {
-  }
+  TGetDelegationTokenReq() noexcept;
 
   virtual ~TGetDelegationTokenReq() noexcept;
   TSessionHandle sessionHandle;
@@ -4508,16 +3485,7 @@ class TGetDelegationTokenReq : public virtual ::apache::thrift::TBase {
 
   void __set_renewer(const std::string& val);
 
-  bool operator == (const TGetDelegationTokenReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (!(owner == rhs.owner))
-      return false;
-    if (!(renewer == rhs.renewer))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetDelegationTokenReq & rhs) const;
   bool operator != (const TGetDelegationTokenReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4530,7 +3498,7 @@ class TGetDelegationTokenReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetDelegationTokenReq &a, TGetDelegationTokenReq &b);
+void swap(TGetDelegationTokenReq &a, TGetDelegationTokenReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetDelegationTokenReq& obj);
 
@@ -4544,9 +3512,7 @@ class TGetDelegationTokenResp : public virtual ::apache::thrift::TBase {
 
   TGetDelegationTokenResp(const TGetDelegationTokenResp&);
   TGetDelegationTokenResp& operator=(const TGetDelegationTokenResp&);
-  TGetDelegationTokenResp() noexcept
-                          : delegationToken() {
-  }
+  TGetDelegationTokenResp() noexcept;
 
   virtual ~TGetDelegationTokenResp() noexcept;
   TStatus status;
@@ -4558,16 +3524,7 @@ class TGetDelegationTokenResp : public virtual ::apache::thrift::TBase {
 
   void __set_delegationToken(const std::string& val);
 
-  bool operator == (const TGetDelegationTokenResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    if (__isset.delegationToken != rhs.__isset.delegationToken)
-      return false;
-    else if (__isset.delegationToken && !(delegationToken == rhs.delegationToken))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetDelegationTokenResp & rhs) const;
   bool operator != (const TGetDelegationTokenResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4580,7 +3537,7 @@ class TGetDelegationTokenResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetDelegationTokenResp &a, TGetDelegationTokenResp &b);
+void swap(TGetDelegationTokenResp &a, TGetDelegationTokenResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetDelegationTokenResp& obj);
 
@@ -4590,9 +3547,7 @@ class TCancelDelegationTokenReq : public virtual ::apache::thrift::TBase {
 
   TCancelDelegationTokenReq(const TCancelDelegationTokenReq&);
   TCancelDelegationTokenReq& operator=(const TCancelDelegationTokenReq&);
-  TCancelDelegationTokenReq() noexcept
-                            : delegationToken() {
-  }
+  TCancelDelegationTokenReq() noexcept;
 
   virtual ~TCancelDelegationTokenReq() noexcept;
   TSessionHandle sessionHandle;
@@ -4602,14 +3557,7 @@ class TCancelDelegationTokenReq : public virtual ::apache::thrift::TBase {
 
   void __set_delegationToken(const std::string& val);
 
-  bool operator == (const TCancelDelegationTokenReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (!(delegationToken == rhs.delegationToken))
-      return false;
-    return true;
-  }
+  bool operator == (const TCancelDelegationTokenReq & rhs) const;
   bool operator != (const TCancelDelegationTokenReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4622,7 +3570,7 @@ class TCancelDelegationTokenReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCancelDelegationTokenReq &a, TCancelDelegationTokenReq &b);
+void swap(TCancelDelegationTokenReq &a, TCancelDelegationTokenReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCancelDelegationTokenReq& obj);
 
@@ -4632,20 +3580,14 @@ class TCancelDelegationTokenResp : public virtual ::apache::thrift::TBase {
 
   TCancelDelegationTokenResp(const TCancelDelegationTokenResp&);
   TCancelDelegationTokenResp& operator=(const TCancelDelegationTokenResp&);
-  TCancelDelegationTokenResp() noexcept {
-  }
+  TCancelDelegationTokenResp() noexcept;
 
   virtual ~TCancelDelegationTokenResp() noexcept;
   TStatus status;
 
   void __set_status(const TStatus& val);
 
-  bool operator == (const TCancelDelegationTokenResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    return true;
-  }
+  bool operator == (const TCancelDelegationTokenResp & rhs) const;
   bool operator != (const TCancelDelegationTokenResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4658,7 +3600,7 @@ class TCancelDelegationTokenResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TCancelDelegationTokenResp &a, TCancelDelegationTokenResp &b);
+void swap(TCancelDelegationTokenResp &a, TCancelDelegationTokenResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TCancelDelegationTokenResp& obj);
 
@@ -4668,9 +3610,7 @@ class TRenewDelegationTokenReq : public virtual ::apache::thrift::TBase {
 
   TRenewDelegationTokenReq(const TRenewDelegationTokenReq&);
   TRenewDelegationTokenReq& operator=(const TRenewDelegationTokenReq&);
-  TRenewDelegationTokenReq() noexcept
-                           : delegationToken() {
-  }
+  TRenewDelegationTokenReq() noexcept;
 
   virtual ~TRenewDelegationTokenReq() noexcept;
   TSessionHandle sessionHandle;
@@ -4680,14 +3620,7 @@ class TRenewDelegationTokenReq : public virtual ::apache::thrift::TBase {
 
   void __set_delegationToken(const std::string& val);
 
-  bool operator == (const TRenewDelegationTokenReq & rhs) const
-  {
-    if (!(sessionHandle == rhs.sessionHandle))
-      return false;
-    if (!(delegationToken == rhs.delegationToken))
-      return false;
-    return true;
-  }
+  bool operator == (const TRenewDelegationTokenReq & rhs) const;
   bool operator != (const TRenewDelegationTokenReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4700,7 +3633,7 @@ class TRenewDelegationTokenReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TRenewDelegationTokenReq &a, TRenewDelegationTokenReq &b);
+void swap(TRenewDelegationTokenReq &a, TRenewDelegationTokenReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TRenewDelegationTokenReq& obj);
 
@@ -4710,20 +3643,14 @@ class TRenewDelegationTokenResp : public virtual ::apache::thrift::TBase {
 
   TRenewDelegationTokenResp(const TRenewDelegationTokenResp&);
   TRenewDelegationTokenResp& operator=(const TRenewDelegationTokenResp&);
-  TRenewDelegationTokenResp() noexcept {
-  }
+  TRenewDelegationTokenResp() noexcept;
 
   virtual ~TRenewDelegationTokenResp() noexcept;
   TStatus status;
 
   void __set_status(const TStatus& val);
 
-  bool operator == (const TRenewDelegationTokenResp & rhs) const
-  {
-    if (!(status == rhs.status))
-      return false;
-    return true;
-  }
+  bool operator == (const TRenewDelegationTokenResp & rhs) const;
   bool operator != (const TRenewDelegationTokenResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4736,7 +3663,7 @@ class TRenewDelegationTokenResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TRenewDelegationTokenResp &a, TRenewDelegationTokenResp &b);
+void swap(TRenewDelegationTokenResp &a, TRenewDelegationTokenResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TRenewDelegationTokenResp& obj);
 
@@ -4746,12 +3673,7 @@ class TProgressUpdateResp : public virtual ::apache::thrift::TBase {
 
   TProgressUpdateResp(const TProgressUpdateResp&);
   TProgressUpdateResp& operator=(const TProgressUpdateResp&);
-  TProgressUpdateResp() noexcept
-                      : progressedPercentage(0),
-                        status(static_cast<TJobExecutionStatus::type>(0)),
-                        footerSummary(),
-                        startTime(0) {
-  }
+  TProgressUpdateResp() noexcept;
 
   virtual ~TProgressUpdateResp() noexcept;
   std::vector<std::string>  headerNames;
@@ -4777,22 +3699,7 @@ class TProgressUpdateResp : public virtual ::apache::thrift::TBase {
 
   void __set_startTime(const int64_t val);
 
-  bool operator == (const TProgressUpdateResp & rhs) const
-  {
-    if (!(headerNames == rhs.headerNames))
-      return false;
-    if (!(rows == rhs.rows))
-      return false;
-    if (!(progressedPercentage == rhs.progressedPercentage))
-      return false;
-    if (!(status == rhs.status))
-      return false;
-    if (!(footerSummary == rhs.footerSummary))
-      return false;
-    if (!(startTime == rhs.startTime))
-      return false;
-    return true;
-  }
+  bool operator == (const TProgressUpdateResp & rhs) const;
   bool operator != (const TProgressUpdateResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4805,7 +3712,7 @@ class TProgressUpdateResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TProgressUpdateResp &a, TProgressUpdateResp &b);
+void swap(TProgressUpdateResp &a, TProgressUpdateResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TProgressUpdateResp& obj);
 
@@ -4815,20 +3722,14 @@ class TGetQueryIdReq : public virtual ::apache::thrift::TBase {
 
   TGetQueryIdReq(const TGetQueryIdReq&);
   TGetQueryIdReq& operator=(const TGetQueryIdReq&);
-  TGetQueryIdReq() noexcept {
-  }
+  TGetQueryIdReq() noexcept;
 
   virtual ~TGetQueryIdReq() noexcept;
   TOperationHandle operationHandle;
 
   void __set_operationHandle(const TOperationHandle& val);
 
-  bool operator == (const TGetQueryIdReq & rhs) const
-  {
-    if (!(operationHandle == rhs.operationHandle))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetQueryIdReq & rhs) const;
   bool operator != (const TGetQueryIdReq &rhs) const {
     return !(*this == rhs);
   }
@@ -4841,7 +3742,7 @@ class TGetQueryIdReq : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetQueryIdReq &a, TGetQueryIdReq &b);
+void swap(TGetQueryIdReq &a, TGetQueryIdReq &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetQueryIdReq& obj);
 
@@ -4851,21 +3752,14 @@ class TGetQueryIdResp : public virtual ::apache::thrift::TBase {
 
   TGetQueryIdResp(const TGetQueryIdResp&);
   TGetQueryIdResp& operator=(const TGetQueryIdResp&);
-  TGetQueryIdResp() noexcept
-                  : queryId() {
-  }
+  TGetQueryIdResp() noexcept;
 
   virtual ~TGetQueryIdResp() noexcept;
   std::string queryId;
 
   void __set_queryId(const std::string& val);
 
-  bool operator == (const TGetQueryIdResp & rhs) const
-  {
-    if (!(queryId == rhs.queryId))
-      return false;
-    return true;
-  }
+  bool operator == (const TGetQueryIdResp & rhs) const;
   bool operator != (const TGetQueryIdResp &rhs) const {
     return !(*this == rhs);
   }
@@ -4878,7 +3772,7 @@ class TGetQueryIdResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TGetQueryIdResp &a, TGetQueryIdResp &b);
+void swap(TGetQueryIdResp &a, TGetQueryIdResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TGetQueryIdResp& obj);
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TArrayTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TArrayTypeEntry.java
index a698e28fcb54..8c3a9d86c29a 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TArrayTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TArrayTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TArrayTypeEntry implements org.apache.thrift.TBase<TArrayTypeEntry, TArrayTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TArrayTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TArrayTypeEntry");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public TArrayTypeEntry(TArrayTypeEntry other) {
     this.objectTypePtr = other.objectTypePtr;
   }
 
+  @Override
   public TArrayTypeEntry deepCopy() {
     return new TArrayTypeEntry(this);
   }
@@ -141,6 +144,7 @@ public void setObjectTypePtrIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OBJECTTYPEPTR_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OBJECT_TYPE_PTR:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OBJECT_TYPE_PTR:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(TArrayTypeEntry other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TArrayTypeEntryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TArrayTypeEntryStandardScheme getScheme() {
       return new TArrayTypeEntryStandardScheme();
     }
@@ -292,33 +302,40 @@ public TArrayTypeEntryStandardScheme getScheme() {
 
   private static class TArrayTypeEntryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TArrayTypeEntry> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TArrayTypeEntry 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 1: // OBJECT_TYPE_PTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.objectTypePtr = iprot.readI32();
-              struct.setObjectTypePtrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // OBJECT_TYPE_PTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.objectTypePtr = iprot.readI32();
+                struct.setObjectTypePtrIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TArrayTypeEntry struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TArrayTypeEntry st
   }
 
   private static class TArrayTypeEntryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TArrayTypeEntryTupleScheme getScheme() {
       return new TArrayTypeEntryTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TArrayTypeEntry str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TArrayTypeEntry struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.objectTypePtr = iprot.readI32();
-      struct.setObjectTypePtrIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.objectTypePtr = iprot.readI32();
+        struct.setObjectTypePtrIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBinaryColumn.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBinaryColumn.java
index 752e2d42b52f..ad53900968c5 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBinaryColumn.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBinaryColumn.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TBinaryColumn implements org.apache.thrift.TBase<TBinaryColumn, TBinaryColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TBinaryColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TBinaryColumn");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TBinaryColumn(TBinaryColumn other) {
     }
   }
 
+  @Override
   public TBinaryColumn deepCopy() {
     return new TBinaryColumn(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TBinaryColumn other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TBinaryColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TBinaryColumnStandardScheme getScheme() {
       return new TBinaryColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TBinaryColumnStandardScheme getScheme() {
 
   private static class TBinaryColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TBinaryColumn> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TBinaryColumn 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list110 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.nio.ByteBuffer>(_list110.size);
-                @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem111;
-                for (int _i112 = 0; _i112 < _list110.size; ++_i112)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem111 = iprot.readBinary();
-                  struct.values.add(_elem111);
+                  org.apache.thrift.protocol.TList _list110 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.nio.ByteBuffer>(_list110.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem111;
+                  for (int _i112 = 0; _i112 < _list110.size; ++_i112)
+                  {
+                    _elem111 = iprot.readBinary();
+                    struct.values.add(_elem111);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TBinaryColumn struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TBinaryColumn stru
   }
 
   private static class TBinaryColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TBinaryColumnTupleScheme getScheme() {
       return new TBinaryColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TBinaryColumn struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TBinaryColumn struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list115 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.values = new java.util.ArrayList<java.nio.ByteBuffer>(_list115.size);
-        @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem116;
-        for (int _i117 = 0; _i117 < _list115.size; ++_i117)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem116 = iprot.readBinary();
-          struct.values.add(_elem116);
+          org.apache.thrift.protocol.TList _list115 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.values = new java.util.ArrayList<java.nio.ByteBuffer>(_list115.size);
+          @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem116;
+          for (int _i117 = 0; _i117 < _list115.size; ++_i117)
+          {
+            _elem116 = iprot.readBinary();
+            struct.values.add(_elem116);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolColumn.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolColumn.java
index ae0fb235a8d6..77290f70c20f 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolColumn.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolColumn.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TBoolColumn implements org.apache.thrift.TBase<TBoolColumn, TBoolColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TBoolColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TBoolColumn");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TBoolColumn(TBoolColumn other) {
     }
   }
 
+  @Override
   public TBoolColumn deepCopy() {
     return new TBoolColumn(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TBoolColumn other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TBoolColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TBoolColumnStandardScheme getScheme() {
       return new TBoolColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TBoolColumnStandardScheme getScheme() {
 
   private static class TBoolColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TBoolColumn> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TBoolColumn 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list54 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.Boolean>(_list54.size);
-                boolean _elem55;
-                for (int _i56 = 0; _i56 < _list54.size; ++_i56)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem55 = iprot.readBool();
-                  struct.values.add(_elem55);
+                  org.apache.thrift.protocol.TList _list54 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.Boolean>(_list54.size);
+                  boolean _elem55;
+                  for (int _i56 = 0; _i56 < _list54.size; ++_i56)
+                  {
+                    _elem55 = iprot.readBool();
+                    struct.values.add(_elem55);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TBoolColumn struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TBoolColumn struct
   }
 
   private static class TBoolColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TBoolColumnTupleScheme getScheme() {
       return new TBoolColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TBoolColumn struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TBoolColumn struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list59 = iprot.readListBegin(org.apache.thrift.protocol.TType.BOOL);
-        struct.values = new java.util.ArrayList<java.lang.Boolean>(_list59.size);
-        boolean _elem60;
-        for (int _i61 = 0; _i61 < _list59.size; ++_i61)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem60 = iprot.readBool();
-          struct.values.add(_elem60);
+          org.apache.thrift.protocol.TList _list59 = iprot.readListBegin(org.apache.thrift.protocol.TType.BOOL);
+          struct.values = new java.util.ArrayList<java.lang.Boolean>(_list59.size);
+          boolean _elem60;
+          for (int _i61 = 0; _i61 < _list59.size; ++_i61)
+          {
+            _elem60 = iprot.readBool();
+            struct.values.add(_elem60);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolValue.java
index bbc1d122ff3a..5ed9117ff3bc 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TBoolValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TBoolValue implements org.apache.thrift.TBase<TBoolValue, TBoolValue._Fields>, java.io.Serializable, Cloneable, Comparable<TBoolValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TBoolValue");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __VALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -102,6 +104,7 @@ public TBoolValue(TBoolValue other) {
     this.value = other.value;
   }
 
+  @Override
   public TBoolValue deepCopy() {
     return new TBoolValue(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TBoolValue other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TBoolValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TBoolValueStandardScheme getScheme() {
       return new TBoolValueStandardScheme();
     }
@@ -285,33 +295,40 @@ public TBoolValueStandardScheme getScheme() {
 
   private static class TBoolValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TBoolValue> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TBoolValue 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.value = iprot.readBool();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.value = iprot.readBool();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TBoolValue struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TBoolValue struct)
   }
 
   private static class TBoolValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TBoolValueTupleScheme getScheme() {
       return new TBoolValueTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TBoolValue struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TBoolValue 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.value = iprot.readBool();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readBool();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteColumn.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteColumn.java
index fe0e9de99f02..fc05ec77aee4 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteColumn.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteColumn.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TByteColumn implements org.apache.thrift.TBase<TByteColumn, TByteColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TByteColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TByteColumn");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TByteColumn(TByteColumn other) {
     }
   }
 
+  @Override
   public TByteColumn deepCopy() {
     return new TByteColumn(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TByteColumn other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TByteColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TByteColumnStandardScheme getScheme() {
       return new TByteColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TByteColumnStandardScheme getScheme() {
 
   private static class TByteColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TByteColumn> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TByteColumn 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.Byte>(_list62.size);
-                byte _elem63;
-                for (int _i64 = 0; _i64 < _list62.size; ++_i64)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem63 = iprot.readByte();
-                  struct.values.add(_elem63);
+                  org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.Byte>(_list62.size);
+                  byte _elem63;
+                  for (int _i64 = 0; _i64 < _list62.size; ++_i64)
+                  {
+                    _elem63 = iprot.readByte();
+                    struct.values.add(_elem63);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TByteColumn struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TByteColumn struct
   }
 
   private static class TByteColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TByteColumnTupleScheme getScheme() {
       return new TByteColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TByteColumn struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TByteColumn struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list67 = iprot.readListBegin(org.apache.thrift.protocol.TType.BYTE);
-        struct.values = new java.util.ArrayList<java.lang.Byte>(_list67.size);
-        byte _elem68;
-        for (int _i69 = 0; _i69 < _list67.size; ++_i69)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem68 = iprot.readByte();
-          struct.values.add(_elem68);
+          org.apache.thrift.protocol.TList _list67 = iprot.readListBegin(org.apache.thrift.protocol.TType.BYTE);
+          struct.values = new java.util.ArrayList<java.lang.Byte>(_list67.size);
+          byte _elem68;
+          for (int _i69 = 0; _i69 < _list67.size; ++_i69)
+          {
+            _elem68 = iprot.readByte();
+            struct.values.add(_elem68);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteValue.java
index e5c763a920cd..48a7f8720cfc 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TByteValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TByteValue implements org.apache.thrift.TBase<TByteValue, TByteValue._Fields>, java.io.Serializable, Cloneable, Comparable<TByteValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TByteValue");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __VALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -102,6 +104,7 @@ public TByteValue(TByteValue other) {
     this.value = other.value;
   }
 
+  @Override
   public TByteValue deepCopy() {
     return new TByteValue(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TByteValue other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TByteValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TByteValueStandardScheme getScheme() {
       return new TByteValueStandardScheme();
     }
@@ -285,33 +295,40 @@ public TByteValueStandardScheme getScheme() {
 
   private static class TByteValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TByteValue> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TByteValue 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
-              struct.value = iprot.readByte();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
+                struct.value = iprot.readByte();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TByteValue struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TByteValue struct)
   }
 
   private static class TByteValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TByteValueTupleScheme getScheme() {
       return new TByteValueTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TByteValue struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TByteValue 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.value = iprot.readByte();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readByte();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIService.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIService.java
index fdb9a9eb4b89..b86be3de6ad4 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIService.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIService.java
@@ -1,13 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.rpc.thrift;
 
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCLIService {
 
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public interface Iface {
@@ -121,9 +121,11 @@
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
+      @Override
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
+      @Override
       public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
@@ -138,6 +140,7 @@ public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.prot
       super(iprot, oprot);
     }
 
+    @Override
     public TOpenSessionResp OpenSession(TOpenSessionReq req) throws org.apache.thrift.TException
     {
       send_OpenSession(req);
@@ -161,6 +164,7 @@ public TOpenSessionResp recv_OpenSession() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "OpenSession failed: unknown result");
     }
 
+    @Override
     public TCloseSessionResp CloseSession(TCloseSessionReq req) throws org.apache.thrift.TException
     {
       send_CloseSession(req);
@@ -184,6 +188,7 @@ public TCloseSessionResp recv_CloseSession() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "CloseSession failed: unknown result");
     }
 
+    @Override
     public TGetInfoResp GetInfo(TGetInfoReq req) throws org.apache.thrift.TException
     {
       send_GetInfo(req);
@@ -207,6 +212,7 @@ public TGetInfoResp recv_GetInfo() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetInfo failed: unknown result");
     }
 
+    @Override
     public TExecuteStatementResp ExecuteStatement(TExecuteStatementReq req) throws org.apache.thrift.TException
     {
       send_ExecuteStatement(req);
@@ -230,6 +236,7 @@ public TExecuteStatementResp recv_ExecuteStatement() throws org.apache.thrift.TE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "ExecuteStatement failed: unknown result");
     }
 
+    @Override
     public TGetTypeInfoResp GetTypeInfo(TGetTypeInfoReq req) throws org.apache.thrift.TException
     {
       send_GetTypeInfo(req);
@@ -253,6 +260,7 @@ public TGetTypeInfoResp recv_GetTypeInfo() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetTypeInfo failed: unknown result");
     }
 
+    @Override
     public TGetCatalogsResp GetCatalogs(TGetCatalogsReq req) throws org.apache.thrift.TException
     {
       send_GetCatalogs(req);
@@ -276,6 +284,7 @@ public TGetCatalogsResp recv_GetCatalogs() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetCatalogs failed: unknown result");
     }
 
+    @Override
     public TGetSchemasResp GetSchemas(TGetSchemasReq req) throws org.apache.thrift.TException
     {
       send_GetSchemas(req);
@@ -299,6 +308,7 @@ public TGetSchemasResp recv_GetSchemas() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetSchemas failed: unknown result");
     }
 
+    @Override
     public TGetTablesResp GetTables(TGetTablesReq req) throws org.apache.thrift.TException
     {
       send_GetTables(req);
@@ -322,6 +332,7 @@ public TGetTablesResp recv_GetTables() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetTables failed: unknown result");
     }
 
+    @Override
     public TGetTableTypesResp GetTableTypes(TGetTableTypesReq req) throws org.apache.thrift.TException
     {
       send_GetTableTypes(req);
@@ -345,6 +356,7 @@ public TGetTableTypesResp recv_GetTableTypes() throws org.apache.thrift.TExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetTableTypes failed: unknown result");
     }
 
+    @Override
     public TGetColumnsResp GetColumns(TGetColumnsReq req) throws org.apache.thrift.TException
     {
       send_GetColumns(req);
@@ -368,6 +380,7 @@ public TGetColumnsResp recv_GetColumns() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetColumns failed: unknown result");
     }
 
+    @Override
     public TGetFunctionsResp GetFunctions(TGetFunctionsReq req) throws org.apache.thrift.TException
     {
       send_GetFunctions(req);
@@ -391,6 +404,7 @@ public TGetFunctionsResp recv_GetFunctions() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetFunctions failed: unknown result");
     }
 
+    @Override
     public TGetPrimaryKeysResp GetPrimaryKeys(TGetPrimaryKeysReq req) throws org.apache.thrift.TException
     {
       send_GetPrimaryKeys(req);
@@ -414,6 +428,7 @@ public TGetPrimaryKeysResp recv_GetPrimaryKeys() throws org.apache.thrift.TExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetPrimaryKeys failed: unknown result");
     }
 
+    @Override
     public TGetCrossReferenceResp GetCrossReference(TGetCrossReferenceReq req) throws org.apache.thrift.TException
     {
       send_GetCrossReference(req);
@@ -437,6 +452,7 @@ public TGetCrossReferenceResp recv_GetCrossReference() throws org.apache.thrift.
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetCrossReference failed: unknown result");
     }
 
+    @Override
     public TGetOperationStatusResp GetOperationStatus(TGetOperationStatusReq req) throws org.apache.thrift.TException
     {
       send_GetOperationStatus(req);
@@ -460,6 +476,7 @@ public TGetOperationStatusResp recv_GetOperationStatus() throws org.apache.thrif
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetOperationStatus failed: unknown result");
     }
 
+    @Override
     public TCancelOperationResp CancelOperation(TCancelOperationReq req) throws org.apache.thrift.TException
     {
       send_CancelOperation(req);
@@ -483,6 +500,7 @@ public TCancelOperationResp recv_CancelOperation() throws org.apache.thrift.TExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "CancelOperation failed: unknown result");
     }
 
+    @Override
     public TCloseOperationResp CloseOperation(TCloseOperationReq req) throws org.apache.thrift.TException
     {
       send_CloseOperation(req);
@@ -506,6 +524,7 @@ public TCloseOperationResp recv_CloseOperation() throws org.apache.thrift.TExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "CloseOperation failed: unknown result");
     }
 
+    @Override
     public TGetResultSetMetadataResp GetResultSetMetadata(TGetResultSetMetadataReq req) throws org.apache.thrift.TException
     {
       send_GetResultSetMetadata(req);
@@ -529,6 +548,7 @@ public TGetResultSetMetadataResp recv_GetResultSetMetadata() throws org.apache.t
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetResultSetMetadata failed: unknown result");
     }
 
+    @Override
     public TFetchResultsResp FetchResults(TFetchResultsReq req) throws org.apache.thrift.TException
     {
       send_FetchResults(req);
@@ -552,6 +572,7 @@ public TFetchResultsResp recv_FetchResults() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "FetchResults failed: unknown result");
     }
 
+    @Override
     public TGetDelegationTokenResp GetDelegationToken(TGetDelegationTokenReq req) throws org.apache.thrift.TException
     {
       send_GetDelegationToken(req);
@@ -575,6 +596,7 @@ public TGetDelegationTokenResp recv_GetDelegationToken() throws org.apache.thrif
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetDelegationToken failed: unknown result");
     }
 
+    @Override
     public TCancelDelegationTokenResp CancelDelegationToken(TCancelDelegationTokenReq req) throws org.apache.thrift.TException
     {
       send_CancelDelegationToken(req);
@@ -598,6 +620,7 @@ public TCancelDelegationTokenResp recv_CancelDelegationToken() throws org.apache
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "CancelDelegationToken failed: unknown result");
     }
 
+    @Override
     public TRenewDelegationTokenResp RenewDelegationToken(TRenewDelegationTokenReq req) throws org.apache.thrift.TException
     {
       send_RenewDelegationToken(req);
@@ -621,6 +644,7 @@ public TRenewDelegationTokenResp recv_RenewDelegationToken() throws org.apache.t
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "RenewDelegationToken failed: unknown result");
     }
 
+    @Override
     public TGetQueryIdResp GetQueryId(TGetQueryIdReq req) throws org.apache.thrift.TException
     {
       send_GetQueryId(req);
@@ -644,6 +668,7 @@ public TGetQueryIdResp recv_GetQueryId() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetQueryId failed: unknown result");
     }
 
+    @Override
     public TSetClientInfoResp SetClientInfo(TSetClientInfoReq req) throws org.apache.thrift.TException
     {
       send_SetClientInfo(req);
@@ -667,6 +692,7 @@ public TSetClientInfoResp recv_SetClientInfo() throws org.apache.thrift.TExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "SetClientInfo failed: unknown result");
     }
 
+    @Override
     public TUploadDataResp UploadData(TUploadDataReq req) throws org.apache.thrift.TException
     {
       send_UploadData(req);
@@ -690,6 +716,7 @@ public TUploadDataResp recv_UploadData() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "UploadData failed: unknown result");
     }
 
+    @Override
     public TDownloadDataResp DownloadData(TDownloadDataReq req) throws org.apache.thrift.TException
     {
       send_DownloadData(req);
@@ -722,6 +749,7 @@ public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.ap
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
+    @Override
       public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
@@ -731,6 +759,7 @@ public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory,
       super(protocolFactory, clientManager, transport);
     }
 
+    @Override
     public void OpenSession(TOpenSessionReq req, org.apache.thrift.async.AsyncMethodCallback<TOpenSessionResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       OpenSession_call method_call = new OpenSession_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -745,6 +774,7 @@ public OpenSession_call(TOpenSessionReq req, org.apache.thrift.async.AsyncMethod
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("OpenSession", org.apache.thrift.protocol.TMessageType.CALL, 0));
         OpenSession_args args = new OpenSession_args();
@@ -753,6 +783,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TOpenSessionResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -763,6 +794,7 @@ public TOpenSessionResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void CloseSession(TCloseSessionReq req, org.apache.thrift.async.AsyncMethodCallback<TCloseSessionResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       CloseSession_call method_call = new CloseSession_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -777,6 +809,7 @@ public CloseSession_call(TCloseSessionReq req, org.apache.thrift.async.AsyncMeth
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("CloseSession", org.apache.thrift.protocol.TMessageType.CALL, 0));
         CloseSession_args args = new CloseSession_args();
@@ -785,6 +818,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TCloseSessionResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -795,6 +829,7 @@ public TCloseSessionResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetInfo(TGetInfoReq req, org.apache.thrift.async.AsyncMethodCallback<TGetInfoResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetInfo_call method_call = new GetInfo_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -809,6 +844,7 @@ public GetInfo_call(TGetInfoReq req, org.apache.thrift.async.AsyncMethodCallback
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetInfo", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetInfo_args args = new GetInfo_args();
@@ -817,6 +853,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetInfoResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -827,6 +864,7 @@ public TGetInfoResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void ExecuteStatement(TExecuteStatementReq req, org.apache.thrift.async.AsyncMethodCallback<TExecuteStatementResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       ExecuteStatement_call method_call = new ExecuteStatement_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -841,6 +879,7 @@ public ExecuteStatement_call(TExecuteStatementReq req, org.apache.thrift.async.A
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("ExecuteStatement", org.apache.thrift.protocol.TMessageType.CALL, 0));
         ExecuteStatement_args args = new ExecuteStatement_args();
@@ -849,6 +888,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TExecuteStatementResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -859,6 +899,7 @@ public TExecuteStatementResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetTypeInfo(TGetTypeInfoReq req, org.apache.thrift.async.AsyncMethodCallback<TGetTypeInfoResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetTypeInfo_call method_call = new GetTypeInfo_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -873,6 +914,7 @@ public GetTypeInfo_call(TGetTypeInfoReq req, org.apache.thrift.async.AsyncMethod
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetTypeInfo", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetTypeInfo_args args = new GetTypeInfo_args();
@@ -881,6 +923,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetTypeInfoResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -891,6 +934,7 @@ public TGetTypeInfoResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetCatalogs(TGetCatalogsReq req, org.apache.thrift.async.AsyncMethodCallback<TGetCatalogsResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetCatalogs_call method_call = new GetCatalogs_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -905,6 +949,7 @@ public GetCatalogs_call(TGetCatalogsReq req, org.apache.thrift.async.AsyncMethod
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetCatalogs", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetCatalogs_args args = new GetCatalogs_args();
@@ -913,6 +958,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetCatalogsResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -923,6 +969,7 @@ public TGetCatalogsResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetSchemas(TGetSchemasReq req, org.apache.thrift.async.AsyncMethodCallback<TGetSchemasResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetSchemas_call method_call = new GetSchemas_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -937,6 +984,7 @@ public GetSchemas_call(TGetSchemasReq req, org.apache.thrift.async.AsyncMethodCa
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetSchemas", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetSchemas_args args = new GetSchemas_args();
@@ -945,6 +993,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetSchemasResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -955,6 +1004,7 @@ public TGetSchemasResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetTables(TGetTablesReq req, org.apache.thrift.async.AsyncMethodCallback<TGetTablesResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetTables_call method_call = new GetTables_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -969,6 +1019,7 @@ public GetTables_call(TGetTablesReq req, org.apache.thrift.async.AsyncMethodCall
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetTables", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetTables_args args = new GetTables_args();
@@ -977,6 +1028,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetTablesResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -987,6 +1039,7 @@ public TGetTablesResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetTableTypes(TGetTableTypesReq req, org.apache.thrift.async.AsyncMethodCallback<TGetTableTypesResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetTableTypes_call method_call = new GetTableTypes_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1001,6 +1054,7 @@ public GetTableTypes_call(TGetTableTypesReq req, org.apache.thrift.async.AsyncMe
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetTableTypes", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetTableTypes_args args = new GetTableTypes_args();
@@ -1009,6 +1063,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetTableTypesResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1019,6 +1074,7 @@ public TGetTableTypesResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetColumns(TGetColumnsReq req, org.apache.thrift.async.AsyncMethodCallback<TGetColumnsResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetColumns_call method_call = new GetColumns_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1033,6 +1089,7 @@ public GetColumns_call(TGetColumnsReq req, org.apache.thrift.async.AsyncMethodCa
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetColumns", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetColumns_args args = new GetColumns_args();
@@ -1041,6 +1098,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetColumnsResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1051,6 +1109,7 @@ public TGetColumnsResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetFunctions(TGetFunctionsReq req, org.apache.thrift.async.AsyncMethodCallback<TGetFunctionsResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetFunctions_call method_call = new GetFunctions_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1065,6 +1124,7 @@ public GetFunctions_call(TGetFunctionsReq req, org.apache.thrift.async.AsyncMeth
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetFunctions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetFunctions_args args = new GetFunctions_args();
@@ -1073,6 +1133,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetFunctionsResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1083,6 +1144,7 @@ public TGetFunctionsResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetPrimaryKeys(TGetPrimaryKeysReq req, org.apache.thrift.async.AsyncMethodCallback<TGetPrimaryKeysResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetPrimaryKeys_call method_call = new GetPrimaryKeys_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1097,6 +1159,7 @@ public GetPrimaryKeys_call(TGetPrimaryKeysReq req, org.apache.thrift.async.Async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetPrimaryKeys", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetPrimaryKeys_args args = new GetPrimaryKeys_args();
@@ -1105,6 +1168,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetPrimaryKeysResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1115,6 +1179,7 @@ public TGetPrimaryKeysResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetCrossReference(TGetCrossReferenceReq req, org.apache.thrift.async.AsyncMethodCallback<TGetCrossReferenceResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetCrossReference_call method_call = new GetCrossReference_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1129,6 +1194,7 @@ public GetCrossReference_call(TGetCrossReferenceReq req, org.apache.thrift.async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetCrossReference", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetCrossReference_args args = new GetCrossReference_args();
@@ -1137,6 +1203,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetCrossReferenceResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1147,6 +1214,7 @@ public TGetCrossReferenceResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetOperationStatus(TGetOperationStatusReq req, org.apache.thrift.async.AsyncMethodCallback<TGetOperationStatusResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetOperationStatus_call method_call = new GetOperationStatus_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1161,6 +1229,7 @@ public GetOperationStatus_call(TGetOperationStatusReq req, org.apache.thrift.asy
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetOperationStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetOperationStatus_args args = new GetOperationStatus_args();
@@ -1169,6 +1238,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetOperationStatusResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1179,6 +1249,7 @@ public TGetOperationStatusResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void CancelOperation(TCancelOperationReq req, org.apache.thrift.async.AsyncMethodCallback<TCancelOperationResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       CancelOperation_call method_call = new CancelOperation_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1193,6 +1264,7 @@ public CancelOperation_call(TCancelOperationReq req, org.apache.thrift.async.Asy
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("CancelOperation", org.apache.thrift.protocol.TMessageType.CALL, 0));
         CancelOperation_args args = new CancelOperation_args();
@@ -1201,6 +1273,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TCancelOperationResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1211,6 +1284,7 @@ public TCancelOperationResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void CloseOperation(TCloseOperationReq req, org.apache.thrift.async.AsyncMethodCallback<TCloseOperationResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       CloseOperation_call method_call = new CloseOperation_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1225,6 +1299,7 @@ public CloseOperation_call(TCloseOperationReq req, org.apache.thrift.async.Async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("CloseOperation", org.apache.thrift.protocol.TMessageType.CALL, 0));
         CloseOperation_args args = new CloseOperation_args();
@@ -1233,6 +1308,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TCloseOperationResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1243,6 +1319,7 @@ public TCloseOperationResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetResultSetMetadata(TGetResultSetMetadataReq req, org.apache.thrift.async.AsyncMethodCallback<TGetResultSetMetadataResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetResultSetMetadata_call method_call = new GetResultSetMetadata_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1257,6 +1334,7 @@ public GetResultSetMetadata_call(TGetResultSetMetadataReq req, org.apache.thrift
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetResultSetMetadata", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetResultSetMetadata_args args = new GetResultSetMetadata_args();
@@ -1265,6 +1343,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetResultSetMetadataResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1275,6 +1354,7 @@ public TGetResultSetMetadataResp getResult() throws org.apache.thrift.TException
       }
     }
 
+    @Override
     public void FetchResults(TFetchResultsReq req, org.apache.thrift.async.AsyncMethodCallback<TFetchResultsResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       FetchResults_call method_call = new FetchResults_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1289,6 +1369,7 @@ public FetchResults_call(TFetchResultsReq req, org.apache.thrift.async.AsyncMeth
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("FetchResults", org.apache.thrift.protocol.TMessageType.CALL, 0));
         FetchResults_args args = new FetchResults_args();
@@ -1297,6 +1378,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TFetchResultsResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1307,6 +1389,7 @@ public TFetchResultsResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void GetDelegationToken(TGetDelegationTokenReq req, org.apache.thrift.async.AsyncMethodCallback<TGetDelegationTokenResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetDelegationToken_call method_call = new GetDelegationToken_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1321,6 +1404,7 @@ public GetDelegationToken_call(TGetDelegationTokenReq req, org.apache.thrift.asy
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetDelegationToken", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetDelegationToken_args args = new GetDelegationToken_args();
@@ -1329,6 +1413,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetDelegationTokenResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1339,6 +1424,7 @@ public TGetDelegationTokenResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void CancelDelegationToken(TCancelDelegationTokenReq req, org.apache.thrift.async.AsyncMethodCallback<TCancelDelegationTokenResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       CancelDelegationToken_call method_call = new CancelDelegationToken_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1353,6 +1439,7 @@ public CancelDelegationToken_call(TCancelDelegationTokenReq req, org.apache.thri
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("CancelDelegationToken", org.apache.thrift.protocol.TMessageType.CALL, 0));
         CancelDelegationToken_args args = new CancelDelegationToken_args();
@@ -1361,6 +1448,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TCancelDelegationTokenResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1371,6 +1459,7 @@ public TCancelDelegationTokenResp getResult() throws org.apache.thrift.TExceptio
       }
     }
 
+    @Override
     public void RenewDelegationToken(TRenewDelegationTokenReq req, org.apache.thrift.async.AsyncMethodCallback<TRenewDelegationTokenResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       RenewDelegationToken_call method_call = new RenewDelegationToken_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1385,6 +1474,7 @@ public RenewDelegationToken_call(TRenewDelegationTokenReq req, org.apache.thrift
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("RenewDelegationToken", org.apache.thrift.protocol.TMessageType.CALL, 0));
         RenewDelegationToken_args args = new RenewDelegationToken_args();
@@ -1393,6 +1483,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TRenewDelegationTokenResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1403,6 +1494,7 @@ public TRenewDelegationTokenResp getResult() throws org.apache.thrift.TException
       }
     }
 
+    @Override
     public void GetQueryId(TGetQueryIdReq req, org.apache.thrift.async.AsyncMethodCallback<TGetQueryIdResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       GetQueryId_call method_call = new GetQueryId_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1417,6 +1509,7 @@ public GetQueryId_call(TGetQueryIdReq req, org.apache.thrift.async.AsyncMethodCa
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetQueryId", org.apache.thrift.protocol.TMessageType.CALL, 0));
         GetQueryId_args args = new GetQueryId_args();
@@ -1425,6 +1518,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TGetQueryIdResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1435,6 +1529,7 @@ public TGetQueryIdResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void SetClientInfo(TSetClientInfoReq req, org.apache.thrift.async.AsyncMethodCallback<TSetClientInfoResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       SetClientInfo_call method_call = new SetClientInfo_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1449,6 +1544,7 @@ public SetClientInfo_call(TSetClientInfoReq req, org.apache.thrift.async.AsyncMe
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("SetClientInfo", org.apache.thrift.protocol.TMessageType.CALL, 0));
         SetClientInfo_args args = new SetClientInfo_args();
@@ -1457,6 +1553,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TSetClientInfoResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1467,6 +1564,7 @@ public TSetClientInfoResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void UploadData(TUploadDataReq req, org.apache.thrift.async.AsyncMethodCallback<TUploadDataResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       UploadData_call method_call = new UploadData_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1481,6 +1579,7 @@ public UploadData_call(TUploadDataReq req, org.apache.thrift.async.AsyncMethodCa
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("UploadData", org.apache.thrift.protocol.TMessageType.CALL, 0));
         UploadData_args args = new UploadData_args();
@@ -1489,6 +1588,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TUploadDataResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1499,6 +1599,7 @@ public TUploadDataResp getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void DownloadData(TDownloadDataReq req, org.apache.thrift.async.AsyncMethodCallback<TDownloadDataResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       DownloadData_call method_call = new DownloadData_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -1513,6 +1614,7 @@ public DownloadData_call(TDownloadDataReq req, org.apache.thrift.async.AsyncMeth
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("DownloadData", org.apache.thrift.protocol.TMessageType.CALL, 0));
         DownloadData_args args = new DownloadData_args();
@@ -1521,6 +1623,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TDownloadDataResp getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -1536,14 +1639,14 @@ public TDownloadDataResp getResult() throws org.apache.thrift.TException {
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
       processMap.put("OpenSession", new OpenSession());
       processMap.put("CloseSession", new CloseSession());
       processMap.put("GetInfo", new GetInfo());
@@ -1572,16 +1675,18 @@ protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.P
       return processMap;
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class OpenSession<I extends Iface> extends org.apache.thrift.ProcessFunction<I, OpenSession_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class OpenSession<I extends Iface> extends org.apache.thrift.ProcessFunction<I, OpenSession_args, OpenSession_result> {
       public OpenSession() {
         super("OpenSession");
       }
 
+      @Override
       public OpenSession_args getEmptyArgsInstance() {
         return new OpenSession_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1590,23 +1695,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public OpenSession_result getEmptyResultInstance() {
+        return new OpenSession_result();
+      }
+
+      @Override
       public OpenSession_result getResult(I iface, OpenSession_args args) throws org.apache.thrift.TException {
-        OpenSession_result result = new OpenSession_result();
+        OpenSession_result result = getEmptyResultInstance();
         result.success = iface.OpenSession(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseSession<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CloseSession_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseSession<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CloseSession_args, CloseSession_result> {
       public CloseSession() {
         super("CloseSession");
       }
 
+      @Override
       public CloseSession_args getEmptyArgsInstance() {
         return new CloseSession_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1615,23 +1728,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public CloseSession_result getEmptyResultInstance() {
+        return new CloseSession_result();
+      }
+
+      @Override
       public CloseSession_result getResult(I iface, CloseSession_args args) throws org.apache.thrift.TException {
-        CloseSession_result result = new CloseSession_result();
+        CloseSession_result result = getEmptyResultInstance();
         result.success = iface.CloseSession(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetInfo_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetInfo_args, GetInfo_result> {
       public GetInfo() {
         super("GetInfo");
       }
 
+      @Override
       public GetInfo_args getEmptyArgsInstance() {
         return new GetInfo_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1640,23 +1761,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetInfo_result getEmptyResultInstance() {
+        return new GetInfo_result();
+      }
+
+      @Override
       public GetInfo_result getResult(I iface, GetInfo_args args) throws org.apache.thrift.TException {
-        GetInfo_result result = new GetInfo_result();
+        GetInfo_result result = getEmptyResultInstance();
         result.success = iface.GetInfo(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class ExecuteStatement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, ExecuteStatement_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class ExecuteStatement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, ExecuteStatement_args, ExecuteStatement_result> {
       public ExecuteStatement() {
         super("ExecuteStatement");
       }
 
+      @Override
       public ExecuteStatement_args getEmptyArgsInstance() {
         return new ExecuteStatement_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1665,23 +1794,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public ExecuteStatement_result getEmptyResultInstance() {
+        return new ExecuteStatement_result();
+      }
+
+      @Override
       public ExecuteStatement_result getResult(I iface, ExecuteStatement_args args) throws org.apache.thrift.TException {
-        ExecuteStatement_result result = new ExecuteStatement_result();
+        ExecuteStatement_result result = getEmptyResultInstance();
         result.success = iface.ExecuteStatement(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTypeInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetTypeInfo_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTypeInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetTypeInfo_args, GetTypeInfo_result> {
       public GetTypeInfo() {
         super("GetTypeInfo");
       }
 
+      @Override
       public GetTypeInfo_args getEmptyArgsInstance() {
         return new GetTypeInfo_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1690,23 +1827,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetTypeInfo_result getEmptyResultInstance() {
+        return new GetTypeInfo_result();
+      }
+
+      @Override
       public GetTypeInfo_result getResult(I iface, GetTypeInfo_args args) throws org.apache.thrift.TException {
-        GetTypeInfo_result result = new GetTypeInfo_result();
+        GetTypeInfo_result result = getEmptyResultInstance();
         result.success = iface.GetTypeInfo(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCatalogs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetCatalogs_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCatalogs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetCatalogs_args, GetCatalogs_result> {
       public GetCatalogs() {
         super("GetCatalogs");
       }
 
+      @Override
       public GetCatalogs_args getEmptyArgsInstance() {
         return new GetCatalogs_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1715,23 +1860,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetCatalogs_result getEmptyResultInstance() {
+        return new GetCatalogs_result();
+      }
+
+      @Override
       public GetCatalogs_result getResult(I iface, GetCatalogs_args args) throws org.apache.thrift.TException {
-        GetCatalogs_result result = new GetCatalogs_result();
+        GetCatalogs_result result = getEmptyResultInstance();
         result.success = iface.GetCatalogs(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetSchemas<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetSchemas_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetSchemas<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetSchemas_args, GetSchemas_result> {
       public GetSchemas() {
         super("GetSchemas");
       }
 
+      @Override
       public GetSchemas_args getEmptyArgsInstance() {
         return new GetSchemas_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1740,23 +1893,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetSchemas_result getEmptyResultInstance() {
+        return new GetSchemas_result();
+      }
+
+      @Override
       public GetSchemas_result getResult(I iface, GetSchemas_args args) throws org.apache.thrift.TException {
-        GetSchemas_result result = new GetSchemas_result();
+        GetSchemas_result result = getEmptyResultInstance();
         result.success = iface.GetSchemas(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTables<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetTables_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTables<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetTables_args, GetTables_result> {
       public GetTables() {
         super("GetTables");
       }
 
+      @Override
       public GetTables_args getEmptyArgsInstance() {
         return new GetTables_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1765,23 +1926,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetTables_result getEmptyResultInstance() {
+        return new GetTables_result();
+      }
+
+      @Override
       public GetTables_result getResult(I iface, GetTables_args args) throws org.apache.thrift.TException {
-        GetTables_result result = new GetTables_result();
+        GetTables_result result = getEmptyResultInstance();
         result.success = iface.GetTables(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTableTypes<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetTableTypes_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTableTypes<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetTableTypes_args, GetTableTypes_result> {
       public GetTableTypes() {
         super("GetTableTypes");
       }
 
+      @Override
       public GetTableTypes_args getEmptyArgsInstance() {
         return new GetTableTypes_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1790,23 +1959,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetTableTypes_result getEmptyResultInstance() {
+        return new GetTableTypes_result();
+      }
+
+      @Override
       public GetTableTypes_result getResult(I iface, GetTableTypes_args args) throws org.apache.thrift.TException {
-        GetTableTypes_result result = new GetTableTypes_result();
+        GetTableTypes_result result = getEmptyResultInstance();
         result.success = iface.GetTableTypes(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetColumns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetColumns_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetColumns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetColumns_args, GetColumns_result> {
       public GetColumns() {
         super("GetColumns");
       }
 
+      @Override
       public GetColumns_args getEmptyArgsInstance() {
         return new GetColumns_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1815,23 +1992,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetColumns_result getEmptyResultInstance() {
+        return new GetColumns_result();
+      }
+
+      @Override
       public GetColumns_result getResult(I iface, GetColumns_args args) throws org.apache.thrift.TException {
-        GetColumns_result result = new GetColumns_result();
+        GetColumns_result result = getEmptyResultInstance();
         result.success = iface.GetColumns(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetFunctions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetFunctions_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetFunctions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetFunctions_args, GetFunctions_result> {
       public GetFunctions() {
         super("GetFunctions");
       }
 
+      @Override
       public GetFunctions_args getEmptyArgsInstance() {
         return new GetFunctions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1840,23 +2025,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetFunctions_result getEmptyResultInstance() {
+        return new GetFunctions_result();
+      }
+
+      @Override
       public GetFunctions_result getResult(I iface, GetFunctions_args args) throws org.apache.thrift.TException {
-        GetFunctions_result result = new GetFunctions_result();
+        GetFunctions_result result = getEmptyResultInstance();
         result.success = iface.GetFunctions(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetPrimaryKeys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetPrimaryKeys_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetPrimaryKeys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetPrimaryKeys_args, GetPrimaryKeys_result> {
       public GetPrimaryKeys() {
         super("GetPrimaryKeys");
       }
 
+      @Override
       public GetPrimaryKeys_args getEmptyArgsInstance() {
         return new GetPrimaryKeys_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1865,23 +2058,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetPrimaryKeys_result getEmptyResultInstance() {
+        return new GetPrimaryKeys_result();
+      }
+
+      @Override
       public GetPrimaryKeys_result getResult(I iface, GetPrimaryKeys_args args) throws org.apache.thrift.TException {
-        GetPrimaryKeys_result result = new GetPrimaryKeys_result();
+        GetPrimaryKeys_result result = getEmptyResultInstance();
         result.success = iface.GetPrimaryKeys(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCrossReference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetCrossReference_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCrossReference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetCrossReference_args, GetCrossReference_result> {
       public GetCrossReference() {
         super("GetCrossReference");
       }
 
+      @Override
       public GetCrossReference_args getEmptyArgsInstance() {
         return new GetCrossReference_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1890,23 +2091,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetCrossReference_result getEmptyResultInstance() {
+        return new GetCrossReference_result();
+      }
+
+      @Override
       public GetCrossReference_result getResult(I iface, GetCrossReference_args args) throws org.apache.thrift.TException {
-        GetCrossReference_result result = new GetCrossReference_result();
+        GetCrossReference_result result = getEmptyResultInstance();
         result.success = iface.GetCrossReference(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetOperationStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetOperationStatus_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetOperationStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetOperationStatus_args, GetOperationStatus_result> {
       public GetOperationStatus() {
         super("GetOperationStatus");
       }
 
+      @Override
       public GetOperationStatus_args getEmptyArgsInstance() {
         return new GetOperationStatus_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1915,23 +2124,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetOperationStatus_result getEmptyResultInstance() {
+        return new GetOperationStatus_result();
+      }
+
+      @Override
       public GetOperationStatus_result getResult(I iface, GetOperationStatus_args args) throws org.apache.thrift.TException {
-        GetOperationStatus_result result = new GetOperationStatus_result();
+        GetOperationStatus_result result = getEmptyResultInstance();
         result.success = iface.GetOperationStatus(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelOperation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CancelOperation_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelOperation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CancelOperation_args, CancelOperation_result> {
       public CancelOperation() {
         super("CancelOperation");
       }
 
+      @Override
       public CancelOperation_args getEmptyArgsInstance() {
         return new CancelOperation_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1940,23 +2157,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public CancelOperation_result getEmptyResultInstance() {
+        return new CancelOperation_result();
+      }
+
+      @Override
       public CancelOperation_result getResult(I iface, CancelOperation_args args) throws org.apache.thrift.TException {
-        CancelOperation_result result = new CancelOperation_result();
+        CancelOperation_result result = getEmptyResultInstance();
         result.success = iface.CancelOperation(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseOperation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CloseOperation_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseOperation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CloseOperation_args, CloseOperation_result> {
       public CloseOperation() {
         super("CloseOperation");
       }
 
+      @Override
       public CloseOperation_args getEmptyArgsInstance() {
         return new CloseOperation_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1965,23 +2190,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public CloseOperation_result getEmptyResultInstance() {
+        return new CloseOperation_result();
+      }
+
+      @Override
       public CloseOperation_result getResult(I iface, CloseOperation_args args) throws org.apache.thrift.TException {
-        CloseOperation_result result = new CloseOperation_result();
+        CloseOperation_result result = getEmptyResultInstance();
         result.success = iface.CloseOperation(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetResultSetMetadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetResultSetMetadata_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetResultSetMetadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetResultSetMetadata_args, GetResultSetMetadata_result> {
       public GetResultSetMetadata() {
         super("GetResultSetMetadata");
       }
 
+      @Override
       public GetResultSetMetadata_args getEmptyArgsInstance() {
         return new GetResultSetMetadata_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -1990,23 +2223,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetResultSetMetadata_result getEmptyResultInstance() {
+        return new GetResultSetMetadata_result();
+      }
+
+      @Override
       public GetResultSetMetadata_result getResult(I iface, GetResultSetMetadata_args args) throws org.apache.thrift.TException {
-        GetResultSetMetadata_result result = new GetResultSetMetadata_result();
+        GetResultSetMetadata_result result = getEmptyResultInstance();
         result.success = iface.GetResultSetMetadata(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class FetchResults<I extends Iface> extends org.apache.thrift.ProcessFunction<I, FetchResults_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class FetchResults<I extends Iface> extends org.apache.thrift.ProcessFunction<I, FetchResults_args, FetchResults_result> {
       public FetchResults() {
         super("FetchResults");
       }
 
+      @Override
       public FetchResults_args getEmptyArgsInstance() {
         return new FetchResults_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2015,23 +2256,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public FetchResults_result getEmptyResultInstance() {
+        return new FetchResults_result();
+      }
+
+      @Override
       public FetchResults_result getResult(I iface, FetchResults_args args) throws org.apache.thrift.TException {
-        FetchResults_result result = new FetchResults_result();
+        FetchResults_result result = getEmptyResultInstance();
         result.success = iface.FetchResults(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetDelegationToken<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetDelegationToken_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetDelegationToken<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetDelegationToken_args, GetDelegationToken_result> {
       public GetDelegationToken() {
         super("GetDelegationToken");
       }
 
+      @Override
       public GetDelegationToken_args getEmptyArgsInstance() {
         return new GetDelegationToken_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2040,23 +2289,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetDelegationToken_result getEmptyResultInstance() {
+        return new GetDelegationToken_result();
+      }
+
+      @Override
       public GetDelegationToken_result getResult(I iface, GetDelegationToken_args args) throws org.apache.thrift.TException {
-        GetDelegationToken_result result = new GetDelegationToken_result();
+        GetDelegationToken_result result = getEmptyResultInstance();
         result.success = iface.GetDelegationToken(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelDelegationToken<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CancelDelegationToken_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelDelegationToken<I extends Iface> extends org.apache.thrift.ProcessFunction<I, CancelDelegationToken_args, CancelDelegationToken_result> {
       public CancelDelegationToken() {
         super("CancelDelegationToken");
       }
 
+      @Override
       public CancelDelegationToken_args getEmptyArgsInstance() {
         return new CancelDelegationToken_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2065,23 +2322,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public CancelDelegationToken_result getEmptyResultInstance() {
+        return new CancelDelegationToken_result();
+      }
+
+      @Override
       public CancelDelegationToken_result getResult(I iface, CancelDelegationToken_args args) throws org.apache.thrift.TException {
-        CancelDelegationToken_result result = new CancelDelegationToken_result();
+        CancelDelegationToken_result result = getEmptyResultInstance();
         result.success = iface.CancelDelegationToken(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class RenewDelegationToken<I extends Iface> extends org.apache.thrift.ProcessFunction<I, RenewDelegationToken_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class RenewDelegationToken<I extends Iface> extends org.apache.thrift.ProcessFunction<I, RenewDelegationToken_args, RenewDelegationToken_result> {
       public RenewDelegationToken() {
         super("RenewDelegationToken");
       }
 
+      @Override
       public RenewDelegationToken_args getEmptyArgsInstance() {
         return new RenewDelegationToken_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2090,23 +2355,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public RenewDelegationToken_result getEmptyResultInstance() {
+        return new RenewDelegationToken_result();
+      }
+
+      @Override
       public RenewDelegationToken_result getResult(I iface, RenewDelegationToken_args args) throws org.apache.thrift.TException {
-        RenewDelegationToken_result result = new RenewDelegationToken_result();
+        RenewDelegationToken_result result = getEmptyResultInstance();
         result.success = iface.RenewDelegationToken(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetQueryId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetQueryId_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetQueryId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetQueryId_args, GetQueryId_result> {
       public GetQueryId() {
         super("GetQueryId");
       }
 
+      @Override
       public GetQueryId_args getEmptyArgsInstance() {
         return new GetQueryId_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2115,23 +2388,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public GetQueryId_result getEmptyResultInstance() {
+        return new GetQueryId_result();
+      }
+
+      @Override
       public GetQueryId_result getResult(I iface, GetQueryId_args args) throws org.apache.thrift.TException {
-        GetQueryId_result result = new GetQueryId_result();
+        GetQueryId_result result = getEmptyResultInstance();
         result.success = iface.GetQueryId(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class SetClientInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, SetClientInfo_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class SetClientInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, SetClientInfo_args, SetClientInfo_result> {
       public SetClientInfo() {
         super("SetClientInfo");
       }
 
+      @Override
       public SetClientInfo_args getEmptyArgsInstance() {
         return new SetClientInfo_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2140,23 +2421,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public SetClientInfo_result getEmptyResultInstance() {
+        return new SetClientInfo_result();
+      }
+
+      @Override
       public SetClientInfo_result getResult(I iface, SetClientInfo_args args) throws org.apache.thrift.TException {
-        SetClientInfo_result result = new SetClientInfo_result();
+        SetClientInfo_result result = getEmptyResultInstance();
         result.success = iface.SetClientInfo(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class UploadData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, UploadData_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class UploadData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, UploadData_args, UploadData_result> {
       public UploadData() {
         super("UploadData");
       }
 
+      @Override
       public UploadData_args getEmptyArgsInstance() {
         return new UploadData_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2165,23 +2454,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public UploadData_result getEmptyResultInstance() {
+        return new UploadData_result();
+      }
+
+      @Override
       public UploadData_result getResult(I iface, UploadData_args args) throws org.apache.thrift.TException {
-        UploadData_result result = new UploadData_result();
+        UploadData_result result = getEmptyResultInstance();
         result.success = iface.UploadData(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class DownloadData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, DownloadData_args> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class DownloadData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, DownloadData_args, DownloadData_result> {
       public DownloadData() {
         super("DownloadData");
       }
 
+      @Override
       public DownloadData_args getEmptyArgsInstance() {
         return new DownloadData_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -2190,8 +2487,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public DownloadData_result getEmptyResultInstance() {
+        return new DownloadData_result();
+      }
+
+      @Override
       public DownloadData_result getResult(I iface, DownloadData_args args) throws org.apache.thrift.TException {
-        DownloadData_result result = new DownloadData_result();
+        DownloadData_result result = getEmptyResultInstance();
         result.success = iface.DownloadData(args.req);
         return result;
       }
@@ -2202,14 +2505,14 @@ public DownloadData_result getResult(I iface, DownloadData_args args) throws org
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>>()));
     }
 
-    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
       processMap.put("OpenSession", new OpenSession());
       processMap.put("CloseSession", new CloseSession());
       processMap.put("GetInfo", new GetInfo());
@@ -2238,18 +2541,26 @@ protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.th
       return processMap;
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class OpenSession<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, OpenSession_args, TOpenSessionResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class OpenSession<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, OpenSession_args, TOpenSessionResp, OpenSession_result> {
       public OpenSession() {
         super("OpenSession");
       }
 
+      @Override
+      public OpenSession_result getEmptyResultInstance() {
+        return new OpenSession_result();
+      }
+
+      @Override
       public OpenSession_args getEmptyArgsInstance() {
         return new OpenSession_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TOpenSessionResp> 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<TOpenSessionResp>() { 
+          @Override
           public void onComplete(TOpenSessionResp o) {
             OpenSession_result result = new OpenSession_result();
             result.success = o;
@@ -2263,6 +2574,7 @@ public void onComplete(TOpenSessionResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2290,27 +2602,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, OpenSession_args args, org.apache.thrift.async.AsyncMethodCallback<TOpenSessionResp> resultHandler) throws org.apache.thrift.TException {
         iface.OpenSession(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseSession<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CloseSession_args, TCloseSessionResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseSession<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CloseSession_args, TCloseSessionResp, CloseSession_result> {
       public CloseSession() {
         super("CloseSession");
       }
 
+      @Override
+      public CloseSession_result getEmptyResultInstance() {
+        return new CloseSession_result();
+      }
+
+      @Override
       public CloseSession_args getEmptyArgsInstance() {
         return new CloseSession_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TCloseSessionResp> 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<TCloseSessionResp>() { 
+          @Override
           public void onComplete(TCloseSessionResp o) {
             CloseSession_result result = new CloseSession_result();
             result.success = o;
@@ -2324,6 +2646,7 @@ public void onComplete(TCloseSessionResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2351,27 +2674,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, CloseSession_args args, org.apache.thrift.async.AsyncMethodCallback<TCloseSessionResp> resultHandler) throws org.apache.thrift.TException {
         iface.CloseSession(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetInfo<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetInfo_args, TGetInfoResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetInfo<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetInfo_args, TGetInfoResp, GetInfo_result> {
       public GetInfo() {
         super("GetInfo");
       }
 
+      @Override
+      public GetInfo_result getEmptyResultInstance() {
+        return new GetInfo_result();
+      }
+
+      @Override
       public GetInfo_args getEmptyArgsInstance() {
         return new GetInfo_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetInfoResp> 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<TGetInfoResp>() { 
+          @Override
           public void onComplete(TGetInfoResp o) {
             GetInfo_result result = new GetInfo_result();
             result.success = o;
@@ -2385,6 +2718,7 @@ public void onComplete(TGetInfoResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2412,27 +2746,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetInfo_args args, org.apache.thrift.async.AsyncMethodCallback<TGetInfoResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetInfo(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class ExecuteStatement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, ExecuteStatement_args, TExecuteStatementResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class ExecuteStatement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, ExecuteStatement_args, TExecuteStatementResp, ExecuteStatement_result> {
       public ExecuteStatement() {
         super("ExecuteStatement");
       }
 
+      @Override
+      public ExecuteStatement_result getEmptyResultInstance() {
+        return new ExecuteStatement_result();
+      }
+
+      @Override
       public ExecuteStatement_args getEmptyArgsInstance() {
         return new ExecuteStatement_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TExecuteStatementResp> 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<TExecuteStatementResp>() { 
+          @Override
           public void onComplete(TExecuteStatementResp o) {
             ExecuteStatement_result result = new ExecuteStatement_result();
             result.success = o;
@@ -2446,6 +2790,7 @@ public void onComplete(TExecuteStatementResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2473,27 +2818,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, ExecuteStatement_args args, org.apache.thrift.async.AsyncMethodCallback<TExecuteStatementResp> resultHandler) throws org.apache.thrift.TException {
         iface.ExecuteStatement(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTypeInfo<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetTypeInfo_args, TGetTypeInfoResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTypeInfo<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetTypeInfo_args, TGetTypeInfoResp, GetTypeInfo_result> {
       public GetTypeInfo() {
         super("GetTypeInfo");
       }
 
+      @Override
+      public GetTypeInfo_result getEmptyResultInstance() {
+        return new GetTypeInfo_result();
+      }
+
+      @Override
       public GetTypeInfo_args getEmptyArgsInstance() {
         return new GetTypeInfo_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetTypeInfoResp> 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<TGetTypeInfoResp>() { 
+          @Override
           public void onComplete(TGetTypeInfoResp o) {
             GetTypeInfo_result result = new GetTypeInfo_result();
             result.success = o;
@@ -2507,6 +2862,7 @@ public void onComplete(TGetTypeInfoResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2534,27 +2890,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetTypeInfo_args args, org.apache.thrift.async.AsyncMethodCallback<TGetTypeInfoResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetTypeInfo(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCatalogs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetCatalogs_args, TGetCatalogsResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCatalogs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetCatalogs_args, TGetCatalogsResp, GetCatalogs_result> {
       public GetCatalogs() {
         super("GetCatalogs");
       }
 
+      @Override
+      public GetCatalogs_result getEmptyResultInstance() {
+        return new GetCatalogs_result();
+      }
+
+      @Override
       public GetCatalogs_args getEmptyArgsInstance() {
         return new GetCatalogs_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetCatalogsResp> 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<TGetCatalogsResp>() { 
+          @Override
           public void onComplete(TGetCatalogsResp o) {
             GetCatalogs_result result = new GetCatalogs_result();
             result.success = o;
@@ -2568,6 +2934,7 @@ public void onComplete(TGetCatalogsResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2595,27 +2962,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetCatalogs_args args, org.apache.thrift.async.AsyncMethodCallback<TGetCatalogsResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetCatalogs(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetSchemas<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetSchemas_args, TGetSchemasResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetSchemas<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetSchemas_args, TGetSchemasResp, GetSchemas_result> {
       public GetSchemas() {
         super("GetSchemas");
       }
 
+      @Override
+      public GetSchemas_result getEmptyResultInstance() {
+        return new GetSchemas_result();
+      }
+
+      @Override
       public GetSchemas_args getEmptyArgsInstance() {
         return new GetSchemas_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetSchemasResp> 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<TGetSchemasResp>() { 
+          @Override
           public void onComplete(TGetSchemasResp o) {
             GetSchemas_result result = new GetSchemas_result();
             result.success = o;
@@ -2629,6 +3006,7 @@ public void onComplete(TGetSchemasResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2656,27 +3034,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetSchemas_args args, org.apache.thrift.async.AsyncMethodCallback<TGetSchemasResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetSchemas(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTables<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetTables_args, TGetTablesResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTables<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetTables_args, TGetTablesResp, GetTables_result> {
       public GetTables() {
         super("GetTables");
       }
 
+      @Override
+      public GetTables_result getEmptyResultInstance() {
+        return new GetTables_result();
+      }
+
+      @Override
       public GetTables_args getEmptyArgsInstance() {
         return new GetTables_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetTablesResp> 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<TGetTablesResp>() { 
+          @Override
           public void onComplete(TGetTablesResp o) {
             GetTables_result result = new GetTables_result();
             result.success = o;
@@ -2690,6 +3078,7 @@ public void onComplete(TGetTablesResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2717,27 +3106,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetTables_args args, org.apache.thrift.async.AsyncMethodCallback<TGetTablesResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetTables(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTableTypes<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetTableTypes_args, TGetTableTypesResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTableTypes<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetTableTypes_args, TGetTableTypesResp, GetTableTypes_result> {
       public GetTableTypes() {
         super("GetTableTypes");
       }
 
+      @Override
+      public GetTableTypes_result getEmptyResultInstance() {
+        return new GetTableTypes_result();
+      }
+
+      @Override
       public GetTableTypes_args getEmptyArgsInstance() {
         return new GetTableTypes_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetTableTypesResp> 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<TGetTableTypesResp>() { 
+          @Override
           public void onComplete(TGetTableTypesResp o) {
             GetTableTypes_result result = new GetTableTypes_result();
             result.success = o;
@@ -2751,6 +3150,7 @@ public void onComplete(TGetTableTypesResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2778,27 +3178,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetTableTypes_args args, org.apache.thrift.async.AsyncMethodCallback<TGetTableTypesResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetTableTypes(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetColumns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetColumns_args, TGetColumnsResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetColumns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetColumns_args, TGetColumnsResp, GetColumns_result> {
       public GetColumns() {
         super("GetColumns");
       }
 
+      @Override
+      public GetColumns_result getEmptyResultInstance() {
+        return new GetColumns_result();
+      }
+
+      @Override
       public GetColumns_args getEmptyArgsInstance() {
         return new GetColumns_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetColumnsResp> 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<TGetColumnsResp>() { 
+          @Override
           public void onComplete(TGetColumnsResp o) {
             GetColumns_result result = new GetColumns_result();
             result.success = o;
@@ -2812,6 +3222,7 @@ public void onComplete(TGetColumnsResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2839,27 +3250,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetColumns_args args, org.apache.thrift.async.AsyncMethodCallback<TGetColumnsResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetColumns(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetFunctions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetFunctions_args, TGetFunctionsResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetFunctions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetFunctions_args, TGetFunctionsResp, GetFunctions_result> {
       public GetFunctions() {
         super("GetFunctions");
       }
 
+      @Override
+      public GetFunctions_result getEmptyResultInstance() {
+        return new GetFunctions_result();
+      }
+
+      @Override
       public GetFunctions_args getEmptyArgsInstance() {
         return new GetFunctions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetFunctionsResp> 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<TGetFunctionsResp>() { 
+          @Override
           public void onComplete(TGetFunctionsResp o) {
             GetFunctions_result result = new GetFunctions_result();
             result.success = o;
@@ -2873,6 +3294,7 @@ public void onComplete(TGetFunctionsResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2900,27 +3322,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetFunctions_args args, org.apache.thrift.async.AsyncMethodCallback<TGetFunctionsResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetFunctions(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetPrimaryKeys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetPrimaryKeys_args, TGetPrimaryKeysResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetPrimaryKeys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetPrimaryKeys_args, TGetPrimaryKeysResp, GetPrimaryKeys_result> {
       public GetPrimaryKeys() {
         super("GetPrimaryKeys");
       }
 
+      @Override
+      public GetPrimaryKeys_result getEmptyResultInstance() {
+        return new GetPrimaryKeys_result();
+      }
+
+      @Override
       public GetPrimaryKeys_args getEmptyArgsInstance() {
         return new GetPrimaryKeys_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetPrimaryKeysResp> 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<TGetPrimaryKeysResp>() { 
+          @Override
           public void onComplete(TGetPrimaryKeysResp o) {
             GetPrimaryKeys_result result = new GetPrimaryKeys_result();
             result.success = o;
@@ -2934,6 +3366,7 @@ public void onComplete(TGetPrimaryKeysResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -2961,27 +3394,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetPrimaryKeys_args args, org.apache.thrift.async.AsyncMethodCallback<TGetPrimaryKeysResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetPrimaryKeys(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCrossReference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetCrossReference_args, TGetCrossReferenceResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCrossReference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetCrossReference_args, TGetCrossReferenceResp, GetCrossReference_result> {
       public GetCrossReference() {
         super("GetCrossReference");
       }
 
+      @Override
+      public GetCrossReference_result getEmptyResultInstance() {
+        return new GetCrossReference_result();
+      }
+
+      @Override
       public GetCrossReference_args getEmptyArgsInstance() {
         return new GetCrossReference_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetCrossReferenceResp> 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<TGetCrossReferenceResp>() { 
+          @Override
           public void onComplete(TGetCrossReferenceResp o) {
             GetCrossReference_result result = new GetCrossReference_result();
             result.success = o;
@@ -2995,6 +3438,7 @@ public void onComplete(TGetCrossReferenceResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3022,27 +3466,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetCrossReference_args args, org.apache.thrift.async.AsyncMethodCallback<TGetCrossReferenceResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetCrossReference(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetOperationStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetOperationStatus_args, TGetOperationStatusResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetOperationStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetOperationStatus_args, TGetOperationStatusResp, GetOperationStatus_result> {
       public GetOperationStatus() {
         super("GetOperationStatus");
       }
 
+      @Override
+      public GetOperationStatus_result getEmptyResultInstance() {
+        return new GetOperationStatus_result();
+      }
+
+      @Override
       public GetOperationStatus_args getEmptyArgsInstance() {
         return new GetOperationStatus_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetOperationStatusResp> 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<TGetOperationStatusResp>() { 
+          @Override
           public void onComplete(TGetOperationStatusResp o) {
             GetOperationStatus_result result = new GetOperationStatus_result();
             result.success = o;
@@ -3056,6 +3510,7 @@ public void onComplete(TGetOperationStatusResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3083,27 +3538,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetOperationStatus_args args, org.apache.thrift.async.AsyncMethodCallback<TGetOperationStatusResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetOperationStatus(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelOperation<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CancelOperation_args, TCancelOperationResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelOperation<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CancelOperation_args, TCancelOperationResp, CancelOperation_result> {
       public CancelOperation() {
         super("CancelOperation");
       }
 
+      @Override
+      public CancelOperation_result getEmptyResultInstance() {
+        return new CancelOperation_result();
+      }
+
+      @Override
       public CancelOperation_args getEmptyArgsInstance() {
         return new CancelOperation_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TCancelOperationResp> 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<TCancelOperationResp>() { 
+          @Override
           public void onComplete(TCancelOperationResp o) {
             CancelOperation_result result = new CancelOperation_result();
             result.success = o;
@@ -3117,6 +3582,7 @@ public void onComplete(TCancelOperationResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3144,27 +3610,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, CancelOperation_args args, org.apache.thrift.async.AsyncMethodCallback<TCancelOperationResp> resultHandler) throws org.apache.thrift.TException {
         iface.CancelOperation(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseOperation<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CloseOperation_args, TCloseOperationResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseOperation<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CloseOperation_args, TCloseOperationResp, CloseOperation_result> {
       public CloseOperation() {
         super("CloseOperation");
       }
 
+      @Override
+      public CloseOperation_result getEmptyResultInstance() {
+        return new CloseOperation_result();
+      }
+
+      @Override
       public CloseOperation_args getEmptyArgsInstance() {
         return new CloseOperation_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TCloseOperationResp> 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<TCloseOperationResp>() { 
+          @Override
           public void onComplete(TCloseOperationResp o) {
             CloseOperation_result result = new CloseOperation_result();
             result.success = o;
@@ -3178,6 +3654,7 @@ public void onComplete(TCloseOperationResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3205,27 +3682,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, CloseOperation_args args, org.apache.thrift.async.AsyncMethodCallback<TCloseOperationResp> resultHandler) throws org.apache.thrift.TException {
         iface.CloseOperation(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetResultSetMetadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetResultSetMetadata_args, TGetResultSetMetadataResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetResultSetMetadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetResultSetMetadata_args, TGetResultSetMetadataResp, GetResultSetMetadata_result> {
       public GetResultSetMetadata() {
         super("GetResultSetMetadata");
       }
 
+      @Override
+      public GetResultSetMetadata_result getEmptyResultInstance() {
+        return new GetResultSetMetadata_result();
+      }
+
+      @Override
       public GetResultSetMetadata_args getEmptyArgsInstance() {
         return new GetResultSetMetadata_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetResultSetMetadataResp> 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<TGetResultSetMetadataResp>() { 
+          @Override
           public void onComplete(TGetResultSetMetadataResp o) {
             GetResultSetMetadata_result result = new GetResultSetMetadata_result();
             result.success = o;
@@ -3239,6 +3726,7 @@ public void onComplete(TGetResultSetMetadataResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3266,27 +3754,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetResultSetMetadata_args args, org.apache.thrift.async.AsyncMethodCallback<TGetResultSetMetadataResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetResultSetMetadata(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class FetchResults<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, FetchResults_args, TFetchResultsResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class FetchResults<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, FetchResults_args, TFetchResultsResp, FetchResults_result> {
       public FetchResults() {
         super("FetchResults");
       }
 
+      @Override
+      public FetchResults_result getEmptyResultInstance() {
+        return new FetchResults_result();
+      }
+
+      @Override
       public FetchResults_args getEmptyArgsInstance() {
         return new FetchResults_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TFetchResultsResp> 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<TFetchResultsResp>() { 
+          @Override
           public void onComplete(TFetchResultsResp o) {
             FetchResults_result result = new FetchResults_result();
             result.success = o;
@@ -3300,6 +3798,7 @@ public void onComplete(TFetchResultsResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3327,27 +3826,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, FetchResults_args args, org.apache.thrift.async.AsyncMethodCallback<TFetchResultsResp> resultHandler) throws org.apache.thrift.TException {
         iface.FetchResults(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetDelegationToken_args, TGetDelegationTokenResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetDelegationToken_args, TGetDelegationTokenResp, GetDelegationToken_result> {
       public GetDelegationToken() {
         super("GetDelegationToken");
       }
 
+      @Override
+      public GetDelegationToken_result getEmptyResultInstance() {
+        return new GetDelegationToken_result();
+      }
+
+      @Override
       public GetDelegationToken_args getEmptyArgsInstance() {
         return new GetDelegationToken_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetDelegationTokenResp> 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<TGetDelegationTokenResp>() { 
+          @Override
           public void onComplete(TGetDelegationTokenResp o) {
             GetDelegationToken_result result = new GetDelegationToken_result();
             result.success = o;
@@ -3361,6 +3870,7 @@ public void onComplete(TGetDelegationTokenResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3388,27 +3898,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback<TGetDelegationTokenResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetDelegationToken(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CancelDelegationToken_args, TCancelDelegationTokenResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, CancelDelegationToken_args, TCancelDelegationTokenResp, CancelDelegationToken_result> {
       public CancelDelegationToken() {
         super("CancelDelegationToken");
       }
 
+      @Override
+      public CancelDelegationToken_result getEmptyResultInstance() {
+        return new CancelDelegationToken_result();
+      }
+
+      @Override
       public CancelDelegationToken_args getEmptyArgsInstance() {
         return new CancelDelegationToken_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TCancelDelegationTokenResp> 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<TCancelDelegationTokenResp>() { 
+          @Override
           public void onComplete(TCancelDelegationTokenResp o) {
             CancelDelegationToken_result result = new CancelDelegationToken_result();
             result.success = o;
@@ -3422,6 +3942,7 @@ public void onComplete(TCancelDelegationTokenResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3449,27 +3970,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, CancelDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback<TCancelDelegationTokenResp> resultHandler) throws org.apache.thrift.TException {
         iface.CancelDelegationToken(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class RenewDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, RenewDelegationToken_args, TRenewDelegationTokenResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class RenewDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, RenewDelegationToken_args, TRenewDelegationTokenResp, RenewDelegationToken_result> {
       public RenewDelegationToken() {
         super("RenewDelegationToken");
       }
 
+      @Override
+      public RenewDelegationToken_result getEmptyResultInstance() {
+        return new RenewDelegationToken_result();
+      }
+
+      @Override
       public RenewDelegationToken_args getEmptyArgsInstance() {
         return new RenewDelegationToken_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TRenewDelegationTokenResp> 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<TRenewDelegationTokenResp>() { 
+          @Override
           public void onComplete(TRenewDelegationTokenResp o) {
             RenewDelegationToken_result result = new RenewDelegationToken_result();
             result.success = o;
@@ -3483,6 +4014,7 @@ public void onComplete(TRenewDelegationTokenResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3510,27 +4042,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, RenewDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback<TRenewDelegationTokenResp> resultHandler) throws org.apache.thrift.TException {
         iface.RenewDelegationToken(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetQueryId<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetQueryId_args, TGetQueryIdResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetQueryId<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetQueryId_args, TGetQueryIdResp, GetQueryId_result> {
       public GetQueryId() {
         super("GetQueryId");
       }
 
+      @Override
+      public GetQueryId_result getEmptyResultInstance() {
+        return new GetQueryId_result();
+      }
+
+      @Override
       public GetQueryId_args getEmptyArgsInstance() {
         return new GetQueryId_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TGetQueryIdResp> 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<TGetQueryIdResp>() { 
+          @Override
           public void onComplete(TGetQueryIdResp o) {
             GetQueryId_result result = new GetQueryId_result();
             result.success = o;
@@ -3544,6 +4086,7 @@ public void onComplete(TGetQueryIdResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3571,27 +4114,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, GetQueryId_args args, org.apache.thrift.async.AsyncMethodCallback<TGetQueryIdResp> resultHandler) throws org.apache.thrift.TException {
         iface.GetQueryId(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class SetClientInfo<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, SetClientInfo_args, TSetClientInfoResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class SetClientInfo<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, SetClientInfo_args, TSetClientInfoResp, SetClientInfo_result> {
       public SetClientInfo() {
         super("SetClientInfo");
       }
 
+      @Override
+      public SetClientInfo_result getEmptyResultInstance() {
+        return new SetClientInfo_result();
+      }
+
+      @Override
       public SetClientInfo_args getEmptyArgsInstance() {
         return new SetClientInfo_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TSetClientInfoResp> 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<TSetClientInfoResp>() { 
+          @Override
           public void onComplete(TSetClientInfoResp o) {
             SetClientInfo_result result = new SetClientInfo_result();
             result.success = o;
@@ -3605,6 +4158,7 @@ public void onComplete(TSetClientInfoResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3632,27 +4186,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, SetClientInfo_args args, org.apache.thrift.async.AsyncMethodCallback<TSetClientInfoResp> resultHandler) throws org.apache.thrift.TException {
         iface.SetClientInfo(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class UploadData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, UploadData_args, TUploadDataResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class UploadData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, UploadData_args, TUploadDataResp, UploadData_result> {
       public UploadData() {
         super("UploadData");
       }
 
+      @Override
+      public UploadData_result getEmptyResultInstance() {
+        return new UploadData_result();
+      }
+
+      @Override
       public UploadData_args getEmptyArgsInstance() {
         return new UploadData_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TUploadDataResp> 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<TUploadDataResp>() { 
+          @Override
           public void onComplete(TUploadDataResp o) {
             UploadData_result result = new UploadData_result();
             result.success = o;
@@ -3666,6 +4230,7 @@ public void onComplete(TUploadDataResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3693,27 +4258,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, UploadData_args args, org.apache.thrift.async.AsyncMethodCallback<TUploadDataResp> resultHandler) throws org.apache.thrift.TException {
         iface.UploadData(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class DownloadData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, DownloadData_args, TDownloadDataResp> {
+    @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class DownloadData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, DownloadData_args, TDownloadDataResp, DownloadData_result> {
       public DownloadData() {
         super("DownloadData");
       }
 
+      @Override
+      public DownloadData_result getEmptyResultInstance() {
+        return new DownloadData_result();
+      }
+
+      @Override
       public DownloadData_args getEmptyArgsInstance() {
         return new DownloadData_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TDownloadDataResp> 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<TDownloadDataResp>() { 
+          @Override
           public void onComplete(TDownloadDataResp o) {
             DownloadData_result result = new DownloadData_result();
             result.success = o;
@@ -3727,6 +4302,7 @@ public void onComplete(TDownloadDataResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -3754,10 +4330,12 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, DownloadData_args args, org.apache.thrift.async.AsyncMethodCallback<TDownloadDataResp> resultHandler) throws org.apache.thrift.TException {
         iface.DownloadData(args.req,resultHandler);
       }
@@ -3765,6 +4343,7 @@ public void start(I iface, DownloadData_args args, org.apache.thrift.async.Async
 
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class OpenSession_args implements org.apache.thrift.TBase<OpenSession_args, OpenSession_args._Fields>, java.io.Serializable, Cloneable, Comparable<OpenSession_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OpenSession_args");
 
@@ -3826,10 +4405,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -3864,6 +4445,7 @@ public OpenSession_args(OpenSession_args other) {
       }
     }
 
+    @Override
     public OpenSession_args deepCopy() {
       return new OpenSession_args(this);
     }
@@ -3897,6 +4479,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -3911,6 +4494,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -3921,6 +4505,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -3991,14 +4576,17 @@ public int compareTo(OpenSession_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -4044,6 +4632,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class OpenSession_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public OpenSession_argsStandardScheme getScheme() {
         return new OpenSession_argsStandardScheme();
       }
@@ -4051,34 +4640,41 @@ public OpenSession_argsStandardScheme getScheme() {
 
     private static class OpenSession_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<OpenSession_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, OpenSession_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TOpenSessionReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TOpenSessionReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, OpenSession_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -4095,6 +4691,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, OpenSession_args s
     }
 
     private static class OpenSession_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public OpenSession_argsTupleScheme getScheme() {
         return new OpenSession_argsTupleScheme();
       }
@@ -4117,12 +4714,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, OpenSession_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, OpenSession_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.req = new TOpenSessionReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TOpenSessionReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -4132,6 +4734,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class OpenSession_result implements org.apache.thrift.TBase<OpenSession_result, OpenSession_result._Fields>, java.io.Serializable, Cloneable, Comparable<OpenSession_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OpenSession_result");
 
@@ -4193,10 +4796,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -4231,6 +4836,7 @@ public OpenSession_result(OpenSession_result other) {
       }
     }
 
+    @Override
     public OpenSession_result deepCopy() {
       return new OpenSession_result(this);
     }
@@ -4264,6 +4870,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -4278,6 +4885,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -4288,6 +4896,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -4358,10 +4967,12 @@ public int compareTo(OpenSession_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -4411,6 +5022,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class OpenSession_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public OpenSession_resultStandardScheme getScheme() {
         return new OpenSession_resultStandardScheme();
       }
@@ -4418,34 +5030,41 @@ public OpenSession_resultStandardScheme getScheme() {
 
     private static class OpenSession_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<OpenSession_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, OpenSession_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 TOpenSessionResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TOpenSessionResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, OpenSession_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -4462,6 +5081,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, OpenSession_result
     }
 
     private static class OpenSession_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public OpenSession_resultTupleScheme getScheme() {
         return new OpenSession_resultTupleScheme();
       }
@@ -4484,12 +5104,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, OpenSession_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, OpenSession_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.success = new TOpenSessionResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TOpenSessionResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -4499,6 +5124,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseSession_args implements org.apache.thrift.TBase<CloseSession_args, CloseSession_args._Fields>, java.io.Serializable, Cloneable, Comparable<CloseSession_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloseSession_args");
 
@@ -4560,10 +5186,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -4598,6 +5226,7 @@ public CloseSession_args(CloseSession_args other) {
       }
     }
 
+    @Override
     public CloseSession_args deepCopy() {
       return new CloseSession_args(this);
     }
@@ -4631,6 +5260,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -4645,6 +5275,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -4655,6 +5286,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -4725,14 +5357,17 @@ public int compareTo(CloseSession_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -4778,6 +5413,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CloseSession_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseSession_argsStandardScheme getScheme() {
         return new CloseSession_argsStandardScheme();
       }
@@ -4785,34 +5421,41 @@ public CloseSession_argsStandardScheme getScheme() {
 
     private static class CloseSession_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<CloseSession_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CloseSession_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TCloseSessionReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TCloseSessionReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CloseSession_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -4829,6 +5472,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CloseSession_args
     }
 
     private static class CloseSession_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseSession_argsTupleScheme getScheme() {
         return new CloseSession_argsTupleScheme();
       }
@@ -4851,12 +5495,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CloseSession_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CloseSession_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.req = new TCloseSessionReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TCloseSessionReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -4866,6 +5515,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseSession_result implements org.apache.thrift.TBase<CloseSession_result, CloseSession_result._Fields>, java.io.Serializable, Cloneable, Comparable<CloseSession_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloseSession_result");
 
@@ -4927,10 +5577,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -4965,6 +5617,7 @@ public CloseSession_result(CloseSession_result other) {
       }
     }
 
+    @Override
     public CloseSession_result deepCopy() {
       return new CloseSession_result(this);
     }
@@ -4998,6 +5651,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -5012,6 +5666,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -5022,6 +5677,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -5092,10 +5748,12 @@ public int compareTo(CloseSession_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -5145,6 +5803,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CloseSession_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseSession_resultStandardScheme getScheme() {
         return new CloseSession_resultStandardScheme();
       }
@@ -5152,34 +5811,41 @@ public CloseSession_resultStandardScheme getScheme() {
 
     private static class CloseSession_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<CloseSession_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CloseSession_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 TCloseSessionResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TCloseSessionResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CloseSession_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -5196,6 +5862,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CloseSession_resul
     }
 
     private static class CloseSession_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseSession_resultTupleScheme getScheme() {
         return new CloseSession_resultTupleScheme();
       }
@@ -5218,12 +5885,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CloseSession_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CloseSession_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.success = new TCloseSessionResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TCloseSessionResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -5233,6 +5905,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetInfo_args implements org.apache.thrift.TBase<GetInfo_args, GetInfo_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfo_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetInfo_args");
 
@@ -5294,10 +5967,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -5332,6 +6007,7 @@ public GetInfo_args(GetInfo_args other) {
       }
     }
 
+    @Override
     public GetInfo_args deepCopy() {
       return new GetInfo_args(this);
     }
@@ -5365,6 +6041,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -5379,6 +6056,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -5389,6 +6067,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -5459,14 +6138,17 @@ public int compareTo(GetInfo_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -5512,6 +6194,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetInfo_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetInfo_argsStandardScheme getScheme() {
         return new GetInfo_argsStandardScheme();
       }
@@ -5519,34 +6202,41 @@ public GetInfo_argsStandardScheme getScheme() {
 
     private static class GetInfo_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetInfo_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetInfo_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetInfoReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetInfoReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetInfo_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -5563,6 +6253,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetInfo_args struc
     }
 
     private static class GetInfo_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetInfo_argsTupleScheme getScheme() {
         return new GetInfo_argsTupleScheme();
       }
@@ -5585,12 +6276,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetInfo_args struct
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetInfo_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.req = new TGetInfoReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetInfoReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -5600,6 +6296,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetInfo_result implements org.apache.thrift.TBase<GetInfo_result, GetInfo_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfo_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetInfo_result");
 
@@ -5661,10 +6358,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -5699,6 +6398,7 @@ public GetInfo_result(GetInfo_result other) {
       }
     }
 
+    @Override
     public GetInfo_result deepCopy() {
       return new GetInfo_result(this);
     }
@@ -5732,6 +6432,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -5746,6 +6447,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -5756,6 +6458,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -5826,10 +6529,12 @@ public int compareTo(GetInfo_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -5879,6 +6584,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetInfo_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetInfo_resultStandardScheme getScheme() {
         return new GetInfo_resultStandardScheme();
       }
@@ -5886,34 +6592,41 @@ public GetInfo_resultStandardScheme getScheme() {
 
     private static class GetInfo_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetInfo_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetInfo_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 TGetInfoResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetInfoResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetInfo_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -5930,6 +6643,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetInfo_result str
     }
 
     private static class GetInfo_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetInfo_resultTupleScheme getScheme() {
         return new GetInfo_resultTupleScheme();
       }
@@ -5952,12 +6666,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetInfo_result stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetInfo_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.success = new TGetInfoResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetInfoResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -5967,6 +6686,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class ExecuteStatement_args implements org.apache.thrift.TBase<ExecuteStatement_args, ExecuteStatement_args._Fields>, java.io.Serializable, Cloneable, Comparable<ExecuteStatement_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecuteStatement_args");
 
@@ -6028,10 +6748,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -6066,6 +6788,7 @@ public ExecuteStatement_args(ExecuteStatement_args other) {
       }
     }
 
+    @Override
     public ExecuteStatement_args deepCopy() {
       return new ExecuteStatement_args(this);
     }
@@ -6099,6 +6822,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -6113,6 +6837,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -6123,6 +6848,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -6193,14 +6919,17 @@ public int compareTo(ExecuteStatement_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -6246,6 +6975,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class ExecuteStatement_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public ExecuteStatement_argsStandardScheme getScheme() {
         return new ExecuteStatement_argsStandardScheme();
       }
@@ -6253,34 +6983,41 @@ public ExecuteStatement_argsStandardScheme getScheme() {
 
     private static class ExecuteStatement_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExecuteStatement_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, ExecuteStatement_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TExecuteStatementReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TExecuteStatementReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, ExecuteStatement_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -6297,6 +7034,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecuteStatement_a
     }
 
     private static class ExecuteStatement_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public ExecuteStatement_argsTupleScheme getScheme() {
         return new ExecuteStatement_argsTupleScheme();
       }
@@ -6319,12 +7057,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ExecuteStatement_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, ExecuteStatement_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.req = new TExecuteStatementReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TExecuteStatementReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -6334,6 +7077,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class ExecuteStatement_result implements org.apache.thrift.TBase<ExecuteStatement_result, ExecuteStatement_result._Fields>, java.io.Serializable, Cloneable, Comparable<ExecuteStatement_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecuteStatement_result");
 
@@ -6395,10 +7139,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -6433,6 +7179,7 @@ public ExecuteStatement_result(ExecuteStatement_result other) {
       }
     }
 
+    @Override
     public ExecuteStatement_result deepCopy() {
       return new ExecuteStatement_result(this);
     }
@@ -6466,6 +7213,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -6480,6 +7228,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -6490,6 +7239,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -6560,10 +7310,12 @@ public int compareTo(ExecuteStatement_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -6613,6 +7365,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class ExecuteStatement_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public ExecuteStatement_resultStandardScheme getScheme() {
         return new ExecuteStatement_resultStandardScheme();
       }
@@ -6620,34 +7373,41 @@ public ExecuteStatement_resultStandardScheme getScheme() {
 
     private static class ExecuteStatement_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExecuteStatement_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, ExecuteStatement_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 TExecuteStatementResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TExecuteStatementResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, ExecuteStatement_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -6664,6 +7424,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecuteStatement_r
     }
 
     private static class ExecuteStatement_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public ExecuteStatement_resultTupleScheme getScheme() {
         return new ExecuteStatement_resultTupleScheme();
       }
@@ -6686,12 +7447,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ExecuteStatement_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, ExecuteStatement_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.success = new TExecuteStatementResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TExecuteStatementResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -6701,6 +7467,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTypeInfo_args implements org.apache.thrift.TBase<GetTypeInfo_args, GetTypeInfo_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetTypeInfo_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTypeInfo_args");
 
@@ -6762,10 +7529,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -6800,6 +7569,7 @@ public GetTypeInfo_args(GetTypeInfo_args other) {
       }
     }
 
+    @Override
     public GetTypeInfo_args deepCopy() {
       return new GetTypeInfo_args(this);
     }
@@ -6833,6 +7603,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -6847,6 +7618,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -6857,6 +7629,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -6927,14 +7700,17 @@ public int compareTo(GetTypeInfo_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -6980,6 +7756,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetTypeInfo_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTypeInfo_argsStandardScheme getScheme() {
         return new GetTypeInfo_argsStandardScheme();
       }
@@ -6987,34 +7764,41 @@ public GetTypeInfo_argsStandardScheme getScheme() {
 
     private static class GetTypeInfo_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTypeInfo_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetTypeInfo_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetTypeInfoReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetTypeInfoReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetTypeInfo_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -7031,6 +7815,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTypeInfo_args s
     }
 
     private static class GetTypeInfo_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTypeInfo_argsTupleScheme getScheme() {
         return new GetTypeInfo_argsTupleScheme();
       }
@@ -7053,12 +7838,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTypeInfo_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetTypeInfo_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.req = new TGetTypeInfoReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetTypeInfoReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -7068,6 +7858,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTypeInfo_result implements org.apache.thrift.TBase<GetTypeInfo_result, GetTypeInfo_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetTypeInfo_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTypeInfo_result");
 
@@ -7129,10 +7920,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -7167,6 +7960,7 @@ public GetTypeInfo_result(GetTypeInfo_result other) {
       }
     }
 
+    @Override
     public GetTypeInfo_result deepCopy() {
       return new GetTypeInfo_result(this);
     }
@@ -7200,6 +7994,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -7214,6 +8009,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -7224,6 +8020,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -7294,10 +8091,12 @@ public int compareTo(GetTypeInfo_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -7347,6 +8146,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetTypeInfo_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTypeInfo_resultStandardScheme getScheme() {
         return new GetTypeInfo_resultStandardScheme();
       }
@@ -7354,34 +8154,41 @@ public GetTypeInfo_resultStandardScheme getScheme() {
 
     private static class GetTypeInfo_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTypeInfo_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetTypeInfo_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 TGetTypeInfoResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetTypeInfoResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetTypeInfo_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -7398,6 +8205,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTypeInfo_result
     }
 
     private static class GetTypeInfo_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTypeInfo_resultTupleScheme getScheme() {
         return new GetTypeInfo_resultTupleScheme();
       }
@@ -7420,12 +8228,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTypeInfo_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetTypeInfo_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.success = new TGetTypeInfoResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetTypeInfoResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -7435,6 +8248,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCatalogs_args implements org.apache.thrift.TBase<GetCatalogs_args, GetCatalogs_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetCatalogs_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCatalogs_args");
 
@@ -7496,10 +8310,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -7534,6 +8350,7 @@ public GetCatalogs_args(GetCatalogs_args other) {
       }
     }
 
+    @Override
     public GetCatalogs_args deepCopy() {
       return new GetCatalogs_args(this);
     }
@@ -7567,6 +8384,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -7581,6 +8399,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -7591,6 +8410,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -7661,14 +8481,17 @@ public int compareTo(GetCatalogs_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -7714,6 +8537,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetCatalogs_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCatalogs_argsStandardScheme getScheme() {
         return new GetCatalogs_argsStandardScheme();
       }
@@ -7721,34 +8545,41 @@ public GetCatalogs_argsStandardScheme getScheme() {
 
     private static class GetCatalogs_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCatalogs_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogs_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetCatalogsReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogs_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetCatalogsReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogs_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -7765,6 +8596,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogs_args s
     }
 
     private static class GetCatalogs_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCatalogs_argsTupleScheme getScheme() {
         return new GetCatalogs_argsTupleScheme();
       }
@@ -7787,12 +8619,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCatalogs_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetCatalogs_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.req = new TGetCatalogsReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetCatalogsReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -7802,6 +8639,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCatalogs_result implements org.apache.thrift.TBase<GetCatalogs_result, GetCatalogs_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetCatalogs_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCatalogs_result");
 
@@ -7863,10 +8701,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -7901,6 +8741,7 @@ public GetCatalogs_result(GetCatalogs_result other) {
       }
     }
 
+    @Override
     public GetCatalogs_result deepCopy() {
       return new GetCatalogs_result(this);
     }
@@ -7934,6 +8775,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -7948,6 +8790,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -7958,6 +8801,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -8028,10 +8872,12 @@ public int compareTo(GetCatalogs_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -8081,6 +8927,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetCatalogs_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCatalogs_resultStandardScheme getScheme() {
         return new GetCatalogs_resultStandardScheme();
       }
@@ -8088,34 +8935,41 @@ public GetCatalogs_resultStandardScheme getScheme() {
 
     private static class GetCatalogs_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCatalogs_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogs_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 TGetCatalogsResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetCatalogsResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogs_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -8132,6 +8986,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogs_result
     }
 
     private static class GetCatalogs_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCatalogs_resultTupleScheme getScheme() {
         return new GetCatalogs_resultTupleScheme();
       }
@@ -8154,12 +9009,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCatalogs_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetCatalogs_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.success = new TGetCatalogsResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetCatalogsResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -8169,6 +9029,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetSchemas_args implements org.apache.thrift.TBase<GetSchemas_args, GetSchemas_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetSchemas_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetSchemas_args");
 
@@ -8230,10 +9091,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -8268,6 +9131,7 @@ public GetSchemas_args(GetSchemas_args other) {
       }
     }
 
+    @Override
     public GetSchemas_args deepCopy() {
       return new GetSchemas_args(this);
     }
@@ -8301,6 +9165,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -8315,6 +9180,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -8325,6 +9191,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -8395,14 +9262,17 @@ public int compareTo(GetSchemas_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -8448,6 +9318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetSchemas_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetSchemas_argsStandardScheme getScheme() {
         return new GetSchemas_argsStandardScheme();
       }
@@ -8455,34 +9326,41 @@ public GetSchemas_argsStandardScheme getScheme() {
 
     private static class GetSchemas_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetSchemas_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetSchemas_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetSchemasReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetSchemasReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemas_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -8499,6 +9377,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemas_args st
     }
 
     private static class GetSchemas_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetSchemas_argsTupleScheme getScheme() {
         return new GetSchemas_argsTupleScheme();
       }
@@ -8521,12 +9400,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetSchemas_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetSchemas_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.req = new TGetSchemasReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetSchemasReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -8536,6 +9420,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetSchemas_result implements org.apache.thrift.TBase<GetSchemas_result, GetSchemas_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetSchemas_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetSchemas_result");
 
@@ -8597,10 +9482,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -8635,6 +9522,7 @@ public GetSchemas_result(GetSchemas_result other) {
       }
     }
 
+    @Override
     public GetSchemas_result deepCopy() {
       return new GetSchemas_result(this);
     }
@@ -8668,6 +9556,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -8682,6 +9571,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -8692,6 +9582,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -8762,10 +9653,12 @@ public int compareTo(GetSchemas_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -8815,6 +9708,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetSchemas_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetSchemas_resultStandardScheme getScheme() {
         return new GetSchemas_resultStandardScheme();
       }
@@ -8822,34 +9716,41 @@ public GetSchemas_resultStandardScheme getScheme() {
 
     private static class GetSchemas_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetSchemas_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetSchemas_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 TGetSchemasResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetSchemasResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemas_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -8866,6 +9767,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemas_result
     }
 
     private static class GetSchemas_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetSchemas_resultTupleScheme getScheme() {
         return new GetSchemas_resultTupleScheme();
       }
@@ -8888,12 +9790,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetSchemas_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetSchemas_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.success = new TGetSchemasResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetSchemasResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -8903,6 +9810,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTables_args implements org.apache.thrift.TBase<GetTables_args, GetTables_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetTables_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTables_args");
 
@@ -8964,10 +9872,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -9002,6 +9912,7 @@ public GetTables_args(GetTables_args other) {
       }
     }
 
+    @Override
     public GetTables_args deepCopy() {
       return new GetTables_args(this);
     }
@@ -9035,6 +9946,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -9049,6 +9961,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -9059,6 +9972,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -9129,14 +10043,17 @@ public int compareTo(GetTables_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -9182,6 +10099,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetTables_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTables_argsStandardScheme getScheme() {
         return new GetTables_argsStandardScheme();
       }
@@ -9189,34 +10107,41 @@ public GetTables_argsStandardScheme getScheme() {
 
     private static class GetTables_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTables_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetTables_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetTablesReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetTablesReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetTables_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -9233,6 +10158,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTables_args str
     }
 
     private static class GetTables_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTables_argsTupleScheme getScheme() {
         return new GetTables_argsTupleScheme();
       }
@@ -9255,12 +10181,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTables_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetTables_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.req = new TGetTablesReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetTablesReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -9270,6 +10201,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTables_result implements org.apache.thrift.TBase<GetTables_result, GetTables_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetTables_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTables_result");
 
@@ -9331,10 +10263,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -9369,6 +10303,7 @@ public GetTables_result(GetTables_result other) {
       }
     }
 
+    @Override
     public GetTables_result deepCopy() {
       return new GetTables_result(this);
     }
@@ -9402,6 +10337,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -9416,6 +10352,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -9426,6 +10363,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -9496,10 +10434,12 @@ public int compareTo(GetTables_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -9549,6 +10489,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetTables_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTables_resultStandardScheme getScheme() {
         return new GetTables_resultStandardScheme();
       }
@@ -9556,34 +10497,41 @@ public GetTables_resultStandardScheme getScheme() {
 
     private static class GetTables_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTables_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetTables_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 TGetTablesResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetTablesResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetTables_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -9600,6 +10548,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTables_result s
     }
 
     private static class GetTables_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTables_resultTupleScheme getScheme() {
         return new GetTables_resultTupleScheme();
       }
@@ -9622,12 +10571,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTables_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetTables_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.success = new TGetTablesResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetTablesResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -9637,6 +10591,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTableTypes_args implements org.apache.thrift.TBase<GetTableTypes_args, GetTableTypes_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetTableTypes_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTableTypes_args");
 
@@ -9698,10 +10653,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -9736,6 +10693,7 @@ public GetTableTypes_args(GetTableTypes_args other) {
       }
     }
 
+    @Override
     public GetTableTypes_args deepCopy() {
       return new GetTableTypes_args(this);
     }
@@ -9769,6 +10727,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -9783,6 +10742,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -9793,6 +10753,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -9863,14 +10824,17 @@ public int compareTo(GetTableTypes_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -9916,6 +10880,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetTableTypes_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTableTypes_argsStandardScheme getScheme() {
         return new GetTableTypes_argsStandardScheme();
       }
@@ -9923,34 +10888,41 @@ public GetTableTypes_argsStandardScheme getScheme() {
 
     private static class GetTableTypes_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTableTypes_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetTableTypes_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetTableTypesReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetTableTypesReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableTypes_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -9967,6 +10939,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableTypes_args
     }
 
     private static class GetTableTypes_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTableTypes_argsTupleScheme getScheme() {
         return new GetTableTypes_argsTupleScheme();
       }
@@ -9989,12 +10962,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTableTypes_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetTableTypes_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.req = new TGetTableTypesReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetTableTypesReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -10004,6 +10982,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetTableTypes_result implements org.apache.thrift.TBase<GetTableTypes_result, GetTableTypes_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetTableTypes_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTableTypes_result");
 
@@ -10065,10 +11044,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -10103,6 +11084,7 @@ public GetTableTypes_result(GetTableTypes_result other) {
       }
     }
 
+    @Override
     public GetTableTypes_result deepCopy() {
       return new GetTableTypes_result(this);
     }
@@ -10136,6 +11118,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -10150,6 +11133,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -10160,6 +11144,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -10230,10 +11215,12 @@ public int compareTo(GetTableTypes_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -10283,6 +11270,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetTableTypes_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTableTypes_resultStandardScheme getScheme() {
         return new GetTableTypes_resultStandardScheme();
       }
@@ -10290,34 +11278,41 @@ public GetTableTypes_resultStandardScheme getScheme() {
 
     private static class GetTableTypes_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTableTypes_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetTableTypes_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 TGetTableTypesResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetTableTypesResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableTypes_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -10334,6 +11329,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableTypes_resu
     }
 
     private static class GetTableTypes_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetTableTypes_resultTupleScheme getScheme() {
         return new GetTableTypes_resultTupleScheme();
       }
@@ -10356,12 +11352,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTableTypes_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetTableTypes_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.success = new TGetTableTypesResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetTableTypesResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -10371,6 +11372,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetColumns_args implements org.apache.thrift.TBase<GetColumns_args, GetColumns_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetColumns_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetColumns_args");
 
@@ -10432,10 +11434,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -10470,6 +11474,7 @@ public GetColumns_args(GetColumns_args other) {
       }
     }
 
+    @Override
     public GetColumns_args deepCopy() {
       return new GetColumns_args(this);
     }
@@ -10503,6 +11508,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -10517,6 +11523,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -10527,6 +11534,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -10597,14 +11605,17 @@ public int compareTo(GetColumns_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -10650,6 +11661,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetColumns_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetColumns_argsStandardScheme getScheme() {
         return new GetColumns_argsStandardScheme();
       }
@@ -10657,34 +11669,41 @@ public GetColumns_argsStandardScheme getScheme() {
 
     private static class GetColumns_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetColumns_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetColumns_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetColumnsReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetColumnsReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetColumns_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -10701,6 +11720,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetColumns_args st
     }
 
     private static class GetColumns_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetColumns_argsTupleScheme getScheme() {
         return new GetColumns_argsTupleScheme();
       }
@@ -10723,12 +11743,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetColumns_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetColumns_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.req = new TGetColumnsReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetColumnsReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -10738,6 +11763,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetColumns_result implements org.apache.thrift.TBase<GetColumns_result, GetColumns_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetColumns_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetColumns_result");
 
@@ -10799,10 +11825,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -10837,6 +11865,7 @@ public GetColumns_result(GetColumns_result other) {
       }
     }
 
+    @Override
     public GetColumns_result deepCopy() {
       return new GetColumns_result(this);
     }
@@ -10870,6 +11899,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -10884,6 +11914,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -10894,6 +11925,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -10964,10 +11996,12 @@ public int compareTo(GetColumns_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -11017,6 +12051,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetColumns_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetColumns_resultStandardScheme getScheme() {
         return new GetColumns_resultStandardScheme();
       }
@@ -11024,34 +12059,41 @@ public GetColumns_resultStandardScheme getScheme() {
 
     private static class GetColumns_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetColumns_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetColumns_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 TGetColumnsResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetColumnsResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetColumns_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -11068,6 +12110,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetColumns_result
     }
 
     private static class GetColumns_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetColumns_resultTupleScheme getScheme() {
         return new GetColumns_resultTupleScheme();
       }
@@ -11090,12 +12133,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetColumns_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetColumns_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.success = new TGetColumnsResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetColumnsResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -11105,6 +12153,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetFunctions_args implements org.apache.thrift.TBase<GetFunctions_args, GetFunctions_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetFunctions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFunctions_args");
 
@@ -11166,10 +12215,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -11204,6 +12255,7 @@ public GetFunctions_args(GetFunctions_args other) {
       }
     }
 
+    @Override
     public GetFunctions_args deepCopy() {
       return new GetFunctions_args(this);
     }
@@ -11237,6 +12289,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -11251,6 +12304,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -11261,6 +12315,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -11331,14 +12386,17 @@ public int compareTo(GetFunctions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -11384,6 +12442,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetFunctions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetFunctions_argsStandardScheme getScheme() {
         return new GetFunctions_argsStandardScheme();
       }
@@ -11391,34 +12450,41 @@ public GetFunctions_argsStandardScheme getScheme() {
 
     private static class GetFunctions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFunctions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetFunctions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetFunctionsReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetFunctionsReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -11435,6 +12501,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctions_args
     }
 
     private static class GetFunctions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetFunctions_argsTupleScheme getScheme() {
         return new GetFunctions_argsTupleScheme();
       }
@@ -11457,12 +12524,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFunctions_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetFunctions_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.req = new TGetFunctionsReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetFunctionsReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -11472,6 +12544,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetFunctions_result implements org.apache.thrift.TBase<GetFunctions_result, GetFunctions_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetFunctions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFunctions_result");
 
@@ -11533,10 +12606,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -11571,6 +12646,7 @@ public GetFunctions_result(GetFunctions_result other) {
       }
     }
 
+    @Override
     public GetFunctions_result deepCopy() {
       return new GetFunctions_result(this);
     }
@@ -11604,6 +12680,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -11618,6 +12695,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -11628,6 +12706,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -11698,10 +12777,12 @@ public int compareTo(GetFunctions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -11751,6 +12832,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetFunctions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetFunctions_resultStandardScheme getScheme() {
         return new GetFunctions_resultStandardScheme();
       }
@@ -11758,34 +12840,41 @@ public GetFunctions_resultStandardScheme getScheme() {
 
     private static class GetFunctions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFunctions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetFunctions_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 TGetFunctionsResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetFunctionsResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -11802,6 +12891,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctions_resul
     }
 
     private static class GetFunctions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetFunctions_resultTupleScheme getScheme() {
         return new GetFunctions_resultTupleScheme();
       }
@@ -11824,12 +12914,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFunctions_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetFunctions_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.success = new TGetFunctionsResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetFunctionsResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -11839,6 +12934,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetPrimaryKeys_args implements org.apache.thrift.TBase<GetPrimaryKeys_args, GetPrimaryKeys_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetPrimaryKeys_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPrimaryKeys_args");
 
@@ -11900,10 +12996,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -11938,6 +13036,7 @@ public GetPrimaryKeys_args(GetPrimaryKeys_args other) {
       }
     }
 
+    @Override
     public GetPrimaryKeys_args deepCopy() {
       return new GetPrimaryKeys_args(this);
     }
@@ -11971,6 +13070,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -11985,6 +13085,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -11995,6 +13096,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -12065,14 +13167,17 @@ public int compareTo(GetPrimaryKeys_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -12118,6 +13223,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetPrimaryKeys_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetPrimaryKeys_argsStandardScheme getScheme() {
         return new GetPrimaryKeys_argsStandardScheme();
       }
@@ -12125,34 +13231,41 @@ public GetPrimaryKeys_argsStandardScheme getScheme() {
 
     private static class GetPrimaryKeys_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPrimaryKeys_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetPrimaryKeys_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetPrimaryKeysReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetPrimaryKeysReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrimaryKeys_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -12169,6 +13282,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrimaryKeys_arg
     }
 
     private static class GetPrimaryKeys_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetPrimaryKeys_argsTupleScheme getScheme() {
         return new GetPrimaryKeys_argsTupleScheme();
       }
@@ -12191,12 +13305,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPrimaryKeys_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetPrimaryKeys_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.req = new TGetPrimaryKeysReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetPrimaryKeysReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -12206,6 +13325,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetPrimaryKeys_result implements org.apache.thrift.TBase<GetPrimaryKeys_result, GetPrimaryKeys_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetPrimaryKeys_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPrimaryKeys_result");
 
@@ -12267,10 +13387,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -12305,6 +13427,7 @@ public GetPrimaryKeys_result(GetPrimaryKeys_result other) {
       }
     }
 
+    @Override
     public GetPrimaryKeys_result deepCopy() {
       return new GetPrimaryKeys_result(this);
     }
@@ -12338,6 +13461,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -12352,6 +13476,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -12362,6 +13487,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -12432,10 +13558,12 @@ public int compareTo(GetPrimaryKeys_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -12485,6 +13613,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetPrimaryKeys_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetPrimaryKeys_resultStandardScheme getScheme() {
         return new GetPrimaryKeys_resultStandardScheme();
       }
@@ -12492,34 +13621,41 @@ public GetPrimaryKeys_resultStandardScheme getScheme() {
 
     private static class GetPrimaryKeys_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPrimaryKeys_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetPrimaryKeys_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 TGetPrimaryKeysResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetPrimaryKeysResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrimaryKeys_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -12536,6 +13672,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrimaryKeys_res
     }
 
     private static class GetPrimaryKeys_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetPrimaryKeys_resultTupleScheme getScheme() {
         return new GetPrimaryKeys_resultTupleScheme();
       }
@@ -12558,12 +13695,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPrimaryKeys_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetPrimaryKeys_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.success = new TGetPrimaryKeysResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetPrimaryKeysResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -12573,6 +13715,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCrossReference_args implements org.apache.thrift.TBase<GetCrossReference_args, GetCrossReference_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetCrossReference_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCrossReference_args");
 
@@ -12634,10 +13777,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -12672,6 +13817,7 @@ public GetCrossReference_args(GetCrossReference_args other) {
       }
     }
 
+    @Override
     public GetCrossReference_args deepCopy() {
       return new GetCrossReference_args(this);
     }
@@ -12705,6 +13851,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -12719,6 +13866,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -12729,6 +13877,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -12799,14 +13948,17 @@ public int compareTo(GetCrossReference_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -12852,6 +14004,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetCrossReference_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCrossReference_argsStandardScheme getScheme() {
         return new GetCrossReference_argsStandardScheme();
       }
@@ -12859,34 +14012,41 @@ public GetCrossReference_argsStandardScheme getScheme() {
 
     private static class GetCrossReference_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCrossReference_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetCrossReference_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetCrossReferenceReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetCrossReferenceReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetCrossReference_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -12903,6 +14063,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCrossReference_
     }
 
     private static class GetCrossReference_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCrossReference_argsTupleScheme getScheme() {
         return new GetCrossReference_argsTupleScheme();
       }
@@ -12925,12 +14086,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCrossReference_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetCrossReference_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.req = new TGetCrossReferenceReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetCrossReferenceReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -12940,6 +14106,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetCrossReference_result implements org.apache.thrift.TBase<GetCrossReference_result, GetCrossReference_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetCrossReference_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCrossReference_result");
 
@@ -13001,10 +14168,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -13039,6 +14208,7 @@ public GetCrossReference_result(GetCrossReference_result other) {
       }
     }
 
+    @Override
     public GetCrossReference_result deepCopy() {
       return new GetCrossReference_result(this);
     }
@@ -13072,6 +14242,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -13086,6 +14257,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -13096,6 +14268,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -13166,10 +14339,12 @@ public int compareTo(GetCrossReference_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -13219,6 +14394,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetCrossReference_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCrossReference_resultStandardScheme getScheme() {
         return new GetCrossReference_resultStandardScheme();
       }
@@ -13226,34 +14402,41 @@ public GetCrossReference_resultStandardScheme getScheme() {
 
     private static class GetCrossReference_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCrossReference_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetCrossReference_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 TGetCrossReferenceResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetCrossReferenceResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetCrossReference_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -13270,6 +14453,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCrossReference_
     }
 
     private static class GetCrossReference_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetCrossReference_resultTupleScheme getScheme() {
         return new GetCrossReference_resultTupleScheme();
       }
@@ -13292,12 +14476,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCrossReference_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetCrossReference_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.success = new TGetCrossReferenceResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetCrossReferenceResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -13307,6 +14496,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetOperationStatus_args implements org.apache.thrift.TBase<GetOperationStatus_args, GetOperationStatus_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetOperationStatus_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOperationStatus_args");
 
@@ -13368,10 +14558,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -13406,6 +14598,7 @@ public GetOperationStatus_args(GetOperationStatus_args other) {
       }
     }
 
+    @Override
     public GetOperationStatus_args deepCopy() {
       return new GetOperationStatus_args(this);
     }
@@ -13439,6 +14632,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -13453,6 +14647,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -13463,6 +14658,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -13533,14 +14729,17 @@ public int compareTo(GetOperationStatus_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -13586,6 +14785,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetOperationStatus_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetOperationStatus_argsStandardScheme getScheme() {
         return new GetOperationStatus_argsStandardScheme();
       }
@@ -13593,34 +14793,41 @@ public GetOperationStatus_argsStandardScheme getScheme() {
 
     private static class GetOperationStatus_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetOperationStatus_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetOperationStatus_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetOperationStatusReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetOperationStatusReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetOperationStatus_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -13637,6 +14844,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetOperationStatus
     }
 
     private static class GetOperationStatus_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetOperationStatus_argsTupleScheme getScheme() {
         return new GetOperationStatus_argsTupleScheme();
       }
@@ -13659,12 +14867,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetOperationStatus_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetOperationStatus_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.req = new TGetOperationStatusReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetOperationStatusReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -13674,6 +14887,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetOperationStatus_result implements org.apache.thrift.TBase<GetOperationStatus_result, GetOperationStatus_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetOperationStatus_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOperationStatus_result");
 
@@ -13735,10 +14949,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -13773,6 +14989,7 @@ public GetOperationStatus_result(GetOperationStatus_result other) {
       }
     }
 
+    @Override
     public GetOperationStatus_result deepCopy() {
       return new GetOperationStatus_result(this);
     }
@@ -13806,6 +15023,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -13820,6 +15038,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -13830,6 +15049,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -13900,10 +15120,12 @@ public int compareTo(GetOperationStatus_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -13953,6 +15175,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetOperationStatus_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetOperationStatus_resultStandardScheme getScheme() {
         return new GetOperationStatus_resultStandardScheme();
       }
@@ -13960,34 +15183,41 @@ public GetOperationStatus_resultStandardScheme getScheme() {
 
     private static class GetOperationStatus_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetOperationStatus_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetOperationStatus_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 TGetOperationStatusResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetOperationStatusResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetOperationStatus_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -14004,6 +15234,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetOperationStatus
     }
 
     private static class GetOperationStatus_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetOperationStatus_resultTupleScheme getScheme() {
         return new GetOperationStatus_resultTupleScheme();
       }
@@ -14026,12 +15257,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetOperationStatus_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetOperationStatus_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.success = new TGetOperationStatusResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetOperationStatusResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -14041,6 +15277,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelOperation_args implements org.apache.thrift.TBase<CancelOperation_args, CancelOperation_args._Fields>, java.io.Serializable, Cloneable, Comparable<CancelOperation_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CancelOperation_args");
 
@@ -14102,10 +15339,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -14140,6 +15379,7 @@ public CancelOperation_args(CancelOperation_args other) {
       }
     }
 
+    @Override
     public CancelOperation_args deepCopy() {
       return new CancelOperation_args(this);
     }
@@ -14173,6 +15413,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -14187,6 +15428,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -14197,6 +15439,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -14267,14 +15510,17 @@ public int compareTo(CancelOperation_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -14320,6 +15566,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CancelOperation_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelOperation_argsStandardScheme getScheme() {
         return new CancelOperation_argsStandardScheme();
       }
@@ -14327,34 +15574,41 @@ public CancelOperation_argsStandardScheme getScheme() {
 
     private static class CancelOperation_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<CancelOperation_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CancelOperation_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TCancelOperationReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TCancelOperationReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CancelOperation_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -14371,6 +15625,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CancelOperation_ar
     }
 
     private static class CancelOperation_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelOperation_argsTupleScheme getScheme() {
         return new CancelOperation_argsTupleScheme();
       }
@@ -14393,12 +15648,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CancelOperation_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CancelOperation_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.req = new TCancelOperationReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TCancelOperationReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -14408,6 +15668,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelOperation_result implements org.apache.thrift.TBase<CancelOperation_result, CancelOperation_result._Fields>, java.io.Serializable, Cloneable, Comparable<CancelOperation_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CancelOperation_result");
 
@@ -14469,10 +15730,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -14507,6 +15770,7 @@ public CancelOperation_result(CancelOperation_result other) {
       }
     }
 
+    @Override
     public CancelOperation_result deepCopy() {
       return new CancelOperation_result(this);
     }
@@ -14540,6 +15804,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -14554,6 +15819,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -14564,6 +15830,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -14634,10 +15901,12 @@ public int compareTo(CancelOperation_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -14687,6 +15956,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CancelOperation_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelOperation_resultStandardScheme getScheme() {
         return new CancelOperation_resultStandardScheme();
       }
@@ -14694,34 +15964,41 @@ public CancelOperation_resultStandardScheme getScheme() {
 
     private static class CancelOperation_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<CancelOperation_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CancelOperation_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 TCancelOperationResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TCancelOperationResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CancelOperation_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -14738,6 +16015,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CancelOperation_re
     }
 
     private static class CancelOperation_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelOperation_resultTupleScheme getScheme() {
         return new CancelOperation_resultTupleScheme();
       }
@@ -14760,12 +16038,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CancelOperation_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CancelOperation_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.success = new TCancelOperationResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TCancelOperationResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -14775,6 +16058,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseOperation_args implements org.apache.thrift.TBase<CloseOperation_args, CloseOperation_args._Fields>, java.io.Serializable, Cloneable, Comparable<CloseOperation_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloseOperation_args");
 
@@ -14836,10 +16120,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -14874,6 +16160,7 @@ public CloseOperation_args(CloseOperation_args other) {
       }
     }
 
+    @Override
     public CloseOperation_args deepCopy() {
       return new CloseOperation_args(this);
     }
@@ -14907,6 +16194,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -14921,6 +16209,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -14931,6 +16220,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -15001,14 +16291,17 @@ public int compareTo(CloseOperation_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -15054,6 +16347,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CloseOperation_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseOperation_argsStandardScheme getScheme() {
         return new CloseOperation_argsStandardScheme();
       }
@@ -15061,34 +16355,41 @@ public CloseOperation_argsStandardScheme getScheme() {
 
     private static class CloseOperation_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<CloseOperation_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CloseOperation_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TCloseOperationReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TCloseOperationReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CloseOperation_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -15105,6 +16406,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CloseOperation_arg
     }
 
     private static class CloseOperation_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseOperation_argsTupleScheme getScheme() {
         return new CloseOperation_argsTupleScheme();
       }
@@ -15127,12 +16429,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CloseOperation_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CloseOperation_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.req = new TCloseOperationReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TCloseOperationReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -15142,6 +16449,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CloseOperation_result implements org.apache.thrift.TBase<CloseOperation_result, CloseOperation_result._Fields>, java.io.Serializable, Cloneable, Comparable<CloseOperation_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloseOperation_result");
 
@@ -15203,10 +16511,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -15241,6 +16551,7 @@ public CloseOperation_result(CloseOperation_result other) {
       }
     }
 
+    @Override
     public CloseOperation_result deepCopy() {
       return new CloseOperation_result(this);
     }
@@ -15274,6 +16585,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -15288,6 +16600,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -15298,6 +16611,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -15368,10 +16682,12 @@ public int compareTo(CloseOperation_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -15421,6 +16737,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CloseOperation_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseOperation_resultStandardScheme getScheme() {
         return new CloseOperation_resultStandardScheme();
       }
@@ -15428,34 +16745,41 @@ public CloseOperation_resultStandardScheme getScheme() {
 
     private static class CloseOperation_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<CloseOperation_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CloseOperation_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 TCloseOperationResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TCloseOperationResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CloseOperation_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -15472,6 +16796,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CloseOperation_res
     }
 
     private static class CloseOperation_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CloseOperation_resultTupleScheme getScheme() {
         return new CloseOperation_resultTupleScheme();
       }
@@ -15494,12 +16819,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CloseOperation_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CloseOperation_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.success = new TCloseOperationResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TCloseOperationResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -15509,6 +16839,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetResultSetMetadata_args implements org.apache.thrift.TBase<GetResultSetMetadata_args, GetResultSetMetadata_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetResultSetMetadata_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetResultSetMetadata_args");
 
@@ -15570,10 +16901,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -15608,6 +16941,7 @@ public GetResultSetMetadata_args(GetResultSetMetadata_args other) {
       }
     }
 
+    @Override
     public GetResultSetMetadata_args deepCopy() {
       return new GetResultSetMetadata_args(this);
     }
@@ -15641,6 +16975,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -15655,6 +16990,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -15665,6 +17001,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -15735,14 +17072,17 @@ public int compareTo(GetResultSetMetadata_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -15788,6 +17128,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetResultSetMetadata_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetResultSetMetadata_argsStandardScheme getScheme() {
         return new GetResultSetMetadata_argsStandardScheme();
       }
@@ -15795,34 +17136,41 @@ public GetResultSetMetadata_argsStandardScheme getScheme() {
 
     private static class GetResultSetMetadata_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetResultSetMetadata_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetResultSetMetadata_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetResultSetMetadataReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetResultSetMetadataReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetResultSetMetadata_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -15839,6 +17187,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetResultSetMetada
     }
 
     private static class GetResultSetMetadata_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetResultSetMetadata_argsTupleScheme getScheme() {
         return new GetResultSetMetadata_argsTupleScheme();
       }
@@ -15861,12 +17210,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetResultSetMetadat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetResultSetMetadata_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.req = new TGetResultSetMetadataReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetResultSetMetadataReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -15876,6 +17230,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetResultSetMetadata_result implements org.apache.thrift.TBase<GetResultSetMetadata_result, GetResultSetMetadata_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetResultSetMetadata_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetResultSetMetadata_result");
 
@@ -15937,10 +17292,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -15975,6 +17332,7 @@ public GetResultSetMetadata_result(GetResultSetMetadata_result other) {
       }
     }
 
+    @Override
     public GetResultSetMetadata_result deepCopy() {
       return new GetResultSetMetadata_result(this);
     }
@@ -16008,6 +17366,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -16022,6 +17381,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -16032,6 +17392,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -16102,10 +17463,12 @@ public int compareTo(GetResultSetMetadata_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -16155,6 +17518,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetResultSetMetadata_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetResultSetMetadata_resultStandardScheme getScheme() {
         return new GetResultSetMetadata_resultStandardScheme();
       }
@@ -16162,34 +17526,41 @@ public GetResultSetMetadata_resultStandardScheme getScheme() {
 
     private static class GetResultSetMetadata_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetResultSetMetadata_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetResultSetMetadata_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 TGetResultSetMetadataResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetResultSetMetadataResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetResultSetMetadata_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -16206,6 +17577,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetResultSetMetada
     }
 
     private static class GetResultSetMetadata_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetResultSetMetadata_resultTupleScheme getScheme() {
         return new GetResultSetMetadata_resultTupleScheme();
       }
@@ -16228,12 +17600,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetResultSetMetadat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetResultSetMetadata_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.success = new TGetResultSetMetadataResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetResultSetMetadataResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -16243,6 +17620,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class FetchResults_args implements org.apache.thrift.TBase<FetchResults_args, FetchResults_args._Fields>, java.io.Serializable, Cloneable, Comparable<FetchResults_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FetchResults_args");
 
@@ -16304,10 +17682,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -16342,6 +17722,7 @@ public FetchResults_args(FetchResults_args other) {
       }
     }
 
+    @Override
     public FetchResults_args deepCopy() {
       return new FetchResults_args(this);
     }
@@ -16375,6 +17756,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -16389,6 +17771,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -16399,6 +17782,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -16469,14 +17853,17 @@ public int compareTo(FetchResults_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -16522,6 +17909,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class FetchResults_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public FetchResults_argsStandardScheme getScheme() {
         return new FetchResults_argsStandardScheme();
       }
@@ -16529,34 +17917,41 @@ public FetchResults_argsStandardScheme getScheme() {
 
     private static class FetchResults_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<FetchResults_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, FetchResults_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TFetchResultsReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TFetchResultsReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, FetchResults_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -16573,6 +17968,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FetchResults_args
     }
 
     private static class FetchResults_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public FetchResults_argsTupleScheme getScheme() {
         return new FetchResults_argsTupleScheme();
       }
@@ -16595,12 +17991,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FetchResults_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, FetchResults_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.req = new TFetchResultsReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TFetchResultsReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -16610,6 +18011,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class FetchResults_result implements org.apache.thrift.TBase<FetchResults_result, FetchResults_result._Fields>, java.io.Serializable, Cloneable, Comparable<FetchResults_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FetchResults_result");
 
@@ -16671,10 +18073,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -16709,6 +18113,7 @@ public FetchResults_result(FetchResults_result other) {
       }
     }
 
+    @Override
     public FetchResults_result deepCopy() {
       return new FetchResults_result(this);
     }
@@ -16742,6 +18147,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -16756,6 +18162,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -16766,6 +18173,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -16836,10 +18244,12 @@ public int compareTo(FetchResults_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -16889,6 +18299,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class FetchResults_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public FetchResults_resultStandardScheme getScheme() {
         return new FetchResults_resultStandardScheme();
       }
@@ -16896,34 +18307,41 @@ public FetchResults_resultStandardScheme getScheme() {
 
     private static class FetchResults_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<FetchResults_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, FetchResults_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 TFetchResultsResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TFetchResultsResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, FetchResults_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -16940,6 +18358,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FetchResults_resul
     }
 
     private static class FetchResults_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public FetchResults_resultTupleScheme getScheme() {
         return new FetchResults_resultTupleScheme();
       }
@@ -16962,12 +18381,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FetchResults_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, FetchResults_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.success = new TFetchResultsResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TFetchResultsResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -16977,6 +18401,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetDelegationToken_args implements org.apache.thrift.TBase<GetDelegationToken_args, GetDelegationToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetDelegationToken_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDelegationToken_args");
 
@@ -17038,10 +18463,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -17076,6 +18503,7 @@ public GetDelegationToken_args(GetDelegationToken_args other) {
       }
     }
 
+    @Override
     public GetDelegationToken_args deepCopy() {
       return new GetDelegationToken_args(this);
     }
@@ -17109,6 +18537,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -17123,6 +18552,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -17133,6 +18563,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -17203,14 +18634,17 @@ public int compareTo(GetDelegationToken_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -17256,6 +18690,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetDelegationToken_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetDelegationToken_argsStandardScheme getScheme() {
         return new GetDelegationToken_argsStandardScheme();
       }
@@ -17263,34 +18698,41 @@ public GetDelegationToken_argsStandardScheme getScheme() {
 
     private static class GetDelegationToken_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetDelegationToken_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetDelegationToken_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetDelegationTokenReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetDelegationTokenReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetDelegationToken_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -17307,6 +18749,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetDelegationToken
     }
 
     private static class GetDelegationToken_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetDelegationToken_argsTupleScheme getScheme() {
         return new GetDelegationToken_argsTupleScheme();
       }
@@ -17329,12 +18772,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetDelegationToken_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetDelegationToken_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.req = new TGetDelegationTokenReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetDelegationTokenReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -17344,6 +18792,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetDelegationToken_result implements org.apache.thrift.TBase<GetDelegationToken_result, GetDelegationToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetDelegationToken_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDelegationToken_result");
 
@@ -17405,10 +18854,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -17443,6 +18894,7 @@ public GetDelegationToken_result(GetDelegationToken_result other) {
       }
     }
 
+    @Override
     public GetDelegationToken_result deepCopy() {
       return new GetDelegationToken_result(this);
     }
@@ -17476,6 +18928,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -17490,6 +18943,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -17500,6 +18954,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -17570,10 +19025,12 @@ public int compareTo(GetDelegationToken_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -17623,6 +19080,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetDelegationToken_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetDelegationToken_resultStandardScheme getScheme() {
         return new GetDelegationToken_resultStandardScheme();
       }
@@ -17630,34 +19088,41 @@ public GetDelegationToken_resultStandardScheme getScheme() {
 
     private static class GetDelegationToken_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetDelegationToken_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetDelegationToken_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 TGetDelegationTokenResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetDelegationTokenResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetDelegationToken_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -17674,6 +19139,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetDelegationToken
     }
 
     private static class GetDelegationToken_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetDelegationToken_resultTupleScheme getScheme() {
         return new GetDelegationToken_resultTupleScheme();
       }
@@ -17696,12 +19162,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetDelegationToken_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetDelegationToken_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.success = new TGetDelegationTokenResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetDelegationTokenResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -17711,6 +19182,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelDelegationToken_args implements org.apache.thrift.TBase<CancelDelegationToken_args, CancelDelegationToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<CancelDelegationToken_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CancelDelegationToken_args");
 
@@ -17772,10 +19244,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -17810,6 +19284,7 @@ public CancelDelegationToken_args(CancelDelegationToken_args other) {
       }
     }
 
+    @Override
     public CancelDelegationToken_args deepCopy() {
       return new CancelDelegationToken_args(this);
     }
@@ -17843,6 +19318,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -17857,6 +19333,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -17867,6 +19344,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -17937,14 +19415,17 @@ public int compareTo(CancelDelegationToken_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -17990,6 +19471,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CancelDelegationToken_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelDelegationToken_argsStandardScheme getScheme() {
         return new CancelDelegationToken_argsStandardScheme();
       }
@@ -17997,34 +19479,41 @@ public CancelDelegationToken_argsStandardScheme getScheme() {
 
     private static class CancelDelegationToken_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<CancelDelegationToken_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CancelDelegationToken_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TCancelDelegationTokenReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TCancelDelegationTokenReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CancelDelegationToken_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -18041,6 +19530,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CancelDelegationTo
     }
 
     private static class CancelDelegationToken_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelDelegationToken_argsTupleScheme getScheme() {
         return new CancelDelegationToken_argsTupleScheme();
       }
@@ -18063,12 +19553,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CancelDelegationTok
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CancelDelegationToken_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.req = new TCancelDelegationTokenReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TCancelDelegationTokenReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -18078,6 +19573,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class CancelDelegationToken_result implements org.apache.thrift.TBase<CancelDelegationToken_result, CancelDelegationToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<CancelDelegationToken_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CancelDelegationToken_result");
 
@@ -18139,10 +19635,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -18177,6 +19675,7 @@ public CancelDelegationToken_result(CancelDelegationToken_result other) {
       }
     }
 
+    @Override
     public CancelDelegationToken_result deepCopy() {
       return new CancelDelegationToken_result(this);
     }
@@ -18210,6 +19709,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -18224,6 +19724,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -18234,6 +19735,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -18304,10 +19806,12 @@ public int compareTo(CancelDelegationToken_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -18357,6 +19861,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class CancelDelegationToken_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelDelegationToken_resultStandardScheme getScheme() {
         return new CancelDelegationToken_resultStandardScheme();
       }
@@ -18364,34 +19869,41 @@ public CancelDelegationToken_resultStandardScheme getScheme() {
 
     private static class CancelDelegationToken_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<CancelDelegationToken_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, CancelDelegationToken_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 TCancelDelegationTokenResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TCancelDelegationTokenResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, CancelDelegationToken_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -18408,6 +19920,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CancelDelegationTo
     }
 
     private static class CancelDelegationToken_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public CancelDelegationToken_resultTupleScheme getScheme() {
         return new CancelDelegationToken_resultTupleScheme();
       }
@@ -18430,12 +19943,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CancelDelegationTok
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, CancelDelegationToken_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.success = new TCancelDelegationTokenResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TCancelDelegationTokenResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -18445,6 +19963,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class RenewDelegationToken_args implements org.apache.thrift.TBase<RenewDelegationToken_args, RenewDelegationToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<RenewDelegationToken_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RenewDelegationToken_args");
 
@@ -18506,10 +20025,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -18544,6 +20065,7 @@ public RenewDelegationToken_args(RenewDelegationToken_args other) {
       }
     }
 
+    @Override
     public RenewDelegationToken_args deepCopy() {
       return new RenewDelegationToken_args(this);
     }
@@ -18577,6 +20099,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -18591,6 +20114,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -18601,6 +20125,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -18671,14 +20196,17 @@ public int compareTo(RenewDelegationToken_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -18724,6 +20252,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class RenewDelegationToken_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public RenewDelegationToken_argsStandardScheme getScheme() {
         return new RenewDelegationToken_argsStandardScheme();
       }
@@ -18731,34 +20260,41 @@ public RenewDelegationToken_argsStandardScheme getScheme() {
 
     private static class RenewDelegationToken_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<RenewDelegationToken_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, RenewDelegationToken_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TRenewDelegationTokenReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TRenewDelegationTokenReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, RenewDelegationToken_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -18775,6 +20311,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RenewDelegationTok
     }
 
     private static class RenewDelegationToken_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public RenewDelegationToken_argsTupleScheme getScheme() {
         return new RenewDelegationToken_argsTupleScheme();
       }
@@ -18797,12 +20334,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RenewDelegationToke
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, RenewDelegationToken_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.req = new TRenewDelegationTokenReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TRenewDelegationTokenReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -18812,6 +20354,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class RenewDelegationToken_result implements org.apache.thrift.TBase<RenewDelegationToken_result, RenewDelegationToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<RenewDelegationToken_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RenewDelegationToken_result");
 
@@ -18873,10 +20416,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -18911,6 +20456,7 @@ public RenewDelegationToken_result(RenewDelegationToken_result other) {
       }
     }
 
+    @Override
     public RenewDelegationToken_result deepCopy() {
       return new RenewDelegationToken_result(this);
     }
@@ -18944,6 +20490,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -18958,6 +20505,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -18968,6 +20516,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -19038,10 +20587,12 @@ public int compareTo(RenewDelegationToken_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -19091,6 +20642,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class RenewDelegationToken_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public RenewDelegationToken_resultStandardScheme getScheme() {
         return new RenewDelegationToken_resultStandardScheme();
       }
@@ -19098,34 +20650,41 @@ public RenewDelegationToken_resultStandardScheme getScheme() {
 
     private static class RenewDelegationToken_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<RenewDelegationToken_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, RenewDelegationToken_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 TRenewDelegationTokenResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TRenewDelegationTokenResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, RenewDelegationToken_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -19142,6 +20701,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RenewDelegationTok
     }
 
     private static class RenewDelegationToken_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public RenewDelegationToken_resultTupleScheme getScheme() {
         return new RenewDelegationToken_resultTupleScheme();
       }
@@ -19164,12 +20724,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RenewDelegationToke
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, RenewDelegationToken_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.success = new TRenewDelegationTokenResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TRenewDelegationTokenResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -19179,6 +20744,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetQueryId_args implements org.apache.thrift.TBase<GetQueryId_args, GetQueryId_args._Fields>, java.io.Serializable, Cloneable, Comparable<GetQueryId_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetQueryId_args");
 
@@ -19240,10 +20806,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -19278,6 +20846,7 @@ public GetQueryId_args(GetQueryId_args other) {
       }
     }
 
+    @Override
     public GetQueryId_args deepCopy() {
       return new GetQueryId_args(this);
     }
@@ -19311,6 +20880,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -19325,6 +20895,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -19335,6 +20906,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -19405,14 +20977,17 @@ public int compareTo(GetQueryId_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -19458,6 +21033,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetQueryId_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetQueryId_argsStandardScheme getScheme() {
         return new GetQueryId_argsStandardScheme();
       }
@@ -19465,34 +21041,41 @@ public GetQueryId_argsStandardScheme getScheme() {
 
     private static class GetQueryId_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetQueryId_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetQueryId_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TGetQueryIdReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TGetQueryIdReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetQueryId_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -19509,6 +21092,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetQueryId_args st
     }
 
     private static class GetQueryId_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetQueryId_argsTupleScheme getScheme() {
         return new GetQueryId_argsTupleScheme();
       }
@@ -19531,12 +21115,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetQueryId_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetQueryId_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.req = new TGetQueryIdReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TGetQueryIdReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -19546,6 +21135,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class GetQueryId_result implements org.apache.thrift.TBase<GetQueryId_result, GetQueryId_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetQueryId_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetQueryId_result");
 
@@ -19607,10 +21197,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -19645,6 +21237,7 @@ public GetQueryId_result(GetQueryId_result other) {
       }
     }
 
+    @Override
     public GetQueryId_result deepCopy() {
       return new GetQueryId_result(this);
     }
@@ -19678,6 +21271,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -19692,6 +21286,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -19702,6 +21297,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -19772,10 +21368,12 @@ public int compareTo(GetQueryId_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -19825,6 +21423,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class GetQueryId_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetQueryId_resultStandardScheme getScheme() {
         return new GetQueryId_resultStandardScheme();
       }
@@ -19832,34 +21431,41 @@ public GetQueryId_resultStandardScheme getScheme() {
 
     private static class GetQueryId_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetQueryId_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, GetQueryId_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 TGetQueryIdResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TGetQueryIdResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, GetQueryId_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -19876,6 +21482,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetQueryId_result
     }
 
     private static class GetQueryId_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public GetQueryId_resultTupleScheme getScheme() {
         return new GetQueryId_resultTupleScheme();
       }
@@ -19898,12 +21505,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetQueryId_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, GetQueryId_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.success = new TGetQueryIdResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TGetQueryIdResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -19913,6 +21525,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class SetClientInfo_args implements org.apache.thrift.TBase<SetClientInfo_args, SetClientInfo_args._Fields>, java.io.Serializable, Cloneable, Comparable<SetClientInfo_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetClientInfo_args");
 
@@ -19974,10 +21587,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -20012,6 +21627,7 @@ public SetClientInfo_args(SetClientInfo_args other) {
       }
     }
 
+    @Override
     public SetClientInfo_args deepCopy() {
       return new SetClientInfo_args(this);
     }
@@ -20045,6 +21661,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -20059,6 +21676,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -20069,6 +21687,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -20139,14 +21758,17 @@ public int compareTo(SetClientInfo_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -20192,6 +21814,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class SetClientInfo_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public SetClientInfo_argsStandardScheme getScheme() {
         return new SetClientInfo_argsStandardScheme();
       }
@@ -20199,34 +21822,41 @@ public SetClientInfo_argsStandardScheme getScheme() {
 
     private static class SetClientInfo_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SetClientInfo_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, SetClientInfo_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TSetClientInfoReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TSetClientInfoReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, SetClientInfo_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -20243,6 +21873,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SetClientInfo_args
     }
 
     private static class SetClientInfo_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public SetClientInfo_argsTupleScheme getScheme() {
         return new SetClientInfo_argsTupleScheme();
       }
@@ -20265,12 +21896,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SetClientInfo_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, SetClientInfo_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.req = new TSetClientInfoReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TSetClientInfoReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -20280,6 +21916,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class SetClientInfo_result implements org.apache.thrift.TBase<SetClientInfo_result, SetClientInfo_result._Fields>, java.io.Serializable, Cloneable, Comparable<SetClientInfo_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetClientInfo_result");
 
@@ -20341,10 +21978,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -20379,6 +22018,7 @@ public SetClientInfo_result(SetClientInfo_result other) {
       }
     }
 
+    @Override
     public SetClientInfo_result deepCopy() {
       return new SetClientInfo_result(this);
     }
@@ -20412,6 +22052,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -20426,6 +22067,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -20436,6 +22078,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -20506,10 +22149,12 @@ public int compareTo(SetClientInfo_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -20559,6 +22204,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class SetClientInfo_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public SetClientInfo_resultStandardScheme getScheme() {
         return new SetClientInfo_resultStandardScheme();
       }
@@ -20566,34 +22212,41 @@ public SetClientInfo_resultStandardScheme getScheme() {
 
     private static class SetClientInfo_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<SetClientInfo_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, SetClientInfo_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 TSetClientInfoResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TSetClientInfoResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, SetClientInfo_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -20610,6 +22263,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SetClientInfo_resu
     }
 
     private static class SetClientInfo_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public SetClientInfo_resultTupleScheme getScheme() {
         return new SetClientInfo_resultTupleScheme();
       }
@@ -20632,12 +22286,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SetClientInfo_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, SetClientInfo_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.success = new TSetClientInfoResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TSetClientInfoResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -20647,6 +22306,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class UploadData_args implements org.apache.thrift.TBase<UploadData_args, UploadData_args._Fields>, java.io.Serializable, Cloneable, Comparable<UploadData_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadData_args");
 
@@ -20708,10 +22368,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -20746,6 +22408,7 @@ public UploadData_args(UploadData_args other) {
       }
     }
 
+    @Override
     public UploadData_args deepCopy() {
       return new UploadData_args(this);
     }
@@ -20779,6 +22442,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -20793,6 +22457,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -20803,6 +22468,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -20873,14 +22539,17 @@ public int compareTo(UploadData_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -20926,6 +22595,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class UploadData_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public UploadData_argsStandardScheme getScheme() {
         return new UploadData_argsStandardScheme();
       }
@@ -20933,34 +22603,41 @@ public UploadData_argsStandardScheme getScheme() {
 
     private static class UploadData_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<UploadData_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, UploadData_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TUploadDataReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TUploadDataReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, UploadData_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -20977,6 +22654,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UploadData_args st
     }
 
     private static class UploadData_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public UploadData_argsTupleScheme getScheme() {
         return new UploadData_argsTupleScheme();
       }
@@ -20999,12 +22677,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UploadData_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, UploadData_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.req = new TUploadDataReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TUploadDataReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -21014,6 +22697,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class UploadData_result implements org.apache.thrift.TBase<UploadData_result, UploadData_result._Fields>, java.io.Serializable, Cloneable, Comparable<UploadData_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadData_result");
 
@@ -21075,10 +22759,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -21113,6 +22799,7 @@ public UploadData_result(UploadData_result other) {
       }
     }
 
+    @Override
     public UploadData_result deepCopy() {
       return new UploadData_result(this);
     }
@@ -21146,6 +22833,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -21160,6 +22848,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -21170,6 +22859,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -21240,10 +22930,12 @@ public int compareTo(UploadData_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -21293,6 +22985,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class UploadData_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public UploadData_resultStandardScheme getScheme() {
         return new UploadData_resultStandardScheme();
       }
@@ -21300,34 +22993,41 @@ public UploadData_resultStandardScheme getScheme() {
 
     private static class UploadData_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<UploadData_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, UploadData_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 TUploadDataResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TUploadDataResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, UploadData_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -21344,6 +23044,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UploadData_result
     }
 
     private static class UploadData_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public UploadData_resultTupleScheme getScheme() {
         return new UploadData_resultTupleScheme();
       }
@@ -21366,12 +23067,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UploadData_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, UploadData_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.success = new TUploadDataResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TUploadDataResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -21381,6 +23087,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class DownloadData_args implements org.apache.thrift.TBase<DownloadData_args, DownloadData_args._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadData_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadData_args");
 
@@ -21442,10 +23149,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -21480,6 +23189,7 @@ public DownloadData_args(DownloadData_args other) {
       }
     }
 
+    @Override
     public DownloadData_args deepCopy() {
       return new DownloadData_args(this);
     }
@@ -21513,6 +23223,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -21527,6 +23238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -21537,6 +23249,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -21607,14 +23320,17 @@ public int compareTo(DownloadData_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -21660,6 +23376,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class DownloadData_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public DownloadData_argsStandardScheme getScheme() {
         return new DownloadData_argsStandardScheme();
       }
@@ -21667,34 +23384,41 @@ public DownloadData_argsStandardScheme getScheme() {
 
     private static class DownloadData_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<DownloadData_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, DownloadData_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TDownloadDataReq();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TDownloadDataReq();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, DownloadData_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -21711,6 +23435,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DownloadData_args
     }
 
     private static class DownloadData_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public DownloadData_argsTupleScheme getScheme() {
         return new DownloadData_argsTupleScheme();
       }
@@ -21733,12 +23458,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DownloadData_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, DownloadData_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.req = new TDownloadDataReq();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TDownloadDataReq();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -21748,6 +23478,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public static class DownloadData_result implements org.apache.thrift.TBase<DownloadData_result, DownloadData_result._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadData_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadData_result");
 
@@ -21809,10 +23540,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -21847,6 +23580,7 @@ public DownloadData_result(DownloadData_result other) {
       }
     }
 
+    @Override
     public DownloadData_result deepCopy() {
       return new DownloadData_result(this);
     }
@@ -21880,6 +23614,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -21894,6 +23629,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -21904,6 +23640,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -21974,10 +23711,12 @@ public int compareTo(DownloadData_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -22027,6 +23766,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class DownloadData_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public DownloadData_resultStandardScheme getScheme() {
         return new DownloadData_resultStandardScheme();
       }
@@ -22034,34 +23774,41 @@ public DownloadData_resultStandardScheme getScheme() {
 
     private static class DownloadData_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<DownloadData_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, DownloadData_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 TDownloadDataResp();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.success = new TDownloadDataResp();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, DownloadData_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -22078,6 +23825,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DownloadData_resul
     }
 
     private static class DownloadData_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public DownloadData_resultTupleScheme getScheme() {
         return new DownloadData_resultTupleScheme();
       }
@@ -22100,12 +23848,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DownloadData_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, DownloadData_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.success = new TDownloadDataResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TDownloadDataResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIServiceConstants.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIServiceConstants.java
index e525f2cdae32..127301f56ea3 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIServiceConstants.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCLIServiceConstants.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenReq.java
index 396b1fa23cb8..f9521244cc1c 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCancelDelegationTokenReq implements org.apache.thrift.TBase<TCancelDelegationTokenReq, TCancelDelegationTokenReq._Fields>, java.io.Serializable, Cloneable, Comparable<TCancelDelegationTokenReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCancelDelegationTokenReq");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public TCancelDelegationTokenReq(TCancelDelegationTokenReq other) {
     }
   }
 
+  @Override
   public TCancelDelegationTokenReq deepCopy() {
     return new TCancelDelegationTokenReq(this);
   }
@@ -177,6 +180,7 @@ public void setDelegationTokenIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(TCancelDelegationTokenReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCancelDelegationTokenReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelDelegationTokenReqStandardScheme getScheme() {
       return new TCancelDelegationTokenReqStandardScheme();
     }
@@ -383,42 +393,49 @@ public TCancelDelegationTokenReqStandardScheme getScheme() {
 
   private static class TCancelDelegationTokenReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCancelDelegationTokenReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCancelDelegationTokenReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // DELEGATION_TOKEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.delegationToken = iprot.readString();
-              struct.setDelegationTokenIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DELEGATION_TOKEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.delegationToken = iprot.readString();
+                struct.setDelegationTokenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelDelegationTokenReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -440,6 +457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelDelegationT
   }
 
   private static class TCancelDelegationTokenReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelDelegationTokenReqTupleScheme getScheme() {
       return new TCancelDelegationTokenReqTupleScheme();
     }
@@ -456,12 +474,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCancelDelegationTo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCancelDelegationTokenReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.delegationToken = iprot.readString();
-      struct.setDelegationTokenIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.delegationToken = iprot.readString();
+        struct.setDelegationTokenIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenResp.java
index 398a9a5d2625..323d0d87fd9b 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelDelegationTokenResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCancelDelegationTokenResp implements org.apache.thrift.TBase<TCancelDelegationTokenResp, TCancelDelegationTokenResp._Fields>, java.io.Serializable, Cloneable, Comparable<TCancelDelegationTokenResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCancelDelegationTokenResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCancelDelegationTokenResp(TCancelDelegationTokenResp other) {
     }
   }
 
+  @Override
   public TCancelDelegationTokenResp deepCopy() {
     return new TCancelDelegationTokenResp(this);
   }
@@ -140,6 +143,7 @@ public void setStatusIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCancelDelegationTokenResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCancelDelegationTokenRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelDelegationTokenRespStandardScheme getScheme() {
       return new TCancelDelegationTokenRespStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCancelDelegationTokenRespStandardScheme getScheme() {
 
   private static class TCancelDelegationTokenRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCancelDelegationTokenResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCancelDelegationTokenResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelDelegationTokenResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelDelegationT
   }
 
   private static class TCancelDelegationTokenRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelDelegationTokenRespTupleScheme getScheme() {
       return new TCancelDelegationTokenRespTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCancelDelegationTo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCancelDelegationTokenResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationReq.java
index 85f45661debd..1ad102566e4e 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCancelOperationReq implements org.apache.thrift.TBase<TCancelOperationReq, TCancelOperationReq._Fields>, java.io.Serializable, Cloneable, Comparable<TCancelOperationReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCancelOperationReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCancelOperationReq(TCancelOperationReq other) {
     }
   }
 
+  @Override
   public TCancelOperationReq deepCopy() {
     return new TCancelOperationReq(this);
   }
@@ -140,6 +143,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCancelOperationReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCancelOperationReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelOperationReqStandardScheme getScheme() {
       return new TCancelOperationReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCancelOperationReqStandardScheme getScheme() {
 
   private static class TCancelOperationReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCancelOperationReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCancelOperationReq 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 1: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelOperationReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelOperationRe
   }
 
   private static class TCancelOperationReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelOperationReqTupleScheme getScheme() {
       return new TCancelOperationReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCancelOperationReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCancelOperationReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationResp.java
index c14bd6bd3d6e..b22922f1e7cc 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCancelOperationResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCancelOperationResp implements org.apache.thrift.TBase<TCancelOperationResp, TCancelOperationResp._Fields>, java.io.Serializable, Cloneable, Comparable<TCancelOperationResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCancelOperationResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCancelOperationResp(TCancelOperationResp other) {
     }
   }
 
+  @Override
   public TCancelOperationResp deepCopy() {
     return new TCancelOperationResp(this);
   }
@@ -140,6 +143,7 @@ public void setStatusIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCancelOperationResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCancelOperationRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelOperationRespStandardScheme getScheme() {
       return new TCancelOperationRespStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCancelOperationRespStandardScheme getScheme() {
 
   private static class TCancelOperationRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCancelOperationResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCancelOperationResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelOperationResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCancelOperationRe
   }
 
   private static class TCancelOperationRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCancelOperationRespTupleScheme getScheme() {
       return new TCancelOperationRespTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCancelOperationRes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCancelOperationResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationReq.java
index 14a954c73e02..b06b9b4edd48 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCloseOperationReq implements org.apache.thrift.TBase<TCloseOperationReq, TCloseOperationReq._Fields>, java.io.Serializable, Cloneable, Comparable<TCloseOperationReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCloseOperationReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCloseOperationReq(TCloseOperationReq other) {
     }
   }
 
+  @Override
   public TCloseOperationReq deepCopy() {
     return new TCloseOperationReq(this);
   }
@@ -140,6 +143,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCloseOperationReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCloseOperationReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseOperationReqStandardScheme getScheme() {
       return new TCloseOperationReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCloseOperationReqStandardScheme getScheme() {
 
   private static class TCloseOperationReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCloseOperationReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCloseOperationReq 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 1: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseOperationReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseOperationReq
   }
 
   private static class TCloseOperationReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseOperationReqTupleScheme getScheme() {
       return new TCloseOperationReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCloseOperationReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCloseOperationReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationResp.java
index d7c95f9352cc..27dc342d14ae 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseOperationResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCloseOperationResp implements org.apache.thrift.TBase<TCloseOperationResp, TCloseOperationResp._Fields>, java.io.Serializable, Cloneable, Comparable<TCloseOperationResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCloseOperationResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCloseOperationResp(TCloseOperationResp other) {
     }
   }
 
+  @Override
   public TCloseOperationResp deepCopy() {
     return new TCloseOperationResp(this);
   }
@@ -140,6 +143,7 @@ public void setStatusIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCloseOperationResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCloseOperationRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseOperationRespStandardScheme getScheme() {
       return new TCloseOperationRespStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCloseOperationRespStandardScheme getScheme() {
 
   private static class TCloseOperationRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCloseOperationResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCloseOperationResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseOperationResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseOperationRes
   }
 
   private static class TCloseOperationRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseOperationRespTupleScheme getScheme() {
       return new TCloseOperationRespTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCloseOperationResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCloseOperationResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionReq.java
index e6b572e640e0..7cec2c345404 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCloseSessionReq implements org.apache.thrift.TBase<TCloseSessionReq, TCloseSessionReq._Fields>, java.io.Serializable, Cloneable, Comparable<TCloseSessionReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCloseSessionReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCloseSessionReq(TCloseSessionReq other) {
     }
   }
 
+  @Override
   public TCloseSessionReq deepCopy() {
     return new TCloseSessionReq(this);
   }
@@ -140,6 +143,7 @@ public void setSessionHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCloseSessionReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCloseSessionReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseSessionReqStandardScheme getScheme() {
       return new TCloseSessionReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCloseSessionReqStandardScheme getScheme() {
 
   private static class TCloseSessionReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCloseSessionReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCloseSessionReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseSessionReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseSessionReq s
   }
 
   private static class TCloseSessionReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseSessionReqTupleScheme getScheme() {
       return new TCloseSessionReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCloseSessionReq st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCloseSessionReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionResp.java
index 0ad76e159757..121241bbbef6 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TCloseSessionResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TCloseSessionResp implements org.apache.thrift.TBase<TCloseSessionResp, TCloseSessionResp._Fields>, java.io.Serializable, Cloneable, Comparable<TCloseSessionResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCloseSessionResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TCloseSessionResp(TCloseSessionResp other) {
     }
   }
 
+  @Override
   public TCloseSessionResp deepCopy() {
     return new TCloseSessionResp(this);
   }
@@ -140,6 +143,7 @@ public void setStatusIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TCloseSessionResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TCloseSessionRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseSessionRespStandardScheme getScheme() {
       return new TCloseSessionRespStandardScheme();
     }
@@ -298,34 +308,41 @@ public TCloseSessionRespStandardScheme getScheme() {
 
   private static class TCloseSessionRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCloseSessionResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TCloseSessionResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseSessionResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TCloseSessionResp
   }
 
   private static class TCloseSessionRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TCloseSessionRespTupleScheme getScheme() {
       return new TCloseSessionRespTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TCloseSessionResp s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TCloseSessionResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumn.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumn.java
index 5aa960d9b069..76595c3e3562 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumn.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumn.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TColumn extends org.apache.thrift.TUnion<TColumn, TColumn._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn");
   private static final org.apache.thrift.protocol.TField BOOL_VAL_FIELD_DESC = new org.apache.thrift.protocol.TField("boolVal", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -91,10 +91,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -134,6 +136,7 @@ public TColumn(_Fields setField, java.lang.Object value) {
   public TColumn(TColumn other) {
     super(other);
   }
+  @Override
   public TColumn deepCopy() {
     return new TColumn(this);
   }
@@ -497,6 +500,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnDesc.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnDesc.java
index bac650506550..0c1a75ff7436 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnDesc.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnDesc.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TColumnDesc implements org.apache.thrift.TBase<TColumnDesc, TColumnDesc._Fields>, java.io.Serializable, Cloneable, Comparable<TColumnDesc> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnDesc");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __POSITION_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.COMMENT};
+  private static final _Fields[] optionals = {_Fields.COMMENT};
   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);
@@ -144,6 +146,7 @@ public TColumnDesc(TColumnDesc other) {
     }
   }
 
+  @Override
   public TColumnDesc deepCopy() {
     return new TColumnDesc(this);
   }
@@ -251,6 +254,7 @@ public void setCommentIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COLUMN_NAME:
@@ -289,6 +293,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COLUMN_NAME:
@@ -308,6 +313,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -451,14 +457,17 @@ public int compareTo(TColumnDesc other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -540,6 +549,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TColumnDescStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TColumnDescStandardScheme getScheme() {
       return new TColumnDescStandardScheme();
     }
@@ -547,58 +557,65 @@ public TColumnDescStandardScheme getScheme() {
 
   private static class TColumnDescStandardScheme extends org.apache.thrift.scheme.StandardScheme<TColumnDesc> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TColumnDesc 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 1: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.columnName = iprot.readString();
-              struct.setColumnNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TYPE_DESC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.typeDesc = new TTypeDesc();
-              struct.typeDesc.read(iprot);
-              struct.setTypeDescIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // POSITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.position = iprot.readI32();
-              struct.setPositionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // COMMENT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.comment = iprot.readString();
-              struct.setCommentIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.columnName = iprot.readString();
+                struct.setColumnNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TYPE_DESC
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.typeDesc = new TTypeDesc();
+                struct.typeDesc.read(iprot);
+                struct.setTypeDescIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // POSITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.position = iprot.readI32();
+                struct.setPositionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COMMENT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.comment = iprot.readString();
+                struct.setCommentIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TColumnDesc struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -630,6 +647,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TColumnDesc struct
   }
 
   private static class TColumnDescTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TColumnDescTupleScheme getScheme() {
       return new TColumnDescTupleScheme();
     }
@@ -655,18 +673,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TColumnDesc struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TColumnDesc struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.columnName = iprot.readString();
-      struct.setColumnNameIsSet(true);
-      struct.typeDesc = new TTypeDesc();
-      struct.typeDesc.read(iprot);
-      struct.setTypeDescIsSet(true);
-      struct.position = iprot.readI32();
-      struct.setPositionIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.comment = iprot.readString();
-        struct.setCommentIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.columnName = iprot.readString();
+        struct.setColumnNameIsSet(true);
+        struct.typeDesc = new TTypeDesc();
+        struct.typeDesc.read(iprot);
+        struct.setTypeDescIsSet(true);
+        struct.position = iprot.readI32();
+        struct.setPositionIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.comment = iprot.readString();
+          struct.setCommentIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnValue.java
index dc174b1a5e61..18e4384ee132 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TColumnValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TColumnValue extends org.apache.thrift.TUnion<TColumnValue, TColumnValue._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnValue");
   private static final org.apache.thrift.protocol.TField BOOL_VAL_FIELD_DESC = new org.apache.thrift.protocol.TField("boolVal", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -87,10 +87,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -128,6 +130,7 @@ public TColumnValue(_Fields setField, java.lang.Object value) {
   public TColumnValue(TColumnValue other) {
     super(other);
   }
+  @Override
   public TColumnValue deepCopy() {
     return new TColumnValue(this);
   }
@@ -455,6 +458,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleColumn.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleColumn.java
index f53287b83cc6..d020733cb8b8 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleColumn.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleColumn.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TDoubleColumn implements org.apache.thrift.TBase<TDoubleColumn, TDoubleColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TDoubleColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDoubleColumn");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TDoubleColumn(TDoubleColumn other) {
     }
   }
 
+  @Override
   public TDoubleColumn deepCopy() {
     return new TDoubleColumn(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TDoubleColumn other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TDoubleColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDoubleColumnStandardScheme getScheme() {
       return new TDoubleColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TDoubleColumnStandardScheme getScheme() {
 
   private static class TDoubleColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDoubleColumn> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDoubleColumn 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list94 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.Double>(_list94.size);
-                double _elem95;
-                for (int _i96 = 0; _i96 < _list94.size; ++_i96)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem95 = iprot.readDouble();
-                  struct.values.add(_elem95);
+                  org.apache.thrift.protocol.TList _list94 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.Double>(_list94.size);
+                  double _elem95;
+                  for (int _i96 = 0; _i96 < _list94.size; ++_i96)
+                  {
+                    _elem95 = iprot.readDouble();
+                    struct.values.add(_elem95);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TDoubleColumn struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TDoubleColumn stru
   }
 
   private static class TDoubleColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDoubleColumnTupleScheme getScheme() {
       return new TDoubleColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TDoubleColumn struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDoubleColumn struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list99 = iprot.readListBegin(org.apache.thrift.protocol.TType.DOUBLE);
-        struct.values = new java.util.ArrayList<java.lang.Double>(_list99.size);
-        double _elem100;
-        for (int _i101 = 0; _i101 < _list99.size; ++_i101)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem100 = iprot.readDouble();
-          struct.values.add(_elem100);
+          org.apache.thrift.protocol.TList _list99 = iprot.readListBegin(org.apache.thrift.protocol.TType.DOUBLE);
+          struct.values = new java.util.ArrayList<java.lang.Double>(_list99.size);
+          double _elem100;
+          for (int _i101 = 0; _i101 < _list99.size; ++_i101)
+          {
+            _elem100 = iprot.readDouble();
+            struct.values.add(_elem100);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleValue.java
index 4a522f430820..d96ef5d7d4b4 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDoubleValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TDoubleValue implements org.apache.thrift.TBase<TDoubleValue, TDoubleValue._Fields>, java.io.Serializable, Cloneable, Comparable<TDoubleValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDoubleValue");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __VALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -102,6 +104,7 @@ public TDoubleValue(TDoubleValue other) {
     this.value = other.value;
   }
 
+  @Override
   public TDoubleValue deepCopy() {
     return new TDoubleValue(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TDoubleValue other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TDoubleValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDoubleValueStandardScheme getScheme() {
       return new TDoubleValueStandardScheme();
     }
@@ -285,33 +295,40 @@ public TDoubleValueStandardScheme getScheme() {
 
   private static class TDoubleValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDoubleValue> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDoubleValue 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.value = iprot.readDouble();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.value = iprot.readDouble();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TDoubleValue struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TDoubleValue struc
   }
 
   private static class TDoubleValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDoubleValueTupleScheme getScheme() {
       return new TDoubleValueTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TDoubleValue struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDoubleValue 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.value = iprot.readDouble();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readDouble();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataReq.java
index e9b1f5937dd5..025a18bb45a3 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TDownloadDataReq implements org.apache.thrift.TBase<TDownloadDataReq, TDownloadDataReq._Fields>, java.io.Serializable, Cloneable, Comparable<TDownloadDataReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDownloadDataReq");
 
@@ -89,17 +89,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TABLE_NAME,_Fields.QUERY,_Fields.FORMAT,_Fields.DOWNLOAD_OPTIONS};
+  private static final _Fields[] optionals = {_Fields.TABLE_NAME,_Fields.QUERY,_Fields.FORMAT,_Fields.DOWNLOAD_OPTIONS};
   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);
@@ -151,6 +153,7 @@ public TDownloadDataReq(TDownloadDataReq other) {
     }
   }
 
+  @Override
   public TDownloadDataReq deepCopy() {
     return new TDownloadDataReq(this);
   }
@@ -295,6 +298,7 @@ public void setDownloadOptionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -341,6 +345,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -363,6 +368,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -533,14 +539,17 @@ public int compareTo(TDownloadDataReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -630,6 +639,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TDownloadDataReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDownloadDataReqStandardScheme getScheme() {
       return new TDownloadDataReqStandardScheme();
     }
@@ -637,78 +647,85 @@ public TDownloadDataReqStandardScheme getScheme() {
 
   private static class TDownloadDataReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDownloadDataReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDownloadDataReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // QUERY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.query = iprot.readString();
-              struct.setQueryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FORMAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.format = iprot.readString();
-              struct.setFormatIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // DOWNLOAD_OPTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map182 = iprot.readMapBegin();
-                struct.downloadOptions = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map182.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key183;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val184;
-                for (int _i185 = 0; _i185 < _map182.size; ++_i185)
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // QUERY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.query = iprot.readString();
+                struct.setQueryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FORMAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.format = iprot.readString();
+                struct.setFormatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // DOWNLOAD_OPTIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key183 = iprot.readString();
-                  _val184 = iprot.readString();
-                  struct.downloadOptions.put(_key183, _val184);
+                  org.apache.thrift.protocol.TMap _map182 = iprot.readMapBegin();
+                  struct.downloadOptions = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map182.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key183;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val184;
+                  for (int _i185 = 0; _i185 < _map182.size; ++_i185)
+                  {
+                    _key183 = iprot.readString();
+                    _val184 = iprot.readString();
+                    struct.downloadOptions.put(_key183, _val184);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setDownloadOptionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDownloadOptionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TDownloadDataReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -761,6 +778,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TDownloadDataReq s
   }
 
   private static class TDownloadDataReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDownloadDataReqTupleScheme getScheme() {
       return new TDownloadDataReqTupleScheme();
     }
@@ -809,37 +827,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TDownloadDataReq st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDownloadDataReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.query = iprot.readString();
-        struct.setQueryIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.format = iprot.readString();
-        struct.setFormatIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TMap _map188 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.downloadOptions = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map188.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key189;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val190;
-          for (int _i191 = 0; _i191 < _map188.size; ++_i191)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.query = iprot.readString();
+          struct.setQueryIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.format = iprot.readString();
+          struct.setFormatIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _key189 = iprot.readString();
-            _val190 = iprot.readString();
-            struct.downloadOptions.put(_key189, _val190);
+            org.apache.thrift.protocol.TMap _map188 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.downloadOptions = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map188.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key189;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val190;
+            for (int _i191 = 0; _i191 < _map188.size; ++_i191)
+            {
+              _key189 = iprot.readString();
+              _val190 = iprot.readString();
+              struct.downloadOptions.put(_key189, _val190);
+            }
           }
+          struct.setDownloadOptionsIsSet(true);
         }
-        struct.setDownloadOptionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataResp.java
index 7db09266d818..33421e286ebf 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TDownloadDataResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TDownloadDataResp implements org.apache.thrift.TBase<TDownloadDataResp, TDownloadDataResp._Fields>, java.io.Serializable, Cloneable, Comparable<TDownloadDataResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDownloadDataResp");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public TDownloadDataResp(TDownloadDataResp other) {
     }
   }
 
+  @Override
   public TDownloadDataResp deepCopy() {
     return new TDownloadDataResp(this);
   }
@@ -177,6 +180,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(TDownloadDataResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -379,6 +388,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TDownloadDataRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDownloadDataRespStandardScheme getScheme() {
       return new TDownloadDataRespStandardScheme();
     }
@@ -386,43 +396,50 @@ public TDownloadDataRespStandardScheme getScheme() {
 
   private static class TDownloadDataRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TDownloadDataResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TDownloadDataResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TDownloadDataResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -444,6 +461,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TDownloadDataResp
   }
 
   private static class TDownloadDataRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TDownloadDataRespTupleScheme getScheme() {
       return new TDownloadDataRespTupleScheme();
     }
@@ -460,13 +478,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TDownloadDataResp s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TDownloadDataResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementReq.java
index 01be66dff1ec..58ed258713c3 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TExecuteStatementReq implements org.apache.thrift.TBase<TExecuteStatementReq, TExecuteStatementReq._Fields>, java.io.Serializable, Cloneable, Comparable<TExecuteStatementReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TExecuteStatementReq");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -102,7 +104,7 @@ public java.lang.String getFieldName() {
   private static final int __RUNASYNC_ISSET_ID = 0;
   private static final int __QUERYTIMEOUT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CONF_OVERLAY,_Fields.RUN_ASYNC,_Fields.QUERY_TIMEOUT};
+  private static final _Fields[] optionals = {_Fields.CONF_OVERLAY,_Fields.RUN_ASYNC,_Fields.QUERY_TIMEOUT};
   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);
@@ -157,6 +159,7 @@ public TExecuteStatementReq(TExecuteStatementReq other) {
     this.queryTimeout = other.queryTimeout;
   }
 
+  @Override
   public TExecuteStatementReq deepCopy() {
     return new TExecuteStatementReq(this);
   }
@@ -299,6 +302,7 @@ public void setQueryTimeoutIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __QUERYTIMEOUT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -345,6 +349,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -367,6 +372,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -537,14 +543,17 @@ public int compareTo(TExecuteStatementReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -630,6 +639,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TExecuteStatementReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TExecuteStatementReqStandardScheme getScheme() {
       return new TExecuteStatementReqStandardScheme();
     }
@@ -637,78 +647,85 @@ public TExecuteStatementReqStandardScheme getScheme() {
 
   private static class TExecuteStatementReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TExecuteStatementReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TExecuteStatementReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATEMENT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.statement = iprot.readString();
-              struct.setStatementIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // CONF_OVERLAY
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map172 = iprot.readMapBegin();
-                struct.confOverlay = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map172.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key173;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val174;
-                for (int _i175 = 0; _i175 < _map172.size; ++_i175)
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATEMENT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.statement = iprot.readString();
+                struct.setStatementIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CONF_OVERLAY
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key173 = iprot.readString();
-                  _val174 = iprot.readString();
-                  struct.confOverlay.put(_key173, _val174);
+                  org.apache.thrift.protocol.TMap _map172 = iprot.readMapBegin();
+                  struct.confOverlay = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map172.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key173;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val174;
+                  for (int _i175 = 0; _i175 < _map172.size; ++_i175)
+                  {
+                    _key173 = iprot.readString();
+                    _val174 = iprot.readString();
+                    struct.confOverlay.put(_key173, _val174);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setConfOverlayIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setConfOverlayIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // RUN_ASYNC
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.runAsync = iprot.readBool();
-              struct.setRunAsyncIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // QUERY_TIMEOUT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.queryTimeout = iprot.readI64();
-              struct.setQueryTimeoutIsSet(true);
-            } else { 
+              break;
+            case 4: // RUN_ASYNC
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.runAsync = iprot.readBool();
+                struct.setRunAsyncIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // QUERY_TIMEOUT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.queryTimeout = iprot.readI64();
+                struct.setQueryTimeoutIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TExecuteStatementReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -755,6 +772,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TExecuteStatementR
   }
 
   private static class TExecuteStatementReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TExecuteStatementReqTupleScheme getScheme() {
       return new TExecuteStatementReqTupleScheme();
     }
@@ -798,35 +816,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TExecuteStatementRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TExecuteStatementReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.statement = iprot.readString();
-      struct.setStatementIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TMap _map178 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.confOverlay = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map178.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key179;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val180;
-          for (int _i181 = 0; _i181 < _map178.size; ++_i181)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.statement = iprot.readString();
+        struct.setStatementIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _key179 = iprot.readString();
-            _val180 = iprot.readString();
-            struct.confOverlay.put(_key179, _val180);
+            org.apache.thrift.protocol.TMap _map178 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.confOverlay = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map178.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key179;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val180;
+            for (int _i181 = 0; _i181 < _map178.size; ++_i181)
+            {
+              _key179 = iprot.readString();
+              _val180 = iprot.readString();
+              struct.confOverlay.put(_key179, _val180);
+            }
           }
+          struct.setConfOverlayIsSet(true);
         }
-        struct.setConfOverlayIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.runAsync = iprot.readBool();
-        struct.setRunAsyncIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.queryTimeout = iprot.readI64();
-        struct.setQueryTimeoutIsSet(true);
+        if (incoming.get(1)) {
+          struct.runAsync = iprot.readBool();
+          struct.setRunAsyncIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.queryTimeout = iprot.readI64();
+          struct.setQueryTimeoutIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementResp.java
index 18a57db246fa..ea215efad6f2 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TExecuteStatementResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TExecuteStatementResp implements org.apache.thrift.TBase<TExecuteStatementResp, TExecuteStatementResp._Fields>, java.io.Serializable, Cloneable, Comparable<TExecuteStatementResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TExecuteStatementResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TExecuteStatementResp(TExecuteStatementResp other) {
     }
   }
 
+  @Override
   public TExecuteStatementResp deepCopy() {
     return new TExecuteStatementResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TExecuteStatementResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TExecuteStatementRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TExecuteStatementRespStandardScheme getScheme() {
       return new TExecuteStatementRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TExecuteStatementRespStandardScheme getScheme() {
 
   private static class TExecuteStatementRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TExecuteStatementResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TExecuteStatementResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TExecuteStatementResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TExecuteStatementR
   }
 
   private static class TExecuteStatementRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TExecuteStatementRespTupleScheme getScheme() {
       return new TExecuteStatementRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TExecuteStatementRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TExecuteStatementResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchOrientation.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchOrientation.java
index 788d95473b30..bc85e12d6f4b 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchOrientation.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchOrientation.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TFetchOrientation implements org.apache.thrift.TEnum {
   FETCH_NEXT(0),
   FETCH_PRIOR(1),
@@ -25,6 +25,7 @@ private TFetchOrientation(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsReq.java
index aca2e55160aa..5826ba4439ab 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TFetchResultsReq implements org.apache.thrift.TBase<TFetchResultsReq, TFetchResultsReq._Fields>, java.io.Serializable, Cloneable, Comparable<TFetchResultsReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TFetchResultsReq");
 
@@ -88,10 +88,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   private static final int __MAXROWS_ISSET_ID = 0;
   private static final int __FETCHTYPE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.FETCH_TYPE};
+  private static final _Fields[] optionals = {_Fields.FETCH_TYPE};
   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);
@@ -151,6 +153,7 @@ public TFetchResultsReq(TFetchResultsReq other) {
     this.fetchType = other.fetchType;
   }
 
+  @Override
   public TFetchResultsReq deepCopy() {
     return new TFetchResultsReq(this);
   }
@@ -266,6 +269,7 @@ public void setFetchTypeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FETCHTYPE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -304,6 +308,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -323,6 +328,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -466,14 +472,17 @@ public int compareTo(TFetchResultsReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -551,6 +560,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TFetchResultsReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TFetchResultsReqStandardScheme getScheme() {
       return new TFetchResultsReqStandardScheme();
     }
@@ -558,58 +568,65 @@ public TFetchResultsReqStandardScheme getScheme() {
 
   private static class TFetchResultsReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TFetchResultsReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TFetchResultsReq 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 1: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ORIENTATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.orientation = org.apache.hive.service.rpc.thrift.TFetchOrientation.findByValue(iprot.readI32());
-              struct.setOrientationIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // MAX_ROWS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.maxRows = iprot.readI64();
-              struct.setMaxRowsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // FETCH_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.fetchType = iprot.readI16();
-              struct.setFetchTypeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ORIENTATION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.orientation = org.apache.hive.service.rpc.thrift.TFetchOrientation.findByValue(iprot.readI32());
+                struct.setOrientationIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // MAX_ROWS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.maxRows = iprot.readI64();
+                struct.setMaxRowsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FETCH_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.fetchType = iprot.readI16();
+                struct.setFetchTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TFetchResultsReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -639,6 +656,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TFetchResultsReq s
   }
 
   private static class TFetchResultsReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TFetchResultsReqTupleScheme getScheme() {
       return new TFetchResultsReqTupleScheme();
     }
@@ -664,18 +682,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TFetchResultsReq st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TFetchResultsReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
-      struct.orientation = org.apache.hive.service.rpc.thrift.TFetchOrientation.findByValue(iprot.readI32());
-      struct.setOrientationIsSet(true);
-      struct.maxRows = iprot.readI64();
-      struct.setMaxRowsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.fetchType = iprot.readI16();
-        struct.setFetchTypeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+        struct.orientation = org.apache.hive.service.rpc.thrift.TFetchOrientation.findByValue(iprot.readI32());
+        struct.setOrientationIsSet(true);
+        struct.maxRows = iprot.readI64();
+        struct.setMaxRowsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.fetchType = iprot.readI16();
+          struct.setFetchTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsResp.java
index 6bbe9d8914c2..ca8eddb9942c 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TFetchResultsResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TFetchResultsResp implements org.apache.thrift.TBase<TFetchResultsResp, TFetchResultsResp._Fields>, java.io.Serializable, Cloneable, Comparable<TFetchResultsResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TFetchResultsResp");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -91,7 +93,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __HASMOREROWS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.HAS_MORE_ROWS,_Fields.RESULTS};
+  private static final _Fields[] optionals = {_Fields.HAS_MORE_ROWS,_Fields.RESULTS};
   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);
@@ -129,6 +131,7 @@ public TFetchResultsResp(TFetchResultsResp other) {
     }
   }
 
+  @Override
   public TFetchResultsResp deepCopy() {
     return new TFetchResultsResp(this);
   }
@@ -211,6 +214,7 @@ public void setResultsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -241,6 +245,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -257,6 +262,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -377,14 +383,17 @@ public int compareTo(TFetchResultsResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -455,6 +464,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TFetchResultsRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TFetchResultsRespStandardScheme getScheme() {
       return new TFetchResultsRespStandardScheme();
     }
@@ -462,51 +472,58 @@ public TFetchResultsRespStandardScheme getScheme() {
 
   private static class TFetchResultsRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TFetchResultsResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TFetchResultsResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HAS_MORE_ROWS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.hasMoreRows = iprot.readBool();
-              struct.setHasMoreRowsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // RESULTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.results = new TRowSet();
-              struct.results.read(iprot);
-              struct.setResultsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // HAS_MORE_ROWS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.hasMoreRows = iprot.readBool();
+                struct.setHasMoreRowsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // RESULTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.results = new TRowSet();
+                struct.results.read(iprot);
+                struct.setResultsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TFetchResultsResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -535,6 +552,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TFetchResultsResp
   }
 
   private static class TFetchResultsRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TFetchResultsRespTupleScheme getScheme() {
       return new TFetchResultsRespTupleScheme();
     }
@@ -564,19 +582,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TFetchResultsResp s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TFetchResultsResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.hasMoreRows = iprot.readBool();
-        struct.setHasMoreRowsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.results = new TRowSet();
-        struct.results.read(iprot);
-        struct.setResultsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.hasMoreRows = iprot.readBool();
+          struct.setHasMoreRowsIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.results = new TRowSet();
+          struct.results.read(iprot);
+          struct.setResultsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsReq.java
index a82cea90f682..414be2c62140 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetCatalogsReq implements org.apache.thrift.TBase<TGetCatalogsReq, TGetCatalogsReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetCatalogsReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetCatalogsReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TGetCatalogsReq(TGetCatalogsReq other) {
     }
   }
 
+  @Override
   public TGetCatalogsReq deepCopy() {
     return new TGetCatalogsReq(this);
   }
@@ -140,6 +143,7 @@ public void setSessionHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TGetCatalogsReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetCatalogsReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCatalogsReqStandardScheme getScheme() {
       return new TGetCatalogsReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TGetCatalogsReqStandardScheme getScheme() {
 
   private static class TGetCatalogsReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetCatalogsReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetCatalogsReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCatalogsReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCatalogsReq st
   }
 
   private static class TGetCatalogsReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCatalogsReqTupleScheme getScheme() {
       return new TGetCatalogsReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetCatalogsReq str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetCatalogsReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsResp.java
index 4888e660812b..7c93938e279f 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCatalogsResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetCatalogsResp implements org.apache.thrift.TBase<TGetCatalogsResp, TGetCatalogsResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetCatalogsResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetCatalogsResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetCatalogsResp(TGetCatalogsResp other) {
     }
   }
 
+  @Override
   public TGetCatalogsResp deepCopy() {
     return new TGetCatalogsResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetCatalogsResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetCatalogsRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCatalogsRespStandardScheme getScheme() {
       return new TGetCatalogsRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetCatalogsRespStandardScheme getScheme() {
 
   private static class TGetCatalogsRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetCatalogsResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetCatalogsResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCatalogsResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCatalogsResp s
   }
 
   private static class TGetCatalogsRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCatalogsRespTupleScheme getScheme() {
       return new TGetCatalogsRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetCatalogsResp st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetCatalogsResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsReq.java
index 59fa1f3da350..cbb64c1e36ef 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetColumnsReq implements org.apache.thrift.TBase<TGetColumnsReq, TGetColumnsReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetColumnsReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetColumnsReq");
 
@@ -89,17 +89,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME,_Fields.TABLE_NAME,_Fields.COLUMN_NAME};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME,_Fields.TABLE_NAME,_Fields.COLUMN_NAME};
   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);
@@ -148,6 +150,7 @@ public TGetColumnsReq(TGetColumnsReq other) {
     }
   }
 
+  @Override
   public TGetColumnsReq deepCopy() {
     return new TGetColumnsReq(this);
   }
@@ -281,6 +284,7 @@ public void setColumnNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -327,6 +331,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -349,6 +354,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -519,14 +525,17 @@ public int compareTo(TGetColumnsReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -616,6 +625,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetColumnsReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetColumnsReqStandardScheme getScheme() {
       return new TGetColumnsReqStandardScheme();
     }
@@ -623,66 +633,73 @@ public TGetColumnsReqStandardScheme getScheme() {
 
   private static class TGetColumnsReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetColumnsReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetColumnsReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaName = iprot.readString();
-              struct.setSchemaNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaName = iprot.readString();
+                struct.setSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.columnName = iprot.readString();
+                struct.setColumnNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.columnName = iprot.readString();
-              struct.setColumnNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetColumnsReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -727,6 +744,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetColumnsReq str
   }
 
   private static class TGetColumnsReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetColumnsReqTupleScheme getScheme() {
       return new TGetColumnsReqTupleScheme();
     }
@@ -768,26 +786,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetColumnsReq stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetColumnsReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.schemaName = iprot.readString();
-        struct.setSchemaNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.columnName = iprot.readString();
-        struct.setColumnNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.schemaName = iprot.readString();
+          struct.setSchemaNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.columnName = iprot.readString();
+          struct.setColumnNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsResp.java
index 533e51f6e94f..ac7fb6004e73 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetColumnsResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetColumnsResp implements org.apache.thrift.TBase<TGetColumnsResp, TGetColumnsResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetColumnsResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetColumnsResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetColumnsResp(TGetColumnsResp other) {
     }
   }
 
+  @Override
   public TGetColumnsResp deepCopy() {
     return new TGetColumnsResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetColumnsResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetColumnsRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetColumnsRespStandardScheme getScheme() {
       return new TGetColumnsRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetColumnsRespStandardScheme getScheme() {
 
   private static class TGetColumnsRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetColumnsResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetColumnsResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetColumnsResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetColumnsResp st
   }
 
   private static class TGetColumnsRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetColumnsRespTupleScheme getScheme() {
       return new TGetColumnsRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetColumnsResp str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetColumnsResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceReq.java
index 9fa79948d038..a46d5fddefe3 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetCrossReferenceReq implements org.apache.thrift.TBase<TGetCrossReferenceReq, TGetCrossReferenceReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetCrossReferenceReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetCrossReferenceReq");
 
@@ -99,17 +99,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.PARENT_CATALOG_NAME,_Fields.PARENT_SCHEMA_NAME,_Fields.PARENT_TABLE_NAME,_Fields.FOREIGN_CATALOG_NAME,_Fields.FOREIGN_SCHEMA_NAME,_Fields.FOREIGN_TABLE_NAME};
+  private static final _Fields[] optionals = {_Fields.PARENT_CATALOG_NAME,_Fields.PARENT_SCHEMA_NAME,_Fields.PARENT_TABLE_NAME,_Fields.FOREIGN_CATALOG_NAME,_Fields.FOREIGN_SCHEMA_NAME,_Fields.FOREIGN_TABLE_NAME};
   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);
@@ -168,6 +170,7 @@ public TGetCrossReferenceReq(TGetCrossReferenceReq other) {
     }
   }
 
+  @Override
   public TGetCrossReferenceReq deepCopy() {
     return new TGetCrossReferenceReq(this);
   }
@@ -351,6 +354,7 @@ public void setForeignTableNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -413,6 +417,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -441,6 +446,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -661,14 +667,17 @@ public int compareTo(TGetCrossReferenceReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -778,6 +787,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetCrossReferenceReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCrossReferenceReqStandardScheme getScheme() {
       return new TGetCrossReferenceReqStandardScheme();
     }
@@ -785,82 +795,89 @@ public TGetCrossReferenceReqStandardScheme getScheme() {
 
   private static class TGetCrossReferenceReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetCrossReferenceReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetCrossReferenceReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PARENT_CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.parentCatalogName = iprot.readString();
-              struct.setParentCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARENT_SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.parentSchemaName = iprot.readString();
-              struct.setParentSchemaNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PARENT_TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.parentTableName = iprot.readString();
-              struct.setParentTableNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PARENT_CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.parentCatalogName = iprot.readString();
+                struct.setParentCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARENT_SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.parentSchemaName = iprot.readString();
+                struct.setParentSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARENT_TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.parentTableName = iprot.readString();
+                struct.setParentTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // FOREIGN_CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.foreignCatalogName = iprot.readString();
+                struct.setForeignCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // FOREIGN_SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.foreignSchemaName = iprot.readString();
+                struct.setForeignSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // FOREIGN_TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.foreignTableName = iprot.readString();
+                struct.setForeignTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // FOREIGN_CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.foreignCatalogName = iprot.readString();
-              struct.setForeignCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // FOREIGN_SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.foreignSchemaName = iprot.readString();
-              struct.setForeignSchemaNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // FOREIGN_TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.foreignTableName = iprot.readString();
-              struct.setForeignTableNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCrossReferenceReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -919,6 +936,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCrossReference
   }
 
   private static class TGetCrossReferenceReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCrossReferenceReqTupleScheme getScheme() {
       return new TGetCrossReferenceReqTupleScheme();
     }
@@ -972,34 +990,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetCrossReferenceR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetCrossReferenceReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.parentCatalogName = iprot.readString();
-        struct.setParentCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.parentSchemaName = iprot.readString();
-        struct.setParentSchemaNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.parentTableName = iprot.readString();
-        struct.setParentTableNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.foreignCatalogName = iprot.readString();
-        struct.setForeignCatalogNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.foreignSchemaName = iprot.readString();
-        struct.setForeignSchemaNameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.foreignTableName = iprot.readString();
-        struct.setForeignTableNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.parentCatalogName = iprot.readString();
+          struct.setParentCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.parentSchemaName = iprot.readString();
+          struct.setParentSchemaNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.parentTableName = iprot.readString();
+          struct.setParentTableNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.foreignCatalogName = iprot.readString();
+          struct.setForeignCatalogNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.foreignSchemaName = iprot.readString();
+          struct.setForeignSchemaNameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.foreignTableName = iprot.readString();
+          struct.setForeignTableNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceResp.java
index f8b93f85d763..28330687fd78 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetCrossReferenceResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetCrossReferenceResp implements org.apache.thrift.TBase<TGetCrossReferenceResp, TGetCrossReferenceResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetCrossReferenceResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetCrossReferenceResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetCrossReferenceResp(TGetCrossReferenceResp other) {
     }
   }
 
+  @Override
   public TGetCrossReferenceResp deepCopy() {
     return new TGetCrossReferenceResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetCrossReferenceResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetCrossReferenceRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCrossReferenceRespStandardScheme getScheme() {
       return new TGetCrossReferenceRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetCrossReferenceRespStandardScheme getScheme() {
 
   private static class TGetCrossReferenceRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetCrossReferenceResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetCrossReferenceResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCrossReferenceResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetCrossReference
   }
 
   private static class TGetCrossReferenceRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetCrossReferenceRespTupleScheme getScheme() {
       return new TGetCrossReferenceRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetCrossReferenceR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetCrossReferenceResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenReq.java
index 89a5ba84485b..411a480f66b5 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetDelegationTokenReq implements org.apache.thrift.TBase<TGetDelegationTokenReq, TGetDelegationTokenReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetDelegationTokenReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetDelegationTokenReq");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public TGetDelegationTokenReq(TGetDelegationTokenReq other) {
     }
   }
 
+  @Override
   public TGetDelegationTokenReq deepCopy() {
     return new TGetDelegationTokenReq(this);
   }
@@ -214,6 +217,7 @@ public void setRenewerIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(TGetDelegationTokenReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -461,6 +470,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetDelegationTokenReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetDelegationTokenReqStandardScheme getScheme() {
       return new TGetDelegationTokenReqStandardScheme();
     }
@@ -468,50 +478,57 @@ public TGetDelegationTokenReqStandardScheme getScheme() {
 
   private static class TGetDelegationTokenReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetDelegationTokenReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetDelegationTokenReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.owner = iprot.readString();
-              struct.setOwnerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // RENEWER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.renewer = iprot.readString();
-              struct.setRenewerIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OWNER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.owner = iprot.readString();
+                struct.setOwnerIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // RENEWER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.renewer = iprot.readString();
+                struct.setRenewerIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetDelegationTokenReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -538,6 +555,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetDelegationToke
   }
 
   private static class TGetDelegationTokenReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetDelegationTokenReqTupleScheme getScheme() {
       return new TGetDelegationTokenReqTupleScheme();
     }
@@ -555,14 +573,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetDelegationToken
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetDelegationTokenReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.owner = iprot.readString();
-      struct.setOwnerIsSet(true);
-      struct.renewer = iprot.readString();
-      struct.setRenewerIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.owner = iprot.readString();
+        struct.setOwnerIsSet(true);
+        struct.renewer = iprot.readString();
+        struct.setRenewerIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenResp.java
index 123a4869f512..b22dc17e3462 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetDelegationTokenResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetDelegationTokenResp implements org.apache.thrift.TBase<TGetDelegationTokenResp, TGetDelegationTokenResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetDelegationTokenResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetDelegationTokenResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.DELEGATION_TOKEN};
+  private static final _Fields[] optionals = {_Fields.DELEGATION_TOKEN};
   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);
@@ -118,6 +120,7 @@ public TGetDelegationTokenResp(TGetDelegationTokenResp other) {
     }
   }
 
+  @Override
   public TGetDelegationTokenResp deepCopy() {
     return new TGetDelegationTokenResp(this);
   }
@@ -176,6 +179,7 @@ public void setDelegationTokenIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetDelegationTokenResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -373,6 +382,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetDelegationTokenRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetDelegationTokenRespStandardScheme getScheme() {
       return new TGetDelegationTokenRespStandardScheme();
     }
@@ -380,42 +390,49 @@ public TGetDelegationTokenRespStandardScheme getScheme() {
 
   private static class TGetDelegationTokenRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetDelegationTokenResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetDelegationTokenResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // DELEGATION_TOKEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.delegationToken = iprot.readString();
-              struct.setDelegationTokenIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DELEGATION_TOKEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.delegationToken = iprot.readString();
+                struct.setDelegationTokenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetDelegationTokenResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -439,6 +456,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetDelegationToke
   }
 
   private static class TGetDelegationTokenRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetDelegationTokenRespTupleScheme getScheme() {
       return new TGetDelegationTokenRespTupleScheme();
     }
@@ -462,14 +480,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetDelegationToken
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetDelegationTokenResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.delegationToken = iprot.readString();
-        struct.setDelegationTokenIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.delegationToken = iprot.readString();
+          struct.setDelegationTokenIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsReq.java
index 97009594fc5d..025ae4f914ad 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetFunctionsReq implements org.apache.thrift.TBase<TGetFunctionsReq, TGetFunctionsReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetFunctionsReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetFunctionsReq");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME};
   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);
@@ -140,6 +142,7 @@ public TGetFunctionsReq(TGetFunctionsReq other) {
     }
   }
 
+  @Override
   public TGetFunctionsReq deepCopy() {
     return new TGetFunctionsReq(this);
   }
@@ -248,6 +251,7 @@ public void setFunctionNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -286,6 +290,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -305,6 +310,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -450,14 +456,17 @@ public int compareTo(TGetFunctionsReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -539,6 +548,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetFunctionsReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetFunctionsReqStandardScheme getScheme() {
       return new TGetFunctionsReqStandardScheme();
     }
@@ -546,58 +556,65 @@ public TGetFunctionsReqStandardScheme getScheme() {
 
   private static class TGetFunctionsReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetFunctionsReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetFunctionsReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaName = iprot.readString();
-              struct.setSchemaNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaName = iprot.readString();
+                struct.setSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FUNCTION_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.functionName = iprot.readString();
+                struct.setFunctionNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FUNCTION_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.functionName = iprot.readString();
-              struct.setFunctionNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetFunctionsReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -633,6 +650,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetFunctionsReq s
   }
 
   private static class TGetFunctionsReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetFunctionsReqTupleScheme getScheme() {
       return new TGetFunctionsReqTupleScheme();
     }
@@ -663,20 +681,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetFunctionsReq st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetFunctionsReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.functionName = iprot.readString();
-      struct.setFunctionNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.schemaName = iprot.readString();
-        struct.setSchemaNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.functionName = iprot.readString();
+        struct.setFunctionNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.schemaName = iprot.readString();
+          struct.setSchemaNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsResp.java
index 90d3a9b29da4..01f501bd865b 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetFunctionsResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetFunctionsResp implements org.apache.thrift.TBase<TGetFunctionsResp, TGetFunctionsResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetFunctionsResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetFunctionsResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetFunctionsResp(TGetFunctionsResp other) {
     }
   }
 
+  @Override
   public TGetFunctionsResp deepCopy() {
     return new TGetFunctionsResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetFunctionsResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetFunctionsRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetFunctionsRespStandardScheme getScheme() {
       return new TGetFunctionsRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetFunctionsRespStandardScheme getScheme() {
 
   private static class TGetFunctionsRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetFunctionsResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetFunctionsResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetFunctionsResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetFunctionsResp
   }
 
   private static class TGetFunctionsRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetFunctionsRespTupleScheme getScheme() {
       return new TGetFunctionsRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetFunctionsResp s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetFunctionsResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoReq.java
index f1ca30696f8f..448c7b33dd87 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetInfoReq implements org.apache.thrift.TBase<TGetInfoReq, TGetInfoReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetInfoReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetInfoReq");
 
@@ -78,10 +78,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public TGetInfoReq(TGetInfoReq other) {
     }
   }
 
+  @Override
   public TGetInfoReq deepCopy() {
     return new TGetInfoReq(this);
   }
@@ -189,6 +192,7 @@ public void setInfoTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -211,6 +215,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -224,6 +229,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -319,14 +325,17 @@ public int compareTo(TGetInfoReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -388,6 +397,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetInfoReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetInfoReqStandardScheme getScheme() {
       return new TGetInfoReqStandardScheme();
     }
@@ -395,42 +405,49 @@ public TGetInfoReqStandardScheme getScheme() {
 
   private static class TGetInfoReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetInfoReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetInfoReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // INFO_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.infoType = org.apache.hive.service.rpc.thrift.TGetInfoType.findByValue(iprot.readI32());
-              struct.setInfoTypeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // INFO_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.infoType = org.apache.hive.service.rpc.thrift.TGetInfoType.findByValue(iprot.readI32());
+                struct.setInfoTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetInfoReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -452,6 +469,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetInfoReq struct
   }
 
   private static class TGetInfoReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetInfoReqTupleScheme getScheme() {
       return new TGetInfoReqTupleScheme();
     }
@@ -468,12 +486,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetInfoReq struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetInfoReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.infoType = org.apache.hive.service.rpc.thrift.TGetInfoType.findByValue(iprot.readI32());
-      struct.setInfoTypeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.infoType = org.apache.hive.service.rpc.thrift.TGetInfoType.findByValue(iprot.readI32());
+        struct.setInfoTypeIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoResp.java
index 3865c189d1ef..c34a5a683205 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetInfoResp implements org.apache.thrift.TBase<TGetInfoResp, TGetInfoResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetInfoResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetInfoResp");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public TGetInfoResp(TGetInfoResp other) {
     }
   }
 
+  @Override
   public TGetInfoResp deepCopy() {
     return new TGetInfoResp(this);
   }
@@ -177,6 +180,7 @@ public void setInfoValueIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(TGetInfoResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetInfoRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetInfoRespStandardScheme getScheme() {
       return new TGetInfoRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetInfoRespStandardScheme getScheme() {
 
   private static class TGetInfoRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetInfoResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetInfoResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // INFO_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.infoValue = new TGetInfoValue();
-              struct.infoValue.read(iprot);
-              struct.setInfoValueIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // INFO_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.infoValue = new TGetInfoValue();
+                struct.infoValue.read(iprot);
+                struct.setInfoValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetInfoResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -441,6 +458,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetInfoResp struc
   }
 
   private static class TGetInfoRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetInfoRespTupleScheme getScheme() {
       return new TGetInfoRespTupleScheme();
     }
@@ -457,13 +475,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetInfoResp struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetInfoResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      struct.infoValue = new TGetInfoValue();
-      struct.infoValue.read(iprot);
-      struct.setInfoValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        struct.infoValue = new TGetInfoValue();
+        struct.infoValue.read(iprot);
+        struct.setInfoValueIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoType.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoType.java
index b341905bb0a5..6dca657d37a6 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoType.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TGetInfoType implements org.apache.thrift.TEnum {
   CLI_MAX_DRIVER_CONNECTIONS(0),
   CLI_MAX_CONCURRENT_ACTIVITIES(1),
@@ -67,6 +67,7 @@ private TGetInfoType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoValue.java
index f93529f56043..6c04ff09ded5 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetInfoValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetInfoValue extends org.apache.thrift.TUnion<TGetInfoValue, TGetInfoValue._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetInfoValue");
   private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -83,10 +83,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -122,6 +124,7 @@ public TGetInfoValue(_Fields setField, java.lang.Object value) {
   public TGetInfoValue(TGetInfoValue other) {
     super(other);
   }
+  @Override
   public TGetInfoValue deepCopy() {
     return new TGetInfoValue(this);
   }
@@ -401,6 +404,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusReq.java
index 639807b9e9af..070a76021e44 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetOperationStatusReq implements org.apache.thrift.TBase<TGetOperationStatusReq, TGetOperationStatusReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetOperationStatusReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetOperationStatusReq");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __GETPROGRESSUPDATE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.GET_PROGRESS_UPDATE};
+  private static final _Fields[] optionals = {_Fields.GET_PROGRESS_UPDATE};
   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);
@@ -119,6 +121,7 @@ public TGetOperationStatusReq(TGetOperationStatusReq other) {
     this.getProgressUpdate = other.getProgressUpdate;
   }
 
+  @Override
   public TGetOperationStatusReq deepCopy() {
     return new TGetOperationStatusReq(this);
   }
@@ -176,6 +179,7 @@ public void setGetProgressUpdateIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __GETPROGRESSUPDATE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetOperationStatusReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -371,6 +380,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetOperationStatusReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetOperationStatusReqStandardScheme getScheme() {
       return new TGetOperationStatusReqStandardScheme();
     }
@@ -378,42 +388,49 @@ public TGetOperationStatusReqStandardScheme getScheme() {
 
   private static class TGetOperationStatusReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetOperationStatusReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetOperationStatusReq 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 1: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // GET_PROGRESS_UPDATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.getProgressUpdate = iprot.readBool();
-              struct.setGetProgressUpdateIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // GET_PROGRESS_UPDATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.getProgressUpdate = iprot.readBool();
+                struct.setGetProgressUpdateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetOperationStatusReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -435,6 +452,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetOperationStatu
   }
 
   private static class TGetOperationStatusReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetOperationStatusReqTupleScheme getScheme() {
       return new TGetOperationStatusReqTupleScheme();
     }
@@ -458,14 +476,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetOperationStatus
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetOperationStatusReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.getProgressUpdate = iprot.readBool();
-        struct.setGetProgressUpdateIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.getProgressUpdate = iprot.readBool();
+          struct.setGetProgressUpdateIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusResp.java
index 439c4a168e3a..c6f6052e02ae 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetOperationStatusResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetOperationStatusResp implements org.apache.thrift.TBase<TGetOperationStatusResp, TGetOperationStatusResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetOperationStatusResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetOperationStatusResp");
 
@@ -123,10 +123,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -139,7 +141,7 @@ public java.lang.String getFieldName() {
   private static final int __HASRESULTSET_ISSET_ID = 3;
   private static final int __NUMMODIFIEDROWS_ISSET_ID = 4;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.OPERATION_STATE,_Fields.SQL_STATE,_Fields.ERROR_CODE,_Fields.ERROR_MESSAGE,_Fields.TASK_STATUS,_Fields.OPERATION_STARTED,_Fields.OPERATION_COMPLETED,_Fields.HAS_RESULT_SET,_Fields.PROGRESS_UPDATE_RESPONSE,_Fields.NUM_MODIFIED_ROWS};
+  private static final _Fields[] optionals = {_Fields.OPERATION_STATE,_Fields.SQL_STATE,_Fields.ERROR_CODE,_Fields.ERROR_MESSAGE,_Fields.TASK_STATUS,_Fields.OPERATION_STARTED,_Fields.OPERATION_COMPLETED,_Fields.HAS_RESULT_SET,_Fields.PROGRESS_UPDATE_RESPONSE,_Fields.NUM_MODIFIED_ROWS};
   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);
@@ -162,7 +164,7 @@ public java.lang.String getFieldName() {
     tmpMap.put(_Fields.HAS_RESULT_SET, new org.apache.thrift.meta_data.FieldMetaData("hasResultSet", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.PROGRESS_UPDATE_RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("progressUpdateResponse", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "TProgressUpdateResp")));
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TProgressUpdateResp.class)));
     tmpMap.put(_Fields.NUM_MODIFIED_ROWS, new org.apache.thrift.meta_data.FieldMetaData("numModifiedRows", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -209,6 +211,7 @@ public TGetOperationStatusResp(TGetOperationStatusResp other) {
     this.numModifiedRows = other.numModifiedRows;
   }
 
+  @Override
   public TGetOperationStatusResp deepCopy() {
     return new TGetOperationStatusResp(this);
   }
@@ -495,6 +498,7 @@ public void setNumModifiedRowsIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUMMODIFIEDROWS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -589,6 +593,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -629,6 +634,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -949,14 +955,17 @@ public int compareTo(TGetOperationStatusResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1067,6 +1076,9 @@ public void validate() throws org.apache.thrift.TException {
     if (status != null) {
       status.validate();
     }
+    if (progressUpdateResponse != null) {
+      progressUpdateResponse.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1088,6 +1100,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetOperationStatusRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetOperationStatusRespStandardScheme getScheme() {
       return new TGetOperationStatusRespStandardScheme();
     }
@@ -1095,115 +1108,122 @@ public TGetOperationStatusRespStandardScheme getScheme() {
 
   private static class TGetOperationStatusRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetOperationStatusResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetOperationStatusResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // OPERATION_STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operationState = org.apache.hive.service.rpc.thrift.TOperationState.findByValue(iprot.readI32());
-              struct.setOperationStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SQL_STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.sqlState = iprot.readString();
-              struct.setSqlStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ERROR_CODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.errorCode = iprot.readI32();
-              struct.setErrorCodeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ERROR_MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errorMessage = iprot.readString();
-              struct.setErrorMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // TASK_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.taskStatus = iprot.readString();
-              struct.setTaskStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // OPERATION_STARTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.operationStarted = iprot.readI64();
-              struct.setOperationStartedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // OPERATION_COMPLETED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.operationCompleted = iprot.readI64();
-              struct.setOperationCompletedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // HAS_RESULT_SET
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.hasResultSet = iprot.readBool();
-              struct.setHasResultSetIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.operationState = org.apache.hive.service.rpc.thrift.TOperationState.findByValue(iprot.readI32());
+                struct.setOperationStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SQL_STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.sqlState = iprot.readString();
+                struct.setSqlStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ERROR_CODE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.errorCode = iprot.readI32();
+                struct.setErrorCodeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ERROR_MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errorMessage = iprot.readString();
+                struct.setErrorMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // TASK_STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.taskStatus = iprot.readString();
+                struct.setTaskStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // OPERATION_STARTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.operationStarted = iprot.readI64();
+                struct.setOperationStartedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // OPERATION_COMPLETED
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.operationCompleted = iprot.readI64();
+                struct.setOperationCompletedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // HAS_RESULT_SET
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.hasResultSet = iprot.readBool();
+                struct.setHasResultSetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // PROGRESS_UPDATE_RESPONSE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.progressUpdateResponse = new TProgressUpdateResp();
+                struct.progressUpdateResponse.read(iprot);
+                struct.setProgressUpdateResponseIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // NUM_MODIFIED_ROWS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numModifiedRows = iprot.readI64();
+                struct.setNumModifiedRowsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // PROGRESS_UPDATE_RESPONSE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.progressUpdateResponse = new TProgressUpdateResp();
-              struct.progressUpdateResponse.read(iprot);
-              struct.setProgressUpdateResponseIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // NUM_MODIFIED_ROWS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numModifiedRows = iprot.readI64();
-              struct.setNumModifiedRowsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetOperationStatusResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1280,6 +1300,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetOperationStatu
   }
 
   private static class TGetOperationStatusRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetOperationStatusRespTupleScheme getScheme() {
       return new TGetOperationStatusRespTupleScheme();
     }
@@ -1357,51 +1378,56 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetOperationStatus
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetOperationStatusResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(10);
-      if (incoming.get(0)) {
-        struct.operationState = org.apache.hive.service.rpc.thrift.TOperationState.findByValue(iprot.readI32());
-        struct.setOperationStateIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.sqlState = iprot.readString();
-        struct.setSqlStateIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.errorCode = iprot.readI32();
-        struct.setErrorCodeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.errorMessage = iprot.readString();
-        struct.setErrorMessageIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.taskStatus = iprot.readString();
-        struct.setTaskStatusIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.operationStarted = iprot.readI64();
-        struct.setOperationStartedIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.operationCompleted = iprot.readI64();
-        struct.setOperationCompletedIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.hasResultSet = iprot.readBool();
-        struct.setHasResultSetIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.progressUpdateResponse = new TProgressUpdateResp();
-        struct.progressUpdateResponse.read(iprot);
-        struct.setProgressUpdateResponseIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.numModifiedRows = iprot.readI64();
-        struct.setNumModifiedRowsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(10);
+        if (incoming.get(0)) {
+          struct.operationState = org.apache.hive.service.rpc.thrift.TOperationState.findByValue(iprot.readI32());
+          struct.setOperationStateIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.sqlState = iprot.readString();
+          struct.setSqlStateIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.errorCode = iprot.readI32();
+          struct.setErrorCodeIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.errorMessage = iprot.readString();
+          struct.setErrorMessageIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.taskStatus = iprot.readString();
+          struct.setTaskStatusIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.operationStarted = iprot.readI64();
+          struct.setOperationStartedIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.operationCompleted = iprot.readI64();
+          struct.setOperationCompletedIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.hasResultSet = iprot.readBool();
+          struct.setHasResultSetIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.progressUpdateResponse = new TProgressUpdateResp();
+          struct.progressUpdateResponse.read(iprot);
+          struct.setProgressUpdateResponseIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.numModifiedRows = iprot.readI64();
+          struct.setNumModifiedRowsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysReq.java
index 5da4f846449e..fd0cea762932 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetPrimaryKeysReq implements org.apache.thrift.TBase<TGetPrimaryKeysReq, TGetPrimaryKeysReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetPrimaryKeysReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetPrimaryKeysReq");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME,_Fields.TABLE_NAME};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME,_Fields.TABLE_NAME};
   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);
@@ -138,6 +140,7 @@ public TGetPrimaryKeysReq(TGetPrimaryKeysReq other) {
     }
   }
 
+  @Override
   public TGetPrimaryKeysReq deepCopy() {
     return new TGetPrimaryKeysReq(this);
   }
@@ -246,6 +249,7 @@ public void setTableNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -284,6 +288,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -303,6 +308,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -448,14 +454,17 @@ public int compareTo(TGetPrimaryKeysReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -535,6 +544,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetPrimaryKeysReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetPrimaryKeysReqStandardScheme getScheme() {
       return new TGetPrimaryKeysReqStandardScheme();
     }
@@ -542,58 +552,65 @@ public TGetPrimaryKeysReqStandardScheme getScheme() {
 
   private static class TGetPrimaryKeysReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetPrimaryKeysReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetPrimaryKeysReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaName = iprot.readString();
+                struct.setSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaName = iprot.readString();
-              struct.setSchemaNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetPrimaryKeysReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -631,6 +648,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetPrimaryKeysReq
   }
 
   private static class TGetPrimaryKeysReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetPrimaryKeysReqTupleScheme getScheme() {
       return new TGetPrimaryKeysReqTupleScheme();
     }
@@ -666,22 +684,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetPrimaryKeysReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetPrimaryKeysReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.schemaName = iprot.readString();
-        struct.setSchemaNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.schemaName = iprot.readString();
+          struct.setSchemaNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysResp.java
index 2ec513e50f8b..f1dd67603838 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetPrimaryKeysResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetPrimaryKeysResp implements org.apache.thrift.TBase<TGetPrimaryKeysResp, TGetPrimaryKeysResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetPrimaryKeysResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetPrimaryKeysResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetPrimaryKeysResp(TGetPrimaryKeysResp other) {
     }
   }
 
+  @Override
   public TGetPrimaryKeysResp deepCopy() {
     return new TGetPrimaryKeysResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetPrimaryKeysResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetPrimaryKeysRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetPrimaryKeysRespStandardScheme getScheme() {
       return new TGetPrimaryKeysRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetPrimaryKeysRespStandardScheme getScheme() {
 
   private static class TGetPrimaryKeysRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetPrimaryKeysResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetPrimaryKeysResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetPrimaryKeysResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetPrimaryKeysRes
   }
 
   private static class TGetPrimaryKeysRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetPrimaryKeysRespTupleScheme getScheme() {
       return new TGetPrimaryKeysRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetPrimaryKeysResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetPrimaryKeysResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdReq.java
index 3d648cb24851..1e7dd563eb8d 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetQueryIdReq implements org.apache.thrift.TBase<TGetQueryIdReq, TGetQueryIdReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetQueryIdReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetQueryIdReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TGetQueryIdReq(TGetQueryIdReq other) {
     }
   }
 
+  @Override
   public TGetQueryIdReq deepCopy() {
     return new TGetQueryIdReq(this);
   }
@@ -140,6 +143,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TGetQueryIdReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetQueryIdReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetQueryIdReqStandardScheme getScheme() {
       return new TGetQueryIdReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TGetQueryIdReqStandardScheme getScheme() {
 
   private static class TGetQueryIdReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetQueryIdReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetQueryIdReq 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 1: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetQueryIdReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetQueryIdReq str
   }
 
   private static class TGetQueryIdReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetQueryIdReqTupleScheme getScheme() {
       return new TGetQueryIdReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetQueryIdReq stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetQueryIdReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdResp.java
index d8a40134aea9..10383cb18533 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetQueryIdResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetQueryIdResp implements org.apache.thrift.TBase<TGetQueryIdResp, TGetQueryIdResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetQueryIdResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetQueryIdResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TGetQueryIdResp(TGetQueryIdResp other) {
     }
   }
 
+  @Override
   public TGetQueryIdResp deepCopy() {
     return new TGetQueryIdResp(this);
   }
@@ -140,6 +143,7 @@ public void setQueryIdIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case QUERY_ID:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case QUERY_ID:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TGetQueryIdResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -288,6 +297,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetQueryIdRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetQueryIdRespStandardScheme getScheme() {
       return new TGetQueryIdRespStandardScheme();
     }
@@ -295,33 +305,40 @@ public TGetQueryIdRespStandardScheme getScheme() {
 
   private static class TGetQueryIdRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetQueryIdResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetQueryIdResp 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 1: // QUERY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.queryId = iprot.readString();
-              struct.setQueryIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // QUERY_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.queryId = iprot.readString();
+                struct.setQueryIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetQueryIdResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetQueryIdResp st
   }
 
   private static class TGetQueryIdRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetQueryIdRespTupleScheme getScheme() {
       return new TGetQueryIdRespTupleScheme();
     }
@@ -353,9 +371,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetQueryIdResp str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetQueryIdResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.queryId = iprot.readString();
-      struct.setQueryIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.queryId = iprot.readString();
+        struct.setQueryIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataReq.java
index 67cce5cbdaa4..0dfcdb218582 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetResultSetMetadataReq implements org.apache.thrift.TBase<TGetResultSetMetadataReq, TGetResultSetMetadataReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetResultSetMetadataReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetResultSetMetadataReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TGetResultSetMetadataReq(TGetResultSetMetadataReq other) {
     }
   }
 
+  @Override
   public TGetResultSetMetadataReq deepCopy() {
     return new TGetResultSetMetadataReq(this);
   }
@@ -140,6 +143,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TGetResultSetMetadataReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetResultSetMetadataReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetResultSetMetadataReqStandardScheme getScheme() {
       return new TGetResultSetMetadataReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TGetResultSetMetadataReqStandardScheme getScheme() {
 
   private static class TGetResultSetMetadataReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetResultSetMetadataReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetResultSetMetadataReq 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 1: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetResultSetMetadataReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetResultSetMetad
   }
 
   private static class TGetResultSetMetadataReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetResultSetMetadataReqTupleScheme getScheme() {
       return new TGetResultSetMetadataReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetResultSetMetada
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetResultSetMetadataReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataResp.java
index 4f3c1d607215..1578627e527d 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetResultSetMetadataResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetResultSetMetadataResp implements org.apache.thrift.TBase<TGetResultSetMetadataResp, TGetResultSetMetadataResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetResultSetMetadataResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetResultSetMetadataResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.SCHEMA};
+  private static final _Fields[] optionals = {_Fields.SCHEMA};
   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);
@@ -118,6 +120,7 @@ public TGetResultSetMetadataResp(TGetResultSetMetadataResp other) {
     }
   }
 
+  @Override
   public TGetResultSetMetadataResp deepCopy() {
     return new TGetResultSetMetadataResp(this);
   }
@@ -176,6 +179,7 @@ public void setSchemaIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetResultSetMetadataResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetResultSetMetadataRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetResultSetMetadataRespStandardScheme getScheme() {
       return new TGetResultSetMetadataRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetResultSetMetadataRespStandardScheme getScheme() {
 
   private static class TGetResultSetMetadataRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetResultSetMetadataResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetResultSetMetadataResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.schema = new TTableSchema();
-              struct.schema.read(iprot);
-              struct.setSchemaIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.schema = new TTableSchema();
+                struct.schema.read(iprot);
+                struct.setSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetResultSetMetadataResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetResultSetMetad
   }
 
   private static class TGetResultSetMetadataRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetResultSetMetadataRespTupleScheme getScheme() {
       return new TGetResultSetMetadataRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetResultSetMetada
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetResultSetMetadataResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.schema = new TTableSchema();
-        struct.schema.read(iprot);
-        struct.setSchemaIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.schema = new TTableSchema();
+          struct.schema.read(iprot);
+          struct.setSchemaIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasReq.java
index d94f18ff8d38..d9eef5c891fb 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetSchemasReq implements org.apache.thrift.TBase<TGetSchemasReq, TGetSchemasReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetSchemasReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetSchemasReq");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME};
   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);
@@ -128,6 +130,7 @@ public TGetSchemasReq(TGetSchemasReq other) {
     }
   }
 
+  @Override
   public TGetSchemasReq deepCopy() {
     return new TGetSchemasReq(this);
   }
@@ -211,6 +214,7 @@ public void setSchemaNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -241,6 +245,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -257,6 +262,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -377,14 +383,17 @@ public int compareTo(TGetSchemasReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -454,6 +463,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetSchemasReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetSchemasReqStandardScheme getScheme() {
       return new TGetSchemasReqStandardScheme();
     }
@@ -461,50 +471,57 @@ public TGetSchemasReqStandardScheme getScheme() {
 
   private static class TGetSchemasReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetSchemasReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetSchemasReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaName = iprot.readString();
-              struct.setSchemaNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaName = iprot.readString();
+                struct.setSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetSchemasReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -535,6 +552,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetSchemasReq str
   }
 
   private static class TGetSchemasReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetSchemasReqTupleScheme getScheme() {
       return new TGetSchemasReqTupleScheme();
     }
@@ -564,18 +582,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetSchemasReq stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetSchemasReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.schemaName = iprot.readString();
-        struct.setSchemaNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.schemaName = iprot.readString();
+          struct.setSchemaNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasResp.java
index 4b02e8f17efb..d10f4d8a86ff 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetSchemasResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetSchemasResp implements org.apache.thrift.TBase<TGetSchemasResp, TGetSchemasResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetSchemasResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetSchemasResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetSchemasResp(TGetSchemasResp other) {
     }
   }
 
+  @Override
   public TGetSchemasResp deepCopy() {
     return new TGetSchemasResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetSchemasResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetSchemasRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetSchemasRespStandardScheme getScheme() {
       return new TGetSchemasRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetSchemasRespStandardScheme getScheme() {
 
   private static class TGetSchemasRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetSchemasResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetSchemasResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetSchemasResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetSchemasResp st
   }
 
   private static class TGetSchemasRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetSchemasRespTupleScheme getScheme() {
       return new TGetSchemasRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetSchemasResp str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetSchemasResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesReq.java
index ef119807d406..a575ae163c43 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetTableTypesReq implements org.apache.thrift.TBase<TGetTableTypesReq, TGetTableTypesReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetTableTypesReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetTableTypesReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TGetTableTypesReq(TGetTableTypesReq other) {
     }
   }
 
+  @Override
   public TGetTableTypesReq deepCopy() {
     return new TGetTableTypesReq(this);
   }
@@ -140,6 +143,7 @@ public void setSessionHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TGetTableTypesReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetTableTypesReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTableTypesReqStandardScheme getScheme() {
       return new TGetTableTypesReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TGetTableTypesReqStandardScheme getScheme() {
 
   private static class TGetTableTypesReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetTableTypesReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetTableTypesReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTableTypesReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTableTypesReq
   }
 
   private static class TGetTableTypesReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTableTypesReqTupleScheme getScheme() {
       return new TGetTableTypesReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetTableTypesReq s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetTableTypesReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesResp.java
index b27064bd50fe..80762d27fd65 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTableTypesResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetTableTypesResp implements org.apache.thrift.TBase<TGetTableTypesResp, TGetTableTypesResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetTableTypesResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetTableTypesResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetTableTypesResp(TGetTableTypesResp other) {
     }
   }
 
+  @Override
   public TGetTableTypesResp deepCopy() {
     return new TGetTableTypesResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetTableTypesResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetTableTypesRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTableTypesRespStandardScheme getScheme() {
       return new TGetTableTypesRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetTableTypesRespStandardScheme getScheme() {
 
   private static class TGetTableTypesRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetTableTypesResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetTableTypesResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTableTypesResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTableTypesResp
   }
 
   private static class TGetTableTypesRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTableTypesRespTupleScheme getScheme() {
       return new TGetTableTypesRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetTableTypesResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetTableTypesResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesReq.java
index 5741437cd634..083e0a99dfdf 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetTablesReq implements org.apache.thrift.TBase<TGetTablesReq, TGetTablesReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetTablesReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetTablesReq");
 
@@ -89,17 +89,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME,_Fields.TABLE_NAME,_Fields.TABLE_TYPES};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.SCHEMA_NAME,_Fields.TABLE_NAME,_Fields.TABLE_TYPES};
   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);
@@ -150,6 +152,7 @@ public TGetTablesReq(TGetTablesReq other) {
     }
   }
 
+  @Override
   public TGetTablesReq deepCopy() {
     return new TGetTablesReq(this);
   }
@@ -299,6 +302,7 @@ public void setTableTypesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -345,6 +349,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -367,6 +372,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -537,14 +543,17 @@ public int compareTo(TGetTablesReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -634,6 +643,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetTablesReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTablesReqStandardScheme getScheme() {
       return new TGetTablesReqStandardScheme();
     }
@@ -641,76 +651,83 @@ public TGetTablesReqStandardScheme getScheme() {
 
   private static class TGetTablesReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetTablesReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetTablesReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaName = iprot.readString();
-              struct.setSchemaNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // TABLE_TYPES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list192 = iprot.readListBegin();
-                struct.tableTypes = new java.util.ArrayList<java.lang.String>(_list192.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem193;
-                for (int _i194 = 0; _i194 < _list192.size; ++_i194)
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaName = iprot.readString();
+                struct.setSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // TABLE_TYPES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem193 = iprot.readString();
-                  struct.tableTypes.add(_elem193);
+                  org.apache.thrift.protocol.TList _list192 = iprot.readListBegin();
+                  struct.tableTypes = new java.util.ArrayList<java.lang.String>(_list192.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem193;
+                  for (int _i194 = 0; _i194 < _list192.size; ++_i194)
+                  {
+                    _elem193 = iprot.readString();
+                    struct.tableTypes.add(_elem193);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTableTypesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTableTypesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTablesReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -762,6 +779,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTablesReq stru
   }
 
   private static class TGetTablesReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTablesReqTupleScheme getScheme() {
       return new TGetTablesReqTupleScheme();
     }
@@ -809,35 +827,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetTablesReq struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetTablesReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.schemaName = iprot.readString();
-        struct.setSchemaNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list197 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.tableTypes = new java.util.ArrayList<java.lang.String>(_list197.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem198;
-          for (int _i199 = 0; _i199 < _list197.size; ++_i199)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.schemaName = iprot.readString();
+          struct.setSchemaNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _elem198 = iprot.readString();
-            struct.tableTypes.add(_elem198);
+            org.apache.thrift.protocol.TList _list197 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.tableTypes = new java.util.ArrayList<java.lang.String>(_list197.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem198;
+            for (int _i199 = 0; _i199 < _list197.size; ++_i199)
+            {
+              _elem198 = iprot.readString();
+              struct.tableTypes.add(_elem198);
+            }
           }
+          struct.setTableTypesIsSet(true);
         }
-        struct.setTableTypesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesResp.java
index 62901964ef22..260684417871 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTablesResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetTablesResp implements org.apache.thrift.TBase<TGetTablesResp, TGetTablesResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetTablesResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetTablesResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetTablesResp(TGetTablesResp other) {
     }
   }
 
+  @Override
   public TGetTablesResp deepCopy() {
     return new TGetTablesResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetTablesResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetTablesRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTablesRespStandardScheme getScheme() {
       return new TGetTablesRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetTablesRespStandardScheme getScheme() {
 
   private static class TGetTablesRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetTablesResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetTablesResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTablesResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTablesResp str
   }
 
   private static class TGetTablesRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTablesRespTupleScheme getScheme() {
       return new TGetTablesRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetTablesResp stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetTablesResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoReq.java
index cea9661c718a..0e8b37b15ff7 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetTypeInfoReq implements org.apache.thrift.TBase<TGetTypeInfoReq, TGetTypeInfoReq._Fields>, java.io.Serializable, Cloneable, Comparable<TGetTypeInfoReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetTypeInfoReq");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TGetTypeInfoReq(TGetTypeInfoReq other) {
     }
   }
 
+  @Override
   public TGetTypeInfoReq deepCopy() {
     return new TGetTypeInfoReq(this);
   }
@@ -140,6 +143,7 @@ public void setSessionHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TGetTypeInfoReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetTypeInfoReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTypeInfoReqStandardScheme getScheme() {
       return new TGetTypeInfoReqStandardScheme();
     }
@@ -298,34 +308,41 @@ public TGetTypeInfoReqStandardScheme getScheme() {
 
   private static class TGetTypeInfoReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetTypeInfoReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetTypeInfoReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTypeInfoReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTypeInfoReq st
   }
 
   private static class TGetTypeInfoReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTypeInfoReqTupleScheme getScheme() {
       return new TGetTypeInfoReqTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetTypeInfoReq str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetTypeInfoReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoResp.java
index ca1e4cc54ecf..ed84771ac693 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TGetTypeInfoResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TGetTypeInfoResp implements org.apache.thrift.TBase<TGetTypeInfoResp, TGetTypeInfoResp._Fields>, java.io.Serializable, Cloneable, Comparable<TGetTypeInfoResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGetTypeInfoResp");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.OPERATION_HANDLE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_HANDLE};
   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);
@@ -118,6 +120,7 @@ public TGetTypeInfoResp(TGetTypeInfoResp other) {
     }
   }
 
+  @Override
   public TGetTypeInfoResp deepCopy() {
     return new TGetTypeInfoResp(this);
   }
@@ -176,6 +179,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(TGetTypeInfoResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TGetTypeInfoRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTypeInfoRespStandardScheme getScheme() {
       return new TGetTypeInfoRespStandardScheme();
     }
@@ -383,43 +393,50 @@ public TGetTypeInfoRespStandardScheme getScheme() {
 
   private static class TGetTypeInfoRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TGetTypeInfoResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TGetTypeInfoResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTypeInfoResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TGetTypeInfoResp s
   }
 
   private static class TGetTypeInfoRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TGetTypeInfoRespTupleScheme getScheme() {
       return new TGetTypeInfoRespTupleScheme();
     }
@@ -466,15 +484,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TGetTypeInfoResp st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TGetTypeInfoResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationHandle = new TOperationHandle();
-        struct.operationHandle.read(iprot);
-        struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationHandle = new TOperationHandle();
+          struct.operationHandle.read(iprot);
+          struct.setOperationHandleIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/THandleIdentifier.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/THandleIdentifier.java
index d1de7a1eb353..1927e6845110 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/THandleIdentifier.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/THandleIdentifier.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class THandleIdentifier implements org.apache.thrift.TBase<THandleIdentifier, THandleIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<THandleIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THandleIdentifier");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public THandleIdentifier(THandleIdentifier other) {
     }
   }
 
+  @Override
   public THandleIdentifier deepCopy() {
     return new THandleIdentifier(this);
   }
@@ -193,6 +196,7 @@ public void setSecretIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case GUID:
@@ -223,6 +227,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case GUID:
@@ -236,6 +241,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -331,14 +337,17 @@ public int compareTo(THandleIdentifier other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -397,6 +406,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class THandleIdentifierStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public THandleIdentifierStandardScheme getScheme() {
       return new THandleIdentifierStandardScheme();
     }
@@ -404,41 +414,48 @@ public THandleIdentifierStandardScheme getScheme() {
 
   private static class THandleIdentifierStandardScheme extends org.apache.thrift.scheme.StandardScheme<THandleIdentifier> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, THandleIdentifier 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 1: // GUID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.guid = iprot.readBinary();
-              struct.setGuidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // SECRET
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.secret = iprot.readBinary();
-              struct.setSecretIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // GUID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.guid = iprot.readBinary();
+                struct.setGuidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SECRET
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.secret = iprot.readBinary();
+                struct.setSecretIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, THandleIdentifier struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -460,6 +477,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, THandleIdentifier
   }
 
   private static class THandleIdentifierTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public THandleIdentifierTupleScheme getScheme() {
       return new THandleIdentifierTupleScheme();
     }
@@ -476,11 +494,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, THandleIdentifier s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, THandleIdentifier struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.guid = iprot.readBinary();
-      struct.setGuidIsSet(true);
-      struct.secret = iprot.readBinary();
-      struct.setSecretIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.guid = iprot.readBinary();
+        struct.setGuidIsSet(true);
+        struct.secret = iprot.readBinary();
+        struct.setSecretIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Column.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Column.java
index 8341e05c80c6..63c256059298 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Column.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Column.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TI16Column implements org.apache.thrift.TBase<TI16Column, TI16Column._Fields>, java.io.Serializable, Cloneable, Comparable<TI16Column> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TI16Column");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TI16Column(TI16Column other) {
     }
   }
 
+  @Override
   public TI16Column deepCopy() {
     return new TI16Column(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TI16Column other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TI16ColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI16ColumnStandardScheme getScheme() {
       return new TI16ColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TI16ColumnStandardScheme getScheme() {
 
   private static class TI16ColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TI16Column> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TI16Column 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.Short>(_list70.size);
-                short _elem71;
-                for (int _i72 = 0; _i72 < _list70.size; ++_i72)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem71 = iprot.readI16();
-                  struct.values.add(_elem71);
+                  org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.Short>(_list70.size);
+                  short _elem71;
+                  for (int _i72 = 0; _i72 < _list70.size; ++_i72)
+                  {
+                    _elem71 = iprot.readI16();
+                    struct.values.add(_elem71);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TI16Column struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TI16Column struct)
   }
 
   private static class TI16ColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI16ColumnTupleScheme getScheme() {
       return new TI16ColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TI16Column struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TI16Column struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list75 = iprot.readListBegin(org.apache.thrift.protocol.TType.I16);
-        struct.values = new java.util.ArrayList<java.lang.Short>(_list75.size);
-        short _elem76;
-        for (int _i77 = 0; _i77 < _list75.size; ++_i77)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem76 = iprot.readI16();
-          struct.values.add(_elem76);
+          org.apache.thrift.protocol.TList _list75 = iprot.readListBegin(org.apache.thrift.protocol.TType.I16);
+          struct.values = new java.util.ArrayList<java.lang.Short>(_list75.size);
+          short _elem76;
+          for (int _i77 = 0; _i77 < _list75.size; ++_i77)
+          {
+            _elem76 = iprot.readI16();
+            struct.values.add(_elem76);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Value.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Value.java
index 368a6eaefdc7..79ae99235113 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Value.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI16Value.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TI16Value implements org.apache.thrift.TBase<TI16Value, TI16Value._Fields>, java.io.Serializable, Cloneable, Comparable<TI16Value> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TI16Value");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __VALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -102,6 +104,7 @@ public TI16Value(TI16Value other) {
     this.value = other.value;
   }
 
+  @Override
   public TI16Value deepCopy() {
     return new TI16Value(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TI16Value other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TI16ValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI16ValueStandardScheme getScheme() {
       return new TI16ValueStandardScheme();
     }
@@ -285,33 +295,40 @@ public TI16ValueStandardScheme getScheme() {
 
   private static class TI16ValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TI16Value> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TI16Value 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.value = iprot.readI16();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.value = iprot.readI16();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TI16Value struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TI16Value struct)
   }
 
   private static class TI16ValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI16ValueTupleScheme getScheme() {
       return new TI16ValueTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TI16Value struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TI16Value 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.value = iprot.readI16();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readI16();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Column.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Column.java
index 04c76242513b..bab9729e834b 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Column.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Column.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TI32Column implements org.apache.thrift.TBase<TI32Column, TI32Column._Fields>, java.io.Serializable, Cloneable, Comparable<TI32Column> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TI32Column");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TI32Column(TI32Column other) {
     }
   }
 
+  @Override
   public TI32Column deepCopy() {
     return new TI32Column(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TI32Column other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TI32ColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI32ColumnStandardScheme getScheme() {
       return new TI32ColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TI32ColumnStandardScheme getScheme() {
 
   private static class TI32ColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TI32Column> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TI32Column 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list78 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.Integer>(_list78.size);
-                int _elem79;
-                for (int _i80 = 0; _i80 < _list78.size; ++_i80)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem79 = iprot.readI32();
-                  struct.values.add(_elem79);
+                  org.apache.thrift.protocol.TList _list78 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.Integer>(_list78.size);
+                  int _elem79;
+                  for (int _i80 = 0; _i80 < _list78.size; ++_i80)
+                  {
+                    _elem79 = iprot.readI32();
+                    struct.values.add(_elem79);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TI32Column struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TI32Column struct)
   }
 
   private static class TI32ColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI32ColumnTupleScheme getScheme() {
       return new TI32ColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TI32Column struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TI32Column struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list83 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
-        struct.values = new java.util.ArrayList<java.lang.Integer>(_list83.size);
-        int _elem84;
-        for (int _i85 = 0; _i85 < _list83.size; ++_i85)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem84 = iprot.readI32();
-          struct.values.add(_elem84);
+          org.apache.thrift.protocol.TList _list83 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.values = new java.util.ArrayList<java.lang.Integer>(_list83.size);
+          int _elem84;
+          for (int _i85 = 0; _i85 < _list83.size; ++_i85)
+          {
+            _elem84 = iprot.readI32();
+            struct.values.add(_elem84);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Value.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Value.java
index 489d84057862..e5d919ab29dc 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Value.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI32Value.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TI32Value implements org.apache.thrift.TBase<TI32Value, TI32Value._Fields>, java.io.Serializable, Cloneable, Comparable<TI32Value> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TI32Value");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __VALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -102,6 +104,7 @@ public TI32Value(TI32Value other) {
     this.value = other.value;
   }
 
+  @Override
   public TI32Value deepCopy() {
     return new TI32Value(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TI32Value other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TI32ValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI32ValueStandardScheme getScheme() {
       return new TI32ValueStandardScheme();
     }
@@ -285,33 +295,40 @@ public TI32ValueStandardScheme getScheme() {
 
   private static class TI32ValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TI32Value> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TI32Value 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.value = iprot.readI32();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.value = iprot.readI32();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TI32Value struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TI32Value struct)
   }
 
   private static class TI32ValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI32ValueTupleScheme getScheme() {
       return new TI32ValueTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TI32Value struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TI32Value 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.value = iprot.readI32();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readI32();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Column.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Column.java
index 878d329a406d..75e57d8a4f8d 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Column.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Column.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TI64Column implements org.apache.thrift.TBase<TI64Column, TI64Column._Fields>, java.io.Serializable, Cloneable, Comparable<TI64Column> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TI64Column");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TI64Column(TI64Column other) {
     }
   }
 
+  @Override
   public TI64Column deepCopy() {
     return new TI64Column(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TI64Column other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TI64ColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI64ColumnStandardScheme getScheme() {
       return new TI64ColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TI64ColumnStandardScheme getScheme() {
 
   private static class TI64ColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TI64Column> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TI64Column 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list86 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.Long>(_list86.size);
-                long _elem87;
-                for (int _i88 = 0; _i88 < _list86.size; ++_i88)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem87 = iprot.readI64();
-                  struct.values.add(_elem87);
+                  org.apache.thrift.protocol.TList _list86 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.Long>(_list86.size);
+                  long _elem87;
+                  for (int _i88 = 0; _i88 < _list86.size; ++_i88)
+                  {
+                    _elem87 = iprot.readI64();
+                    struct.values.add(_elem87);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TI64Column struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TI64Column struct)
   }
 
   private static class TI64ColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI64ColumnTupleScheme getScheme() {
       return new TI64ColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TI64Column struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TI64Column struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list91 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.values = new java.util.ArrayList<java.lang.Long>(_list91.size);
-        long _elem92;
-        for (int _i93 = 0; _i93 < _list91.size; ++_i93)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem92 = iprot.readI64();
-          struct.values.add(_elem92);
+          org.apache.thrift.protocol.TList _list91 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.values = new java.util.ArrayList<java.lang.Long>(_list91.size);
+          long _elem92;
+          for (int _i93 = 0; _i93 < _list91.size; ++_i93)
+          {
+            _elem92 = iprot.readI64();
+            struct.values.add(_elem92);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Value.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Value.java
index fce094aba8f6..e962235ca187 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Value.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TI64Value.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TI64Value implements org.apache.thrift.TBase<TI64Value, TI64Value._Fields>, java.io.Serializable, Cloneable, Comparable<TI64Value> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TI64Value");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __VALUE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -102,6 +104,7 @@ public TI64Value(TI64Value other) {
     this.value = other.value;
   }
 
+  @Override
   public TI64Value deepCopy() {
     return new TI64Value(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TI64Value other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TI64ValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI64ValueStandardScheme getScheme() {
       return new TI64ValueStandardScheme();
     }
@@ -285,33 +295,40 @@ public TI64ValueStandardScheme getScheme() {
 
   private static class TI64ValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TI64Value> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TI64Value 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.value = iprot.readI64();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.value = iprot.readI64();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TI64Value struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TI64Value struct)
   }
 
   private static class TI64ValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TI64ValueTupleScheme getScheme() {
       return new TI64ValueTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TI64Value struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TI64Value 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.value = iprot.readI64();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readI64();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TJobExecutionStatus.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TJobExecutionStatus.java
index 5887fae525d6..f7ee4e992f73 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TJobExecutionStatus.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TJobExecutionStatus.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TJobExecutionStatus implements org.apache.thrift.TEnum {
   IN_PROGRESS(0),
   COMPLETE(1),
@@ -22,6 +22,7 @@ private TJobExecutionStatus(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TMapTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TMapTypeEntry.java
index ec6192d3ff6b..a3e13cc3b094 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TMapTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TMapTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TMapTypeEntry implements org.apache.thrift.TBase<TMapTypeEntry, TMapTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TMapTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TMapTypeEntry");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TMapTypeEntry(TMapTypeEntry other) {
     this.valueTypePtr = other.valueTypePtr;
   }
 
+  @Override
   public TMapTypeEntry deepCopy() {
     return new TMapTypeEntry(this);
   }
@@ -177,6 +180,7 @@ public void setValueTypePtrIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALUETYPEPTR_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case KEY_TYPE_PTR:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case KEY_TYPE_PTR:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -303,14 +309,17 @@ public int compareTo(TMapTypeEntry other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -363,6 +372,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TMapTypeEntryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TMapTypeEntryStandardScheme getScheme() {
       return new TMapTypeEntryStandardScheme();
     }
@@ -370,41 +380,48 @@ public TMapTypeEntryStandardScheme getScheme() {
 
   private static class TMapTypeEntryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TMapTypeEntry> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TMapTypeEntry 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 1: // KEY_TYPE_PTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.keyTypePtr = iprot.readI32();
-              struct.setKeyTypePtrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // VALUE_TYPE_PTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.valueTypePtr = iprot.readI32();
-              struct.setValueTypePtrIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // KEY_TYPE_PTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.keyTypePtr = iprot.readI32();
+                struct.setKeyTypePtrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // VALUE_TYPE_PTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.valueTypePtr = iprot.readI32();
+                struct.setValueTypePtrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TMapTypeEntry struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -422,6 +439,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TMapTypeEntry stru
   }
 
   private static class TMapTypeEntryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TMapTypeEntryTupleScheme getScheme() {
       return new TMapTypeEntryTupleScheme();
     }
@@ -438,11 +456,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TMapTypeEntry struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TMapTypeEntry struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.keyTypePtr = iprot.readI32();
-      struct.setKeyTypePtrIsSet(true);
-      struct.valueTypePtr = iprot.readI32();
-      struct.setValueTypePtrIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.keyTypePtr = iprot.readI32();
+        struct.setKeyTypePtrIsSet(true);
+        struct.valueTypePtr = iprot.readI32();
+        struct.setValueTypePtrIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
index 9bdb0461d267..86f37c742780 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq, TOpenSessionReq._Fields>, java.io.Serializable, Cloneable, Comparable<TOpenSessionReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TOpenSessionReq");
 
@@ -88,17 +88,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.USERNAME,_Fields.PASSWORD,_Fields.CONFIGURATION};
+  private static final _Fields[] optionals = {_Fields.USERNAME,_Fields.PASSWORD,_Fields.CONFIGURATION};
   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);
@@ -147,6 +149,7 @@ public TOpenSessionReq(TOpenSessionReq other) {
     }
   }
 
+  @Override
   public TOpenSessionReq deepCopy() {
     return new TOpenSessionReq(this);
   }
@@ -275,6 +278,7 @@ public void setConfigurationIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CLIENT_PROTOCOL:
@@ -313,6 +317,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CLIENT_PROTOCOL:
@@ -332,6 +337,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -477,14 +483,17 @@ public int compareTo(TOpenSessionReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -558,6 +567,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TOpenSessionReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TOpenSessionReqStandardScheme getScheme() {
       return new TOpenSessionReqStandardScheme();
     }
@@ -565,69 +575,76 @@ public TOpenSessionReqStandardScheme getScheme() {
 
   private static class TOpenSessionReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TOpenSessionReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TOpenSessionReq 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 1: // CLIENT_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
-              struct.setClient_protocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // USERNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.username = iprot.readString();
-              struct.setUsernameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PASSWORD
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.password = iprot.readString();
-              struct.setPasswordIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // CONFIGURATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map142 = iprot.readMapBegin();
-                struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map142.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key143;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val144;
-                for (int _i145 = 0; _i145 < _map142.size; ++_i145)
+          }
+          switch (schemeField.id) {
+            case 1: // CLIENT_PROTOCOL
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
+                struct.setClient_protocolIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // USERNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.username = iprot.readString();
+                struct.setUsernameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PASSWORD
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.password = iprot.readString();
+                struct.setPasswordIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CONFIGURATION
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key143 = iprot.readString();
-                  _val144 = iprot.readString();
-                  struct.configuration.put(_key143, _val144);
+                  org.apache.thrift.protocol.TMap _map142 = iprot.readMapBegin();
+                  struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map142.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key143;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val144;
+                  for (int _i145 = 0; _i145 < _map142.size; ++_i145)
+                  {
+                    _key143 = iprot.readString();
+                    _val144 = iprot.readString();
+                    struct.configuration.put(_key143, _val144);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setConfigurationIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setConfigurationIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TOpenSessionReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -673,6 +690,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TOpenSessionReq st
   }
 
   private static class TOpenSessionReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TOpenSessionReqTupleScheme getScheme() {
       return new TOpenSessionReqTupleScheme();
     }
@@ -715,32 +733,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TOpenSessionReq str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TOpenSessionReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
-      struct.setClient_protocolIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.username = iprot.readString();
-        struct.setUsernameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.password = iprot.readString();
-        struct.setPasswordIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map148 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map148.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key149;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val150;
-          for (int _i151 = 0; _i151 < _map148.size; ++_i151)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
+        struct.setClient_protocolIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.username = iprot.readString();
+          struct.setUsernameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.password = iprot.readString();
+          struct.setPasswordIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _key149 = iprot.readString();
-            _val150 = iprot.readString();
-            struct.configuration.put(_key149, _val150);
+            org.apache.thrift.protocol.TMap _map148 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map148.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key149;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val150;
+            for (int _i151 = 0; _i151 < _map148.size; ++_i151)
+            {
+              _key149 = iprot.readString();
+              _val150 = iprot.readString();
+              struct.configuration.put(_key149, _val150);
+            }
           }
+          struct.setConfigurationIsSet(true);
         }
-        struct.setConfigurationIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
index 8e60fd43a8bf..fa35ca58a392 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionResp, TOpenSessionResp._Fields>, java.io.Serializable, Cloneable, Comparable<TOpenSessionResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TOpenSessionResp");
 
@@ -88,17 +88,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.SESSION_HANDLE,_Fields.CONFIGURATION};
+  private static final _Fields[] optionals = {_Fields.SESSION_HANDLE,_Fields.CONFIGURATION};
   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);
@@ -149,6 +151,7 @@ public TOpenSessionResp(TOpenSessionResp other) {
     }
   }
 
+  @Override
   public TOpenSessionResp deepCopy() {
     return new TOpenSessionResp(this);
   }
@@ -277,6 +280,7 @@ public void setConfigurationIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -315,6 +319,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -334,6 +339,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -479,14 +485,17 @@ public int compareTo(TOpenSessionResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -571,6 +580,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TOpenSessionRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TOpenSessionRespStandardScheme getScheme() {
       return new TOpenSessionRespStandardScheme();
     }
@@ -578,71 +588,78 @@ public TOpenSessionRespStandardScheme getScheme() {
 
   private static class TOpenSessionRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TOpenSessionResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TOpenSessionResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SERVER_PROTOCOL_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
-              struct.setServerProtocolVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // CONFIGURATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map152 = iprot.readMapBegin();
-                struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map152.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key153;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val154;
-                for (int _i155 = 0; _i155 < _map152.size; ++_i155)
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SERVER_PROTOCOL_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
+                struct.setServerProtocolVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CONFIGURATION
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key153 = iprot.readString();
-                  _val154 = iprot.readString();
-                  struct.configuration.put(_key153, _val154);
+                  org.apache.thrift.protocol.TMap _map152 = iprot.readMapBegin();
+                  struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map152.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key153;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val154;
+                  for (int _i155 = 0; _i155 < _map152.size; ++_i155)
+                  {
+                    _key153 = iprot.readString();
+                    _val154 = iprot.readString();
+                    struct.configuration.put(_key153, _val154);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setConfigurationIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setConfigurationIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TOpenSessionResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -686,6 +703,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TOpenSessionResp s
   }
 
   private static class TOpenSessionRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TOpenSessionRespTupleScheme getScheme() {
       return new TOpenSessionRespTupleScheme();
     }
@@ -723,32 +741,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TOpenSessionResp st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TOpenSessionResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      struct.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
-      struct.setServerProtocolVersionIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.sessionHandle = new TSessionHandle();
-        struct.sessionHandle.read(iprot);
-        struct.setSessionHandleIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TMap _map158 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map158.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key159;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val160;
-          for (int _i161 = 0; _i161 < _map158.size; ++_i161)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        struct.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.findByValue(iprot.readI32());
+        struct.setServerProtocolVersionIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.sessionHandle = new TSessionHandle();
+          struct.sessionHandle.read(iprot);
+          struct.setSessionHandleIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _key159 = iprot.readString();
-            _val160 = iprot.readString();
-            struct.configuration.put(_key159, _val160);
+            org.apache.thrift.protocol.TMap _map158 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map158.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key159;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val160;
+            for (int _i161 = 0; _i161 < _map158.size; ++_i161)
+            {
+              _key159 = iprot.readString();
+              _val160 = iprot.readString();
+              struct.configuration.put(_key159, _val160);
+            }
           }
+          struct.setConfigurationIsSet(true);
         }
-        struct.setConfigurationIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationHandle.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationHandle.java
index 36c9374f6178..b79c4d6faa89 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationHandle.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationHandle.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandle, TOperationHandle._Fields>, java.io.Serializable, Cloneable, Comparable<TOperationHandle> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TOperationHandle");
 
@@ -88,10 +88,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   private static final int __HASRESULTSET_ISSET_ID = 0;
   private static final int __MODIFIEDROWCOUNT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MODIFIED_ROW_COUNT};
+  private static final _Fields[] optionals = {_Fields.MODIFIED_ROW_COUNT};
   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);
@@ -147,6 +149,7 @@ public TOperationHandle(TOperationHandle other) {
     this.modifiedRowCount = other.modifiedRowCount;
   }
 
+  @Override
   public TOperationHandle deepCopy() {
     return new TOperationHandle(this);
   }
@@ -261,6 +264,7 @@ public void setModifiedRowCountIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MODIFIEDROWCOUNT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OPERATION_ID:
@@ -299,6 +303,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OPERATION_ID:
@@ -318,6 +323,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -461,14 +467,17 @@ public int compareTo(TOperationHandle other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -546,6 +555,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TOperationHandleStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TOperationHandleStandardScheme getScheme() {
       return new TOperationHandleStandardScheme();
     }
@@ -553,58 +563,65 @@ public TOperationHandleStandardScheme getScheme() {
 
   private static class TOperationHandleStandardScheme extends org.apache.thrift.scheme.StandardScheme<TOperationHandle> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TOperationHandle 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 1: // OPERATION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationId = new THandleIdentifier();
-              struct.operationId.read(iprot);
-              struct.setOperationIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // OPERATION_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operationType = org.apache.hive.service.rpc.thrift.TOperationType.findByValue(iprot.readI32());
-              struct.setOperationTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // HAS_RESULT_SET
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.hasResultSet = iprot.readBool();
-              struct.setHasResultSetIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // MODIFIED_ROW_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.modifiedRowCount = iprot.readDouble();
-              struct.setModifiedRowCountIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // OPERATION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationId = new THandleIdentifier();
+                struct.operationId.read(iprot);
+                struct.setOperationIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.operationType = org.apache.hive.service.rpc.thrift.TOperationType.findByValue(iprot.readI32());
+                struct.setOperationTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // HAS_RESULT_SET
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.hasResultSet = iprot.readBool();
+                struct.setHasResultSetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // MODIFIED_ROW_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.modifiedRowCount = iprot.readDouble();
+                struct.setModifiedRowCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TOperationHandle struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -634,6 +651,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TOperationHandle s
   }
 
   private static class TOperationHandleTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TOperationHandleTupleScheme getScheme() {
       return new TOperationHandleTupleScheme();
     }
@@ -659,18 +677,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TOperationHandle st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TOperationHandle struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.operationId = new THandleIdentifier();
-      struct.operationId.read(iprot);
-      struct.setOperationIdIsSet(true);
-      struct.operationType = org.apache.hive.service.rpc.thrift.TOperationType.findByValue(iprot.readI32());
-      struct.setOperationTypeIsSet(true);
-      struct.hasResultSet = iprot.readBool();
-      struct.setHasResultSetIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.modifiedRowCount = iprot.readDouble();
-        struct.setModifiedRowCountIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.operationId = new THandleIdentifier();
+        struct.operationId.read(iprot);
+        struct.setOperationIdIsSet(true);
+        struct.operationType = org.apache.hive.service.rpc.thrift.TOperationType.findByValue(iprot.readI32());
+        struct.setOperationTypeIsSet(true);
+        struct.hasResultSet = iprot.readBool();
+        struct.setHasResultSetIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.modifiedRowCount = iprot.readDouble();
+          struct.setModifiedRowCountIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationState.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationState.java
index 50affee914e5..e967347e5680 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationState.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TOperationState implements org.apache.thrift.TEnum {
   INITIALIZED_STATE(0),
   RUNNING_STATE(1),
@@ -28,6 +28,7 @@ private TOperationState(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationType.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationType.java
index 4e9338e9fae0..ea43eaaedc5b 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationType.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOperationType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TOperationType implements org.apache.thrift.TEnum {
   EXECUTE_STATEMENT(0),
   GET_TYPE_INFO(1),
@@ -29,6 +29,7 @@ private TOperationType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TPrimitiveTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TPrimitiveTypeEntry.java
index baad72a0685e..4f3fd6c7560c 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TPrimitiveTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TPrimitiveTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTypeEntry, TPrimitiveTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TPrimitiveTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPrimitiveTypeEntry");
 
@@ -78,17 +78,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TYPE_QUALIFIERS};
+  private static final _Fields[] optionals = {_Fields.TYPE_QUALIFIERS};
   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);
@@ -122,6 +124,7 @@ public TPrimitiveTypeEntry(TPrimitiveTypeEntry other) {
     }
   }
 
+  @Override
   public TPrimitiveTypeEntry deepCopy() {
     return new TPrimitiveTypeEntry(this);
   }
@@ -188,6 +191,7 @@ public void setTypeQualifiersIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -210,6 +214,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -223,6 +228,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -318,14 +324,17 @@ public int compareTo(TPrimitiveTypeEntry other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -385,6 +394,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TPrimitiveTypeEntryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TPrimitiveTypeEntryStandardScheme getScheme() {
       return new TPrimitiveTypeEntryStandardScheme();
     }
@@ -392,42 +402,49 @@ public TPrimitiveTypeEntryStandardScheme getScheme() {
 
   private static class TPrimitiveTypeEntryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TPrimitiveTypeEntry> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TPrimitiveTypeEntry 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 1: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hive.service.rpc.thrift.TTypeId.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // TYPE_QUALIFIERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.typeQualifiers = new TTypeQualifiers();
-              struct.typeQualifiers.read(iprot);
-              struct.setTypeQualifiersIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hive.service.rpc.thrift.TTypeId.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TYPE_QUALIFIERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.typeQualifiers = new TTypeQualifiers();
+                struct.typeQualifiers.read(iprot);
+                struct.setTypeQualifiersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TPrimitiveTypeEntry struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -451,6 +468,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TPrimitiveTypeEntr
   }
 
   private static class TPrimitiveTypeEntryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TPrimitiveTypeEntryTupleScheme getScheme() {
       return new TPrimitiveTypeEntryTupleScheme();
     }
@@ -474,14 +492,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TPrimitiveTypeEntry
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TPrimitiveTypeEntry struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.type = org.apache.hive.service.rpc.thrift.TTypeId.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.typeQualifiers = new TTypeQualifiers();
-        struct.typeQualifiers.read(iprot);
-        struct.setTypeQualifiersIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.type = org.apache.hive.service.rpc.thrift.TTypeId.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.typeQualifiers = new TTypeQualifiers();
+          struct.typeQualifiers.read(iprot);
+          struct.setTypeQualifiersIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProgressUpdateResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProgressUpdateResp.java
index 8b2f6a21629e..362d39dcb079 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProgressUpdateResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProgressUpdateResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TProgressUpdateResp implements org.apache.thrift.TBase<TProgressUpdateResp, TProgressUpdateResp._Fields>, java.io.Serializable, Cloneable, Comparable<TProgressUpdateResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TProgressUpdateResp");
 
@@ -98,10 +98,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -182,6 +184,7 @@ public TProgressUpdateResp(TProgressUpdateResp other) {
     this.startTime = other.startTime;
   }
 
+  @Override
   public TProgressUpdateResp deepCopy() {
     return new TProgressUpdateResp(this);
   }
@@ -378,6 +381,7 @@ public void setStartTimeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case HEADER_NAMES:
@@ -432,6 +436,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case HEADER_NAMES:
@@ -457,6 +462,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -648,14 +654,17 @@ public int compareTo(TProgressUpdateResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -756,6 +765,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TProgressUpdateRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TProgressUpdateRespStandardScheme getScheme() {
       return new TProgressUpdateRespStandardScheme();
     }
@@ -763,103 +773,110 @@ public TProgressUpdateRespStandardScheme getScheme() {
 
   private static class TProgressUpdateRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TProgressUpdateResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TProgressUpdateResp 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 1: // HEADER_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list200 = iprot.readListBegin();
-                struct.headerNames = new java.util.ArrayList<java.lang.String>(_list200.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem201;
-                for (int _i202 = 0; _i202 < _list200.size; ++_i202)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // HEADER_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem201 = iprot.readString();
-                  struct.headerNames.add(_elem201);
+                  org.apache.thrift.protocol.TList _list200 = iprot.readListBegin();
+                  struct.headerNames = new java.util.ArrayList<java.lang.String>(_list200.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem201;
+                  for (int _i202 = 0; _i202 < _list200.size; ++_i202)
+                  {
+                    _elem201 = iprot.readString();
+                    struct.headerNames.add(_elem201);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setHeaderNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setHeaderNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ROWS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list203 = iprot.readListBegin();
-                struct.rows = new java.util.ArrayList<java.util.List<java.lang.String>>(_list203.size);
-                @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem204;
-                for (int _i205 = 0; _i205 < _list203.size; ++_i205)
+              break;
+            case 2: // ROWS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
+                  org.apache.thrift.protocol.TList _list203 = iprot.readListBegin();
+                  struct.rows = new java.util.ArrayList<java.util.List<java.lang.String>>(_list203.size);
+                  @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem204;
+                  for (int _i205 = 0; _i205 < _list203.size; ++_i205)
                   {
-                    org.apache.thrift.protocol.TList _list206 = iprot.readListBegin();
-                    _elem204 = new java.util.ArrayList<java.lang.String>(_list206.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _elem207;
-                    for (int _i208 = 0; _i208 < _list206.size; ++_i208)
                     {
-                      _elem207 = iprot.readString();
-                      _elem204.add(_elem207);
+                      org.apache.thrift.protocol.TList _list206 = iprot.readListBegin();
+                      _elem204 = new java.util.ArrayList<java.lang.String>(_list206.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _elem207;
+                      for (int _i208 = 0; _i208 < _list206.size; ++_i208)
+                      {
+                        _elem207 = iprot.readString();
+                        _elem204.add(_elem207);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.rows.add(_elem204);
                   }
-                  struct.rows.add(_elem204);
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRowsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRowsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PROGRESSED_PERCENTAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.progressedPercentage = iprot.readDouble();
-              struct.setProgressedPercentageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.status = org.apache.hive.service.rpc.thrift.TJobExecutionStatus.findByValue(iprot.readI32());
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // FOOTER_SUMMARY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.footerSummary = iprot.readString();
-              struct.setFooterSummaryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // START_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.startTime = iprot.readI64();
-              struct.setStartTimeIsSet(true);
-            } else { 
+              break;
+            case 3: // PROGRESSED_PERCENTAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.progressedPercentage = iprot.readDouble();
+                struct.setProgressedPercentageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.status = org.apache.hive.service.rpc.thrift.TJobExecutionStatus.findByValue(iprot.readI32());
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // FOOTER_SUMMARY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.footerSummary = iprot.readString();
+                struct.setFooterSummaryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // START_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.startTime = iprot.readI64();
+                struct.setStartTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TProgressUpdateResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -918,6 +935,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TProgressUpdateRes
   }
 
   private static class TProgressUpdateRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TProgressUpdateRespTupleScheme getScheme() {
       return new TProgressUpdateRespTupleScheme();
     }
@@ -956,46 +974,51 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TProgressUpdateResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TProgressUpdateResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list215 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.headerNames = new java.util.ArrayList<java.lang.String>(_list215.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem216;
-        for (int _i217 = 0; _i217 < _list215.size; ++_i217)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem216 = iprot.readString();
-          struct.headerNames.add(_elem216);
+          org.apache.thrift.protocol.TList _list215 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.headerNames = new java.util.ArrayList<java.lang.String>(_list215.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem216;
+          for (int _i217 = 0; _i217 < _list215.size; ++_i217)
+          {
+            _elem216 = iprot.readString();
+            struct.headerNames.add(_elem216);
+          }
         }
-      }
-      struct.setHeaderNamesIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list218 = iprot.readListBegin(org.apache.thrift.protocol.TType.LIST);
-        struct.rows = new java.util.ArrayList<java.util.List<java.lang.String>>(_list218.size);
-        @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem219;
-        for (int _i220 = 0; _i220 < _list218.size; ++_i220)
+        struct.setHeaderNamesIsSet(true);
         {
+          org.apache.thrift.protocol.TList _list218 = iprot.readListBegin(org.apache.thrift.protocol.TType.LIST);
+          struct.rows = new java.util.ArrayList<java.util.List<java.lang.String>>(_list218.size);
+          @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem219;
+          for (int _i220 = 0; _i220 < _list218.size; ++_i220)
           {
-            org.apache.thrift.protocol.TList _list221 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            _elem219 = new java.util.ArrayList<java.lang.String>(_list221.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem222;
-            for (int _i223 = 0; _i223 < _list221.size; ++_i223)
             {
-              _elem222 = iprot.readString();
-              _elem219.add(_elem222);
+              org.apache.thrift.protocol.TList _list221 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              _elem219 = new java.util.ArrayList<java.lang.String>(_list221.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem222;
+              for (int _i223 = 0; _i223 < _list221.size; ++_i223)
+              {
+                _elem222 = iprot.readString();
+                _elem219.add(_elem222);
+              }
             }
+            struct.rows.add(_elem219);
           }
-          struct.rows.add(_elem219);
         }
+        struct.setRowsIsSet(true);
+        struct.progressedPercentage = iprot.readDouble();
+        struct.setProgressedPercentageIsSet(true);
+        struct.status = org.apache.hive.service.rpc.thrift.TJobExecutionStatus.findByValue(iprot.readI32());
+        struct.setStatusIsSet(true);
+        struct.footerSummary = iprot.readString();
+        struct.setFooterSummaryIsSet(true);
+        struct.startTime = iprot.readI64();
+        struct.setStartTimeIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setRowsIsSet(true);
-      struct.progressedPercentage = iprot.readDouble();
-      struct.setProgressedPercentageIsSet(true);
-      struct.status = org.apache.hive.service.rpc.thrift.TJobExecutionStatus.findByValue(iprot.readI32());
-      struct.setStatusIsSet(true);
-      struct.footerSummary = iprot.readString();
-      struct.setFooterSummaryIsSet(true);
-      struct.startTime = iprot.readI64();
-      struct.setStartTimeIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
index eb7742dd93d9..e86321433e7a 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TProtocolVersion implements org.apache.thrift.TEnum {
   HIVE_CLI_SERVICE_PROTOCOL_V1(0),
   HIVE_CLI_SERVICE_PROTOCOL_V2(1),
@@ -30,6 +30,7 @@ private TProtocolVersion(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenReq.java
index 57ab7481b3ff..8ec51fb7ad93 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TRenewDelegationTokenReq implements org.apache.thrift.TBase<TRenewDelegationTokenReq, TRenewDelegationTokenReq._Fields>, java.io.Serializable, Cloneable, Comparable<TRenewDelegationTokenReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRenewDelegationTokenReq");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public TRenewDelegationTokenReq(TRenewDelegationTokenReq other) {
     }
   }
 
+  @Override
   public TRenewDelegationTokenReq deepCopy() {
     return new TRenewDelegationTokenReq(this);
   }
@@ -177,6 +180,7 @@ public void setDelegationTokenIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(TRenewDelegationTokenReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TRenewDelegationTokenReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRenewDelegationTokenReqStandardScheme getScheme() {
       return new TRenewDelegationTokenReqStandardScheme();
     }
@@ -383,42 +393,49 @@ public TRenewDelegationTokenReqStandardScheme getScheme() {
 
   private static class TRenewDelegationTokenReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TRenewDelegationTokenReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TRenewDelegationTokenReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // DELEGATION_TOKEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.delegationToken = iprot.readString();
-              struct.setDelegationTokenIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DELEGATION_TOKEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.delegationToken = iprot.readString();
+                struct.setDelegationTokenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TRenewDelegationTokenReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -440,6 +457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TRenewDelegationTo
   }
 
   private static class TRenewDelegationTokenReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRenewDelegationTokenReqTupleScheme getScheme() {
       return new TRenewDelegationTokenReqTupleScheme();
     }
@@ -456,12 +474,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TRenewDelegationTok
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TRenewDelegationTokenReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.delegationToken = iprot.readString();
-      struct.setDelegationTokenIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.delegationToken = iprot.readString();
+        struct.setDelegationTokenIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenResp.java
index f4df8b76bde2..507a370540ca 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRenewDelegationTokenResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TRenewDelegationTokenResp implements org.apache.thrift.TBase<TRenewDelegationTokenResp, TRenewDelegationTokenResp._Fields>, java.io.Serializable, Cloneable, Comparable<TRenewDelegationTokenResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRenewDelegationTokenResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TRenewDelegationTokenResp(TRenewDelegationTokenResp other) {
     }
   }
 
+  @Override
   public TRenewDelegationTokenResp deepCopy() {
     return new TRenewDelegationTokenResp(this);
   }
@@ -140,6 +143,7 @@ public void setStatusIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TRenewDelegationTokenResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TRenewDelegationTokenRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRenewDelegationTokenRespStandardScheme getScheme() {
       return new TRenewDelegationTokenRespStandardScheme();
     }
@@ -298,34 +308,41 @@ public TRenewDelegationTokenRespStandardScheme getScheme() {
 
   private static class TRenewDelegationTokenRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TRenewDelegationTokenResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TRenewDelegationTokenResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TRenewDelegationTokenResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TRenewDelegationTo
   }
 
   private static class TRenewDelegationTokenRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRenewDelegationTokenRespTupleScheme getScheme() {
       return new TRenewDelegationTokenRespTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TRenewDelegationTok
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TRenewDelegationTokenResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRow.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRow.java
index 2b4b2fce5066..93e7ecca17a9 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRow.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRow.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.io.Serializable, Cloneable, Comparable<TRow> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRow");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public TRow(TRow other) {
     }
   }
 
+  @Override
   public TRow deepCopy() {
     return new TRow(this);
   }
@@ -161,6 +164,7 @@ public void setColValsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COL_VALS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_VALS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(TRow other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TRowStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRowStandardScheme getScheme() {
       return new TRowStandardScheme();
     }
@@ -316,44 +326,51 @@ public TRowStandardScheme getScheme() {
 
   private static class TRowStandardScheme extends org.apache.thrift.scheme.StandardScheme<TRow> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TRow 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 1: // COL_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
-                struct.colVals = new java.util.ArrayList<TColumnValue>(_list46.size);
-                @org.apache.thrift.annotation.Nullable TColumnValue _elem47;
-                for (int _i48 = 0; _i48 < _list46.size; ++_i48)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COL_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem47 = new TColumnValue();
-                  _elem47.read(iprot);
-                  struct.colVals.add(_elem47);
+                  org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
+                  struct.colVals = new java.util.ArrayList<TColumnValue>(_list46.size);
+                  @org.apache.thrift.annotation.Nullable TColumnValue _elem47;
+                  for (int _i48 = 0; _i48 < _list46.size; ++_i48)
+                  {
+                    _elem47 = new TColumnValue();
+                    _elem47.read(iprot);
+                    struct.colVals.add(_elem47);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColValsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TRow struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TRow struct) throw
   }
 
   private static class TRowTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRowTupleScheme getScheme() {
       return new TRowTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TRow struct) throws
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TRow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list51 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.colVals = new java.util.ArrayList<TColumnValue>(_list51.size);
-        @org.apache.thrift.annotation.Nullable TColumnValue _elem52;
-        for (int _i53 = 0; _i53 < _list51.size; ++_i53)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem52 = new TColumnValue();
-          _elem52.read(iprot);
-          struct.colVals.add(_elem52);
+          org.apache.thrift.protocol.TList _list51 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.colVals = new java.util.ArrayList<TColumnValue>(_list51.size);
+          @org.apache.thrift.annotation.Nullable TColumnValue _elem52;
+          for (int _i53 = 0; _i53 < _list51.size; ++_i53)
+          {
+            _elem52 = new TColumnValue();
+            _elem52.read(iprot);
+            struct.colVals.add(_elem52);
+          }
         }
+        struct.setColValsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setColValsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRowSet.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRowSet.java
index 63cfc3c94c84..e0fcf5db64c0 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRowSet.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TRowSet.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields>, java.io.Serializable, Cloneable, Comparable<TRowSet> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowSet");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -102,7 +104,7 @@ public java.lang.String getFieldName() {
   private static final int __STARTROWOFFSET_ISSET_ID = 0;
   private static final int __COLUMNCOUNT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.BINARY_COLUMNS,_Fields.COLUMN_COUNT};
+  private static final _Fields[] optionals = {_Fields.COLUMNS,_Fields.BINARY_COLUMNS,_Fields.COLUMN_COUNT};
   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);
@@ -161,6 +163,7 @@ public TRowSet(TRowSet other) {
     this.columnCount = other.columnCount;
   }
 
+  @Override
   public TRowSet deepCopy() {
     return new TRowSet(this);
   }
@@ -332,6 +335,7 @@ public void setColumnCountIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __COLUMNCOUNT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case START_ROW_OFFSET:
@@ -382,6 +386,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case START_ROW_OFFSET:
@@ -404,6 +409,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -572,14 +578,17 @@ public int compareTo(TRowSet other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -662,6 +671,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TRowSetStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRowSetStandardScheme getScheme() {
       return new TRowSetStandardScheme();
     }
@@ -669,87 +679,94 @@ public TRowSetStandardScheme getScheme() {
 
   private static class TRowSetStandardScheme extends org.apache.thrift.scheme.StandardScheme<TRowSet> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TRowSet 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 1: // START_ROW_OFFSET
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.startRowOffset = iprot.readI64();
-              struct.setStartRowOffsetIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // ROWS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list118 = iprot.readListBegin();
-                struct.rows = new java.util.ArrayList<TRow>(_list118.size);
-                @org.apache.thrift.annotation.Nullable TRow _elem119;
-                for (int _i120 = 0; _i120 < _list118.size; ++_i120)
+          }
+          switch (schemeField.id) {
+            case 1: // START_ROW_OFFSET
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.startRowOffset = iprot.readI64();
+                struct.setStartRowOffsetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ROWS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem119 = new TRow();
-                  _elem119.read(iprot);
-                  struct.rows.add(_elem119);
+                  org.apache.thrift.protocol.TList _list118 = iprot.readListBegin();
+                  struct.rows = new java.util.ArrayList<TRow>(_list118.size);
+                  @org.apache.thrift.annotation.Nullable TRow _elem119;
+                  for (int _i120 = 0; _i120 < _list118.size; ++_i120)
+                  {
+                    _elem119 = new TRow();
+                    _elem119.read(iprot);
+                    struct.rows.add(_elem119);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRowsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRowsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // COLUMNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list121 = iprot.readListBegin();
-                struct.columns = new java.util.ArrayList<TColumn>(_list121.size);
-                @org.apache.thrift.annotation.Nullable TColumn _elem122;
-                for (int _i123 = 0; _i123 < _list121.size; ++_i123)
+              break;
+            case 3: // COLUMNS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem122 = new TColumn();
-                  _elem122.read(iprot);
-                  struct.columns.add(_elem122);
+                  org.apache.thrift.protocol.TList _list121 = iprot.readListBegin();
+                  struct.columns = new java.util.ArrayList<TColumn>(_list121.size);
+                  @org.apache.thrift.annotation.Nullable TColumn _elem122;
+                  for (int _i123 = 0; _i123 < _list121.size; ++_i123)
+                  {
+                    _elem122 = new TColumn();
+                    _elem122.read(iprot);
+                    struct.columns.add(_elem122);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColumnsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColumnsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // BINARY_COLUMNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.binaryColumns = iprot.readBinary();
-              struct.setBinaryColumnsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COLUMN_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.columnCount = iprot.readI32();
-              struct.setColumnCountIsSet(true);
-            } else { 
+              break;
+            case 4: // BINARY_COLUMNS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.binaryColumns = iprot.readBinary();
+                struct.setBinaryColumnsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // COLUMN_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.columnCount = iprot.readI32();
+                struct.setColumnCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TRowSet struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -802,6 +819,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TRowSet struct) th
   }
 
   private static class TRowSetTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TRowSetTupleScheme getScheme() {
       return new TRowSetTupleScheme();
     }
@@ -850,43 +868,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TRowSet struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TRowSet struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.startRowOffset = iprot.readI64();
-      struct.setStartRowOffsetIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list128 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.rows = new java.util.ArrayList<TRow>(_list128.size);
-        @org.apache.thrift.annotation.Nullable TRow _elem129;
-        for (int _i130 = 0; _i130 < _list128.size; ++_i130)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.startRowOffset = iprot.readI64();
+        struct.setStartRowOffsetIsSet(true);
         {
-          _elem129 = new TRow();
-          _elem129.read(iprot);
-          struct.rows.add(_elem129);
+          org.apache.thrift.protocol.TList _list128 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.rows = new java.util.ArrayList<TRow>(_list128.size);
+          @org.apache.thrift.annotation.Nullable TRow _elem129;
+          for (int _i130 = 0; _i130 < _list128.size; ++_i130)
+          {
+            _elem129 = new TRow();
+            _elem129.read(iprot);
+            struct.rows.add(_elem129);
+          }
         }
-      }
-      struct.setRowsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list131 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.columns = new java.util.ArrayList<TColumn>(_list131.size);
-          @org.apache.thrift.annotation.Nullable TColumn _elem132;
-          for (int _i133 = 0; _i133 < _list131.size; ++_i133)
+        struct.setRowsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _elem132 = new TColumn();
-            _elem132.read(iprot);
-            struct.columns.add(_elem132);
+            org.apache.thrift.protocol.TList _list131 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.columns = new java.util.ArrayList<TColumn>(_list131.size);
+            @org.apache.thrift.annotation.Nullable TColumn _elem132;
+            for (int _i133 = 0; _i133 < _list131.size; ++_i133)
+            {
+              _elem132 = new TColumn();
+              _elem132.read(iprot);
+              struct.columns.add(_elem132);
+            }
           }
+          struct.setColumnsIsSet(true);
         }
-        struct.setColumnsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.binaryColumns = iprot.readBinary();
-        struct.setBinaryColumnsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.columnCount = iprot.readI32();
-        struct.setColumnCountIsSet(true);
+        if (incoming.get(1)) {
+          struct.binaryColumns = iprot.readBinary();
+          struct.setBinaryColumnsIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.columnCount = iprot.readI32();
+          struct.setColumnCountIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSessionHandle.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSessionHandle.java
index d290a41f8bd3..2601fb3703b2 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSessionHandle.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSessionHandle.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TSessionHandle implements org.apache.thrift.TBase<TSessionHandle, TSessionHandle._Fields>, java.io.Serializable, Cloneable, Comparable<TSessionHandle> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSessionHandle");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TSessionHandle(TSessionHandle other) {
     }
   }
 
+  @Override
   public TSessionHandle deepCopy() {
     return new TSessionHandle(this);
   }
@@ -140,6 +143,7 @@ public void setSessionIdIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_ID:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_ID:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TSessionHandle other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TSessionHandleStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TSessionHandleStandardScheme getScheme() {
       return new TSessionHandleStandardScheme();
     }
@@ -298,34 +308,41 @@ public TSessionHandleStandardScheme getScheme() {
 
   private static class TSessionHandleStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSessionHandle> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSessionHandle 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 1: // SESSION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionId = new THandleIdentifier();
-              struct.sessionId.read(iprot);
-              struct.setSessionIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionId = new THandleIdentifier();
+                struct.sessionId.read(iprot);
+                struct.setSessionIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TSessionHandle struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TSessionHandle str
   }
 
   private static class TSessionHandleTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TSessionHandleTupleScheme getScheme() {
       return new TSessionHandleTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TSessionHandle stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSessionHandle struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionId = new THandleIdentifier();
-      struct.sessionId.read(iprot);
-      struct.setSessionIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionId = new THandleIdentifier();
+        struct.sessionId.read(iprot);
+        struct.setSessionIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoReq.java
index 8a7c7286be82..5df6c78f93e8 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TSetClientInfoReq implements org.apache.thrift.TBase<TSetClientInfoReq, TSetClientInfoReq._Fields>, java.io.Serializable, Cloneable, Comparable<TSetClientInfoReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSetClientInfoReq");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CONFIGURATION};
+  private static final _Fields[] optionals = {_Fields.CONFIGURATION};
   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);
@@ -121,6 +123,7 @@ public TSetClientInfoReq(TSetClientInfoReq other) {
     }
   }
 
+  @Override
   public TSetClientInfoReq deepCopy() {
     return new TSetClientInfoReq(this);
   }
@@ -190,6 +193,7 @@ public void setConfigurationIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -212,6 +216,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -225,6 +230,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -320,14 +326,17 @@ public int compareTo(TSetClientInfoReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -387,6 +396,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TSetClientInfoReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TSetClientInfoReqStandardScheme getScheme() {
       return new TSetClientInfoReqStandardScheme();
     }
@@ -394,54 +404,61 @@ public TSetClientInfoReqStandardScheme getScheme() {
 
   private static class TSetClientInfoReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSetClientInfoReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSetClientInfoReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // CONFIGURATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map162 = iprot.readMapBegin();
-                struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map162.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key163;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val164;
-                for (int _i165 = 0; _i165 < _map162.size; ++_i165)
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CONFIGURATION
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key163 = iprot.readString();
-                  _val164 = iprot.readString();
-                  struct.configuration.put(_key163, _val164);
+                  org.apache.thrift.protocol.TMap _map162 = iprot.readMapBegin();
+                  struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map162.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key163;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val164;
+                  for (int _i165 = 0; _i165 < _map162.size; ++_i165)
+                  {
+                    _key163 = iprot.readString();
+                    _val164 = iprot.readString();
+                    struct.configuration.put(_key163, _val164);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setConfigurationIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setConfigurationIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TSetClientInfoReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -473,6 +490,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TSetClientInfoReq
   }
 
   private static class TSetClientInfoReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TSetClientInfoReqTupleScheme getScheme() {
       return new TSetClientInfoReqTupleScheme();
     }
@@ -503,25 +521,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TSetClientInfoReq s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSetClientInfoReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TMap _map168 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map168.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key169;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val170;
-          for (int _i171 = 0; _i171 < _map168.size; ++_i171)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _key169 = iprot.readString();
-            _val170 = iprot.readString();
-            struct.configuration.put(_key169, _val170);
+            org.apache.thrift.protocol.TMap _map168 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.configuration = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map168.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key169;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val170;
+            for (int _i171 = 0; _i171 < _map168.size; ++_i171)
+            {
+              _key169 = iprot.readString();
+              _val170 = iprot.readString();
+              struct.configuration.put(_key169, _val170);
+            }
           }
+          struct.setConfigurationIsSet(true);
         }
-        struct.setConfigurationIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoResp.java
index d33e8c90f1ce..26e45f883bd7 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TSetClientInfoResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TSetClientInfoResp implements org.apache.thrift.TBase<TSetClientInfoResp, TSetClientInfoResp._Fields>, java.io.Serializable, Cloneable, Comparable<TSetClientInfoResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSetClientInfoResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TSetClientInfoResp(TSetClientInfoResp other) {
     }
   }
 
+  @Override
   public TSetClientInfoResp deepCopy() {
     return new TSetClientInfoResp(this);
   }
@@ -140,6 +143,7 @@ public void setStatusIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TSetClientInfoResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TSetClientInfoRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TSetClientInfoRespStandardScheme getScheme() {
       return new TSetClientInfoRespStandardScheme();
     }
@@ -298,34 +308,41 @@ public TSetClientInfoRespStandardScheme getScheme() {
 
   private static class TSetClientInfoRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TSetClientInfoResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TSetClientInfoResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TSetClientInfoResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TSetClientInfoResp
   }
 
   private static class TSetClientInfoRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TSetClientInfoRespTupleScheme getScheme() {
       return new TSetClientInfoRespTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TSetClientInfoResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TSetClientInfoResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatus.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatus.java
index 9af39b2fcaab..d28a2a7c9443 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatus.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatus.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TStatus");
 
@@ -93,10 +93,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -105,7 +107,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ERRORCODE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.INFO_MESSAGES,_Fields.SQL_STATE,_Fields.ERROR_CODE,_Fields.ERROR_MESSAGE};
+  private static final _Fields[] optionals = {_Fields.INFO_MESSAGES,_Fields.SQL_STATE,_Fields.ERROR_CODE,_Fields.ERROR_MESSAGE};
   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);
@@ -155,6 +157,7 @@ public TStatus(TStatus other) {
     }
   }
 
+  @Override
   public TStatus deepCopy() {
     return new TStatus(this);
   }
@@ -311,6 +314,7 @@ public void setErrorMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS_CODE:
@@ -357,6 +361,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS_CODE:
@@ -379,6 +384,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -549,14 +555,17 @@ public int compareTo(TStatus other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -641,6 +650,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TStatusStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStatusStandardScheme getScheme() {
       return new TStatusStandardScheme();
     }
@@ -648,75 +658,82 @@ public TStatusStandardScheme getScheme() {
 
   private static class TStatusStandardScheme extends org.apache.thrift.scheme.StandardScheme<TStatus> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TStatus 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 1: // STATUS_CODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.statusCode = org.apache.hive.service.rpc.thrift.TStatusCode.findByValue(iprot.readI32());
-              struct.setStatusCodeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // INFO_MESSAGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list134 = iprot.readListBegin();
-                struct.infoMessages = new java.util.ArrayList<java.lang.String>(_list134.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem135;
-                for (int _i136 = 0; _i136 < _list134.size; ++_i136)
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS_CODE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.statusCode = org.apache.hive.service.rpc.thrift.TStatusCode.findByValue(iprot.readI32());
+                struct.setStatusCodeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // INFO_MESSAGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem135 = iprot.readString();
-                  struct.infoMessages.add(_elem135);
+                  org.apache.thrift.protocol.TList _list134 = iprot.readListBegin();
+                  struct.infoMessages = new java.util.ArrayList<java.lang.String>(_list134.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem135;
+                  for (int _i136 = 0; _i136 < _list134.size; ++_i136)
+                  {
+                    _elem135 = iprot.readString();
+                    struct.infoMessages.add(_elem135);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setInfoMessagesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setInfoMessagesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SQL_STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.sqlState = iprot.readString();
-              struct.setSqlStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ERROR_CODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.errorCode = iprot.readI32();
-              struct.setErrorCodeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ERROR_MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errorMessage = iprot.readString();
-              struct.setErrorMessageIsSet(true);
-            } else { 
+              break;
+            case 3: // SQL_STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.sqlState = iprot.readString();
+                struct.setSqlStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ERROR_CODE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.errorCode = iprot.readI32();
+                struct.setErrorCodeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ERROR_MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errorMessage = iprot.readString();
+                struct.setErrorMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TStatus struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -766,6 +783,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TStatus struct) th
   }
 
   private static class TStatusTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStatusTupleScheme getScheme() {
       return new TStatusTupleScheme();
     }
@@ -813,34 +831,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TStatus struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.statusCode = org.apache.hive.service.rpc.thrift.TStatusCode.findByValue(iprot.readI32());
-      struct.setStatusCodeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list139 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.infoMessages = new java.util.ArrayList<java.lang.String>(_list139.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem140;
-          for (int _i141 = 0; _i141 < _list139.size; ++_i141)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.statusCode = org.apache.hive.service.rpc.thrift.TStatusCode.findByValue(iprot.readI32());
+        struct.setStatusCodeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
           {
-            _elem140 = iprot.readString();
-            struct.infoMessages.add(_elem140);
+            org.apache.thrift.protocol.TList _list139 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.infoMessages = new java.util.ArrayList<java.lang.String>(_list139.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem140;
+            for (int _i141 = 0; _i141 < _list139.size; ++_i141)
+            {
+              _elem140 = iprot.readString();
+              struct.infoMessages.add(_elem140);
+            }
           }
+          struct.setInfoMessagesIsSet(true);
         }
-        struct.setInfoMessagesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.sqlState = iprot.readString();
-        struct.setSqlStateIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.errorCode = iprot.readI32();
-        struct.setErrorCodeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.errorMessage = iprot.readString();
-        struct.setErrorMessageIsSet(true);
+        if (incoming.get(1)) {
+          struct.sqlState = iprot.readString();
+          struct.setSqlStateIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.errorCode = iprot.readI32();
+          struct.setErrorCodeIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.errorMessage = iprot.readString();
+          struct.setErrorMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatusCode.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatusCode.java
index 7aaba8271bb1..e8882a762782 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatusCode.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStatusCode.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TStatusCode implements org.apache.thrift.TEnum {
   SUCCESS_STATUS(0),
   SUCCESS_WITH_INFO_STATUS(1),
@@ -24,6 +24,7 @@ private TStatusCode(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringColumn.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringColumn.java
index 89132f8668c9..8e31ac9e5e42 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringColumn.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringColumn.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TStringColumn implements org.apache.thrift.TBase<TStringColumn, TStringColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TStringColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TStringColumn");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TStringColumn(TStringColumn other) {
     }
   }
 
+  @Override
   public TStringColumn deepCopy() {
     return new TStringColumn(this);
   }
@@ -203,6 +206,7 @@ public void setNullsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -229,6 +233,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -242,6 +247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -337,14 +343,17 @@ public int compareTo(TStringColumn other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -403,6 +412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TStringColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStringColumnStandardScheme getScheme() {
       return new TStringColumnStandardScheme();
     }
@@ -410,51 +420,58 @@ public TStringColumnStandardScheme getScheme() {
 
   private static class TStringColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<TStringColumn> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TStringColumn 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list102 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.String>(_list102.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem103;
-                for (int _i104 = 0; _i104 < _list102.size; ++_i104)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem103 = iprot.readString();
-                  struct.values.add(_elem103);
+                  org.apache.thrift.protocol.TList _list102 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.String>(_list102.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem103;
+                  for (int _i104 = 0; _i104 < _list102.size; ++_i104)
+                  {
+                    _elem103 = iprot.readString();
+                    struct.values.add(_elem103);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nulls = iprot.readBinary();
-              struct.setNullsIsSet(true);
-            } else { 
+              break;
+            case 2: // NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nulls = iprot.readBinary();
+                struct.setNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TStringColumn struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -483,6 +500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TStringColumn stru
   }
 
   private static class TStringColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStringColumnTupleScheme getScheme() {
       return new TStringColumnTupleScheme();
     }
@@ -505,20 +523,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TStringColumn struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TStringColumn struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list107 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.values = new java.util.ArrayList<java.lang.String>(_list107.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem108;
-        for (int _i109 = 0; _i109 < _list107.size; ++_i109)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem108 = iprot.readString();
-          struct.values.add(_elem108);
+          org.apache.thrift.protocol.TList _list107 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.values = new java.util.ArrayList<java.lang.String>(_list107.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem108;
+          for (int _i109 = 0; _i109 < _list107.size; ++_i109)
+          {
+            _elem108 = iprot.readString();
+            struct.values.add(_elem108);
+          }
         }
+        struct.setValuesIsSet(true);
+        struct.nulls = iprot.readBinary();
+        struct.setNullsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
-      struct.nulls = iprot.readBinary();
-      struct.setNullsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringValue.java
index 82cfa2d0f47a..951bf9a28e4a 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStringValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TStringValue implements org.apache.thrift.TBase<TStringValue, TStringValue._Fields>, java.io.Serializable, Cloneable, Comparable<TStringValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TStringValue");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.VALUE};
+  private static final _Fields[] optionals = {_Fields.VALUE};
   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);
@@ -101,6 +103,7 @@ public TStringValue(TStringValue other) {
     }
   }
 
+  @Override
   public TStringValue deepCopy() {
     return new TStringValue(this);
   }
@@ -134,6 +137,7 @@ public void setValueIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUE:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUE:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(TStringValue other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -280,6 +289,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TStringValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStringValueStandardScheme getScheme() {
       return new TStringValueStandardScheme();
     }
@@ -287,33 +297,40 @@ public TStringValueStandardScheme getScheme() {
 
   private static class TStringValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<TStringValue> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TStringValue 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 1: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.value = iprot.readString();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.value = iprot.readString();
+                struct.setValueIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TStringValue struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -332,6 +349,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TStringValue struc
   }
 
   private static class TStringValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStringValueTupleScheme getScheme() {
       return new TStringValueTupleScheme();
     }
@@ -354,11 +372,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TStringValue struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TStringValue 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.value = iprot.readString();
-        struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.value = iprot.readString();
+          struct.setValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStructTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStructTypeEntry.java
index 644daf5192a7..f95575b84d97 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStructTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TStructTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TStructTypeEntry implements org.apache.thrift.TBase<TStructTypeEntry, TStructTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TStructTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TStructTypeEntry");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TStructTypeEntry(TStructTypeEntry other) {
     }
   }
 
+  @Override
   public TStructTypeEntry deepCopy() {
     return new TStructTypeEntry(this);
   }
@@ -165,6 +168,7 @@ public void setNameToTypePtrIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME_TO_TYPE_PTR:
@@ -179,6 +183,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME_TO_TYPE_PTR:
@@ -189,6 +194,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -259,14 +265,17 @@ public int compareTo(TStructTypeEntry other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -313,6 +322,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TStructTypeEntryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStructTypeEntryStandardScheme getScheme() {
       return new TStructTypeEntryStandardScheme();
     }
@@ -320,45 +330,52 @@ public TStructTypeEntryStandardScheme getScheme() {
 
   private static class TStructTypeEntryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TStructTypeEntry> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TStructTypeEntry 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 1: // NAME_TO_TYPE_PTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin();
-                struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map10.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key11;
-                int _val12;
-                for (int _i13 = 0; _i13 < _map10.size; ++_i13)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // NAME_TO_TYPE_PTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key11 = iprot.readString();
-                  _val12 = iprot.readI32();
-                  struct.nameToTypePtr.put(_key11, _val12);
+                  org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin();
+                  struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map10.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key11;
+                  int _val12;
+                  for (int _i13 = 0; _i13 < _map10.size; ++_i13)
+                  {
+                    _key11 = iprot.readString();
+                    _val12 = iprot.readI32();
+                    struct.nameToTypePtr.put(_key11, _val12);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setNameToTypePtrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNameToTypePtrIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TStructTypeEntry struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -383,6 +400,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TStructTypeEntry s
   }
 
   private static class TStructTypeEntryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TStructTypeEntryTupleScheme getScheme() {
       return new TStructTypeEntryTupleScheme();
     }
@@ -405,20 +423,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TStructTypeEntry st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TStructTypeEntry struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32); 
-        struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map16.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _key17;
-        int _val18;
-        for (int _i19 = 0; _i19 < _map16.size; ++_i19)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key17 = iprot.readString();
-          _val18 = iprot.readI32();
-          struct.nameToTypePtr.put(_key17, _val18);
+          org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32); 
+          struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map16.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key17;
+          int _val18;
+          for (int _i19 = 0; _i19 < _map16.size; ++_i19)
+          {
+            _key17 = iprot.readString();
+            _val18 = iprot.readI32();
+            struct.nameToTypePtr.put(_key17, _val18);
+          }
         }
+        struct.setNameToTypePtrIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setNameToTypePtrIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java
index d11d1db306ae..d31218f70e47 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TTableSchema implements org.apache.thrift.TBase<TTableSchema, TTableSchema._Fields>, java.io.Serializable, Cloneable, Comparable<TTableSchema> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTableSchema");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public TTableSchema(TTableSchema other) {
     }
   }
 
+  @Override
   public TTableSchema deepCopy() {
     return new TTableSchema(this);
   }
@@ -161,6 +164,7 @@ public void setColumnsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COLUMNS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COLUMNS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(TTableSchema other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TTableSchemaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TTableSchemaStandardScheme getScheme() {
       return new TTableSchemaStandardScheme();
     }
@@ -316,44 +326,51 @@ public TTableSchemaStandardScheme getScheme() {
 
   private static class TTableSchemaStandardScheme extends org.apache.thrift.scheme.StandardScheme<TTableSchema> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TTableSchema 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 1: // COLUMNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
-                struct.columns = new java.util.ArrayList<TColumnDesc>(_list38.size);
-                @org.apache.thrift.annotation.Nullable TColumnDesc _elem39;
-                for (int _i40 = 0; _i40 < _list38.size; ++_i40)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COLUMNS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem39 = new TColumnDesc();
-                  _elem39.read(iprot);
-                  struct.columns.add(_elem39);
+                  org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
+                  struct.columns = new java.util.ArrayList<TColumnDesc>(_list38.size);
+                  @org.apache.thrift.annotation.Nullable TColumnDesc _elem39;
+                  for (int _i40 = 0; _i40 < _list38.size; ++_i40)
+                  {
+                    _elem39 = new TColumnDesc();
+                    _elem39.read(iprot);
+                    struct.columns.add(_elem39);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColumnsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColumnsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TTableSchema struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TTableSchema struc
   }
 
   private static class TTableSchemaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TTableSchemaTupleScheme getScheme() {
       return new TTableSchemaTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TTableSchema struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TTableSchema struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list43 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.columns = new java.util.ArrayList<TColumnDesc>(_list43.size);
-        @org.apache.thrift.annotation.Nullable TColumnDesc _elem44;
-        for (int _i45 = 0; _i45 < _list43.size; ++_i45)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem44 = new TColumnDesc();
-          _elem44.read(iprot);
-          struct.columns.add(_elem44);
+          org.apache.thrift.protocol.TList _list43 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.columns = new java.util.ArrayList<TColumnDesc>(_list43.size);
+          @org.apache.thrift.annotation.Nullable TColumnDesc _elem44;
+          for (int _i45 = 0; _i45 < _list43.size; ++_i45)
+          {
+            _elem44 = new TColumnDesc();
+            _elem44.read(iprot);
+            struct.columns.add(_elem44);
+          }
         }
+        struct.setColumnsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setColumnsIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java
index 629d0a35aa59..21ba25e4d35e 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TTypeDesc implements org.apache.thrift.TBase<TTypeDesc, TTypeDesc._Fields>, java.io.Serializable, Cloneable, Comparable<TTypeDesc> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeDesc");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public TTypeDesc(TTypeDesc other) {
     }
   }
 
+  @Override
   public TTypeDesc deepCopy() {
     return new TTypeDesc(this);
   }
@@ -161,6 +164,7 @@ public void setTypesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPES:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPES:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(TTypeDesc other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TTypeDescStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TTypeDescStandardScheme getScheme() {
       return new TTypeDescStandardScheme();
     }
@@ -316,44 +326,51 @@ public TTypeDescStandardScheme getScheme() {
 
   private static class TTypeDescStandardScheme extends org.apache.thrift.scheme.StandardScheme<TTypeDesc> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TTypeDesc 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 1: // TYPES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
-                struct.types = new java.util.ArrayList<TTypeEntry>(_list30.size);
-                @org.apache.thrift.annotation.Nullable TTypeEntry _elem31;
-                for (int _i32 = 0; _i32 < _list30.size; ++_i32)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TYPES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem31 = new TTypeEntry();
-                  _elem31.read(iprot);
-                  struct.types.add(_elem31);
+                  org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
+                  struct.types = new java.util.ArrayList<TTypeEntry>(_list30.size);
+                  @org.apache.thrift.annotation.Nullable TTypeEntry _elem31;
+                  for (int _i32 = 0; _i32 < _list30.size; ++_i32)
+                  {
+                    _elem31 = new TTypeEntry();
+                    _elem31.read(iprot);
+                    struct.types.add(_elem31);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTypesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTypesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TTypeDesc struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TTypeDesc struct)
   }
 
   private static class TTypeDescTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TTypeDescTupleScheme getScheme() {
       return new TTypeDescTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TTypeDesc struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TTypeDesc struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list35 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.types = new java.util.ArrayList<TTypeEntry>(_list35.size);
-        @org.apache.thrift.annotation.Nullable TTypeEntry _elem36;
-        for (int _i37 = 0; _i37 < _list35.size; ++_i37)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem36 = new TTypeEntry();
-          _elem36.read(iprot);
-          struct.types.add(_elem36);
+          org.apache.thrift.protocol.TList _list35 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.types = new java.util.ArrayList<TTypeEntry>(_list35.size);
+          @org.apache.thrift.annotation.Nullable TTypeEntry _elem36;
+          for (int _i37 = 0; _i37 < _list35.size; ++_i37)
+          {
+            _elem36 = new TTypeEntry();
+            _elem36.read(iprot);
+            struct.types.add(_elem36);
+          }
         }
+        struct.setTypesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setTypesIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java
index 1d61a51d8955..1a48b4903af9 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TTypeEntry extends org.apache.thrift.TUnion<TTypeEntry, TTypeEntry._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeEntry");
   private static final org.apache.thrift.protocol.TField PRIMITIVE_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("primitiveEntry", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -83,10 +83,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -122,6 +124,7 @@ public TTypeEntry(_Fields setField, java.lang.Object value) {
   public TTypeEntry(TTypeEntry other) {
     super(other);
   }
+  @Override
   public TTypeEntry deepCopy() {
     return new TTypeEntry(this);
   }
@@ -413,6 +416,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java
index 57108255c1c6..09ce063a576c 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TTypeId implements org.apache.thrift.TEnum {
   BOOLEAN_TYPE(0),
   TINYINT_TYPE(1),
@@ -43,6 +43,7 @@ private TTypeId(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java
index 0d6b39dcf92f..1e4145b57d44 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TTypeQualifierValue extends org.apache.thrift.TUnion<TTypeQualifierValue, TTypeQualifierValue._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeQualifierValue");
   private static final org.apache.thrift.protocol.TField I32_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("i32Value", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -67,10 +67,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -98,6 +100,7 @@ public TTypeQualifierValue(_Fields setField, java.lang.Object value) {
   public TTypeQualifierValue(TTypeQualifierValue other) {
     super(other);
   }
+  @Override
   public TTypeQualifierValue deepCopy() {
     return new TTypeQualifierValue(this);
   }
@@ -241,6 +244,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java
index f1c960d10609..385407dd3891 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TTypeQualifiers implements org.apache.thrift.TBase<TTypeQualifiers, TTypeQualifiers._Fields>, java.io.Serializable, Cloneable, Comparable<TTypeQualifiers> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeQualifiers");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TTypeQualifiers(TTypeQualifiers other) {
     }
   }
 
+  @Override
   public TTypeQualifiers deepCopy() {
     return new TTypeQualifiers(this);
   }
@@ -165,6 +168,7 @@ public void setQualifiersIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case QUALIFIERS:
@@ -179,6 +183,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case QUALIFIERS:
@@ -189,6 +194,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -259,14 +265,17 @@ public int compareTo(TTypeQualifiers other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -313,6 +322,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TTypeQualifiersStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TTypeQualifiersStandardScheme getScheme() {
       return new TTypeQualifiersStandardScheme();
     }
@@ -320,46 +330,53 @@ public TTypeQualifiersStandardScheme getScheme() {
 
   private static class TTypeQualifiersStandardScheme extends org.apache.thrift.scheme.StandardScheme<TTypeQualifiers> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TTypeQualifiers 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 1: // QUALIFIERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
-                struct.qualifiers = new java.util.HashMap<java.lang.String,TTypeQualifierValue>(2*_map0.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1;
-                @org.apache.thrift.annotation.Nullable TTypeQualifierValue _val2;
-                for (int _i3 = 0; _i3 < _map0.size; ++_i3)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // QUALIFIERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1 = iprot.readString();
-                  _val2 = new TTypeQualifierValue();
-                  _val2.read(iprot);
-                  struct.qualifiers.put(_key1, _val2);
+                  org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
+                  struct.qualifiers = new java.util.HashMap<java.lang.String,TTypeQualifierValue>(2*_map0.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1;
+                  @org.apache.thrift.annotation.Nullable TTypeQualifierValue _val2;
+                  for (int _i3 = 0; _i3 < _map0.size; ++_i3)
+                  {
+                    _key1 = iprot.readString();
+                    _val2 = new TTypeQualifierValue();
+                    _val2.read(iprot);
+                    struct.qualifiers.put(_key1, _val2);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setQualifiersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setQualifiersIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TTypeQualifiers struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -384,6 +401,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TTypeQualifiers st
   }
 
   private static class TTypeQualifiersTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TTypeQualifiersTupleScheme getScheme() {
       return new TTypeQualifiersTupleScheme();
     }
@@ -406,21 +424,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TTypeQualifiers str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TTypeQualifiers struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map6 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
-        struct.qualifiers = new java.util.HashMap<java.lang.String,TTypeQualifierValue>(2*_map6.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _key7;
-        @org.apache.thrift.annotation.Nullable TTypeQualifierValue _val8;
-        for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key7 = iprot.readString();
-          _val8 = new TTypeQualifierValue();
-          _val8.read(iprot);
-          struct.qualifiers.put(_key7, _val8);
+          org.apache.thrift.protocol.TMap _map6 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+          struct.qualifiers = new java.util.HashMap<java.lang.String,TTypeQualifierValue>(2*_map6.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key7;
+          @org.apache.thrift.annotation.Nullable TTypeQualifierValue _val8;
+          for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+          {
+            _key7 = iprot.readString();
+            _val8 = new TTypeQualifierValue();
+            _val8.read(iprot);
+            struct.qualifiers.put(_key7, _val8);
+          }
         }
+        struct.setQualifiersIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setQualifiersIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUnionTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUnionTypeEntry.java
index fbbee464944f..ab7e01db4d70 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUnionTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUnionTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TUnionTypeEntry implements org.apache.thrift.TBase<TUnionTypeEntry, TUnionTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TUnionTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TUnionTypeEntry");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TUnionTypeEntry(TUnionTypeEntry other) {
     }
   }
 
+  @Override
   public TUnionTypeEntry deepCopy() {
     return new TUnionTypeEntry(this);
   }
@@ -165,6 +168,7 @@ public void setNameToTypePtrIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME_TO_TYPE_PTR:
@@ -179,6 +183,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME_TO_TYPE_PTR:
@@ -189,6 +194,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -259,14 +265,17 @@ public int compareTo(TUnionTypeEntry other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -313,6 +322,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TUnionTypeEntryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUnionTypeEntryStandardScheme getScheme() {
       return new TUnionTypeEntryStandardScheme();
     }
@@ -320,45 +330,52 @@ public TUnionTypeEntryStandardScheme getScheme() {
 
   private static class TUnionTypeEntryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TUnionTypeEntry> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TUnionTypeEntry 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 1: // NAME_TO_TYPE_PTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map20 = iprot.readMapBegin();
-                struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map20.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key21;
-                int _val22;
-                for (int _i23 = 0; _i23 < _map20.size; ++_i23)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // NAME_TO_TYPE_PTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key21 = iprot.readString();
-                  _val22 = iprot.readI32();
-                  struct.nameToTypePtr.put(_key21, _val22);
+                  org.apache.thrift.protocol.TMap _map20 = iprot.readMapBegin();
+                  struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map20.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key21;
+                  int _val22;
+                  for (int _i23 = 0; _i23 < _map20.size; ++_i23)
+                  {
+                    _key21 = iprot.readString();
+                    _val22 = iprot.readI32();
+                    struct.nameToTypePtr.put(_key21, _val22);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setNameToTypePtrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNameToTypePtrIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TUnionTypeEntry struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -383,6 +400,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TUnionTypeEntry st
   }
 
   private static class TUnionTypeEntryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUnionTypeEntryTupleScheme getScheme() {
       return new TUnionTypeEntryTupleScheme();
     }
@@ -405,20 +423,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TUnionTypeEntry str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TUnionTypeEntry struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32); 
-        struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map26.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _key27;
-        int _val28;
-        for (int _i29 = 0; _i29 < _map26.size; ++_i29)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key27 = iprot.readString();
-          _val28 = iprot.readI32();
-          struct.nameToTypePtr.put(_key27, _val28);
+          org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32); 
+          struct.nameToTypePtr = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map26.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key27;
+          int _val28;
+          for (int _i29 = 0; _i29 < _map26.size; ++_i29)
+          {
+            _key27 = iprot.readString();
+            _val28 = iprot.readI32();
+            struct.nameToTypePtr.put(_key27, _val28);
+          }
         }
+        struct.setNameToTypePtrIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setNameToTypePtrIsSet(true);
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataReq.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataReq.java
index 365be3a68635..f6a5d995d838 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataReq.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TUploadDataReq implements org.apache.thrift.TBase<TUploadDataReq, TUploadDataReq._Fields>, java.io.Serializable, Cloneable, Comparable<TUploadDataReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TUploadDataReq");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TABLE_NAME,_Fields.PATH};
+  private static final _Fields[] optionals = {_Fields.TABLE_NAME,_Fields.PATH};
   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);
@@ -140,6 +142,7 @@ public TUploadDataReq(TUploadDataReq other) {
     }
   }
 
+  @Override
   public TUploadDataReq deepCopy() {
     return new TUploadDataReq(this);
   }
@@ -256,6 +259,7 @@ public void setValuesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_HANDLE:
@@ -298,6 +302,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_HANDLE:
@@ -317,6 +322,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -462,14 +468,17 @@ public int compareTo(TUploadDataReq other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -551,6 +560,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TUploadDataReqStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUploadDataReqStandardScheme getScheme() {
       return new TUploadDataReqStandardScheme();
     }
@@ -558,58 +568,65 @@ public TUploadDataReqStandardScheme getScheme() {
 
   private static class TUploadDataReqStandardScheme extends org.apache.thrift.scheme.StandardScheme<TUploadDataReq> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TUploadDataReq 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 1: // SESSION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sessionHandle = new TSessionHandle();
-              struct.sessionHandle.read(iprot);
-              struct.setSessionHandleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.path = iprot.readString();
-              struct.setPathIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SESSION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sessionHandle = new TSessionHandle();
+                struct.sessionHandle.read(iprot);
+                struct.setSessionHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.path = iprot.readString();
+                struct.setPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.values = iprot.readBinary();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.values = iprot.readBinary();
-              struct.setValuesIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TUploadDataReq struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -645,6 +662,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TUploadDataReq str
   }
 
   private static class TUploadDataReqTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUploadDataReqTupleScheme getScheme() {
       return new TUploadDataReqTupleScheme();
     }
@@ -675,20 +693,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TUploadDataReq stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TUploadDataReq struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sessionHandle = new TSessionHandle();
-      struct.sessionHandle.read(iprot);
-      struct.setSessionHandleIsSet(true);
-      struct.values = iprot.readBinary();
-      struct.setValuesIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.path = iprot.readString();
-        struct.setPathIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sessionHandle = new TSessionHandle();
+        struct.sessionHandle.read(iprot);
+        struct.setSessionHandleIsSet(true);
+        struct.values = iprot.readBinary();
+        struct.setValuesIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.path = iprot.readString();
+          struct.setPathIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataResp.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataResp.java
index 6fea90129c19..adaa2493a8f9 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUploadDataResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TUploadDataResp implements org.apache.thrift.TBase<TUploadDataResp, TUploadDataResp._Fields>, java.io.Serializable, Cloneable, Comparable<TUploadDataResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TUploadDataResp");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public TUploadDataResp(TUploadDataResp other) {
     }
   }
 
+  @Override
   public TUploadDataResp deepCopy() {
     return new TUploadDataResp(this);
   }
@@ -177,6 +180,7 @@ public void setOperationHandleIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATUS:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(TUploadDataResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -379,6 +388,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TUploadDataRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUploadDataRespStandardScheme getScheme() {
       return new TUploadDataRespStandardScheme();
     }
@@ -386,43 +396,50 @@ public TUploadDataRespStandardScheme getScheme() {
 
   private static class TUploadDataRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<TUploadDataResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TUploadDataResp 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 1: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.status = new TStatus();
-              struct.status.read(iprot);
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPERATION_HANDLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.operationHandle = new TOperationHandle();
-              struct.operationHandle.read(iprot);
-              struct.setOperationHandleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.status = new TStatus();
+                struct.status.read(iprot);
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPERATION_HANDLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.operationHandle = new TOperationHandle();
+                struct.operationHandle.read(iprot);
+                struct.setOperationHandleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TUploadDataResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -444,6 +461,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TUploadDataResp st
   }
 
   private static class TUploadDataRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUploadDataRespTupleScheme getScheme() {
       return new TUploadDataRespTupleScheme();
     }
@@ -460,13 +478,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TUploadDataResp str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TUploadDataResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.status = new TStatus();
-      struct.status.read(iprot);
-      struct.setStatusIsSet(true);
-      struct.operationHandle = new TOperationHandle();
-      struct.operationHandle.read(iprot);
-      struct.setOperationHandleIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.status = new TStatus();
+        struct.status.read(iprot);
+        struct.setStatusIsSet(true);
+        struct.operationHandle = new TOperationHandle();
+        struct.operationHandle.read(iprot);
+        struct.setOperationHandleIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUserDefinedTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUserDefinedTypeEntry.java
index a4d6336bc1de..c22913dbd2c7 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUserDefinedTypeEntry.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TUserDefinedTypeEntry.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hive.service.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.hive.common.classification.InterfaceAudience.Public @org.apache.hadoop.hive.common.classification.InterfaceStability.Stable public class TUserDefinedTypeEntry implements org.apache.thrift.TBase<TUserDefinedTypeEntry, TUserDefinedTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TUserDefinedTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TUserDefinedTypeEntry");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TUserDefinedTypeEntry(TUserDefinedTypeEntry other) {
     }
   }
 
+  @Override
   public TUserDefinedTypeEntry deepCopy() {
     return new TUserDefinedTypeEntry(this);
   }
@@ -140,6 +143,7 @@ public void setTypeClassNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE_CLASS_NAME:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE_CLASS_NAME:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TUserDefinedTypeEntry other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -288,6 +297,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TUserDefinedTypeEntryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUserDefinedTypeEntryStandardScheme getScheme() {
       return new TUserDefinedTypeEntryStandardScheme();
     }
@@ -295,33 +305,40 @@ public TUserDefinedTypeEntryStandardScheme getScheme() {
 
   private static class TUserDefinedTypeEntryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TUserDefinedTypeEntry> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TUserDefinedTypeEntry 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 1: // TYPE_CLASS_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.typeClassName = iprot.readString();
-              struct.setTypeClassNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // TYPE_CLASS_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.typeClassName = iprot.readString();
+                struct.setTypeClassNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TUserDefinedTypeEntry struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TUserDefinedTypeEn
   }
 
   private static class TUserDefinedTypeEntryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TUserDefinedTypeEntryTupleScheme getScheme() {
       return new TUserDefinedTypeEntryTupleScheme();
     }
@@ -353,9 +371,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TUserDefinedTypeEnt
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TUserDefinedTypeEntry struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.typeClassName = iprot.readString();
-      struct.setTypeClassNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.typeClassName = iprot.readString();
+        struct.setTypeClassNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/service-rpc/src/gen/thrift/gen-php/Constant.php b/service-rpc/src/gen/thrift/gen-php/Constant.php
index 59b6c40636c3..52f8a15d5eca 100644
--- a/service-rpc/src/gen/thrift/gen-php/Constant.php
+++ b/service-rpc/src/gen/thrift/gen-php/Constant.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TArrayTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TArrayTypeEntry.php
index 97e0923105f0..1d4e22e029bc 100644
--- a/service-rpc/src/gen/thrift/gen-php/TArrayTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TArrayTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TBinaryColumn.php b/service-rpc/src/gen/thrift/gen-php/TBinaryColumn.php
index f9bf9f2531a3..ea26e3e7ac47 100644
--- a/service-rpc/src/gen/thrift/gen-php/TBinaryColumn.php
+++ b/service-rpc/src/gen/thrift/gen-php/TBinaryColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TBoolColumn.php b/service-rpc/src/gen/thrift/gen-php/TBoolColumn.php
index 4564053648be..54a096c78860 100644
--- a/service-rpc/src/gen/thrift/gen-php/TBoolColumn.php
+++ b/service-rpc/src/gen/thrift/gen-php/TBoolColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TBoolValue.php b/service-rpc/src/gen/thrift/gen-php/TBoolValue.php
index 905df9472d15..b466706143f6 100644
--- a/service-rpc/src/gen/thrift/gen-php/TBoolValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TBoolValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TByteColumn.php b/service-rpc/src/gen/thrift/gen-php/TByteColumn.php
index c9d8859357bd..bfcb3e04bf79 100644
--- a/service-rpc/src/gen/thrift/gen-php/TByteColumn.php
+++ b/service-rpc/src/gen/thrift/gen-php/TByteColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TByteValue.php b/service-rpc/src/gen/thrift/gen-php/TByteValue.php
index 702f19cbb09c..4f3aae37a616 100644
--- a/service-rpc/src/gen/thrift/gen-php/TByteValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TByteValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIServiceClient.php b/service-rpc/src/gen/thrift/gen-php/TCLIServiceClient.php
index 768f2421760f..cd367f22b001 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIServiceClient.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIServiceClient.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIServiceIf.php b/service-rpc/src/gen/thrift/gen-php/TCLIServiceIf.php
index fac446bce078..113f444dd984 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIServiceIf.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIServiceIf.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_args.php
index bb3c079257bc..db5a4f9fc482 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_result.php
index 8649044df139..8261e761f8f9 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelDelegationToken_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_args.php
index 1a80bfe25bae..bcc0f61b4c24 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_result.php
index f276ba067b03..5227ab72b47a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CancelOperation_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_args.php
index ccefa8b8861d..4c2a239f8129 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_result.php
index 2f654604c7f6..17805b39c762 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseOperation_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_args.php
index 3c272870410d..d4e9bbadab11 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_result.php
index a1009cf11b96..6612914e7bf0 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_CloseSession_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_args.php
index 2476791c4f1b..619b54997844 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_result.php
index ea314ea2f5ac..22e9c607be03 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_DownloadData_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_args.php
index 3ffd7e0df8a3..9c14a3c6ba15 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_result.php
index e06f4bc73ddd..72036a0fcbf1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_ExecuteStatement_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_args.php
index 90d30137d67a..1ebfcc718af0 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_result.php
index 297e7e23ef4e..b6e96dd71655 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_FetchResults_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_args.php
index fcdf5bc21c5c..e538a6215f18 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_result.php
index 94f365a02b98..22ef8b71da6e 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCatalogs_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_args.php
index f7cfa0e359a2..ee45b73f3f3e 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_result.php
index 410f57e8362b..f5110dd94337 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetColumns_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_args.php
index c7c06fc9ff1f..f60bf0d6b7de 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_result.php
index 5653c9038d90..910bd56e5d1a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetCrossReference_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_args.php
index 952483273d98..5dc7400e3668 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_result.php
index 5bb33b6f183c..4efab6ae9b2f 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetDelegationToken_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_args.php
index f11dad7fea6d..dc71d7d70486 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_result.php
index 1a4c70a9880b..5c31693f0e1c 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetFunctions_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_args.php
index cb9c5d93d00e..9ce983f80701 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_result.php
index d7af0075d50f..6015a1cb1df4 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetInfo_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_args.php
index 9deb1d317f74..dbea285b1667 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_result.php
index e2ecc74fc4b1..645ed4c8290c 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetOperationStatus_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_args.php
index 74870c7c0327..9154cd84c6ef 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_result.php
index 3fecf86c6264..29d6dfba4379 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetPrimaryKeys_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_args.php
index 88374c86b9e9..2043a8decfe5 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_result.php
index 01e17c3f3d38..6b67a5ad4f73 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetQueryId_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_args.php
index ebbc7ca5caff..53e5cb00691f 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_result.php
index 2a6bc684b76e..a0691ba37b19 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetResultSetMetadata_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_args.php
index b2fe8e9394a7..019b4506c54c 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_result.php
index 38925d98eab9..0850412317f1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetSchemas_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_args.php
index cba95c64b48b..5f69e42259e6 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_result.php
index 2c5b854d39f1..887fe128e8db 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTableTypes_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_args.php
index af9fbdd00680..a4296e4535c1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_result.php
index 0debdeacd039..3370e69e6d22 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTables_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_args.php
index ecd5fb580705..b4a52982fa0a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_result.php
index 2bf2ba48ba28..d3c9e1fdc3ff 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_GetTypeInfo_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_args.php
index 9947516f1d7e..d53532e906b7 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_result.php
index 262a91f8bb8d..8d133066f2d1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_OpenSession_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_args.php
index 1f8bc6ab4cf8..5166345a3e57 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_result.php
index 7ae60b5f828e..4fc9ddb8b2ad 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_RenewDelegationToken_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_args.php
index 02beaffedabd..9bde51ff7785 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_result.php
index 36220aa879e5..e56db9a4f63f 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_SetClientInfo_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_args.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_args.php
index 3b8753c44345..6f22b792fc54 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_args.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_result.php b/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_result.php
index 03e96f1f00c3..e4f049330562 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_result.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCLIService_UploadData_result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenReq.php b/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenReq.php
index dfe12656079c..86a48188c674 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenResp.php b/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenResp.php
index e591264e6fb0..ed35ec6f8471 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCancelDelegationTokenResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCancelOperationReq.php b/service-rpc/src/gen/thrift/gen-php/TCancelOperationReq.php
index d939ee96b054..cba2134dd850 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCancelOperationReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCancelOperationReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCancelOperationResp.php b/service-rpc/src/gen/thrift/gen-php/TCancelOperationResp.php
index 7aaff0fd3062..5e46d33c3fbd 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCancelOperationResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCancelOperationResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCloseOperationReq.php b/service-rpc/src/gen/thrift/gen-php/TCloseOperationReq.php
index e2930b02468e..bb9890e6bb7c 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCloseOperationReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCloseOperationReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCloseOperationResp.php b/service-rpc/src/gen/thrift/gen-php/TCloseOperationResp.php
index c27690fd0e28..968bdf2753dd 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCloseOperationResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCloseOperationResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCloseSessionReq.php b/service-rpc/src/gen/thrift/gen-php/TCloseSessionReq.php
index 59fafe9bb040..3481802fca25 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCloseSessionReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCloseSessionReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TCloseSessionResp.php b/service-rpc/src/gen/thrift/gen-php/TCloseSessionResp.php
index 5748420113f9..38e7bf5a1202 100644
--- a/service-rpc/src/gen/thrift/gen-php/TCloseSessionResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TCloseSessionResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TColumn.php b/service-rpc/src/gen/thrift/gen-php/TColumn.php
index 1e26e2ad38a0..5d35e8076369 100644
--- a/service-rpc/src/gen/thrift/gen-php/TColumn.php
+++ b/service-rpc/src/gen/thrift/gen-php/TColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TColumnDesc.php b/service-rpc/src/gen/thrift/gen-php/TColumnDesc.php
index 6e851bed747c..bc27510bedf1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TColumnDesc.php
+++ b/service-rpc/src/gen/thrift/gen-php/TColumnDesc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TColumnValue.php b/service-rpc/src/gen/thrift/gen-php/TColumnValue.php
index 2314eaed87e0..cb8d11975800 100644
--- a/service-rpc/src/gen/thrift/gen-php/TColumnValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TColumnValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TDoubleColumn.php b/service-rpc/src/gen/thrift/gen-php/TDoubleColumn.php
index 98529ab85120..4cb9cd65dd0e 100644
--- a/service-rpc/src/gen/thrift/gen-php/TDoubleColumn.php
+++ b/service-rpc/src/gen/thrift/gen-php/TDoubleColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TDoubleValue.php b/service-rpc/src/gen/thrift/gen-php/TDoubleValue.php
index 97dc79af5222..5e66f200b294 100644
--- a/service-rpc/src/gen/thrift/gen-php/TDoubleValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TDoubleValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TDownloadDataReq.php b/service-rpc/src/gen/thrift/gen-php/TDownloadDataReq.php
index 0d79fc591345..f3e941a47d3c 100644
--- a/service-rpc/src/gen/thrift/gen-php/TDownloadDataReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TDownloadDataReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TDownloadDataResp.php b/service-rpc/src/gen/thrift/gen-php/TDownloadDataResp.php
index c5b995011621..0d8d902d1a20 100644
--- a/service-rpc/src/gen/thrift/gen-php/TDownloadDataResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TDownloadDataResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TExecuteStatementReq.php b/service-rpc/src/gen/thrift/gen-php/TExecuteStatementReq.php
index 8d600b955c18..e6362e8cd6c7 100644
--- a/service-rpc/src/gen/thrift/gen-php/TExecuteStatementReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TExecuteStatementReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TExecuteStatementResp.php b/service-rpc/src/gen/thrift/gen-php/TExecuteStatementResp.php
index 8e4e979c25f9..4b1b65833449 100644
--- a/service-rpc/src/gen/thrift/gen-php/TExecuteStatementResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TExecuteStatementResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TFetchOrientation.php b/service-rpc/src/gen/thrift/gen-php/TFetchOrientation.php
index f9645cedefa1..aedcbd4164ea 100644
--- a/service-rpc/src/gen/thrift/gen-php/TFetchOrientation.php
+++ b/service-rpc/src/gen/thrift/gen-php/TFetchOrientation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TFetchResultsReq.php b/service-rpc/src/gen/thrift/gen-php/TFetchResultsReq.php
index e53fcddf5ec5..8f0991845468 100644
--- a/service-rpc/src/gen/thrift/gen-php/TFetchResultsReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TFetchResultsReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TFetchResultsResp.php b/service-rpc/src/gen/thrift/gen-php/TFetchResultsResp.php
index d9c05ef1d8f9..ddee8f8b07d1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TFetchResultsResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TFetchResultsResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetCatalogsReq.php b/service-rpc/src/gen/thrift/gen-php/TGetCatalogsReq.php
index 7b5238c76788..88f18d587777 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetCatalogsReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetCatalogsReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetCatalogsResp.php b/service-rpc/src/gen/thrift/gen-php/TGetCatalogsResp.php
index c194e82e4bc6..253b94a70653 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetCatalogsResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetCatalogsResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetColumnsReq.php b/service-rpc/src/gen/thrift/gen-php/TGetColumnsReq.php
index c39a757947d5..31b029c3780b 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetColumnsReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetColumnsReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetColumnsResp.php b/service-rpc/src/gen/thrift/gen-php/TGetColumnsResp.php
index 659e98ef55d7..7f7f311c17e8 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetColumnsResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetColumnsResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceReq.php b/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceReq.php
index 65c6d8032383..65a598adb622 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceResp.php b/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceResp.php
index 633df3e22e6b..420cf40d4145 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetCrossReferenceResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenReq.php b/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenReq.php
index edfa5d164243..98fdbc2fbc33 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenResp.php b/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenResp.php
index 3db7133f7aae..cb326081f7b7 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetDelegationTokenResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetFunctionsReq.php b/service-rpc/src/gen/thrift/gen-php/TGetFunctionsReq.php
index 2402a77e79fb..2e1df2511019 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetFunctionsReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetFunctionsReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetFunctionsResp.php b/service-rpc/src/gen/thrift/gen-php/TGetFunctionsResp.php
index 35fded62f10a..6c5a48b6f328 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetFunctionsResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetFunctionsResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetInfoReq.php b/service-rpc/src/gen/thrift/gen-php/TGetInfoReq.php
index d7582611bd8c..17ef62312319 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetInfoReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetInfoReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetInfoResp.php b/service-rpc/src/gen/thrift/gen-php/TGetInfoResp.php
index c90d8f006c9b..0111325a69e8 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetInfoResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetInfoResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetInfoType.php b/service-rpc/src/gen/thrift/gen-php/TGetInfoType.php
index e97f28e591c1..3137e5fd2712 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetInfoType.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetInfoType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetInfoValue.php b/service-rpc/src/gen/thrift/gen-php/TGetInfoValue.php
index 3ac84354d619..0c4d6ef63d6e 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetInfoValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetInfoValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusReq.php b/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusReq.php
index e5f7571c7808..01662c41e03d 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusResp.php b/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusResp.php
index 26e3932f2e95..c7e36b91df18 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetOperationStatusResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysReq.php b/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysReq.php
index 4c32d1496dbe..d164afeef888 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysResp.php b/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysResp.php
index 6d8e57c3c9c2..8f991547b4ad 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetPrimaryKeysResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetQueryIdReq.php b/service-rpc/src/gen/thrift/gen-php/TGetQueryIdReq.php
index 015db12df1b0..267ee8da4f8c 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetQueryIdReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetQueryIdReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetQueryIdResp.php b/service-rpc/src/gen/thrift/gen-php/TGetQueryIdResp.php
index 392edeb6598a..9f8a7256c4e4 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetQueryIdResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetQueryIdResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataReq.php b/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataReq.php
index 1a09e28eb67a..33d10d875fc8 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataResp.php b/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataResp.php
index d00559f5b382..125ad7529b4a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetResultSetMetadataResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetSchemasReq.php b/service-rpc/src/gen/thrift/gen-php/TGetSchemasReq.php
index 6d939571f6fe..17994b6d410b 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetSchemasReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetSchemasReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetSchemasResp.php b/service-rpc/src/gen/thrift/gen-php/TGetSchemasResp.php
index 6baa14b897ce..4654726fe782 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetSchemasResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetSchemasResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetTableTypesReq.php b/service-rpc/src/gen/thrift/gen-php/TGetTableTypesReq.php
index 7b7beb38f6e7..385a3c6bd1e4 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetTableTypesReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetTableTypesReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetTableTypesResp.php b/service-rpc/src/gen/thrift/gen-php/TGetTableTypesResp.php
index 3562b6543561..6911bd67966d 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetTableTypesResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetTableTypesResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetTablesReq.php b/service-rpc/src/gen/thrift/gen-php/TGetTablesReq.php
index 3f7a2d16dc56..8e12acccdde4 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetTablesReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetTablesReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetTablesResp.php b/service-rpc/src/gen/thrift/gen-php/TGetTablesResp.php
index 6be9a495fc07..895eb0ce0201 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetTablesResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetTablesResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoReq.php b/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoReq.php
index 6408bd5603a4..d31634c2705a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoResp.php b/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoResp.php
index 08253ff48086..11bb75cc15c6 100644
--- a/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TGetTypeInfoResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/THandleIdentifier.php b/service-rpc/src/gen/thrift/gen-php/THandleIdentifier.php
index 7de585994fa9..0ae62df5e181 100644
--- a/service-rpc/src/gen/thrift/gen-php/THandleIdentifier.php
+++ b/service-rpc/src/gen/thrift/gen-php/THandleIdentifier.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TI16Column.php b/service-rpc/src/gen/thrift/gen-php/TI16Column.php
index 8593d7afd59e..977f2876a8fc 100644
--- a/service-rpc/src/gen/thrift/gen-php/TI16Column.php
+++ b/service-rpc/src/gen/thrift/gen-php/TI16Column.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TI16Value.php b/service-rpc/src/gen/thrift/gen-php/TI16Value.php
index 66acf21338b2..23aa67b43f10 100644
--- a/service-rpc/src/gen/thrift/gen-php/TI16Value.php
+++ b/service-rpc/src/gen/thrift/gen-php/TI16Value.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TI32Column.php b/service-rpc/src/gen/thrift/gen-php/TI32Column.php
index 5a21c59f5ef7..d5126d1e87f1 100644
--- a/service-rpc/src/gen/thrift/gen-php/TI32Column.php
+++ b/service-rpc/src/gen/thrift/gen-php/TI32Column.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TI32Value.php b/service-rpc/src/gen/thrift/gen-php/TI32Value.php
index 76d4e3418943..5be424cac9e7 100644
--- a/service-rpc/src/gen/thrift/gen-php/TI32Value.php
+++ b/service-rpc/src/gen/thrift/gen-php/TI32Value.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TI64Column.php b/service-rpc/src/gen/thrift/gen-php/TI64Column.php
index 288e80dcb908..13ead571bb27 100644
--- a/service-rpc/src/gen/thrift/gen-php/TI64Column.php
+++ b/service-rpc/src/gen/thrift/gen-php/TI64Column.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TI64Value.php b/service-rpc/src/gen/thrift/gen-php/TI64Value.php
index ac83082c433a..c24110f954d3 100644
--- a/service-rpc/src/gen/thrift/gen-php/TI64Value.php
+++ b/service-rpc/src/gen/thrift/gen-php/TI64Value.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TJobExecutionStatus.php b/service-rpc/src/gen/thrift/gen-php/TJobExecutionStatus.php
index 26cc025d6183..a7ade9ef3a1b 100644
--- a/service-rpc/src/gen/thrift/gen-php/TJobExecutionStatus.php
+++ b/service-rpc/src/gen/thrift/gen-php/TJobExecutionStatus.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TMapTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TMapTypeEntry.php
index cb3f73b212d5..eb4763a5cf13 100644
--- a/service-rpc/src/gen/thrift/gen-php/TMapTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TMapTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TOpenSessionReq.php b/service-rpc/src/gen/thrift/gen-php/TOpenSessionReq.php
index 8ec19a02078c..b91578089c73 100644
--- a/service-rpc/src/gen/thrift/gen-php/TOpenSessionReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TOpenSessionReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TOpenSessionResp.php b/service-rpc/src/gen/thrift/gen-php/TOpenSessionResp.php
index dc938f0450b5..80fb2e070842 100644
--- a/service-rpc/src/gen/thrift/gen-php/TOpenSessionResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TOpenSessionResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TOperationHandle.php b/service-rpc/src/gen/thrift/gen-php/TOperationHandle.php
index 1c55e87cabdd..d1a2a4f6e27f 100644
--- a/service-rpc/src/gen/thrift/gen-php/TOperationHandle.php
+++ b/service-rpc/src/gen/thrift/gen-php/TOperationHandle.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TOperationState.php b/service-rpc/src/gen/thrift/gen-php/TOperationState.php
index 3527fe9dd7ce..1dd16618638e 100644
--- a/service-rpc/src/gen/thrift/gen-php/TOperationState.php
+++ b/service-rpc/src/gen/thrift/gen-php/TOperationState.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TOperationType.php b/service-rpc/src/gen/thrift/gen-php/TOperationType.php
index 608cad9b735a..baaad849368a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TOperationType.php
+++ b/service-rpc/src/gen/thrift/gen-php/TOperationType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TPrimitiveTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TPrimitiveTypeEntry.php
index f7cbf56650b1..23b9b6da2102 100644
--- a/service-rpc/src/gen/thrift/gen-php/TPrimitiveTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TPrimitiveTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TProgressUpdateResp.php b/service-rpc/src/gen/thrift/gen-php/TProgressUpdateResp.php
index 12005c6c5de3..0492afc585df 100644
--- a/service-rpc/src/gen/thrift/gen-php/TProgressUpdateResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TProgressUpdateResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TProtocolVersion.php b/service-rpc/src/gen/thrift/gen-php/TProtocolVersion.php
index b27fb349010b..145a0cffe4cb 100644
--- a/service-rpc/src/gen/thrift/gen-php/TProtocolVersion.php
+++ b/service-rpc/src/gen/thrift/gen-php/TProtocolVersion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenReq.php b/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenReq.php
index c2123a9aa9ee..18e5352a6423 100644
--- a/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenResp.php b/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenResp.php
index bc7a9d00bcd5..e0022ae254b3 100644
--- a/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TRenewDelegationTokenResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TRow.php b/service-rpc/src/gen/thrift/gen-php/TRow.php
index fd042db525f4..3eaa29fe0d1d 100644
--- a/service-rpc/src/gen/thrift/gen-php/TRow.php
+++ b/service-rpc/src/gen/thrift/gen-php/TRow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TRowSet.php b/service-rpc/src/gen/thrift/gen-php/TRowSet.php
index 1e75cadcd32c..3c61f3361b58 100644
--- a/service-rpc/src/gen/thrift/gen-php/TRowSet.php
+++ b/service-rpc/src/gen/thrift/gen-php/TRowSet.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TSessionHandle.php b/service-rpc/src/gen/thrift/gen-php/TSessionHandle.php
index 8ced51158eef..e0c068019093 100644
--- a/service-rpc/src/gen/thrift/gen-php/TSessionHandle.php
+++ b/service-rpc/src/gen/thrift/gen-php/TSessionHandle.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TSetClientInfoReq.php b/service-rpc/src/gen/thrift/gen-php/TSetClientInfoReq.php
index 61f42941ed3e..526fae1af728 100644
--- a/service-rpc/src/gen/thrift/gen-php/TSetClientInfoReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TSetClientInfoReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TSetClientInfoResp.php b/service-rpc/src/gen/thrift/gen-php/TSetClientInfoResp.php
index 6f6f839cbf52..9e60fa2f5dd2 100644
--- a/service-rpc/src/gen/thrift/gen-php/TSetClientInfoResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TSetClientInfoResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TStatus.php b/service-rpc/src/gen/thrift/gen-php/TStatus.php
index e438e0507dd7..ab79050bc65a 100644
--- a/service-rpc/src/gen/thrift/gen-php/TStatus.php
+++ b/service-rpc/src/gen/thrift/gen-php/TStatus.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TStatusCode.php b/service-rpc/src/gen/thrift/gen-php/TStatusCode.php
index e636dca5b43b..54e32c96255e 100644
--- a/service-rpc/src/gen/thrift/gen-php/TStatusCode.php
+++ b/service-rpc/src/gen/thrift/gen-php/TStatusCode.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TStringColumn.php b/service-rpc/src/gen/thrift/gen-php/TStringColumn.php
index 326532fcfb75..eecbf5995328 100644
--- a/service-rpc/src/gen/thrift/gen-php/TStringColumn.php
+++ b/service-rpc/src/gen/thrift/gen-php/TStringColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TStringValue.php b/service-rpc/src/gen/thrift/gen-php/TStringValue.php
index 9af225d717f4..552c131208af 100644
--- a/service-rpc/src/gen/thrift/gen-php/TStringValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TStringValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TStructTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TStructTypeEntry.php
index 37d394a2208c..39596a497c54 100644
--- a/service-rpc/src/gen/thrift/gen-php/TStructTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TStructTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TTableSchema.php b/service-rpc/src/gen/thrift/gen-php/TTableSchema.php
index 7a589d4416a5..c74b7380de31 100644
--- a/service-rpc/src/gen/thrift/gen-php/TTableSchema.php
+++ b/service-rpc/src/gen/thrift/gen-php/TTableSchema.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TTypeDesc.php b/service-rpc/src/gen/thrift/gen-php/TTypeDesc.php
index d2e877cbc022..cc17350a7eb8 100644
--- a/service-rpc/src/gen/thrift/gen-php/TTypeDesc.php
+++ b/service-rpc/src/gen/thrift/gen-php/TTypeDesc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TTypeEntry.php
index d12af78452cf..86018437d536 100644
--- a/service-rpc/src/gen/thrift/gen-php/TTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TTypeId.php b/service-rpc/src/gen/thrift/gen-php/TTypeId.php
index ac799c4a173d..144b29241abd 100644
--- a/service-rpc/src/gen/thrift/gen-php/TTypeId.php
+++ b/service-rpc/src/gen/thrift/gen-php/TTypeId.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TTypeQualifierValue.php b/service-rpc/src/gen/thrift/gen-php/TTypeQualifierValue.php
index 8f6521a8170a..c78a4433e5d8 100644
--- a/service-rpc/src/gen/thrift/gen-php/TTypeQualifierValue.php
+++ b/service-rpc/src/gen/thrift/gen-php/TTypeQualifierValue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TTypeQualifiers.php b/service-rpc/src/gen/thrift/gen-php/TTypeQualifiers.php
index 8e2ed9537fc4..c81d2a7bd6ed 100644
--- a/service-rpc/src/gen/thrift/gen-php/TTypeQualifiers.php
+++ b/service-rpc/src/gen/thrift/gen-php/TTypeQualifiers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TUnionTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TUnionTypeEntry.php
index d986b4c5da06..a9e335c589a8 100644
--- a/service-rpc/src/gen/thrift/gen-php/TUnionTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TUnionTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TUploadDataReq.php b/service-rpc/src/gen/thrift/gen-php/TUploadDataReq.php
index 225b87ec4771..63cec4697367 100644
--- a/service-rpc/src/gen/thrift/gen-php/TUploadDataReq.php
+++ b/service-rpc/src/gen/thrift/gen-php/TUploadDataReq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TUploadDataResp.php b/service-rpc/src/gen/thrift/gen-php/TUploadDataResp.php
index 239ee67709b9..ec7af3627808 100644
--- a/service-rpc/src/gen/thrift/gen-php/TUploadDataResp.php
+++ b/service-rpc/src/gen/thrift/gen-php/TUploadDataResp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-php/TUserDefinedTypeEntry.php b/service-rpc/src/gen/thrift/gen-php/TUserDefinedTypeEntry.php
index 3d1c185af5ab..5e40ea7f306f 100644
--- a/service-rpc/src/gen/thrift/gen-php/TUserDefinedTypeEntry.php
+++ b/service-rpc/src/gen/thrift/gen-php/TUserDefinedTypeEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService-remote b/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService-remote
index 683ee3c8b3bf..de37879778f8 100755
--- a/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService-remote
+++ b/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService-remote
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService.py b/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService.py
index 1867def07703..c6526f685a03 100644
--- a/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService.py
+++ b/service-rpc/src/gen/thrift/gen-py/TCLIService/TCLIService.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 import logging
@@ -1663,9 +1664,10 @@ class OpenSession_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -1689,6 +1691,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1726,9 +1729,10 @@ class OpenSession_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -1752,6 +1756,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1788,9 +1793,10 @@ class CloseSession_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -1814,6 +1820,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1851,9 +1858,10 @@ class CloseSession_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -1877,6 +1885,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1913,9 +1922,10 @@ class GetInfo_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -1939,6 +1949,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1976,9 +1987,10 @@ class GetInfo_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2002,6 +2014,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2038,9 +2051,10 @@ class ExecuteStatement_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2064,6 +2078,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2101,9 +2116,10 @@ class ExecuteStatement_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2127,6 +2143,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2163,9 +2180,10 @@ class GetTypeInfo_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2189,6 +2207,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2226,9 +2245,10 @@ class GetTypeInfo_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2252,6 +2272,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2288,9 +2309,10 @@ class GetCatalogs_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2314,6 +2336,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2351,9 +2374,10 @@ class GetCatalogs_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2377,6 +2401,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2413,9 +2438,10 @@ class GetSchemas_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2439,6 +2465,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2476,9 +2503,10 @@ class GetSchemas_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2502,6 +2530,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2538,9 +2567,10 @@ class GetTables_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2564,6 +2594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2601,9 +2632,10 @@ class GetTables_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2627,6 +2659,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2663,9 +2696,10 @@ class GetTableTypes_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2689,6 +2723,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2726,9 +2761,10 @@ class GetTableTypes_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2752,6 +2788,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2788,9 +2825,10 @@ class GetColumns_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2814,6 +2852,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2851,9 +2890,10 @@ class GetColumns_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2877,6 +2917,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2913,9 +2954,10 @@ class GetFunctions_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -2939,6 +2981,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2976,9 +3019,10 @@ class GetFunctions_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3002,6 +3046,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3038,9 +3083,10 @@ class GetPrimaryKeys_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3064,6 +3110,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3101,9 +3148,10 @@ class GetPrimaryKeys_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3127,6 +3175,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3163,9 +3212,10 @@ class GetCrossReference_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3189,6 +3239,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3226,9 +3277,10 @@ class GetCrossReference_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3252,6 +3304,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3288,9 +3341,10 @@ class GetOperationStatus_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3314,6 +3368,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3351,9 +3406,10 @@ class GetOperationStatus_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3377,6 +3433,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3413,9 +3470,10 @@ class CancelOperation_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3439,6 +3497,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3476,9 +3535,10 @@ class CancelOperation_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3502,6 +3562,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3538,9 +3599,10 @@ class CloseOperation_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3564,6 +3626,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3601,9 +3664,10 @@ class CloseOperation_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3627,6 +3691,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3663,9 +3728,10 @@ class GetResultSetMetadata_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3689,6 +3755,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3726,9 +3793,10 @@ class GetResultSetMetadata_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3752,6 +3820,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3788,9 +3857,10 @@ class FetchResults_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3814,6 +3884,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3851,9 +3922,10 @@ class FetchResults_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3877,6 +3949,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3913,9 +3986,10 @@ class GetDelegationToken_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -3939,6 +4013,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3976,9 +4051,10 @@ class GetDelegationToken_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4002,6 +4078,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4038,9 +4115,10 @@ class CancelDelegationToken_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -4064,6 +4142,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4101,9 +4180,10 @@ class CancelDelegationToken_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4127,6 +4207,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4163,9 +4244,10 @@ class RenewDelegationToken_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -4189,6 +4271,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4226,9 +4309,10 @@ class RenewDelegationToken_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4252,6 +4336,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4288,9 +4373,10 @@ class GetQueryId_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -4314,6 +4400,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4351,9 +4438,10 @@ class GetQueryId_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4377,6 +4465,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4413,9 +4502,10 @@ class SetClientInfo_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -4439,6 +4529,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4476,9 +4567,10 @@ class SetClientInfo_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4502,6 +4594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4538,9 +4631,10 @@ class UploadData_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -4564,6 +4658,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4601,9 +4696,10 @@ class UploadData_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4627,6 +4723,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4663,9 +4760,10 @@ class DownloadData_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -4689,6 +4787,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4726,9 +4825,10 @@ class DownloadData_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -4752,6 +4852,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
diff --git a/service-rpc/src/gen/thrift/gen-py/TCLIService/constants.py b/service-rpc/src/gen/thrift/gen-py/TCLIService/constants.py
index 769dc57c9b8b..58697c939bd3 100644
--- a/service-rpc/src/gen/thrift/gen-py/TCLIService/constants.py
+++ b/service-rpc/src/gen/thrift/gen-py/TCLIService/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,65 +9,66 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 from .ttypes import *
 PRIMITIVE_TYPES = set((
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    8,
-    9,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        15,
+        16,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
 ))
 COMPLEX_TYPES = set((
-    10,
-    11,
-    12,
-    13,
-    14,
+        10,
+        11,
+        12,
+        13,
+        14,
 ))
 COLLECTION_TYPES = set((
-    10,
-    11,
+        10,
+        11,
 ))
 TYPE_NAMES = {
-    10: "ARRAY",
-    4: "BIGINT",
-    9: "BINARY",
-    0: "BOOLEAN",
-    19: "CHAR",
-    17: "DATE",
-    15: "DECIMAL",
-    6: "DOUBLE",
-    5: "FLOAT",
-    21: "INTERVAL_DAY_TIME",
-    20: "INTERVAL_YEAR_MONTH",
-    3: "INT",
-    11: "MAP",
-    16: "NULL",
-    2: "SMALLINT",
-    7: "STRING",
-    12: "STRUCT",
-    22: "TIMESTAMP WITH LOCAL TIME ZONE",
-    8: "TIMESTAMP",
-    1: "TINYINT",
-    13: "UNIONTYPE",
-    23: "UNKNOWN",
-    18: "VARCHAR",
+        10: "ARRAY",
+        4: "BIGINT",
+        9: "BINARY",
+        0: "BOOLEAN",
+        19: "CHAR",
+        17: "DATE",
+        15: "DECIMAL",
+        6: "DOUBLE",
+        5: "FLOAT",
+        21: "INTERVAL_DAY_TIME",
+        20: "INTERVAL_YEAR_MONTH",
+        3: "INT",
+        11: "MAP",
+        16: "NULL",
+        2: "SMALLINT",
+        7: "STRING",
+        12: "STRUCT",
+        22: "TIMESTAMP WITH LOCAL TIME ZONE",
+        8: "TIMESTAMP",
+        1: "TINYINT",
+        13: "UNIONTYPE",
+        23: "UNKNOWN",
+        18: "VARCHAR",
 }
 CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength"
 PRECISION = "precision"
diff --git a/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py b/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
index 8d72578a4970..434a76326c0c 100644
--- a/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
+++ b/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 
@@ -443,9 +444,10 @@ class TTypeQualifierValue(object):
      - stringValue
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, i32Value=None, stringValue=None,):
+    def __init__(self, i32Value = None, stringValue = None,):
         self.i32Value = i32Value
         self.stringValue = stringValue
 
@@ -474,6 +476,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -510,9 +513,10 @@ class TTypeQualifiers(object):
      - qualifiers
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, qualifiers=None,):
+    def __init__(self, qualifiers = None,):
         self.qualifiers = qualifiers
 
     def read(self, iprot):
@@ -542,6 +546,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -581,9 +586,10 @@ class TPrimitiveTypeEntry(object):
      - typeQualifiers
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, type=None, typeQualifiers=None,):
+    def __init__(self, type = None, typeQualifiers = None,):
         self.type = type
         self.typeQualifiers = typeQualifiers
 
@@ -613,6 +619,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -651,9 +658,10 @@ class TArrayTypeEntry(object):
      - objectTypePtr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, objectTypePtr=None,):
+    def __init__(self, objectTypePtr = None,):
         self.objectTypePtr = objectTypePtr
 
     def read(self, iprot):
@@ -676,6 +684,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -711,9 +720,10 @@ class TMapTypeEntry(object):
      - valueTypePtr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, keyTypePtr=None, valueTypePtr=None,):
+    def __init__(self, keyTypePtr = None, valueTypePtr = None,):
         self.keyTypePtr = keyTypePtr
         self.valueTypePtr = valueTypePtr
 
@@ -742,6 +752,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -782,9 +793,10 @@ class TStructTypeEntry(object):
      - nameToTypePtr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, nameToTypePtr=None,):
+    def __init__(self, nameToTypePtr = None,):
         self.nameToTypePtr = nameToTypePtr
 
     def read(self, iprot):
@@ -813,6 +825,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -851,9 +864,10 @@ class TUnionTypeEntry(object):
      - nameToTypePtr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, nameToTypePtr=None,):
+    def __init__(self, nameToTypePtr = None,):
         self.nameToTypePtr = nameToTypePtr
 
     def read(self, iprot):
@@ -882,6 +896,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -920,9 +935,10 @@ class TUserDefinedTypeEntry(object):
      - typeClassName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, typeClassName=None,):
+    def __init__(self, typeClassName = None,):
         self.typeClassName = typeClassName
 
     def read(self, iprot):
@@ -945,6 +961,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -984,9 +1001,10 @@ class TTypeEntry(object):
      - userDefinedTypeEntry
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, primitiveEntry=None, arrayEntry=None, mapEntry=None, structEntry=None, unionEntry=None, userDefinedTypeEntry=None,):
+    def __init__(self, primitiveEntry = None, arrayEntry = None, mapEntry = None, structEntry = None, unionEntry = None, userDefinedTypeEntry = None,):
         self.primitiveEntry = primitiveEntry
         self.arrayEntry = arrayEntry
         self.mapEntry = mapEntry
@@ -1045,6 +1063,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1097,9 +1116,10 @@ class TTypeDesc(object):
      - types
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, types=None,):
+    def __init__(self, types = None,):
         self.types = types
 
     def read(self, iprot):
@@ -1128,6 +1148,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1168,9 +1189,10 @@ class TColumnDesc(object):
      - comment
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, columnName=None, typeDesc=None, position=None, comment=None,):
+    def __init__(self, columnName = None, typeDesc = None, position = None, comment = None,):
         self.columnName = columnName
         self.typeDesc = typeDesc
         self.position = position
@@ -1212,6 +1234,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1262,9 +1285,10 @@ class TTableSchema(object):
      - columns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, columns=None,):
+    def __init__(self, columns = None,):
         self.columns = columns
 
     def read(self, iprot):
@@ -1293,6 +1317,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1330,9 +1355,10 @@ class TBoolValue(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1355,6 +1381,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1387,9 +1414,10 @@ class TByteValue(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1412,6 +1440,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1444,9 +1473,10 @@ class TI16Value(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1469,6 +1499,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1501,9 +1532,10 @@ class TI32Value(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1526,6 +1558,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1558,9 +1591,10 @@ class TI64Value(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1583,6 +1617,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1615,9 +1650,10 @@ class TDoubleValue(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1640,6 +1676,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1672,9 +1709,10 @@ class TStringValue(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, value=None,):
+    def __init__(self, value = None,):
         self.value = value
 
     def read(self, iprot):
@@ -1697,6 +1735,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1735,9 +1774,10 @@ class TColumnValue(object):
      - stringVal
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, boolVal=None, byteVal=None, i16Val=None, i32Val=None, i64Val=None, doubleVal=None, stringVal=None,):
+    def __init__(self, boolVal = None, byteVal = None, i16Val = None, i32Val = None, i64Val = None, doubleVal = None, stringVal = None,):
         self.boolVal = boolVal
         self.byteVal = byteVal
         self.i16Val = i16Val
@@ -1803,6 +1843,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1859,9 +1900,10 @@ class TRow(object):
      - colVals
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, colVals=None,):
+    def __init__(self, colVals = None,):
         self.colVals = colVals
 
     def read(self, iprot):
@@ -1890,6 +1932,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1928,9 +1971,10 @@ class TBoolColumn(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -1964,6 +2008,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2008,9 +2053,10 @@ class TByteColumn(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2044,6 +2090,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2088,9 +2135,10 @@ class TI16Column(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2124,6 +2172,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2168,9 +2217,10 @@ class TI32Column(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2204,6 +2254,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2248,9 +2299,10 @@ class TI64Column(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2284,6 +2336,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2328,9 +2381,10 @@ class TDoubleColumn(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2364,6 +2418,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2408,9 +2463,10 @@ class TStringColumn(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2444,6 +2500,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2488,9 +2545,10 @@ class TBinaryColumn(object):
      - nulls
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, nulls=None,):
+    def __init__(self, values = None, nulls = None,):
         self.values = values
         self.nulls = nulls
 
@@ -2524,6 +2582,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2574,9 +2633,10 @@ class TColumn(object):
      - binaryVal
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, boolVal=None, byteVal=None, i16Val=None, i32Val=None, i64Val=None, doubleVal=None, stringVal=None, binaryVal=None,):
+    def __init__(self, boolVal = None, byteVal = None, i16Val = None, i32Val = None, i64Val = None, doubleVal = None, stringVal = None, binaryVal = None,):
         self.boolVal = boolVal
         self.byteVal = byteVal
         self.i16Val = i16Val
@@ -2649,6 +2709,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2713,9 +2774,10 @@ class TRowSet(object):
      - columnCount
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, startRowOffset=None, rows=None, columns=None, binaryColumns=None, columnCount=None,):
+    def __init__(self, startRowOffset = None, rows = None, columns = None, binaryColumns = None, columnCount = None,):
         self.startRowOffset = startRowOffset
         self.rows = rows
         self.columns = columns
@@ -2774,6 +2836,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2836,9 +2899,10 @@ class TStatus(object):
      - errorMessage
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, statusCode=None, infoMessages=None, sqlState=None, errorCode=None, errorMessage=None,):
+    def __init__(self, statusCode = None, infoMessages = None, sqlState = None, errorCode = None, errorMessage = None,):
         self.statusCode = statusCode
         self.infoMessages = infoMessages
         self.sqlState = sqlState
@@ -2890,6 +2954,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2944,9 +3009,10 @@ class THandleIdentifier(object):
      - secret
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, guid=None, secret=None,):
+    def __init__(self, guid = None, secret = None,):
         self.guid = guid
         self.secret = secret
 
@@ -2975,6 +3041,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3015,9 +3082,10 @@ class TSessionHandle(object):
      - sessionId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionId=None,):
+    def __init__(self, sessionId = None,):
         self.sessionId = sessionId
 
     def read(self, iprot):
@@ -3041,6 +3109,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3078,9 +3147,10 @@ class TOperationHandle(object):
      - modifiedRowCount
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationId=None, operationType=None, hasResultSet=None, modifiedRowCount=None,):
+    def __init__(self, operationId = None, operationType = None, hasResultSet = None, modifiedRowCount = None,):
         self.operationId = operationId
         self.operationType = operationType
         self.hasResultSet = hasResultSet
@@ -3122,6 +3192,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3175,9 +3246,10 @@ class TOpenSessionReq(object):
      - configuration
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, client_protocol=9, username=None, password=None, configuration=None,):
+    def __init__(self, client_protocol =     9, username = None, password = None, configuration = None,):
         self.client_protocol = client_protocol
         self.username = username
         self.password = password
@@ -3224,6 +3296,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3277,9 +3350,10 @@ class TOpenSessionResp(object):
      - configuration
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, serverProtocolVersion=9, sessionHandle=None, configuration=None,):
+    def __init__(self, status = None, serverProtocolVersion =     9, sessionHandle = None, configuration = None,):
         self.status = status
         self.serverProtocolVersion = serverProtocolVersion
         self.sessionHandle = sessionHandle
@@ -3328,6 +3402,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3381,9 +3456,10 @@ class TSetClientInfoReq(object):
      - configuration
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, configuration=None,):
+    def __init__(self, sessionHandle = None, configuration = None,):
         self.sessionHandle = sessionHandle
         self.configuration = configuration
 
@@ -3419,6 +3495,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3461,9 +3538,10 @@ class TSetClientInfoResp(object):
      - status
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None,):
+    def __init__(self, status = None,):
         self.status = status
 
     def read(self, iprot):
@@ -3487,6 +3565,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3521,9 +3600,10 @@ class TCloseSessionReq(object):
      - sessionHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None,):
+    def __init__(self, sessionHandle = None,):
         self.sessionHandle = sessionHandle
 
     def read(self, iprot):
@@ -3547,6 +3627,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3581,9 +3662,10 @@ class TCloseSessionResp(object):
      - status
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None,):
+    def __init__(self, status = None,):
         self.status = status
 
     def read(self, iprot):
@@ -3607,6 +3689,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3646,9 +3729,10 @@ class TGetInfoValue(object):
      - lenValue
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, stringValue=None, smallIntValue=None, integerBitmask=None, integerFlag=None, binaryValue=None, lenValue=None,):
+    def __init__(self, stringValue = None, smallIntValue = None, integerBitmask = None, integerFlag = None, binaryValue = None, lenValue = None,):
         self.stringValue = stringValue
         self.smallIntValue = smallIntValue
         self.integerBitmask = integerBitmask
@@ -3701,6 +3785,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3754,9 +3839,10 @@ class TGetInfoReq(object):
      - infoType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, infoType=None,):
+    def __init__(self, sessionHandle = None, infoType = None,):
         self.sessionHandle = sessionHandle
         self.infoType = infoType
 
@@ -3786,6 +3872,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3827,9 +3914,10 @@ class TGetInfoResp(object):
      - infoValue
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, infoValue=None,):
+    def __init__(self, status = None, infoValue = None,):
         self.status = status
         self.infoValue = infoValue
 
@@ -3860,6 +3948,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3904,9 +3993,10 @@ class TExecuteStatementReq(object):
      - queryTimeout
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, statement=None, confOverlay=None, runAsync=False, queryTimeout=0,):
+    def __init__(self, sessionHandle = None, statement = None, confOverlay = None, runAsync = False, queryTimeout = 0,):
         self.sessionHandle = sessionHandle
         self.statement = statement
         self.confOverlay = confOverlay
@@ -3960,6 +4050,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4017,9 +4108,10 @@ class TExecuteStatementResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -4050,6 +4142,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4088,9 +4181,10 @@ class TGetTypeInfoReq(object):
      - sessionHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None,):
+    def __init__(self, sessionHandle = None,):
         self.sessionHandle = sessionHandle
 
     def read(self, iprot):
@@ -4114,6 +4208,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4149,9 +4244,10 @@ class TGetTypeInfoResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -4182,6 +4278,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4223,9 +4320,10 @@ class TUploadDataReq(object):
      - values
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, tableName=None, path=None, values=None,):
+    def __init__(self, sessionHandle = None, tableName = None, path = None, values = None,):
         self.sessionHandle = sessionHandle
         self.tableName = tableName
         self.path = path
@@ -4267,6 +4365,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4316,9 +4415,10 @@ class TUploadDataResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -4349,6 +4449,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4393,9 +4494,10 @@ class TDownloadDataReq(object):
      - downloadOptions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, tableName=None, query=None, format=None, downloadOptions=None,):
+    def __init__(self, sessionHandle = None, tableName = None, query = None, format = None, downloadOptions = None,):
         self.sessionHandle = sessionHandle
         self.tableName = tableName
         self.query = query
@@ -4449,6 +4551,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4504,9 +4607,10 @@ class TDownloadDataResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -4537,6 +4641,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4577,9 +4682,10 @@ class TGetCatalogsReq(object):
      - sessionHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None,):
+    def __init__(self, sessionHandle = None,):
         self.sessionHandle = sessionHandle
 
     def read(self, iprot):
@@ -4603,6 +4709,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4638,9 +4745,10 @@ class TGetCatalogsResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -4671,6 +4779,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4711,9 +4820,10 @@ class TGetSchemasReq(object):
      - schemaName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, catalogName=None, schemaName=None,):
+    def __init__(self, sessionHandle = None, catalogName = None, schemaName = None,):
         self.sessionHandle = sessionHandle
         self.catalogName = catalogName
         self.schemaName = schemaName
@@ -4749,6 +4859,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4792,9 +4903,10 @@ class TGetSchemasResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -4825,6 +4937,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4867,9 +4980,10 @@ class TGetTablesReq(object):
      - tableTypes
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, catalogName=None, schemaName=None, tableName=None, tableTypes=None,):
+    def __init__(self, sessionHandle = None, catalogName = None, schemaName = None, tableName = None, tableTypes = None,):
         self.sessionHandle = sessionHandle
         self.catalogName = catalogName
         self.schemaName = schemaName
@@ -4922,6 +5036,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4976,9 +5091,10 @@ class TGetTablesResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -5009,6 +5125,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5047,9 +5164,10 @@ class TGetTableTypesReq(object):
      - sessionHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None,):
+    def __init__(self, sessionHandle = None,):
         self.sessionHandle = sessionHandle
 
     def read(self, iprot):
@@ -5073,6 +5191,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5108,9 +5227,10 @@ class TGetTableTypesResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -5141,6 +5261,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5183,9 +5304,10 @@ class TGetColumnsReq(object):
      - columnName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, catalogName=None, schemaName=None, tableName=None, columnName=None,):
+    def __init__(self, sessionHandle = None, catalogName = None, schemaName = None, tableName = None, columnName = None,):
         self.sessionHandle = sessionHandle
         self.catalogName = catalogName
         self.schemaName = schemaName
@@ -5233,6 +5355,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5284,9 +5407,10 @@ class TGetColumnsResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -5317,6 +5441,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5358,9 +5483,10 @@ class TGetFunctionsReq(object):
      - functionName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, catalogName=None, schemaName=None, functionName=None,):
+    def __init__(self, sessionHandle = None, catalogName = None, schemaName = None, functionName = None,):
         self.sessionHandle = sessionHandle
         self.catalogName = catalogName
         self.schemaName = schemaName
@@ -5402,6 +5528,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5451,9 +5578,10 @@ class TGetFunctionsResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -5484,6 +5612,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5525,9 +5654,10 @@ class TGetPrimaryKeysReq(object):
      - tableName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, catalogName=None, schemaName=None, tableName=None,):
+    def __init__(self, sessionHandle = None, catalogName = None, schemaName = None, tableName = None,):
         self.sessionHandle = sessionHandle
         self.catalogName = catalogName
         self.schemaName = schemaName
@@ -5569,6 +5699,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5616,9 +5747,10 @@ class TGetPrimaryKeysResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -5649,6 +5781,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5693,9 +5826,10 @@ class TGetCrossReferenceReq(object):
      - foreignTableName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, parentCatalogName=None, parentSchemaName=None, parentTableName=None, foreignCatalogName=None, foreignSchemaName=None, foreignTableName=None,):
+    def __init__(self, sessionHandle = None, parentCatalogName = None, parentSchemaName = None, parentTableName = None, foreignCatalogName = None, foreignSchemaName = None, foreignTableName = None,):
         self.sessionHandle = sessionHandle
         self.parentCatalogName = parentCatalogName
         self.parentSchemaName = parentSchemaName
@@ -5755,6 +5889,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5814,9 +5949,10 @@ class TGetCrossReferenceResp(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationHandle=None,):
+    def __init__(self, status = None, operationHandle = None,):
         self.status = status
         self.operationHandle = operationHandle
 
@@ -5847,6 +5983,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5886,9 +6023,10 @@ class TGetOperationStatusReq(object):
      - getProgressUpdate
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationHandle=None, getProgressUpdate=None,):
+    def __init__(self, operationHandle = None, getProgressUpdate = None,):
         self.operationHandle = operationHandle
         self.getProgressUpdate = getProgressUpdate
 
@@ -5918,6 +6056,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5966,9 +6105,10 @@ class TGetOperationStatusResp(object):
      - numModifiedRows
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, operationState=None, sqlState=None, errorCode=None, errorMessage=None, taskStatus=None, operationStarted=None, operationCompleted=None, hasResultSet=None, progressUpdateResponse=None, numModifiedRows=None,):
+    def __init__(self, status = None, operationState = None, sqlState = None, errorCode = None, errorMessage = None, taskStatus = None, operationStarted = None, operationCompleted = None, hasResultSet = None, progressUpdateResponse = None, numModifiedRows = None,):
         self.status = status
         self.operationState = operationState
         self.sqlState = sqlState
@@ -6053,6 +6193,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6127,9 +6268,10 @@ class TCancelOperationReq(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationHandle=None,):
+    def __init__(self, operationHandle = None,):
         self.operationHandle = operationHandle
 
     def read(self, iprot):
@@ -6153,6 +6295,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6187,9 +6330,10 @@ class TCancelOperationResp(object):
      - status
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None,):
+    def __init__(self, status = None,):
         self.status = status
 
     def read(self, iprot):
@@ -6213,6 +6357,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6247,9 +6392,10 @@ class TCloseOperationReq(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationHandle=None,):
+    def __init__(self, operationHandle = None,):
         self.operationHandle = operationHandle
 
     def read(self, iprot):
@@ -6273,6 +6419,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6307,9 +6454,10 @@ class TCloseOperationResp(object):
      - status
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None,):
+    def __init__(self, status = None,):
         self.status = status
 
     def read(self, iprot):
@@ -6333,6 +6481,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6367,9 +6516,10 @@ class TGetResultSetMetadataReq(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationHandle=None,):
+    def __init__(self, operationHandle = None,):
         self.operationHandle = operationHandle
 
     def read(self, iprot):
@@ -6393,6 +6543,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6428,9 +6579,10 @@ class TGetResultSetMetadataResp(object):
      - schema
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, schema=None,):
+    def __init__(self, status = None, schema = None,):
         self.status = status
         self.schema = schema
 
@@ -6461,6 +6613,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6502,9 +6655,10 @@ class TFetchResultsReq(object):
      - fetchType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationHandle=None, orientation=0, maxRows=None, fetchType=0,):
+    def __init__(self, operationHandle = None, orientation =     0, maxRows = None, fetchType = 0,):
         self.operationHandle = operationHandle
         self.orientation = orientation
         self.maxRows = maxRows
@@ -6546,6 +6700,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6598,9 +6753,10 @@ class TFetchResultsResp(object):
      - results
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, hasMoreRows=None, results=None,):
+    def __init__(self, status = None, hasMoreRows = None, results = None,):
         self.status = status
         self.hasMoreRows = hasMoreRows
         self.results = results
@@ -6637,6 +6793,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6681,9 +6838,10 @@ class TGetDelegationTokenReq(object):
      - renewer
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, owner=None, renewer=None,):
+    def __init__(self, sessionHandle = None, owner = None, renewer = None,):
         self.sessionHandle = sessionHandle
         self.owner = owner
         self.renewer = renewer
@@ -6719,6 +6877,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6766,9 +6925,10 @@ class TGetDelegationTokenResp(object):
      - delegationToken
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None, delegationToken=None,):
+    def __init__(self, status = None, delegationToken = None,):
         self.status = status
         self.delegationToken = delegationToken
 
@@ -6798,6 +6958,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6837,9 +6998,10 @@ class TCancelDelegationTokenReq(object):
      - delegationToken
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, delegationToken=None,):
+    def __init__(self, sessionHandle = None, delegationToken = None,):
         self.sessionHandle = sessionHandle
         self.delegationToken = delegationToken
 
@@ -6869,6 +7031,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6909,9 +7072,10 @@ class TCancelDelegationTokenResp(object):
      - status
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None,):
+    def __init__(self, status = None,):
         self.status = status
 
     def read(self, iprot):
@@ -6935,6 +7099,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6970,9 +7135,10 @@ class TRenewDelegationTokenReq(object):
      - delegationToken
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sessionHandle=None, delegationToken=None,):
+    def __init__(self, sessionHandle = None, delegationToken = None,):
         self.sessionHandle = sessionHandle
         self.delegationToken = delegationToken
 
@@ -7002,6 +7168,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7042,9 +7209,10 @@ class TRenewDelegationTokenResp(object):
      - status
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, status=None,):
+    def __init__(self, status = None,):
         self.status = status
 
     def read(self, iprot):
@@ -7068,6 +7236,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7107,9 +7276,10 @@ class TProgressUpdateResp(object):
      - startTime
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, headerNames=None, rows=None, progressedPercentage=None, status=None, footerSummary=None, startTime=None,):
+    def __init__(self, headerNames = None, rows = None, progressedPercentage = None, status = None, footerSummary = None, startTime = None,):
         self.headerNames = headerNames
         self.rows = rows
         self.progressedPercentage = progressedPercentage
@@ -7177,6 +7347,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7250,9 +7421,10 @@ class TGetQueryIdReq(object):
      - operationHandle
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, operationHandle=None,):
+    def __init__(self, operationHandle = None,):
         self.operationHandle = operationHandle
 
     def read(self, iprot):
@@ -7276,6 +7448,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7310,9 +7483,10 @@ class TGetQueryIdResp(object):
      - queryId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, queryId=None,):
+    def __init__(self, queryId = None,):
         self.queryId = queryId
 
     def read(self, iprot):
@@ -7335,6 +7509,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7583,7 +7758,7 @@ def __ne__(self, other):
 all_structs.append(TOpenSessionReq)
 TOpenSessionReq.thrift_spec = (
     None,  # 0
-    (1, TType.I32, 'client_protocol', None, 9, ),  # 1
+    (1, TType.I32, 'client_protocol', None,     9, ),  # 1
     (2, TType.STRING, 'username', 'UTF8', None, ),  # 2
     (3, TType.STRING, 'password', 'UTF8', None, ),  # 3
     (4, TType.MAP, 'configuration', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 4
@@ -7592,7 +7767,7 @@ def __ne__(self, other):
 TOpenSessionResp.thrift_spec = (
     None,  # 0
     (1, TType.STRUCT, 'status', [TStatus, None], None, ),  # 1
-    (2, TType.I32, 'serverProtocolVersion', None, 9, ),  # 2
+    (2, TType.I32, 'serverProtocolVersion', None,     9, ),  # 2
     (3, TType.STRUCT, 'sessionHandle', [TSessionHandle, None], None, ),  # 3
     (4, TType.MAP, 'configuration', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 4
 )
@@ -7860,7 +8035,7 @@ def __ne__(self, other):
 TFetchResultsReq.thrift_spec = (
     None,  # 0
     (1, TType.STRUCT, 'operationHandle', [TOperationHandle, None], None, ),  # 1
-    (2, TType.I32, 'orientation', None, 0, ),  # 2
+    (2, TType.I32, 'orientation', None,     0, ),  # 2
     (3, TType.I64, 'maxRows', None, None, ),  # 3
     (4, TType.I16, 'fetchType', None, 0, ),  # 4
 )
diff --git a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service.rb b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service.rb
index 8fc5bb86d4c0..06ae1118cf71 100644
--- a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service.rb
+++ b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -21,6 +21,8 @@ def send_OpenSession(req)
     end
 
     def recv_OpenSession()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'OpenSession')
       result = receive_message(OpenSession_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'OpenSession failed: unknown result')
@@ -36,6 +38,8 @@ def send_CloseSession(req)
     end
 
     def recv_CloseSession()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'CloseSession')
       result = receive_message(CloseSession_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'CloseSession failed: unknown result')
@@ -51,6 +55,8 @@ def send_GetInfo(req)
     end
 
     def recv_GetInfo()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetInfo')
       result = receive_message(GetInfo_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetInfo failed: unknown result')
@@ -66,6 +72,8 @@ def send_ExecuteStatement(req)
     end
 
     def recv_ExecuteStatement()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'ExecuteStatement')
       result = receive_message(ExecuteStatement_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'ExecuteStatement failed: unknown result')
@@ -81,6 +89,8 @@ def send_GetTypeInfo(req)
     end
 
     def recv_GetTypeInfo()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetTypeInfo')
       result = receive_message(GetTypeInfo_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetTypeInfo failed: unknown result')
@@ -96,6 +106,8 @@ def send_GetCatalogs(req)
     end
 
     def recv_GetCatalogs()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetCatalogs')
       result = receive_message(GetCatalogs_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetCatalogs failed: unknown result')
@@ -111,6 +123,8 @@ def send_GetSchemas(req)
     end
 
     def recv_GetSchemas()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetSchemas')
       result = receive_message(GetSchemas_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetSchemas failed: unknown result')
@@ -126,6 +140,8 @@ def send_GetTables(req)
     end
 
     def recv_GetTables()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetTables')
       result = receive_message(GetTables_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetTables failed: unknown result')
@@ -141,6 +157,8 @@ def send_GetTableTypes(req)
     end
 
     def recv_GetTableTypes()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetTableTypes')
       result = receive_message(GetTableTypes_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetTableTypes failed: unknown result')
@@ -156,6 +174,8 @@ def send_GetColumns(req)
     end
 
     def recv_GetColumns()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetColumns')
       result = receive_message(GetColumns_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetColumns failed: unknown result')
@@ -171,6 +191,8 @@ def send_GetFunctions(req)
     end
 
     def recv_GetFunctions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetFunctions')
       result = receive_message(GetFunctions_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetFunctions failed: unknown result')
@@ -186,6 +208,8 @@ def send_GetPrimaryKeys(req)
     end
 
     def recv_GetPrimaryKeys()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetPrimaryKeys')
       result = receive_message(GetPrimaryKeys_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetPrimaryKeys failed: unknown result')
@@ -201,6 +225,8 @@ def send_GetCrossReference(req)
     end
 
     def recv_GetCrossReference()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetCrossReference')
       result = receive_message(GetCrossReference_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetCrossReference failed: unknown result')
@@ -216,6 +242,8 @@ def send_GetOperationStatus(req)
     end
 
     def recv_GetOperationStatus()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetOperationStatus')
       result = receive_message(GetOperationStatus_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetOperationStatus failed: unknown result')
@@ -231,6 +259,8 @@ def send_CancelOperation(req)
     end
 
     def recv_CancelOperation()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'CancelOperation')
       result = receive_message(CancelOperation_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'CancelOperation failed: unknown result')
@@ -246,6 +276,8 @@ def send_CloseOperation(req)
     end
 
     def recv_CloseOperation()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'CloseOperation')
       result = receive_message(CloseOperation_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'CloseOperation failed: unknown result')
@@ -261,6 +293,8 @@ def send_GetResultSetMetadata(req)
     end
 
     def recv_GetResultSetMetadata()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetResultSetMetadata')
       result = receive_message(GetResultSetMetadata_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetResultSetMetadata failed: unknown result')
@@ -276,6 +310,8 @@ def send_FetchResults(req)
     end
 
     def recv_FetchResults()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'FetchResults')
       result = receive_message(FetchResults_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'FetchResults failed: unknown result')
@@ -291,6 +327,8 @@ def send_GetDelegationToken(req)
     end
 
     def recv_GetDelegationToken()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetDelegationToken')
       result = receive_message(GetDelegationToken_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetDelegationToken failed: unknown result')
@@ -306,6 +344,8 @@ def send_CancelDelegationToken(req)
     end
 
     def recv_CancelDelegationToken()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'CancelDelegationToken')
       result = receive_message(CancelDelegationToken_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'CancelDelegationToken failed: unknown result')
@@ -321,6 +361,8 @@ def send_RenewDelegationToken(req)
     end
 
     def recv_RenewDelegationToken()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'RenewDelegationToken')
       result = receive_message(RenewDelegationToken_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'RenewDelegationToken failed: unknown result')
@@ -336,6 +378,8 @@ def send_GetQueryId(req)
     end
 
     def recv_GetQueryId()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'GetQueryId')
       result = receive_message(GetQueryId_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'GetQueryId failed: unknown result')
@@ -351,6 +395,8 @@ def send_SetClientInfo(req)
     end
 
     def recv_SetClientInfo()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'SetClientInfo')
       result = receive_message(SetClientInfo_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'SetClientInfo failed: unknown result')
@@ -366,6 +412,8 @@ def send_UploadData(req)
     end
 
     def recv_UploadData()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'UploadData')
       result = receive_message(UploadData_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'UploadData failed: unknown result')
@@ -381,6 +429,8 @@ def send_DownloadData(req)
     end
 
     def recv_DownloadData()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'DownloadData')
       result = receive_message(DownloadData_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'DownloadData failed: unknown result')
diff --git a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb
index 8aca726814bf..4c2f361c5df9 100644
--- a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb
+++ b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
index 787ddcd7728e..a8774cbb5827 100644
--- a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
+++ b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -359,7 +359,7 @@ def stringValue(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -376,7 +376,7 @@ class TTypeQualifiers
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field qualifiers is unset!') unless @qualifiers
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field qualifiers is unset!') unless @qualifiers
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -395,9 +395,9 @@ class TPrimitiveTypeEntry
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
     unless @type.nil? || ::TTypeId::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -415,7 +415,7 @@ class TArrayTypeEntry
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field objectTypePtr is unset!') unless @objectTypePtr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field objectTypePtr is unset!') unless @objectTypePtr
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -434,8 +434,8 @@ class TMapTypeEntry
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyTypePtr is unset!') unless @keyTypePtr
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field valueTypePtr is unset!') unless @valueTypePtr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field keyTypePtr is unset!') unless @keyTypePtr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field valueTypePtr is unset!') unless @valueTypePtr
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -452,7 +452,7 @@ class TStructTypeEntry
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nameToTypePtr is unset!') unless @nameToTypePtr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nameToTypePtr is unset!') unless @nameToTypePtr
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -469,7 +469,7 @@ class TUnionTypeEntry
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nameToTypePtr is unset!') unless @nameToTypePtr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nameToTypePtr is unset!') unless @nameToTypePtr
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -486,7 +486,7 @@ class TUserDefinedTypeEntry
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field typeClassName is unset!') unless @typeClassName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field typeClassName is unset!') unless @typeClassName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -539,7 +539,7 @@ def userDefinedTypeEntry(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -556,7 +556,7 @@ class TTypeDesc
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field types is unset!') unless @types
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field types is unset!') unless @types
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -579,9 +579,9 @@ class TColumnDesc
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field columnName is unset!') unless @columnName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field typeDesc is unset!') unless @typeDesc
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field position is unset!') unless @position
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field columnName is unset!') unless @columnName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field typeDesc is unset!') unless @typeDesc
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field position is unset!') unless @position
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -598,7 +598,7 @@ class TTableSchema
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field columns is unset!') unless @columns
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field columns is unset!') unless @columns
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -769,7 +769,7 @@ def stringVal(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -786,7 +786,7 @@ class TRow
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colVals is unset!') unless @colVals
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colVals is unset!') unless @colVals
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -805,8 +805,8 @@ class TBoolColumn
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -825,8 +825,8 @@ class TByteColumn
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -845,8 +845,8 @@ class TI16Column
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -865,8 +865,8 @@ class TI32Column
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -885,8 +885,8 @@ class TI64Column
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -905,8 +905,8 @@ class TDoubleColumn
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -925,8 +925,8 @@ class TStringColumn
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -945,8 +945,8 @@ class TBinaryColumn
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nulls is unset!') unless @nulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nulls is unset!') unless @nulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1011,7 +1011,7 @@ def binaryVal(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -1036,8 +1036,8 @@ class TRowSet
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field startRowOffset is unset!') unless @startRowOffset
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field rows is unset!') unless @rows
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field startRowOffset is unset!') unless @startRowOffset
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field rows is unset!') unless @rows
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1062,9 +1062,9 @@ class TStatus
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field statusCode is unset!') unless @statusCode
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field statusCode is unset!') unless @statusCode
     unless @statusCode.nil? || ::TStatusCode::VALID_VALUES.include?(@statusCode)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field statusCode!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field statusCode!')
     end
   end
 
@@ -1084,8 +1084,8 @@ class THandleIdentifier
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field guid is unset!') unless @guid
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field secret is unset!') unless @secret
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field guid is unset!') unless @guid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field secret is unset!') unless @secret
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1102,7 +1102,7 @@ class TSessionHandle
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionId is unset!') unless @sessionId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionId is unset!') unless @sessionId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1125,11 +1125,11 @@ class TOperationHandle
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationId is unset!') unless @operationId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationType is unset!') unless @operationType
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hasResultSet is unset!') if @hasResultSet.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationId is unset!') unless @operationId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationType is unset!') unless @operationType
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hasResultSet is unset!') if @hasResultSet.nil?
     unless @operationType.nil? || ::TOperationType::VALID_VALUES.include?(@operationType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field operationType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field operationType!')
     end
   end
 
@@ -1153,9 +1153,9 @@ class TOpenSessionReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field client_protocol is unset!') unless @client_protocol
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field client_protocol is unset!') unless @client_protocol
     unless @client_protocol.nil? || ::TProtocolVersion::VALID_VALUES.include?(@client_protocol)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field client_protocol!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field client_protocol!')
     end
   end
 
@@ -1179,10 +1179,10 @@ class TOpenSessionResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field serverProtocolVersion is unset!') unless @serverProtocolVersion
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field serverProtocolVersion is unset!') unless @serverProtocolVersion
     unless @serverProtocolVersion.nil? || ::TProtocolVersion::VALID_VALUES.include?(@serverProtocolVersion)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field serverProtocolVersion!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field serverProtocolVersion!')
     end
   end
 
@@ -1202,7 +1202,7 @@ class TSetClientInfoReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1219,7 +1219,7 @@ class TSetClientInfoResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1236,7 +1236,7 @@ class TCloseSessionReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1253,7 +1253,7 @@ class TCloseSessionResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1306,7 +1306,7 @@ def lenValue(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -1325,10 +1325,10 @@ class TGetInfoReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field infoType is unset!') unless @infoType
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field infoType is unset!') unless @infoType
     unless @infoType.nil? || ::TGetInfoType::VALID_VALUES.include?(@infoType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field infoType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field infoType!')
     end
   end
 
@@ -1348,8 +1348,8 @@ class TGetInfoResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field infoValue is unset!') unless @infoValue
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field infoValue is unset!') unless @infoValue
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1374,8 +1374,8 @@ class TExecuteStatementReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field statement is unset!') unless @statement
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field statement is unset!') unless @statement
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1394,7 +1394,7 @@ class TExecuteStatementResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1411,7 +1411,7 @@ class TGetTypeInfoReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1430,7 +1430,7 @@ class TGetTypeInfoResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1453,8 +1453,8 @@ class TUploadDataReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1473,8 +1473,8 @@ class TUploadDataResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1499,7 +1499,7 @@ class TDownloadDataReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1518,8 +1518,8 @@ class TDownloadDataResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1536,7 +1536,7 @@ class TGetCatalogsReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1555,7 +1555,7 @@ class TGetCatalogsResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1576,7 +1576,7 @@ class TGetSchemasReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1595,7 +1595,7 @@ class TGetSchemasResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1620,7 +1620,7 @@ class TGetTablesReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1639,7 +1639,7 @@ class TGetTablesResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1656,7 +1656,7 @@ class TGetTableTypesReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1675,7 +1675,7 @@ class TGetTableTypesResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1700,7 +1700,7 @@ class TGetColumnsReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1719,7 +1719,7 @@ class TGetColumnsResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1742,8 +1742,8 @@ class TGetFunctionsReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field functionName is unset!') unless @functionName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field functionName is unset!') unless @functionName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1762,7 +1762,7 @@ class TGetFunctionsResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1785,7 +1785,7 @@ class TGetPrimaryKeysReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1804,7 +1804,7 @@ class TGetPrimaryKeysResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1833,7 +1833,7 @@ class TGetCrossReferenceReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1852,7 +1852,7 @@ class TGetCrossReferenceResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1871,7 +1871,7 @@ class TGetOperationStatusReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1908,9 +1908,9 @@ class TGetOperationStatusResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
     unless @operationState.nil? || ::TOperationState::VALID_VALUES.include?(@operationState)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field operationState!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field operationState!')
     end
   end
 
@@ -1928,7 +1928,7 @@ class TCancelOperationReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1945,7 +1945,7 @@ class TCancelOperationResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1962,7 +1962,7 @@ class TCloseOperationReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1979,7 +1979,7 @@ class TCloseOperationResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1996,7 +1996,7 @@ class TGetResultSetMetadataReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2015,7 +2015,7 @@ class TGetResultSetMetadataResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2038,11 +2038,11 @@ class TFetchResultsReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field orientation is unset!') unless @orientation
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field maxRows is unset!') unless @maxRows
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field orientation is unset!') unless @orientation
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field maxRows is unset!') unless @maxRows
     unless @orientation.nil? || ::TFetchOrientation::VALID_VALUES.include?(@orientation)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field orientation!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field orientation!')
     end
   end
 
@@ -2064,7 +2064,7 @@ class TFetchResultsResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2085,9 +2085,9 @@ class TGetDelegationTokenReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field owner is unset!') unless @owner
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field renewer is unset!') unless @renewer
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field owner is unset!') unless @owner
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field renewer is unset!') unless @renewer
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2106,7 +2106,7 @@ class TGetDelegationTokenResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2125,8 +2125,8 @@ class TCancelDelegationTokenReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field delegationToken is unset!') unless @delegationToken
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field delegationToken is unset!') unless @delegationToken
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2143,7 +2143,7 @@ class TCancelDelegationTokenResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2162,8 +2162,8 @@ class TRenewDelegationTokenReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sessionHandle is unset!') unless @sessionHandle
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field delegationToken is unset!') unless @delegationToken
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sessionHandle is unset!') unless @sessionHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field delegationToken is unset!') unless @delegationToken
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2180,7 +2180,7 @@ class TRenewDelegationTokenResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2207,14 +2207,14 @@ class TProgressUpdateResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field headerNames is unset!') unless @headerNames
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field rows is unset!') unless @rows
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field progressedPercentage is unset!') unless @progressedPercentage
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field footerSummary is unset!') unless @footerSummary
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field startTime is unset!') unless @startTime
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field headerNames is unset!') unless @headerNames
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field rows is unset!') unless @rows
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field progressedPercentage is unset!') unless @progressedPercentage
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field status is unset!') unless @status
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field footerSummary is unset!') unless @footerSummary
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field startTime is unset!') unless @startTime
     unless @status.nil? || ::TJobExecutionStatus::VALID_VALUES.include?(@status)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field status!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field status!')
     end
   end
 
@@ -2232,7 +2232,7 @@ class TGetQueryIdReq
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field operationHandle is unset!') unless @operationHandle
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field operationHandle is unset!') unless @operationHandle
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2249,7 +2249,7 @@ class TGetQueryIdResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field queryId is unset!') unless @queryId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field queryId is unset!') unless @queryId
   end
 
   ::Thrift::Struct.generate_accessors self
diff --git a/service/pom.xml b/service/pom.xml
index 3f224f4e3310..65e80caee027 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -124,6 +124,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
diff --git a/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java b/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
index d8e01cd9690c..267c9f85be33 100644
--- a/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
+++ b/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
@@ -29,6 +29,7 @@
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.servlet.DispatcherType;
+import javax.servlet.http.HttpServlet;
 import javax.ws.rs.HttpMethod;
 
 import com.google.common.base.Splitter;
@@ -214,7 +215,7 @@ public void onClosed(Connection connection) {
       UserGroupInformation serviceUGI = cliService.getServiceUGI();
       // UGI for the http/_HOST (SPNego) principal
       UserGroupInformation httpUGI = cliService.getHttpUGI();
-      TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, serviceUGI, httpUGI,
+      HttpServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, serviceUGI, httpUGI,
           hiveAuthFactory, hiveConf);
 
       // Context handler
diff --git a/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpServlet.java b/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpServlet.java
index 43f963107fae..2e42e995cf44 100644
--- a/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpServlet.java
+++ b/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpServlet.java
@@ -23,8 +23,10 @@
 import java.net.InetAddress;
 import java.security.PrivilegedExceptionAction;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -34,7 +36,10 @@
 import java.util.concurrent.TimeUnit;
 
 import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -49,7 +54,6 @@
 import org.apache.hadoop.hive.shims.HadoopShims.KerberosNameShim;
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hive.service.ServiceException;
 import org.apache.hive.service.auth.AuthType;
 import org.apache.hive.service.auth.AuthenticationProviderFactory;
 import org.apache.hive.service.auth.AuthenticationProviderFactory.AuthMethods;
@@ -72,9 +76,12 @@
 import org.apache.hive.service.auth.saml.HiveSamlAuthTokenGenerator;
 import org.apache.hive.service.cli.HiveSQLException;
 import org.apache.hive.service.cli.session.SessionManager;
+import org.apache.thrift.TException;
 import org.apache.thrift.TProcessor;
+import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.TServlet;
+import org.apache.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.transport.TTransport;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
@@ -92,7 +99,7 @@
  * ThriftHttpServlet
  *
  */
-public class ThriftHttpServlet extends TServlet {
+public class ThriftHttpServlet extends HttpServlet {
 
   private static final long serialVersionUID = 1L;
   public static final Logger LOG = LoggerFactory.getLogger(ThriftHttpServlet.class.getName());
@@ -116,10 +123,18 @@ public class ThriftHttpServlet extends TServlet {
   private JWTValidator jwtValidator;
   private HttpAuthService httpAuthService;
 
+  private TProcessor processor;
+  private TProtocolFactory inProtocolFactory;
+  private TProtocolFactory outProtocolFactory;
+  private Collection<Map.Entry<String, String>> customHeaders;
+
   public ThriftHttpServlet(TProcessor processor, TProtocolFactory protocolFactory,
       UserGroupInformation serviceUGI, UserGroupInformation httpUGI,
       HiveAuthFactory hiveAuthFactory, HiveConf hiveConf) throws Exception {
-    super(processor, protocolFactory);
+    this.processor = processor;
+    this.inProtocolFactory = protocolFactory;
+    this.outProtocolFactory = protocolFactory;
+    this.customHeaders = new ArrayList<>();
     this.hiveConf = hiveConf;
     this.authType = AuthType.authTypeFromConf(hiveConf, true);
     this.serviceUGI = serviceUGI;
@@ -268,7 +283,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         }
         LOG.info("Cookie added for clientUserName " + clientUserName);
       }
-      super.doPost(request, response);
+      processThriftRequest(request, response);
     } catch (HttpAuthenticationException e) {
       // Ignore HttpEmptyAuthenticationException, it is normal for knox
       // to send a request with empty header
@@ -666,4 +681,26 @@ private static String getDoAsQueryParam(String queryString) {
     return null;
   }
 
+  private void processThriftRequest(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    try {
+      response.setContentType("application/x-thrift");
+      if (customHeaders != null) {
+        for (Map.Entry<String, String> header : customHeaders) {
+          response.addHeader(header.getKey(), header.getValue());
+        }
+      }
+      ServletInputStream in = request.getInputStream();
+      ServletOutputStream out = response.getOutputStream();
+      TTransport transport = new TIOStreamTransport(in, out);
+
+      TProtocol inProtocol = inProtocolFactory.getProtocol(transport);
+      TProtocol outProtocol = outProtocolFactory.getProtocol(transport);
+
+      processor.process(inProtocol, outProtocol);
+      out.flush();
+    } catch (TException te) {
+      throw new ServletException(te);
+    }
+  }
 }
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
index 3f399d8282c9..44066259d199 100644
--- a/shims/common/pom.xml
+++ b/shims/common/pom.xml
@@ -68,6 +68,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
diff --git a/standalone-metastore/deptree.txt b/standalone-metastore/deptree.txt
new file mode 100644
index 000000000000..92e83f1219d6
--- /dev/null
+++ b/standalone-metastore/deptree.txt
@@ -0,0 +1,2084 @@
+[INFO] Scanning for projects...
+[WARNING] 
+[WARNING] Some problems were encountered while building the effective model for org.apache.hive:hive-standalone-metastore:pom:4.3.0-SNAPSHOT
+[WARNING] 'parent.relativePath' of POM org.apache.hive:hive-standalone-metastore:4.3.0-SNAPSHOT (/home/invisibleprogrammer/work/hive/standalone-metastore/pom.xml) points at org.apache.hive:hive instead of org.apache:apache, please verify your project structure @ line 17, column 11
+[WARNING] 
+[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
+[WARNING] 
+[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
+[WARNING] 
+[WARNING] This build will only read from the build cache, since the clean lifecycle is not part of the build invocation.
+[INFO] ------------------------------------------------------------------------
+[INFO] Reactor Build Order:
+[INFO] 
+[INFO] Hive Standalone Metastore                                          [pom]
+[INFO] Hive Standalone Metastore Common Code                              [jar]
+[INFO] Hive Metastore Client                                              [jar]
+[INFO] Hive Metastore Server                                              [jar]
+[INFO] Hive Metastore Tools                                               [pom]
+[INFO] Hive Metastore Tools common libraries                              [jar]
+[INFO] Hive metastore benchmarks                                          [jar]
+[INFO] Hive Metastore REST Catalog                                        [jar]
+[INFO] Hive Metastore Packaging                                           [pom]
+[INFO] 
+[INFO] -------------< org.apache.hive:hive-standalone-metastore >--------------
+[INFO] Building Hive Standalone Metastore 4.3.0-SNAPSHOT                  [1/9]
+[INFO]   from pom.xml
+[INFO] --------------------------------[ pom ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-standalone-metastore ---
+[INFO] org.apache.hive:hive-standalone-metastore:pom:4.3.0-SNAPSHOT
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO]    +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO]    \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] 
+[INFO] ----------< org.apache.hive:hive-standalone-metastore-common >----------
+[INFO] Building Hive Standalone Metastore Common Code 4.3.0-SNAPSHOT      [2/9]
+[INFO]   from metastore-common/pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-standalone-metastore-common ---
+[INFO] org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  \- commons-logging:commons-logging:jar:1.2:compile
+[INFO] +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  +- com.google.errorprone:error_prone_annotations:jar:2.30.0:compile
+[INFO] |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  +- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.24:compile
+[INFO] +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
+[INFO] |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  +- org.apache.hadoop:hadoop-client-api:jar:3.4.1:compile
+[INFO] |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  +- org.jetbrains:annotations:jar:17.0.0:compile
+[INFO] |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] +- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO] |  +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO] |  \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  \- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] +- javolution:javolution:jar:5.5.1:compile
+[INFO] +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] +- org.apache.hadoop:hadoop-common:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile (optional)
+[INFO] |  +- commons-cli:commons-cli:jar:1.9.0:compile (optional)
+[INFO] |  +- org.apache.commons:commons-math3:jar:3.6.1:compile (optional)
+[INFO] |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile (optional)
+[INFO] |  +- commons-codec:commons-codec:jar:1.15:compile (optional)
+[INFO] |  +- commons-io:commons-io:jar:2.16.1:compile
+[INFO] |  +- commons-net:commons-net:jar:3.9.0:compile (optional)
+[INFO] |  +- org.apache.commons:commons-collections4:jar:4.4:compile (optional)
+[INFO] |  +- javax.servlet:javax.servlet-api:jar:3.1.0:compile (optional)
+[INFO] |  +- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile (optional)
+[INFO] |  +- javax.servlet.jsp:jsp-api:jar:2.1:runtime (optional)
+[INFO] |  +- com.sun.jersey:jersey-core:jar:1.19.4:compile (optional)
+[INFO] |  |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile (optional)
+[INFO] |  +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile (optional)
+[INFO] |  +- com.github.pjfanning:jersey-json:jar:1.22.0:compile (optional)
+[INFO] |  |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile (optional)
+[INFO] |  +- org.codehaus.jettison:jettison:jar:1.5.4:compile (optional)
+[INFO] |  +- com.sun.jersey:jersey-server:jar:1.19.4:compile (optional)
+[INFO] |  +- org.apache.commons:commons-configuration2:jar:2.10.1:compile (optional)
+[INFO] |  +- org.apache.commons:commons-text:jar:1.10.0:compile (optional)
+[INFO] |  +- org.apache.avro:avro:jar:1.11.4:compile (optional)
+[INFO] |  +- com.google.re2j:re2j:jar:1.1:compile (optional)
+[INFO] |  +- com.google.code.gson:gson:jar:2.9.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile (optional)
+[INFO] |  |  \- org.apache.kerby:kerb-util:jar:2.0.3:compile (optional)
+[INFO] |  |     +- org.apache.kerby:kerby-config:jar:2.0.3:compile (optional)
+[INFO] |  |     \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile (optional)
+[INFO] |  +- com.jcraft:jsch:jar:0.1.55:compile (optional)
+[INFO] |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  +- org.apache.commons:commons-compress:jar:1.26.1:compile (optional)
+[INFO] |  +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile (optional)
+[INFO] |  +- org.apache.kerby:kerb-core:jar:2.0.3:compile (optional)
+[INFO] |  |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile (optional)
+[INFO] |  |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile (optional)
+[INFO] |  |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile (optional)
+[INFO] |  +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile (optional)
+[INFO] |  +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile (optional)
+[INFO] |  +- dnsjava:dnsjava:jar:3.6.1:compile (optional)
+[INFO] |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] +- org.apache.hadoop:hadoop-distcp:jar:3.4.2:provided
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:3.4.2:compile (optional)
+[INFO] |  +- commons-daemon:commons-daemon:jar:1.0.13:compile (optional)
+[INFO] |  \- org.fusesource.leveldbjni:leveldbjni-all:jar:1.8:compile (optional)
+[INFO] +- org.apache.hadoop:hadoop-hdfs-client:jar:3.4.2:compile (optional)
+[INFO] |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile (optional)
+[INFO] +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-client:jar:3.4.2:compile (optional)
+[INFO] |  |  +- org.eclipse.jetty.websocket:websocket-client:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-client:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  |  \- org.eclipse.jetty:jetty-http:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-io:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  \- org.eclipse.jetty.websocket:websocket-common:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |     \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  \- org.apache.hadoop:hadoop-yarn-api:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-common:jar:3.4.2:compile (optional)
+[INFO] |  |  +- javax.xml.bind:jaxb-api:jar:2.2.11:compile (optional)
+[INFO] |  |  +- org.eclipse.jetty:jetty-util:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  +- com.sun.jersey:jersey-client:jar:1.19.4:compile (optional)
+[INFO] |  |  +- com.google.inject:guice:jar:4.2.3:compile (optional)
+[INFO] |  |  |  +- javax.inject:javax.inject:jar:1:compile (optional)
+[INFO] |  |  |  \- aopalliance:aopalliance:jar:1.0:compile (optional)
+[INFO] |  |  +- com.sun.jersey.contribs:jersey-guice:jar:1.19.4:compile (optional)
+[INFO] |  |  +- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.6:compile (optional)
+[INFO] |  |  \- com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.18.6:compile (optional)
+[INFO] |  |     \- com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.18.6:compile (optional)
+[INFO] |  +- com.google.inject.extensions:guice-servlet:jar:4.2.3:compile (optional)
+[INFO] |  \- io.netty:netty-all:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-dns:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-haproxy:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-http:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-http2:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-memcache:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-mqtt:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-redis:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-smtp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-socks:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-stomp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-xml:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-handler-proxy:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-handler-ssl-ocsp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-resolver-dns:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-rxtx:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-sctp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-udt:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-classes-kqueue:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-resolver-dns-classes-macos:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-riscv64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     \- io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] +- org.apache.httpcomponents.client5:httpclient5:jar:5.6.2:compile
+[INFO] |  \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.4.3:compile
+[INFO] +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:runtime
+[INFO] |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:runtime
+[INFO] +- org.skyscreamer:jsonassert:jar:1.4.0:test
+[INFO] |  \- com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:test
+[INFO] +- org.apache.zookeeper:zookeeper:jar:3.8.4:compile
+[INFO] |  +- org.apache.zookeeper:zookeeper-jute:jar:3.8.4:compile
+[INFO] |  \- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] +- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] +- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] |  +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |  |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |  +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |  \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] +- junit:junit:jar:4.13.2:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |  +- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] |  +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |  \- org.objenesis:objenesis:jar:3.3:test
+[INFO] \- org.slf4j:slf4j-simple:jar:1.7.30:test
+[INFO] 
+[INFO] ----------< org.apache.hive:hive-standalone-metastore-client >----------
+[INFO] Building Hive Metastore Client 4.3.0-SNAPSHOT                      [3/9]
+[INFO]   from metastore-client/pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-standalone-metastore-client ---
+[INFO] org.apache.hive:hive-standalone-metastore-client:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  |  \- commons-logging:commons-logging:jar:1.2:compile
+[INFO] |  +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  |  +- com.google.code.gson:gson:jar:2.11.0:compile
+[INFO] |  |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  |  +- com.google.errorprone:error_prone_annotations:jar:2.30.0:compile
+[INFO] |  |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  |  +- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.24:compile
+[INFO] |  +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  |  +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
+[INFO] |  |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] |  +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] |  +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] |  +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-api:jar:3.4.1:compile
+[INFO] |  |  |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  |  +- org.jetbrains:annotations:jar:17.0.0:compile
+[INFO] |  |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |  |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |  |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] |  +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] |  |  \- org.apache.hadoop:hadoop-common:jar:3.4.2:compile
+[INFO] |  |     +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile
+[INFO] |  |     +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile
+[INFO] |  |     +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile
+[INFO] |  |     +- commons-cli:commons-cli:jar:1.9.0:compile
+[INFO] |  |     +- org.apache.commons:commons-math3:jar:3.6.1:compile
+[INFO] |  |     +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
+[INFO] |  |     |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
+[INFO] |  |     +- commons-codec:commons-codec:jar:1.15:compile
+[INFO] |  |     +- commons-net:commons-net:jar:3.9.0:compile
+[INFO] |  |     +- org.apache.commons:commons-collections4:jar:4.4:compile
+[INFO] |  |     +- javax.servlet:javax.servlet-api:jar:3.1.0:compile
+[INFO] |  |     +- jakarta.activation:jakarta.activation-api:jar:1.2.1:runtime
+[INFO] |  |     +- javax.servlet.jsp:jsp-api:jar:2.1:runtime
+[INFO] |  |     +- com.sun.jersey:jersey-core:jar:1.19.4:compile
+[INFO] |  |     |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile
+[INFO] |  |     +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile
+[INFO] |  |     +- com.github.pjfanning:jersey-json:jar:1.22.0:compile
+[INFO] |  |     |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] |  |     |     \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] |  |     |        +- javax.xml.stream:stax-api:jar:1.0-2:compile
+[INFO] |  |     |        \- javax.activation:activation:jar:1.1:compile
+[INFO] |  |     +- org.codehaus.jettison:jettison:jar:1.5.4:compile
+[INFO] |  |     +- com.sun.jersey:jersey-server:jar:1.19.4:compile
+[INFO] |  |     +- ch.qos.reload4j:reload4j:jar:1.2.22:compile
+[INFO] |  |     +- org.apache.commons:commons-configuration2:jar:2.10.1:compile
+[INFO] |  |     +- org.apache.commons:commons-text:jar:1.10.0:compile
+[INFO] |  |     +- org.slf4j:slf4j-reload4j:jar:1.7.36:compile
+[INFO] |  |     +- org.apache.avro:avro:jar:1.11.4:compile
+[INFO] |  |     +- com.google.re2j:re2j:jar:1.1:compile
+[INFO] |  |     +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile
+[INFO] |  |     |  \- org.apache.kerby:kerb-util:jar:2.0.3:compile
+[INFO] |  |     |     +- org.apache.kerby:kerby-config:jar:2.0.3:compile
+[INFO] |  |     |     \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile
+[INFO] |  |     +- com.jcraft:jsch:jar:0.1.55:compile
+[INFO] |  |     +- org.apache.commons:commons-compress:jar:1.26.1:compile
+[INFO] |  |     +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile
+[INFO] |  |     +- org.apache.kerby:kerb-core:jar:2.0.3:compile
+[INFO] |  |     |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile
+[INFO] |  |     |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile
+[INFO] |  |     |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile
+[INFO] |  |     +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile
+[INFO] |  |     +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+[INFO] |  |     \- dnsjava:dnsjava:jar:3.6.1:compile
+[INFO] |  +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  |  \- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] |  +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] |  +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] |  +- javolution:javolution:jar:5.5.1:compile
+[INFO] |  +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |  |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |  |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] |  +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] |  +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] |  +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.httpcomponents.client5:httpclient5:jar:5.3.1:compile
+[INFO] |  |  \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.4:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] |  +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] |  +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:runtime
+[INFO] |  |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:runtime
+[INFO] |  +- org.apache.zookeeper:zookeeper:jar:3.8.4:compile
+[INFO] |  |  +- org.apache.zookeeper:zookeeper-jute:jar:3.8.4:compile
+[INFO] |  |  +- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] |  |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  \- commons-io:commons-io:jar:2.11.0:compile
+[INFO] |  +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] |  +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] |  +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] |  +- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] |  \- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] |     +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |     |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |     +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |     \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] +- junit:junit:jar:4.13.2:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |  +- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] |  +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |  \- org.objenesis:objenesis:jar:3.3:test
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO]    +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO]    \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] 
+[INFO] ----------< org.apache.hive:hive-standalone-metastore-server >----------
+[INFO] Building Hive Metastore Server 4.3.0-SNAPSHOT                      [4/9]
+[INFO]   from metastore-server/pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-standalone-metastore-server ---
+[INFO] org.apache.hive:hive-standalone-metastore-server:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.hive:hive-standalone-metastore-client:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  \- org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |     +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |     +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |     |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |     |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |     |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |     |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |     |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |     |  \- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |     +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |     |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |     |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] |     +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] |     +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] |     +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |     |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |     |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |     |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] |     +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |     +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] |     +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |     |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] |     \- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] +- org.apache.httpcomponents.client5:httpclient5:jar:5.6.2:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.4.3:compile
+[INFO] |  \- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  +- org.jetbrains:annotations:jar:17.0.0:compile
+[INFO] |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] +- org.apache.datasketches:datasketches-hive:jar:2.0.0:compile
+[INFO] |  \- org.apache.datasketches:datasketches-java:jar:6.0.0:compile
+[INFO] |     \- org.apache.datasketches:datasketches-memory:jar:2.2.0:compile
+[INFO] +- org.reflections:reflections:jar:0.10.2:compile
+[INFO] |  +- org.javassist:javassist:jar:3.28.0-GA:compile
+[INFO] |  \- com.google.code.findbugs:jsr305:jar:3.0.2:compile
+[INFO] +- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO] |  +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO] |  \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  +- com.google.errorprone:error_prone_annotations:jar:2.0.18:compile
+[INFO] |  +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+[INFO] +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] +- org.apache.commons:commons-dbcp2:jar:2.14.0:compile
+[INFO] |  +- org.apache.commons:commons-pool2:jar:2.13.0:compile
+[INFO] |  +- commons-logging:commons-logging:jar:1.3.5:compile
+[INFO] |  \- jakarta.transaction:jakarta.transaction-api:jar:1.3.3:compile
+[INFO] +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] +- javolution:javolution:jar:5.5.1:compile
+[INFO] +- org.antlr:antlr4-runtime:jar:4.9.3:compile
+[INFO] +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] +- org.apache.commons:commons-collections4:jar:4.4:compile
+[INFO] +- org.apache.hadoop:hadoop-common:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile (optional)
+[INFO] |  +- commons-cli:commons-cli:jar:1.9.0:compile (optional)
+[INFO] |  +- org.apache.commons:commons-math3:jar:3.6.1:compile (optional)
+[INFO] |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
+[INFO] |  +- commons-codec:commons-codec:jar:1.15:compile
+[INFO] |  +- commons-io:commons-io:jar:2.16.1:compile
+[INFO] |  +- commons-net:commons-net:jar:3.9.0:compile (optional)
+[INFO] |  +- javax.servlet:javax.servlet-api:jar:3.1.0:compile
+[INFO] |  +- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile
+[INFO] |  +- javax.servlet.jsp:jsp-api:jar:2.1:runtime (optional)
+[INFO] |  +- com.sun.jersey:jersey-core:jar:1.19.4:compile (optional)
+[INFO] |  |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile (optional)
+[INFO] |  +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile (optional)
+[INFO] |  +- com.github.pjfanning:jersey-json:jar:1.22.0:compile (optional)
+[INFO] |  |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile (optional)
+[INFO] |  +- org.codehaus.jettison:jettison:jar:1.5.4:compile (optional)
+[INFO] |  +- com.sun.jersey:jersey-server:jar:1.19.4:compile (optional)
+[INFO] |  +- org.apache.commons:commons-configuration2:jar:2.10.1:compile (optional)
+[INFO] |  +- org.apache.commons:commons-text:jar:1.10.0:compile (optional)
+[INFO] |  +- org.apache.avro:avro:jar:1.11.4:compile (optional)
+[INFO] |  +- com.google.re2j:re2j:jar:1.1:compile (optional)
+[INFO] |  +- com.google.code.gson:gson:jar:2.9.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile (optional)
+[INFO] |  |  \- org.apache.kerby:kerb-util:jar:2.0.3:compile (optional)
+[INFO] |  |     +- org.apache.kerby:kerby-config:jar:2.0.3:compile (optional)
+[INFO] |  |     \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile (optional)
+[INFO] |  +- com.jcraft:jsch:jar:0.1.55:compile (optional)
+[INFO] |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile (optional)
+[INFO] |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  +- org.apache.commons:commons-compress:jar:1.26.1:compile
+[INFO] |  +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile (optional)
+[INFO] |  +- org.apache.kerby:kerb-core:jar:2.0.3:compile (optional)
+[INFO] |  |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile (optional)
+[INFO] |  |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile (optional)
+[INFO] |  |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile (optional)
+[INFO] |  +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile (optional)
+[INFO] |  +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile (optional)
+[INFO] |  +- dnsjava:dnsjava:jar:3.6.1:compile (optional)
+[INFO] |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] +- org.apache.hadoop:hadoop-distcp:jar:3.4.2:provided
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:3.4.2:compile (optional)
+[INFO] |  +- commons-daemon:commons-daemon:jar:1.0.13:compile (optional)
+[INFO] |  \- org.fusesource.leveldbjni:leveldbjni-all:jar:1.8:compile (optional)
+[INFO] +- org.apache.hadoop:hadoop-hdfs-client:jar:3.4.2:compile (optional)
+[INFO] |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
+[INFO] +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-client:jar:3.4.2:compile (optional)
+[INFO] |  |  +- org.eclipse.jetty.websocket:websocket-client:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-client:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  \- org.eclipse.jetty.websocket:websocket-common:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |     \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  \- org.apache.hadoop:hadoop-yarn-api:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-common:jar:3.4.2:compile (optional)
+[INFO] |  |  +- javax.xml.bind:jaxb-api:jar:2.2.11:compile (optional)
+[INFO] |  |  +- com.sun.jersey:jersey-client:jar:1.19.4:compile (optional)
+[INFO] |  |  +- com.google.inject:guice:jar:4.2.3:compile (optional)
+[INFO] |  |  |  +- javax.inject:javax.inject:jar:1:compile
+[INFO] |  |  |  \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] |  |  +- com.sun.jersey.contribs:jersey-guice:jar:1.19.4:compile (optional)
+[INFO] |  |  +- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.6:compile (optional)
+[INFO] |  |  \- com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.18.6:compile (optional)
+[INFO] |  |     \- com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.18.6:compile (optional)
+[INFO] |  +- com.google.inject.extensions:guice-servlet:jar:4.2.3:compile (optional)
+[INFO] |  \- io.netty:netty-all:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-dns:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-haproxy:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-http:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-http2:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-memcache:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-mqtt:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-redis:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-smtp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-socks:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-stomp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-xml:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-handler-proxy:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-handler-ssl-ocsp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-resolver-dns:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-rxtx:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-sctp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-udt:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-classes-kqueue:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-resolver-dns-classes-macos:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.127.Final:compile
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-riscv64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     \- io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] +- commons-beanutils:commons-beanutils:jar:1.9.4:compile
+[INFO] |  \- commons-collections:commons-collections:jar:3.2.2:compile
+[INFO] +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.25.3:compile
+[INFO] |  \- org.apache.logging.log4j:log4j-api:jar:2.25.3:compile
+[INFO] +- org.apache.logging.log4j:log4j-1.2-api:jar:2.25.3:compile
+[INFO] +- org.apache.logging.log4j:log4j-core:jar:2.25.3:compile
+[INFO] +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:runtime
+[INFO] |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:runtime
+[INFO] +- org.datanucleus:datanucleus-api-jdo:jar:6.0.5:compile
+[INFO] +- org.datanucleus:datanucleus-core:jar:6.0.11:compile
+[INFO] +- org.datanucleus:datanucleus-rdbms:jar:6.0.11:compile
+[INFO] +- org.datanucleus:javax.jdo:jar:3.2.0-release:compile
+[INFO] |  +- javax.transaction:javax.transaction-api:jar:1.3:compile
+[INFO] |  \- org.glassfish.corba:glassfish-corba-omgapi:jar:4.2.2:compile
+[INFO] +- org.skyscreamer:jsonassert:jar:1.4.0:test
+[INFO] |  \- com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:test
+[INFO] +- sqlline:sqlline:jar:1.9.0:compile
+[INFO] +- org.jline:jline:jar:3.25.0:compile
+[INFO] +- com.cronutils:cron-utils:jar:9.2.1:compile
+[INFO] +- com.microsoft.sqlserver:mssql-jdbc:jar:6.2.1.jre8:runtime (optional)
+[INFO] +- com.oracle.database.jdbc:ojdbc8:jar:21.3.0.0:runtime (optional)
+[INFO] +- com.mysql:mysql-connector-j:jar:8.2.0:runtime (optional)
+[INFO] +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] +- org.mariadb.jdbc:mariadb-java-client:jar:2.5.0:runtime (optional)
+[INFO] +- org.postgresql:postgresql:jar:42.7.3:runtime (optional)
+[INFO] |  \- org.checkerframework:checker-qual:jar:3.42.0:compile
+[INFO] +- org.eclipse.jetty:jetty-util:jar:9.4.57.v20241219:compile
+[INFO] +- org.eclipse.jetty:jetty-server:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-http:jar:9.4.57.v20241219:compile
+[INFO] |  \- org.eclipse.jetty:jetty-io:jar:9.4.57.v20241219:compile
+[INFO] +- org.eclipse.jetty:jetty-servlet:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-security:jar:9.4.57.v20241219:compile
+[INFO] |  \- org.eclipse.jetty:jetty-util-ajax:jar:9.4.57.v20241219:compile
+[INFO] +- org.springframework:spring-jdbc:jar:5.3.39:compile
+[INFO] |  +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |  \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] +- junit:junit:jar:4.13.2:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- org.apache.directory.server:apacheds-server-integ:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-core:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-admin:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-authn:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-number:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-authz:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-changelog:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-collective:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-event:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-exception:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-journal:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-normalization:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-operational:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-referral:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-schema:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-subtree:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-interceptors-trigger:jar:2.0.0-M24:test
+[INFO] |  |  |  \- org.apache.directory.api:api-ldap-extras-trigger:jar:1.0.0:test
+[INFO] |  |  +- commons-lang:commons-lang:jar:2.6:test
+[INFO] |  |  +- org.apache.directory.api:api-ldap-extras-util:jar:1.0.0:test
+[INFO] |  |  +- org.apache.directory.api:api-ldap-schema-data:jar:1.0.0:test
+[INFO] |  |  \- org.bouncycastle:bcprov-jdk15on:jar:1.56:test
+[INFO] |  +- org.apache.directory.server:apacheds-core-annotations:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-ldif-partition:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-jdbm-partition:jar:2.0.0-M24:test
+[INFO] |  |  |  \- org.apache.directory.server:apacheds-core-avl:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-xdbm-partition:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.mavibot:mavibot:jar:1.0.0-M8:test
+[INFO] |  |  \- org.apache.directory.server:apacheds-mavibot-partition:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-core-api:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.server:apacheds-core-constants:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.api:api-i18n:jar:1.0.0:test
+[INFO] |  |  +- org.apache.directory.api:api-ldap-extras-aci:jar:1.0.0:test
+[INFO] |  |  \- net.sf.ehcache:ehcache:jar:2.10.4:test
+[INFO] |  +- org.apache.directory.server:apacheds-core-shared:jar:2.0.0-M24:test
+[INFO] |  |  +- org.apache.directory.api:api-ldap-extras-codec-api:jar:1.0.0:test
+[INFO] |  |  \- org.apache.directory.jdbm:apacheds-jdbm1:jar:2.0.0-M3:test
+[INFO] |  +- org.apache.directory.server:apacheds-core-integ:jar:2.0.0-M24:test
+[INFO] |  |  \- org.apache.directory.server:apacheds-interceptors-hash:jar:2.0.0-M24:test
+[INFO] |  |     \- org.apache.directory.server:apacheds-server-config:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-core-jndi:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-kerberos-codec:jar:2.0.0-M24:test
+[INFO] |  |  \- org.apache.directory.api:api-asn1-ber:jar:1.0.0:test
+[INFO] |  +- org.apache.directory.server:apacheds-interceptor-kerberos:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-protocol-ldap:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-server-annotations:jar:2.0.0-M24:test
+[INFO] |  +- ldapsdk:ldapsdk:jar:4.1:test
+[INFO] |  +- org.apache.directory.api:api-asn1-api:jar:1.0.0:test
+[INFO] |  +- org.apache.directory.api:api-ldap-extras-sp:jar:1.0.0:test
+[INFO] |  +- org.apache.directory.api:api-ldap-codec-core:jar:1.0.0:test
+[INFO] |  +- org.apache.directory.api:api-ldap-extras-codec:jar:1.0.0:test
+[INFO] |  +- org.apache.directory.api:api-ldap-model:jar:1.0.0:test
+[INFO] |  |  \- org.apache.servicemix.bundles:org.apache.servicemix.bundles.antlr:jar:2.7.7_5:test
+[INFO] |  +- org.apache.directory.api:api-util:jar:1.0.0:test
+[INFO] |  +- org.apache.mina:mina-core:jar:2.0.16:test
+[INFO] |  +- org.apache.directory.api:api-ldap-client-api:jar:1.0.0:test
+[INFO] |  |  \- commons-pool:commons-pool:jar:1.6:test
+[INFO] |  \- org.apache.directory.api:api-dsml-engine:jar:1.0.0:test
+[INFO] |     +- org.apache.directory.api:api-dsml-parser:jar:1.0.0:test
+[INFO] |     +- org.apache.servicemix.bundles:org.apache.servicemix.bundles.xpp3:jar:1.1.4c_7:test
+[INFO] |     \- org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:1.6.1_5:test
+[INFO] |        \- xml-apis:xml-apis:jar:1.0.b2:test
+[INFO] +- org.apache.directory.server:apacheds-test-framework:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-i18n:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-protocol-kerberos:jar:2.0.0-M24:test
+[INFO] |  +- org.apache.directory.server:apacheds-protocol-shared:jar:2.0.0-M24:test
+[INFO] |  \- org.apache.directory.api:api-ldap-codec-standalone:jar:1.0.0:test
+[INFO] |     \- org.apache.directory.api:api-ldap-net-mina:jar:1.0.0:test
+[INFO] +- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |  +- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] |  +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |  \- org.objenesis:objenesis:jar:3.3:test
+[INFO] +- org.apache.curator:curator-test:jar:5.7.1:test
+[INFO] |  \- org.apache.zookeeper:zookeeper:jar:3.9.2:compile
+[INFO] |     +- org.apache.zookeeper:zookeeper-jute:jar:3.9.2:compile
+[INFO] |     +- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] |     +- io.netty:netty-tcnative-boringssl-static:jar:2.0.61.Final:compile
+[INFO] |     |  +- io.netty:netty-tcnative-classes:jar:2.0.61.Final:compile
+[INFO] |     |  +- io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64:2.0.61.Final:compile
+[INFO] |     |  +- io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64:2.0.61.Final:compile
+[INFO] |     |  +- io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64:2.0.61.Final:compile
+[INFO] |     |  +- io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64:2.0.61.Final:compile
+[INFO] |     |  \- io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64:2.0.61.Final:compile
+[INFO] |     \- ch.qos.logback:logback-core:jar:1.2.13:compile
+[INFO] +- com.nimbusds:oauth2-oidc-sdk:jar:11.28:compile
+[INFO] |  +- com.github.stephenc.jcip:jcip-annotations:jar:1.0-1:compile
+[INFO] |  +- com.nimbusds:content-type:jar:2.3:compile
+[INFO] |  +- net.minidev:json-smart:jar:2.5.2:compile
+[INFO] |  |  \- net.minidev:accessors-smart:jar:2.5.2:compile
+[INFO] |  |     \- org.ow2.asm:asm:jar:9.7.1:compile
+[INFO] |  +- com.nimbusds:lang-tag:jar:1.7:compile
+[INFO] |  \- com.nimbusds:nimbus-jose-jwt:jar:10.4.2:compile
+[INFO] +- org.pac4j:pac4j-core:jar:4.5.8:compile
+[INFO] +- com.github.tomakehurst:wiremock-jre8-standalone:jar:2.32.0:test
+[INFO] +- org.apache.logging.log4j:log4j-core-test:jar:2.25.3:test
+[INFO] |  +- org.apache.logging.log4j:log4j-api-test:jar:2.25.3:test
+[INFO] |  |  +- org.junit-pioneer:junit-pioneer:jar:1.9.1:test
+[INFO] |  |  |  +- org.junit.jupiter:junit-jupiter-params:jar:5.9.0:test
+[INFO] |  |  |  \- org.junit.platform:junit-platform-launcher:jar:1.13.3:test
+[INFO] |  |  +- org.apache.maven:maven-core:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-settings:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-settings-builder:jar:3.9.10:test
+[INFO] |  |  |  |  \- org.codehaus.plexus:plexus-sec-dispatcher:jar:2.0:test
+[INFO] |  |  |  |     \- org.codehaus.plexus:plexus-cipher:jar:2.0:test
+[INFO] |  |  |  +- org.apache.maven:maven-builder-support:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-repository-metadata:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-artifact:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-plugin-api:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-model-builder:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven:maven-resolver-provider:jar:3.9.10:test
+[INFO] |  |  |  +- org.apache.maven.resolver:maven-resolver-impl:jar:1.9.23:test
+[INFO] |  |  |  |  \- org.apache.maven.resolver:maven-resolver-named-locks:jar:1.9.23:test
+[INFO] |  |  |  +- org.apache.maven.resolver:maven-resolver-api:jar:1.9.23:test
+[INFO] |  |  |  +- org.apache.maven.resolver:maven-resolver-spi:jar:1.9.23:test
+[INFO] |  |  |  +- org.apache.maven.resolver:maven-resolver-util:jar:1.9.23:test
+[INFO] |  |  |  +- org.apache.maven.shared:maven-shared-utils:jar:3.4.2:test
+[INFO] |  |  |  +- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.9.0.M4:test
+[INFO] |  |  |  +- org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.9.0.M4:test
+[INFO] |  |  |  +- com.google.inject:guice:jar:classes:5.1.0:test
+[INFO] |  |  |  +- com.google.guava:failureaccess:jar:1.0.3:test
+[INFO] |  |  |  +- org.codehaus.plexus:plexus-classworlds:jar:2.9.0:test
+[INFO] |  |  |  +- org.codehaus.plexus:plexus-interpolation:jar:1.28:test
+[INFO] |  |  |  \- org.codehaus.plexus:plexus-component-annotations:jar:2.2.0:test
+[INFO] |  |  +- org.apache.maven:maven-model:jar:3.9.10:test
+[INFO] |  |  \- org.codehaus.plexus:plexus-utils:jar:3.6.0:test
+[INFO] |  +- org.assertj:assertj-core:jar:3.27.3:test
+[INFO] |  +- org.awaitility:awaitility:jar:4.3.0:test
+[INFO] |  +- org.hamcrest:hamcrest:jar:3.0:test
+[INFO] |  +- com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:jar:3.3.4:test
+[INFO] |  \- org.springframework:spring-test:jar:5.3.39:test
+[INFO] +- org.junit.vintage:junit-vintage-engine:jar:5.13.3:test
+[INFO] |  +- org.junit.platform:junit-platform-engine:jar:1.13.3:test
+[INFO] |  |  +- org.opentest4j:opentest4j:jar:1.3.0:test
+[INFO] |  |  \- org.junit.platform:junit-platform-commons:jar:1.13.3:test
+[INFO] |  \- org.apiguardian:apiguardian-api:jar:1.1.2:test
+[INFO] +- uk.org.webcompere:system-stubs-core:jar:2.1.8:test
+[INFO] +- org.testcontainers:mariadb:jar:1.21.4:test
+[INFO] |  \- org.testcontainers:jdbc:jar:1.21.4:test
+[INFO] |     \- org.testcontainers:database-commons:jar:1.21.4:test
+[INFO] +- org.testcontainers:mysql:jar:1.21.4:test
+[INFO] +- org.testcontainers:postgresql:jar:1.21.4:test
+[INFO] +- org.testcontainers:oracle-xe:jar:1.21.4:test
+[INFO] +- org.testcontainers:mssqlserver:jar:1.21.4:test
+[INFO] +- org.testcontainers:testcontainers:jar:1.21.4:test
+[INFO] |  +- org.rnorth.duct-tape:duct-tape:jar:1.0.8:test
+[INFO] |  +- com.github.docker-java:docker-java-api:jar:3.4.2:test
+[INFO] |  \- com.github.docker-java:docker-java-transport-zerodep:jar:3.4.2:test
+[INFO] |     +- com.github.docker-java:docker-java-transport:jar:3.4.2:test
+[INFO] |     \- net.java.dev.jna:jna:jar:5.13.0:test
+[INFO] \- org.keycloak:keycloak-admin-client:jar:26.0.6:test
+[INFO]    +- org.keycloak:keycloak-client-common-synced:jar:26.0.6:test
+[INFO]    |  +- org.jboss.logging:jboss-logging:jar:3.6.0.Final:test
+[INFO]    |  \- org.jboss.logging:commons-logging-jboss-logging:jar:1.0.0.Final:test
+[INFO]    +- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.18.6:test
+[INFO]    +- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.18.6:test
+[INFO]    +- org.eclipse.microprofile.openapi:microprofile-openapi-api:jar:3.1.1:test
+[INFO]    +- org.jboss.resteasy:resteasy-client:jar:6.2.9.Final:test
+[INFO]    |  +- org.jboss.resteasy:resteasy-client-api:jar:6.2.9.Final:test
+[INFO]    |  +- org.jboss.resteasy:resteasy-core-spi:jar:6.2.9.Final:test
+[INFO]    |  |  \- jakarta.validation:jakarta.validation-api:jar:3.0.2:test
+[INFO]    |  +- org.jboss.resteasy:resteasy-core:jar:6.2.9.Final:test
+[INFO]    |  |  +- org.jboss:jandex:jar:2.4.5.Final:test
+[INFO]    |  |  +- org.eclipse.angus:angus-activation:jar:1.0.0:test
+[INFO]    |  |  \- com.ibm.async:asyncutil:jar:0.1.0:test
+[INFO]    |  +- jakarta.ws.rs:jakarta.ws.rs-api:jar:3.1.0:test
+[INFO]    |  \- org.reactivestreams:reactive-streams:jar:1.0.4:test
+[INFO]    +- org.jboss.resteasy:resteasy-multipart-provider:jar:6.2.9.Final:test
+[INFO]    |  +- jakarta.mail:jakarta.mail-api:jar:2.1.2:test
+[INFO]    |  +- org.eclipse.angus:angus-mail:jar:1.0.0:test
+[INFO]    |  +- org.apache.james:apache-mime4j-dom:jar:0.8.11:test
+[INFO]    |  |  \- org.apache.james:apache-mime4j-core:jar:0.8.11:test
+[INFO]    |  \- org.apache.james:apache-mime4j-storage:jar:0.8.11:test
+[INFO]    +- org.jboss.resteasy:resteasy-jackson2-provider:jar:6.2.9.Final:test
+[INFO]    |  +- com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:jar:2.18.6:test
+[INFO]    |  +- com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:jar:2.18.6:test
+[INFO]    |  +- com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:jar:2.18.6:test
+[INFO]    |  \- com.github.java-json-tools:json-patch:jar:1.13:test
+[INFO]    |     +- com.github.java-json-tools:msg-simple:jar:1.2:test
+[INFO]    |     |  \- com.github.java-json-tools:btf:jar:1.3:test
+[INFO]    |     \- com.github.java-json-tools:jackson-coreutils:jar:2.0:test
+[INFO]    \- org.jboss.resteasy:resteasy-jaxb-provider:jar:6.2.9.Final:test
+[INFO]       +- jakarta.xml.bind:jakarta.xml.bind-api:jar:3.0.1:test
+[INFO]       +- org.glassfish.jaxb:codemodel:jar:4.0.3:test
+[INFO]       +- org.glassfish.jaxb:jaxb-core:jar:4.0.3:test
+[INFO]       +- org.glassfish.jaxb:jaxb-jxc:jar:4.0.3:test
+[INFO]       +- org.glassfish.jaxb:jaxb-runtime:jar:4.0.3:test
+[INFO]       +- org.glassfish.jaxb:txw2:jar:4.0.3:test
+[INFO]       +- org.glassfish.jaxb:jaxb-xjc:jar:4.0.3:test
+[INFO]       +- org.glassfish.jaxb:xsom:jar:4.0.3:test
+[INFO]       +- com.sun.istack:istack-commons-runtime:jar:4.1.2:test
+[INFO]       +- com.sun.istack:istack-commons-tools:jar:4.1.2:test
+[INFO]       +- com.sun.xml.bind.external:relaxng-datatype:jar:4.0.3:test
+[INFO]       \- com.sun.xml.bind.external:rngom:jar:4.0.3:test
+[INFO] 
+[INFO] ----------------< org.apache.hive:hive-metastore-tools >----------------
+[INFO] Building Hive Metastore Tools 4.3.0-SNAPSHOT                       [5/9]
+[INFO]   from metastore-tools/pom.xml
+[INFO] --------------------------------[ pom ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-metastore-tools ---
+[INFO] org.apache.hive:hive-metastore-tools:pom:4.3.0-SNAPSHOT
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO]    +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO]    \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] 
+[INFO] ---------------< org.apache.hive:metastore-tools-common >---------------
+[INFO] Building Hive Metastore Tools common libraries 4.3.0-SNAPSHOT      [6/9]
+[INFO]   from metastore-tools/tools-common/pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ metastore-tools-common ---
+[INFO] org.apache.hive:metastore-tools-common:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  |  \- commons-logging:commons-logging:jar:1.2:compile
+[INFO] |  +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  |  +- com.google.code.gson:gson:jar:2.11.0:compile
+[INFO] |  |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  |  \- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] |  +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] |  +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] |  +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-api:jar:3.4.1:compile
+[INFO] |  |  |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |  |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |  |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] |  +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] |  |  \- org.apache.hadoop:hadoop-common:jar:3.4.2:compile
+[INFO] |  |     +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile
+[INFO] |  |     +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile
+[INFO] |  |     +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile
+[INFO] |  |     +- commons-cli:commons-cli:jar:1.9.0:compile
+[INFO] |  |     +- org.apache.commons:commons-math3:jar:3.6.1:compile
+[INFO] |  |     +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
+[INFO] |  |     |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
+[INFO] |  |     +- commons-codec:commons-codec:jar:1.15:compile
+[INFO] |  |     +- commons-net:commons-net:jar:3.9.0:compile
+[INFO] |  |     +- org.apache.commons:commons-collections4:jar:4.4:compile
+[INFO] |  |     +- javax.servlet:javax.servlet-api:jar:3.1.0:compile
+[INFO] |  |     +- jakarta.activation:jakarta.activation-api:jar:1.2.1:runtime
+[INFO] |  |     +- javax.servlet.jsp:jsp-api:jar:2.1:runtime
+[INFO] |  |     +- com.sun.jersey:jersey-core:jar:1.19.4:compile
+[INFO] |  |     |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile
+[INFO] |  |     +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile
+[INFO] |  |     +- com.github.pjfanning:jersey-json:jar:1.22.0:compile
+[INFO] |  |     |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] |  |     |     \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] |  |     |        +- javax.xml.stream:stax-api:jar:1.0-2:compile
+[INFO] |  |     |        \- javax.activation:activation:jar:1.1:compile
+[INFO] |  |     +- org.codehaus.jettison:jettison:jar:1.5.4:compile
+[INFO] |  |     +- com.sun.jersey:jersey-server:jar:1.19.4:compile
+[INFO] |  |     +- ch.qos.reload4j:reload4j:jar:1.2.22:compile
+[INFO] |  |     +- org.apache.commons:commons-configuration2:jar:2.10.1:compile
+[INFO] |  |     +- org.apache.commons:commons-text:jar:1.10.0:compile
+[INFO] |  |     +- org.slf4j:slf4j-reload4j:jar:1.7.36:compile
+[INFO] |  |     +- org.apache.avro:avro:jar:1.11.4:compile
+[INFO] |  |     +- com.google.re2j:re2j:jar:1.1:compile
+[INFO] |  |     +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile
+[INFO] |  |     |  \- org.apache.kerby:kerb-util:jar:2.0.3:compile
+[INFO] |  |     |     +- org.apache.kerby:kerby-config:jar:2.0.3:compile
+[INFO] |  |     |     \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile
+[INFO] |  |     +- com.jcraft:jsch:jar:0.1.55:compile
+[INFO] |  |     +- org.apache.commons:commons-compress:jar:1.26.1:compile
+[INFO] |  |     +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile
+[INFO] |  |     +- org.apache.kerby:kerb-core:jar:2.0.3:compile
+[INFO] |  |     |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile
+[INFO] |  |     |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile
+[INFO] |  |     |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile
+[INFO] |  |     +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile
+[INFO] |  |     +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+[INFO] |  |     \- dnsjava:dnsjava:jar:3.6.1:compile
+[INFO] |  +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] |  +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] |  +- javolution:javolution:jar:5.5.1:compile
+[INFO] |  +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |  |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |  |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] |  +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] |  +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] |  +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.httpcomponents.client5:httpclient5:jar:5.3.1:compile
+[INFO] |  |  \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.4:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] |  +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] |  +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:runtime
+[INFO] |  |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:runtime
+[INFO] |  +- org.apache.zookeeper:zookeeper:jar:3.8.4:compile
+[INFO] |  |  +- org.apache.zookeeper:zookeeper-jute:jar:3.8.4:compile
+[INFO] |  |  +- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] |  |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  \- commons-io:commons-io:jar:2.11.0:compile
+[INFO] |  +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] |  +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] |  +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] |  +- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] |  \- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] |     +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |     |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |     +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |     \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] +- org.jetbrains:annotations:jar:16.0.2:compile
+[INFO] +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  +- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] |  +- com.google.errorprone:error_prone_annotations:jar:2.0.18:compile
+[INFO] |  +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+[INFO] +- org.junit.jupiter:junit-jupiter-engine:jar:5.13.3:test
+[INFO] |  +- org.junit.platform:junit-platform-engine:jar:1.13.3:test
+[INFO] |  |  +- org.opentest4j:opentest4j:jar:1.3.0:test
+[INFO] |  |  \- org.junit.platform:junit-platform-commons:jar:1.13.3:test
+[INFO] |  +- org.junit.jupiter:junit-jupiter-api:jar:5.13.3:test
+[INFO] |  \- org.apiguardian:apiguardian-api:jar:1.1.2:test
+[INFO] +- org.hamcrest:hamcrest-all:jar:1.3:test
+[INFO] +- junit:junit:jar:4.13.2:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO]    +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO]    \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] 
+[INFO] -------------< org.apache.hive:hive-metastore-benchmarks >--------------
+[INFO] Building Hive metastore benchmarks 4.3.0-SNAPSHOT                  [7/9]
+[INFO]   from metastore-tools/metastore-benchmarks/pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-metastore-benchmarks ---
+[INFO] org.apache.hive:hive-metastore-benchmarks:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.hive:metastore-tools-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  |  |  \- commons-logging:commons-logging:jar:1.2:compile
+[INFO] |  |  +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  |  |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  |  |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  |  |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  |  |  \- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  |  +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  |  |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  |  |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] |  |  +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] |  |  +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] |  |  +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  |  |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  |  |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  |  |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  |  |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-client-api:jar:3.4.1:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  |  |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  |  |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |  |  |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |  |  |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] |  |  +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] |  |  +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] |  |  +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] |  |  +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] |  |  +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] |  |  +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] |  |  +- javolution:javolution:jar:5.5.1:compile
+[INFO] |  |  +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  |  |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |  |  |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |  |  |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] |  |  +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] |  |  +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  |  |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] |  |  +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.httpcomponents.client5:httpclient5:jar:5.3.1:compile
+[INFO] |  |  |  \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.4:compile
+[INFO] |  |  +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] |  |  +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] |  |  +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  |  |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:runtime
+[INFO] |  |  |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:runtime
+[INFO] |  |  +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  |  |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] |  |  +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] |  |  +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  |  \- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] |  |     +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |  |     |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |  |     +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |  |     \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] |  \- com.google.guava:guava:jar:22.0:compile
+[INFO] |     +- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] |     +- com.google.errorprone:error_prone_annotations:jar:2.0.18:compile
+[INFO] |     +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] |     \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+[INFO] +- org.apache.hive.hcatalog:hive-hcatalog-server-extensions:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.hive.hcatalog:hive-hcatalog-core:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive:hive-cli:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.apache.hive:hive-serde:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  +- org.apache.hive:hive-service-rpc:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  +- com.carrotsearch:hppc:jar:0.7.2:compile
+[INFO] |  |  |  |  +- com.google.flatbuffers:flatbuffers-java:jar:1.12.0:compile
+[INFO] |  |  |  |  +- com.opencsv:opencsv:jar:5.9:compile
+[INFO] |  |  |  |  |  \- commons-beanutils:commons-beanutils:jar:1.9.4:compile
+[INFO] |  |  |  |  +- org.apache.parquet:parquet-hadoop-bundle:jar:1.16.0:compile
+[INFO] |  |  |  |  \- com.esri.geometry:esri-geometry-api:jar:2.2.4:compile
+[INFO] |  |  |  +- org.apache.hive:hive-service:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  +- org.apache.hive:hive-llap-server:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  |  +- com.lmax:disruptor:jar:3.3.7:compile
+[INFO] |  |  |  |  |  \- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:jar:1.60.1:compile
+[INFO] |  |  |  |  +- org.apache.hive:hive-hplsql:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  |  \- org.antlr:antlr4-runtime:jar:4.9.3:compile
+[INFO] |  |  |  |  +- com.nimbusds:nimbus-jose-jwt:jar:10.4.2:compile
+[INFO] |  |  |  |  +- org.eclipse.jetty:apache-jsp:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  |  +- org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.2:compile
+[INFO] |  |  |  |  |  +- org.mortbay.jasper:apache-jsp:jar:8.5.100:compile
+[INFO] |  |  |  |  |  |  +- org.eclipse.jdt:ecj:jar:3.26.0:compile
+[INFO] |  |  |  |  |  |  \- org.mortbay.jasper:apache-el:jar:8.5.100:compile
+[INFO] |  |  |  |  |  \- org.eclipse.jetty:jetty-annotations:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  |     +- org.eclipse.jetty:jetty-plus:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  |     |  \- org.eclipse.jetty:jetty-jndi:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  |     +- org.ow2.asm:asm:jar:9.7.1:compile
+[INFO] |  |  |  |  |     \- org.ow2.asm:asm-commons:jar:9.7.1:compile
+[INFO] |  |  |  |  |        \- org.ow2.asm:asm-tree:jar:9.7.1:compile
+[INFO] |  |  |  |  +- org.apache.santuario:xmlsec:jar:2.3.4:compile
+[INFO] |  |  |  |  |  \- jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3:compile
+[INFO] |  |  |  |  +- org.jamon:jamon-runtime:jar:2.4.1:compile
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-exporter-logging:jar:1.60.1:compile
+[INFO] |  |  |  +- org.apache.hive:hive-shims:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  +- org.apache.hive.shims:hive-shims-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  \- org.apache.hive.shims:hive-shims-0.23:jar:4.3.0-SNAPSHOT:runtime
+[INFO] |  |  |  |     \- org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:3.4.2:runtime
+[INFO] |  |  |  |        +- org.apache.hadoop:hadoop-yarn-server-common:jar:3.4.2:runtime
+[INFO] |  |  |  |        |  +- javax.cache:cache-api:jar:1.1.1:runtime
+[INFO] |  |  |  |        |  +- org.ehcache:ehcache:jar:3.8.2:runtime
+[INFO] |  |  |  |        |  |  \- org.glassfish.jaxb:jaxb-runtime:jar:2.3.1:runtime
+[INFO] |  |  |  |        |  |     +- org.glassfish.jaxb:txw2:jar:2.3.1:runtime
+[INFO] |  |  |  |        |  |     +- com.sun.istack:istack-commons-runtime:jar:3.0.7:runtime
+[INFO] |  |  |  |        |  |     +- org.jvnet.staxex:stax-ex:jar:1.8:runtime
+[INFO] |  |  |  |        |  |     \- com.sun.xml.fastinfoset:FastInfoset:jar:1.2.15:runtime
+[INFO] |  |  |  |        |  \- com.microsoft.sqlserver:mssql-jdbc:jar:6.2.1.jre8:runtime
+[INFO] |  |  |  |        +- org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:jar:3.4.2:runtime
+[INFO] |  |  |  |        |  \- de.ruedigermoeller:fst:jar:2.50:runtime
+[INFO] |  |  |  |        +- org.apache.hadoop:hadoop-yarn-server-web-proxy:jar:3.4.2:runtime
+[INFO] |  |  |  |        |  \- org.bouncycastle:bcpkix-jdk18on:jar:1.78.1:runtime
+[INFO] |  |  |  |        |     \- org.bouncycastle:bcutil-jdk18on:jar:1.78.1:runtime
+[INFO] |  |  |  |        \- org.jsonschema2pojo:jsonschema2pojo-core:jar:1.0.2:runtime
+[INFO] |  |  |  |           \- com.sun.codemodel:codemodel:jar:2.6:runtime
+[INFO] |  |  |  \- org.jline:jline:jar:3.25.0:compile
+[INFO] |  |  +- org.apache.hive:hive-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.apache.hive:hive-classification:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-http:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  +- org.eclipse.jetty:jetty-util:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  \- org.eclipse.jetty:jetty-io:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-rewrite:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-server:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-servlet:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  +- org.eclipse.jetty:jetty-security:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  \- org.eclipse.jetty:jetty-util-ajax:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-webapp:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  \- org.eclipse.jetty:jetty-xml:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- joda-time:joda-time:jar:2.13.0:compile
+[INFO] |  |  |  +- org.apache.logging.log4j:log4j-1.2-api:jar:2.25.3:compile
+[INFO] |  |  |  +- org.apache.logging.log4j:log4j-web:jar:2.25.3:compile
+[INFO] |  |  |  +- org.apache.ant:ant:jar:1.10.15:compile
+[INFO] |  |  |  |  \- org.apache.ant:ant-launcher:jar:1.10.15:compile
+[INFO] |  |  |  +- net.sf.jpam:jpam:jar:1.1:compile
+[INFO] |  |  |  +- org.apache.tez:tez-api:jar:0.10.5:compile
+[INFO] |  |  |  +- org.fusesource.jansi:jansi:jar:2.4.0:compile
+[INFO] |  |  |  +- com.tdunning:json:jar:1.8:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-api:jar:1.60.1:compile
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-context:jar:1.60.1:compile
+[INFO] |  |  |  |     \- io.opentelemetry:opentelemetry-common:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-exporter-otlp:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-sdk-logs:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-exporter-otlp-common:jar:1.60.1:runtime
+[INFO] |  |  |  |  |  \- io.opentelemetry:opentelemetry-exporter-common:jar:1.60.1:runtime
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-exporter-sender-okhttp:jar:1.60.1:runtime
+[INFO] |  |  |  |  |  \- com.squareup.okhttp3:okhttp-jvm:jar:5.3.2:runtime
+[INFO] |  |  |  |  |     +- com.squareup.okio:okio-jvm:jar:3.16.4:runtime
+[INFO] |  |  |  |  |     \- org.jetbrains.kotlin:kotlin-stdlib:jar:2.2.21:runtime
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-sdk:jar:1.60.1:compile
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-sdk-common:jar:1.60.1:compile
+[INFO] |  |  |  \- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |  |  |     +- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] |  |  |     +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |  |  |     \- org.objenesis:objenesis:jar:3.3:runtime
+[INFO] |  |  +- org.apache.hive:hive-metastore:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  \- org.apache.hive:hive-standalone-metastore-client:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive:hive-exec:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.graalvm.js:js-scriptengine:jar:23.0.8:compile
+[INFO] |  |  |  |  \- org.graalvm.sdk:graal-sdk:jar:23.0.8:compile
+[INFO] |  |  |  +- org.graalvm.js:js:jar:23.0.8:compile
+[INFO] |  |  |  |  +- org.graalvm.regex:regex:jar:23.0.8:compile
+[INFO] |  |  |  |  +- org.graalvm.truffle:truffle-api:jar:23.0.8:compile
+[INFO] |  |  |  |  \- com.ibm.icu:icu4j:jar:72.1:compile
+[INFO] |  |  |  +- org.apache.atlas:atlas-client-v2:jar:2.4.0:compile
+[INFO] |  |  |  |  \- cglib:cglib:jar:2.2.2:compile
+[INFO] |  |  |  |     \- asm:asm:jar:3.3.1:compile
+[INFO] |  |  |  +- org.apache.atlas:atlas-client-common:jar:2.4.0:compile
+[INFO] |  |  |  |  \- javax.xml.bind:jaxb-api:jar:2.3.1:compile
+[INFO] |  |  |  |     \- javax.activation:javax.activation-api:jar:1.2.0:compile
+[INFO] |  |  |  +- org.apache.atlas:atlas-intg:jar:2.4.0:compile
+[INFO] |  |  |  |  +- com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.18.6:compile
+[INFO] |  |  |  |  +- com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.18.6:compile
+[INFO] |  |  |  |  +- commons-validator:commons-validator:jar:1.6:compile
+[INFO] |  |  |  |  |  \- commons-digester:commons-digester:jar:1.8.1:compile
+[INFO] |  |  |  |  \- javax.inject:javax.inject:jar:1:compile
+[INFO] |  |  |  +- commons-configuration:commons-configuration:jar:1.10:compile
+[INFO] |  |  |  +- org.apache.commons:commons-dbcp2:jar:2.14.0:compile
+[INFO] |  |  |  |  +- org.apache.commons:commons-pool2:jar:2.13.0:compile
+[INFO] |  |  |  |  \- jakarta.transaction:jakarta.transaction-api:jar:1.3.3:compile
+[INFO] |  |  |  +- org.apache.hive:hive-vector-code-gen:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.apache.hive:hive-llap-tez:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  +- org.apache.hive:hive-llap-client:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |  \- org.apache.hive:hive-llap-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  |     +- io.jsonwebtoken:jjwt-api:jar:0.10.5:compile
+[INFO] |  |  |  |     +- io.jsonwebtoken:jjwt-impl:jar:0.10.5:compile
+[INFO] |  |  |  |     \- io.jsonwebtoken:jjwt-jackson:jar:0.10.5:compile
+[INFO] |  |  |  +- com.amazonaws.secretsmanager:aws-secretsmanager-caching-java:jar:2.2.0:compile
+[INFO] |  |  |  |  \- com.github.spotbugs:spotbugs-annotations:jar:4.9.8:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-yarn-registry:jar:3.4.2:compile
+[INFO] |  |  |  |  \- org.apache.hadoop:hadoop-registry:jar:3.4.2:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-yarn-api:jar:3.4.2:compile
+[INFO] |  |  |  +- org.apache.ivy:ivy:jar:2.5.2:compile
+[INFO] |  |  |  +- org.apache.curator:apache-curator:pom:5.7.1:compile
+[INFO] |  |  |  +- org.codehaus.groovy:groovy-all:jar:2.4.21:compile
+[INFO] |  |  |  +- org.datanucleus:datanucleus-core:jar:6.0.11:compile
+[INFO] |  |  |  +- stax:stax-api:jar:1.0.1:compile
+[INFO] |  |  |  +- org.reflections:reflections:jar:0.10.2:compile
+[INFO] |  |  |  |  \- org.javassist:javassist:jar:3.28.0-GA:compile
+[INFO] |  |  |  +- com.jayway.jsonpath:json-path:jar:2.9.0:runtime
+[INFO] |  |  |  |  \- net.minidev:json-smart:jar:2.5.0:runtime
+[INFO] |  |  |  |     \- net.minidev:accessors-smart:jar:2.5.0:runtime
+[INFO] |  |  |  +- org.codehaus.janino:commons-compiler:jar:3.1.12:runtime
+[INFO] |  |  |  +- org.codehaus.janino:janino:jar:3.1.12:runtime
+[INFO] |  |  |  \- com.sun.jersey.contribs:jersey-multipart:jar:1.19.4:compile
+[INFO] |  |  |     \- org.jvnet.mimepull:mimepull:jar:1.9.3:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-archives:jar:3.4.2:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:3.4.2:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-yarn-client:jar:3.4.2:compile
+[INFO] |  |  |  |  \- org.eclipse.jetty.websocket:websocket-client:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |     +- org.eclipse.jetty:jetty-client:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |     \- org.eclipse.jetty.websocket:websocket-common:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |        \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-yarn-common:jar:3.4.2:compile
+[INFO] |  |  |  |  +- com.sun.jersey:jersey-client:jar:1.19.4:compile
+[INFO] |  |  |  |  +- com.google.inject:guice:jar:4.2.3:compile
+[INFO] |  |  |  |  |  \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] |  |  |  |  +- com.sun.jersey.contribs:jersey-guice:jar:1.19.4:compile
+[INFO] |  |  |  |  \- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.6:compile
+[INFO] |  |  |  +- org.apache.hadoop:hadoop-hdfs-client:jar:3.4.2:compile
+[INFO] |  |  |  \- com.google.inject.extensions:guice-servlet:jar:4.2.3:compile
+[INFO] |  |  \- org.apache.hadoop:hadoop-hdfs:jar:3.4.2:compile
+[INFO] |  |     +- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] |  |     +- ch.qos.reload4j:reload4j:jar:1.2.22:compile
+[INFO] |  |     \- org.fusesource.leveldbjni:leveldbjni-all:jar:1.8:compile
+[INFO] |  +- jakarta.jms:jakarta.jms-api:jar:2.0.2:compile
+[INFO] |  +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO] |  +- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] |  +- org.apache.hadoop:hadoop-common:jar:3.4.2:compile
+[INFO] |  |  +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile
+[INFO] |  |  +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile
+[INFO] |  |  +- commons-cli:commons-cli:jar:1.9.0:compile
+[INFO] |  |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
+[INFO] |  |  |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
+[INFO] |  |  +- commons-codec:commons-codec:jar:1.15:compile
+[INFO] |  |  +- commons-io:commons-io:jar:2.16.1:compile
+[INFO] |  |  +- commons-net:commons-net:jar:3.9.0:compile
+[INFO] |  |  +- org.apache.commons:commons-collections4:jar:4.4:compile
+[INFO] |  |  +- javax.servlet:javax.servlet-api:jar:3.1.0:compile
+[INFO] |  |  +- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile
+[INFO] |  |  +- javax.servlet.jsp:jsp-api:jar:2.1:runtime
+[INFO] |  |  +- com.sun.jersey:jersey-core:jar:1.19.4:compile
+[INFO] |  |  |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile
+[INFO] |  |  +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile
+[INFO] |  |  +- com.github.pjfanning:jersey-json:jar:1.22.0:compile
+[INFO] |  |  |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] |  |  +- org.codehaus.jettison:jettison:jar:1.5.4:compile
+[INFO] |  |  +- com.sun.jersey:jersey-server:jar:1.19.4:compile
+[INFO] |  |  +- org.apache.commons:commons-configuration2:jar:2.10.1:compile
+[INFO] |  |  +- org.apache.commons:commons-text:jar:1.10.0:compile
+[INFO] |  |  +- org.apache.avro:avro:jar:1.11.4:compile
+[INFO] |  |  +- com.google.re2j:re2j:jar:1.1:compile
+[INFO] |  |  +- com.google.code.gson:gson:jar:2.9.0:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile
+[INFO] |  |  |  \- org.apache.kerby:kerb-util:jar:2.0.3:compile
+[INFO] |  |  |     +- org.apache.kerby:kerby-config:jar:2.0.3:compile
+[INFO] |  |  |     \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile
+[INFO] |  |  +- com.jcraft:jsch:jar:0.1.55:compile
+[INFO] |  |  +- org.apache.commons:commons-compress:jar:1.26.1:compile
+[INFO] |  |  +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile
+[INFO] |  |  +- org.apache.kerby:kerb-core:jar:2.0.3:compile
+[INFO] |  |  |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile
+[INFO] |  |  |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile
+[INFO] |  |  |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile
+[INFO] |  |  +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile
+[INFO] |  |  +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+[INFO] |  |  +- dnsjava:dnsjava:jar:3.6.1:compile
+[INFO] |  |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] |  \- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] +- org.openjdk.jmh:jmh-core:jar:1.23:compile
+[INFO] |  +- net.sf.jopt-simple:jopt-simple:jar:4.6:compile
+[INFO] |  \- org.apache.commons:commons-math3:jar:3.6.1:compile
+[INFO] +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.25.3:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-api:jar:2.25.3:compile
+[INFO] |  \- org.apache.logging.log4j:log4j-core:jar:2.25.3:compile
+[INFO] +- org.jetbrains:annotations:jar:16.0.2:compile
+[INFO] +- info.picocli:picocli:jar:3.1.0:compile
+[INFO] +- org.apache.maven.plugins:maven-jxr-plugin:jar:2.5:compile
+[INFO] |  +- org.apache.velocity:velocity:jar:1.5:compile
+[INFO] |  |  +- commons-collections:commons-collections:jar:3.1:compile
+[INFO] |  |  +- commons-lang:commons-lang:jar:2.1:compile
+[INFO] |  |  \- oro:oro:jar:2.0.8:compile
+[INFO] |  +- org.apache.maven:maven-jxr:jar:2.5:compile
+[INFO] |  +- org.apache.maven:maven-plugin-api:jar:2.2.1:compile
+[INFO] |  +- org.apache.maven:maven-project:jar:2.2.1:compile
+[INFO] |  |  +- org.apache.maven:maven-settings:jar:2.2.1:compile
+[INFO] |  |  +- org.apache.maven:maven-profile:jar:2.2.1:compile
+[INFO] |  |  +- org.apache.maven:maven-artifact-manager:jar:2.2.1:compile
+[INFO] |  |  |  +- org.apache.maven:maven-repository-metadata:jar:2.2.1:compile
+[INFO] |  |  |  \- backport-util-concurrent:backport-util-concurrent:jar:3.1:compile
+[INFO] |  |  +- org.apache.maven:maven-plugin-registry:jar:2.2.1:compile
+[INFO] |  |  +- org.codehaus.plexus:plexus-interpolation:jar:1.11:compile
+[INFO] |  |  +- org.apache.maven:maven-artifact:jar:2.2.1:compile
+[INFO] |  |  \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+[INFO] |  |     +- junit:junit:jar:4.13.2:test
+[INFO] |  |     |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] |  |     \- classworlds:classworlds:jar:1.1-alpha-2:compile
+[INFO] |  +- org.apache.maven:maven-model:jar:2.2.1:compile
+[INFO] |  +- org.apache.maven.reporting:maven-reporting-api:jar:3.0:compile
+[INFO] |  +- org.apache.maven.reporting:maven-reporting-impl:jar:2.3:compile
+[INFO] |  |  +- org.apache.maven.shared:maven-shared-utils:jar:0.6:compile
+[INFO] |  |  \- org.apache.maven.doxia:doxia-core:jar:1.2:compile
+[INFO] |  |     \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] |  +- org.apache.maven.wagon:wagon-provider-api:jar:1.0:compile
+[INFO] |  +- org.apache.maven.doxia:doxia-site-renderer:jar:1.4:compile
+[INFO] |  |  +- org.apache.maven.doxia:doxia-logging-api:jar:1.4:compile
+[INFO] |  |  +- org.apache.maven.doxia:doxia-decoration-model:jar:1.4:compile
+[INFO] |  |  +- org.apache.maven.doxia:doxia-module-xhtml:jar:1.4:compile
+[INFO] |  |  +- org.apache.maven.doxia:doxia-module-fml:jar:1.4:compile
+[INFO] |  |  +- org.codehaus.plexus:plexus-i18n:jar:1.0-beta-7:compile
+[INFO] |  |  +- org.codehaus.plexus:plexus-velocity:jar:1.1.7:compile
+[INFO] |  |  \- org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile
+[INFO] |  +- org.apache.maven.doxia:doxia-sink-api:jar:1.4:compile
+[INFO] |  +- xml-apis:xml-apis:jar:1.0.b2:compile
+[INFO] |  \- xalan:xalan:jar:2.7.0:compile
+[INFO] +- org.junit.jupiter:junit-jupiter-engine:jar:5.13.3:test
+[INFO] |  +- org.junit.platform:junit-platform-engine:jar:1.13.3:test
+[INFO] |  |  +- org.opentest4j:opentest4j:jar:1.3.0:test
+[INFO] |  |  \- org.junit.platform:junit-platform-commons:jar:1.13.3:test
+[INFO] |  +- org.junit.jupiter:junit-jupiter-api:jar:5.13.3:test
+[INFO] |  \- org.apiguardian:apiguardian-api:jar:1.1.2:test
+[INFO] +- org.hamcrest:hamcrest-all:jar:1.3:test
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO] 
+[INFO] -------< org.apache.hive:hive-standalone-metastore-rest-catalog >-------
+[INFO] Building Hive Metastore REST Catalog 4.3.0-SNAPSHOT                [8/9]
+[INFO]   from metastore-rest-catalog/pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-standalone-metastore-rest-catalog ---
+[INFO] org.apache.hive:hive-standalone-metastore-rest-catalog:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.hive:hive-standalone-metastore-server:jar:4.3.0-SNAPSHOT:provided
+[INFO] |  +- org.apache.hive:hive-standalone-metastore-client:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.httpcomponents.client5:httpclient5:jar:5.3.1:compile
+[INFO] |  +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  |  +- org.jetbrains:annotations:jar:17.0.0:compile
+[INFO] |  |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |  |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |  |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] |  +- org.apache.datasketches:datasketches-hive:jar:2.0.0:provided
+[INFO] |  |  \- org.apache.datasketches:datasketches-java:jar:6.0.0:provided
+[INFO] |  |     \- org.apache.datasketches:datasketches-memory:jar:2.2.0:provided
+[INFO] |  +- org.reflections:reflections:jar:0.10.2:provided
+[INFO] |  |  \- org.javassist:javassist:jar:3.28.0-GA:provided
+[INFO] |  +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] |  +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  |  +- com.google.errorprone:error_prone_annotations:jar:2.0.18:compile
+[INFO] |  |  +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] |  |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+[INFO] |  +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] |  +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] |  +- org.apache.commons:commons-dbcp2:jar:2.14.0:provided
+[INFO] |  |  +- org.apache.commons:commons-pool2:jar:2.13.0:provided
+[INFO] |  |  +- commons-logging:commons-logging:jar:1.3.5:compile
+[INFO] |  |  \- jakarta.transaction:jakarta.transaction-api:jar:1.3.3:provided
+[INFO] |  +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] |  +- javolution:javolution:jar:5.5.1:compile
+[INFO] |  +- org.antlr:antlr4-runtime:jar:4.9.3:provided
+[INFO] |  +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] |  +- org.apache.commons:commons-collections4:jar:4.4:compile
+[INFO] |  +- commons-beanutils:commons-beanutils:jar:1.9.4:compile
+[INFO] |  +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.25.3:compile
+[INFO] |  |  \- org.apache.logging.log4j:log4j-api:jar:2.25.3:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-1.2-api:jar:2.25.3:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-core:jar:2.25.3:compile
+[INFO] |  +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] |  +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  +- org.datanucleus:datanucleus-api-jdo:jar:6.0.5:provided
+[INFO] |  +- org.datanucleus:datanucleus-core:jar:6.0.11:provided
+[INFO] |  +- org.datanucleus:datanucleus-rdbms:jar:6.0.11:provided
+[INFO] |  +- org.datanucleus:javax.jdo:jar:3.2.0-release:provided
+[INFO] |  |  +- javax.transaction:javax.transaction-api:jar:1.3:provided
+[INFO] |  |  \- org.glassfish.corba:glassfish-corba-omgapi:jar:4.2.2:provided
+[INFO] |  +- sqlline:sqlline:jar:1.9.0:provided
+[INFO] |  +- org.jline:jline:jar:3.25.0:compile
+[INFO] |  +- com.cronutils:cron-utils:jar:9.2.1:provided
+[INFO] |  +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] |  +- org.eclipse.jetty:jetty-util:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-server:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-http:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty:jetty-io:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-servlet:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-security:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty:jetty-util-ajax:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.springframework:spring-jdbc:jar:5.3.39:provided
+[INFO] |  |  +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |  |  \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] |  +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |  |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |  +- com.nimbusds:oauth2-oidc-sdk:jar:11.28:provided
+[INFO] |  |  +- com.github.stephenc.jcip:jcip-annotations:jar:1.0-1:compile
+[INFO] |  |  +- com.nimbusds:content-type:jar:2.3:provided
+[INFO] |  |  +- net.minidev:json-smart:jar:2.5.2:provided
+[INFO] |  |  |  \- net.minidev:accessors-smart:jar:2.5.2:provided
+[INFO] |  |  \- com.nimbusds:lang-tag:jar:1.7:provided
+[INFO] |  \- org.pac4j:pac4j-core:jar:4.5.8:provided
+[INFO] +- org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  |  \- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] |  +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] |  +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] |  +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |  |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |  |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] |  +- org.apache.zookeeper:zookeeper:jar:3.8.4:compile
+[INFO] |  |  +- org.apache.zookeeper:zookeeper-jute:jar:3.8.4:compile
+[INFO] |  |  \- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] |  +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] |  +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] |  +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] |  +- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] |  \- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] +- org.apache.hive:hive-iceberg-catalog:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.hive:hive-iceberg-shading:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.hive:hive-serde:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive:hive-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.apache.hive:hive-classification:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-rewrite:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- joda-time:joda-time:jar:2.13.0:compile
+[INFO] |  |  |  +- org.apache.logging.log4j:log4j-web:jar:2.25.3:compile
+[INFO] |  |  |  +- net.sf.jpam:jpam:jar:1.1:compile
+[INFO] |  |  |  +- org.apache.tez:tez-api:jar:0.10.5:compile
+[INFO] |  |  |  +- org.fusesource.jansi:jansi:jar:2.4.0:compile
+[INFO] |  |  |  +- com.tdunning:json:jar:1.8:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-api:jar:1.60.1:compile
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-context:jar:1.60.1:compile
+[INFO] |  |  |  |     \- io.opentelemetry:opentelemetry-common:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-exporter-otlp:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-sdk-logs:jar:1.60.1:compile
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-exporter-otlp-common:jar:1.60.1:runtime
+[INFO] |  |  |  |  |  \- io.opentelemetry:opentelemetry-exporter-common:jar:1.60.1:runtime
+[INFO] |  |  |  |  +- io.opentelemetry:opentelemetry-exporter-sender-okhttp:jar:1.60.1:runtime
+[INFO] |  |  |  |  |  \- com.squareup.okhttp3:okhttp-jvm:jar:5.3.2:runtime
+[INFO] |  |  |  |  |     +- com.squareup.okio:okio-jvm:jar:3.16.4:runtime
+[INFO] |  |  |  |  |     \- org.jetbrains.kotlin:kotlin-stdlib:jar:2.2.21:runtime
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.60.1:runtime
+[INFO] |  |  |  \- io.opentelemetry:opentelemetry-sdk:jar:1.60.1:compile
+[INFO] |  |  |     \- io.opentelemetry:opentelemetry-sdk-common:jar:1.60.1:compile
+[INFO] |  |  +- org.apache.hive:hive-service-rpc:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- com.carrotsearch:hppc:jar:0.7.2:compile
+[INFO] |  |  +- com.google.flatbuffers:flatbuffers-java:jar:1.12.0:compile
+[INFO] |  |  +- com.opencsv:opencsv:jar:5.9:compile
+[INFO] |  |  +- org.apache.parquet:parquet-hadoop-bundle:jar:1.16.0:compile
+[INFO] |  |  \- com.esri.geometry:esri-geometry-api:jar:2.2.4:compile
+[INFO] |  +- org.apache.hadoop:hadoop-client:jar:3.4.2:compile
+[INFO] |  |  \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:3.4.2:compile
+[INFO] |  |     +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:3.4.2:compile
+[INFO] |  |     \- org.slf4j:slf4j-reload4j:jar:1.7.36:compile
+[INFO] |  |        \- ch.qos.reload4j:reload4j:jar:1.2.19:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.4.3:compile
+[INFO] |  \- org.mockito:mockito-inline:jar:5.2.0:compile
+[INFO] |     \- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |        +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |        \- org.objenesis:objenesis:jar:3.3:runtime
+[INFO] +- org.springframework.boot:spring-boot-starter-web:jar:2.7.18:compile
+[INFO] |  +- org.springframework.boot:spring-boot-starter:jar:2.7.18:compile
+[INFO] |  |  +- org.springframework.boot:spring-boot:jar:2.7.18:compile
+[INFO] |  |  +- org.springframework.boot:spring-boot-autoconfigure:jar:2.7.18:compile
+[INFO] |  |  \- org.yaml:snakeyaml:jar:1.30:compile
+[INFO] |  +- org.springframework.boot:spring-boot-starter-json:jar:2.7.18:compile
+[INFO] |  |  \- com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.18.6:compile
+[INFO] |  +- org.springframework:spring-web:jar:5.3.31:compile
+[INFO] |  \- org.springframework:spring-webmvc:jar:5.3.31:compile
+[INFO] |     +- org.springframework:spring-aop:jar:5.3.31:compile
+[INFO] |     +- org.springframework:spring-context:jar:5.3.31:compile
+[INFO] |     \- org.springframework:spring-expression:jar:5.3.31:compile
+[INFO] +- org.springframework.boot:spring-boot-starter-jetty:jar:2.7.18:compile
+[INFO] |  +- jakarta.servlet:jakarta.servlet-api:jar:4.0.4:compile
+[INFO] |  +- jakarta.websocket:jakarta.websocket-api:jar:1.1.2:compile
+[INFO] |  +- org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.83:compile
+[INFO] |  +- org.eclipse.jetty:jetty-servlets:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty:jetty-continuation:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-webapp:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty:jetty-xml:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty.websocket:websocket-server:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty.websocket:websocket-common:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty.websocket:websocket-client:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  \- org.eclipse.jetty:jetty-client:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.57.v20241219:compile
+[INFO] |  \- org.eclipse.jetty.websocket:javax-websocket-server-impl:jar:9.4.57.v20241219:compile
+[INFO] |     +- org.eclipse.jetty:jetty-annotations:jar:9.4.57.v20241219:compile
+[INFO] |     |  +- org.eclipse.jetty:jetty-plus:jar:9.4.57.v20241219:compile
+[INFO] |     |  +- org.ow2.asm:asm:jar:9.7.1:compile
+[INFO] |     |  \- org.ow2.asm:asm-commons:jar:9.7.1:compile
+[INFO] |     |     \- org.ow2.asm:asm-tree:jar:9.7.1:compile
+[INFO] |     \- org.eclipse.jetty.websocket:javax-websocket-client-impl:jar:9.4.57.v20241219:compile
+[INFO] +- org.springframework.boot:spring-boot-starter-actuator:jar:2.7.18:compile
+[INFO] |  +- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.7.18:compile
+[INFO] |  |  \- org.springframework.boot:spring-boot-actuator:jar:2.7.18:compile
+[INFO] |  \- io.micrometer:micrometer-core:jar:1.9.17:compile
+[INFO] |     +- org.hdrhistogram:HdrHistogram:jar:2.1.12:compile
+[INFO] |     \- org.latencyutils:LatencyUtils:jar:2.0.3:runtime
+[INFO] +- io.micrometer:micrometer-registry-prometheus:jar:1.9.17:compile
+[INFO] |  \- io.prometheus:simpleclient_common:jar:0.15.0:compile
+[INFO] |     \- io.prometheus:simpleclient:jar:0.15.0:compile
+[INFO] |        +- io.prometheus:simpleclient_tracer_otel:jar:0.15.0:compile
+[INFO] |        |  \- io.prometheus:simpleclient_tracer_common:jar:0.15.0:compile
+[INFO] |        \- io.prometheus:simpleclient_tracer_otel_agent:jar:0.15.0:compile
+[INFO] +- org.apache.hive:hive-exec:jar:core:4.3.0-SNAPSHOT:test
+[INFO] |  +- org.graalvm.js:js-scriptengine:jar:23.0.8:test
+[INFO] |  |  \- org.graalvm.sdk:graal-sdk:jar:23.0.8:test
+[INFO] |  +- org.graalvm.js:js:jar:23.0.8:test
+[INFO] |  |  +- org.graalvm.regex:regex:jar:23.0.8:test
+[INFO] |  |  +- org.graalvm.truffle:truffle-api:jar:23.0.8:test
+[INFO] |  |  \- com.ibm.icu:icu4j:jar:72.1:test
+[INFO] |  +- org.apache.atlas:atlas-client-v2:jar:2.4.0:test
+[INFO] |  |  \- cglib:cglib:jar:2.2.2:test
+[INFO] |  |     \- asm:asm:jar:3.3.1:test
+[INFO] |  +- org.apache.atlas:atlas-client-common:jar:2.4.0:test
+[INFO] |  |  \- javax.xml.bind:jaxb-api:jar:2.3.1:compile
+[INFO] |  |     \- javax.activation:javax.activation-api:jar:1.2.0:compile
+[INFO] |  +- org.apache.atlas:atlas-intg:jar:2.4.0:test
+[INFO] |  |  +- com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.18.6:compile
+[INFO] |  |  +- com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.18.6:compile
+[INFO] |  |  +- commons-validator:commons-validator:jar:1.6:test
+[INFO] |  |  |  \- commons-digester:commons-digester:jar:1.8.1:test
+[INFO] |  |  \- javax.inject:javax.inject:jar:1:compile
+[INFO] |  +- commons-configuration:commons-configuration:jar:1.10:test
+[INFO] |  |  \- commons-lang:commons-lang:jar:2.6:compile
+[INFO] |  +- org.apache.commons:commons-math3:jar:3.6.1:compile
+[INFO] |  +- org.apache.hive:hive-vector-code-gen:jar:4.3.0-SNAPSHOT:test
+[INFO] |  +- org.apache.hive:hive-llap-tez:jar:4.3.0-SNAPSHOT:test
+[INFO] |  |  +- org.apache.hive:hive-llap-client:jar:4.3.0-SNAPSHOT:test
+[INFO] |  |  \- org.apache.hive:hive-llap-common:jar:4.3.0-SNAPSHOT:test
+[INFO] |  |     +- io.jsonwebtoken:jjwt-api:jar:0.10.5:test
+[INFO] |  |     +- io.jsonwebtoken:jjwt-impl:jar:0.10.5:test
+[INFO] |  |     \- io.jsonwebtoken:jjwt-jackson:jar:0.10.5:test
+[INFO] |  +- org.apache.hive:hive-shims:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive.shims:hive-shims-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  \- org.apache.hive.shims:hive-shims-0.23:jar:4.3.0-SNAPSHOT:runtime
+[INFO] |  |     \- org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:3.4.2:runtime
+[INFO] |  |        +- org.apache.hadoop:hadoop-yarn-server-common:jar:3.4.2:runtime
+[INFO] |  |        |  +- javax.cache:cache-api:jar:1.1.1:runtime
+[INFO] |  |        |  +- org.ehcache:ehcache:jar:3.8.2:runtime
+[INFO] |  |        |  \- com.microsoft.sqlserver:mssql-jdbc:jar:6.2.1.jre8:runtime
+[INFO] |  |        +- org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:jar:3.4.2:runtime
+[INFO] |  |        |  \- de.ruedigermoeller:fst:jar:2.50:runtime
+[INFO] |  |        +- org.apache.hadoop:hadoop-yarn-server-web-proxy:jar:3.4.2:runtime
+[INFO] |  |        |  \- org.bouncycastle:bcpkix-jdk18on:jar:1.78.1:runtime
+[INFO] |  |        |     \- org.bouncycastle:bcutil-jdk18on:jar:1.78.1:runtime
+[INFO] |  |        \- org.jsonschema2pojo:jsonschema2pojo-core:jar:1.0.2:runtime
+[INFO] |  |           \- com.sun.codemodel:codemodel:jar:2.6:runtime
+[INFO] |  +- com.amazonaws.secretsmanager:aws-secretsmanager-caching-java:jar:2.2.0:test
+[INFO] |  |  \- com.github.spotbugs:spotbugs-annotations:jar:4.9.8:test
+[INFO] |  +- commons-codec:commons-codec:jar:1.15:compile
+[INFO] |  +- commons-io:commons-io:jar:2.16.1:compile
+[INFO] |  +- commons-collections:commons-collections:jar:3.2.2:compile
+[INFO] |  +- org.apache.commons:commons-text:jar:1.10.0:compile
+[INFO] |  +- org.apache.ant:ant:jar:1.10.15:compile
+[INFO] |  |  \- org.apache.ant:ant-launcher:jar:1.10.15:compile
+[INFO] |  +- org.apache.commons:commons-compress:jar:1.26.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-registry:jar:3.4.2:test
+[INFO] |  |  \- org.apache.hadoop:hadoop-registry:jar:3.4.2:runtime
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-api:jar:3.4.2:compile
+[INFO] |  +- org.apache.ivy:ivy:jar:2.5.2:test
+[INFO] |  +- org.apache.curator:apache-curator:pom:5.7.1:test
+[INFO] |  +- org.codehaus.groovy:groovy-all:jar:2.4.21:test
+[INFO] |  +- com.google.code.gson:gson:jar:2.9.0:compile
+[INFO] |  +- stax:stax-api:jar:1.0.1:test
+[INFO] |  +- com.jayway.jsonpath:json-path:jar:2.9.0:test
+[INFO] |  +- org.codehaus.janino:commons-compiler:jar:3.1.12:test
+[INFO] |  +- org.codehaus.janino:janino:jar:3.1.12:test
+[INFO] |  \- com.sun.jersey.contribs:jersey-multipart:jar:1.19.4:test
+[INFO] |     \- org.jvnet.mimepull:mimepull:jar:1.9.3:test
+[INFO] +- org.apache.hive:hive-standalone-metastore-common:jar:tests:4.3.0-SNAPSHOT:test
+[INFO] +- org.apache.hive:hive-standalone-metastore-server:jar:tests:4.3.0-SNAPSHOT:test
+[INFO] +- org.apache.iceberg:iceberg-api:jar:tests:1.11.0:test
+[INFO] |  \- org.apache.iceberg:iceberg-bundled-guava:jar:1.11.0:test
+[INFO] +- org.apache.iceberg:iceberg-core:jar:tests:1.11.0:test
+[INFO] |  +- org.apache.iceberg:iceberg-api:jar:1.11.0:test
+[INFO] |  +- org.apache.avro:avro:jar:1.12.1:compile
+[INFO] |  +- org.apache.iceberg:iceberg-common:jar:1.11.0:test
+[INFO] |  +- io.airlift:aircompressor:jar:2.0.3:compile
+[INFO] |  +- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] |  \- org.roaringbitmap:RoaringBitmap:jar:1.6.14:test
+[INFO] +- org.apache.iceberg:iceberg-open-api:jar:test-fixtures:1.11.0:test
+[INFO] +- org.assertj:assertj-core:jar:3.27.3:test
+[INFO] |  \- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] +- junit:junit:jar:4.13.2:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- com.github.tomakehurst:wiremock-jre8-standalone:jar:2.32.0:test
+[INFO] +- org.junit.jupiter:junit-jupiter:jar:5.13.3:test
+[INFO] |  +- org.junit.jupiter:junit-jupiter-api:jar:5.13.3:test
+[INFO] |  |  +- org.opentest4j:opentest4j:jar:1.3.0:test
+[INFO] |  |  \- org.junit.platform:junit-platform-commons:jar:1.13.3:test
+[INFO] |  +- org.junit.jupiter:junit-jupiter-params:jar:5.13.3:test
+[INFO] |  \- org.junit.jupiter:junit-jupiter-engine:jar:5.13.3:test
+[INFO] +- org.junit.platform:junit-platform-launcher:jar:1.13.3:test
+[INFO] |  +- org.junit.platform:junit-platform-engine:jar:1.13.3:test
+[INFO] |  \- org.apiguardian:apiguardian-api:jar:1.1.2:test
+[INFO] +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile
+[INFO] |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
+[INFO] |  +- com.nimbusds:nimbus-jose-jwt:jar:9.37.2:compile
+[INFO] |  +- org.apache.kerby:kerb-core:jar:2.0.3:compile
+[INFO] |  |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile
+[INFO] |  |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile
+[INFO] |  |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile
+[INFO] |  +- org.apache.kerby:kerb-util:jar:2.0.3:compile
+[INFO] |  |  +- org.apache.kerby:kerby-config:jar:2.0.3:compile
+[INFO] |  |  \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile
+[INFO] |  \- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile
+[INFO] +- org.apache.hadoop:hadoop-common:jar:3.4.2:compile
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile
+[INFO] |  +- commons-cli:commons-cli:jar:1.9.0:compile
+[INFO] |  +- commons-net:commons-net:jar:3.9.0:compile
+[INFO] |  +- javax.servlet:javax.servlet-api:jar:3.1.0:compile
+[INFO] |  +- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile
+[INFO] |  +- javax.servlet.jsp:jsp-api:jar:2.1:runtime
+[INFO] |  +- com.sun.jersey:jersey-core:jar:1.19.4:compile
+[INFO] |  |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile
+[INFO] |  +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile
+[INFO] |  +- com.github.pjfanning:jersey-json:jar:1.22.0:compile
+[INFO] |  |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] |  +- org.codehaus.jettison:jettison:jar:1.5.4:compile
+[INFO] |  +- com.sun.jersey:jersey-server:jar:1.19.4:compile
+[INFO] |  +- org.apache.commons:commons-configuration2:jar:2.10.1:compile
+[INFO] |  +- com.google.re2j:re2j:jar:1.1:compile
+[INFO] |  +- com.jcraft:jsch:jar:0.1.55:compile
+[INFO] |  +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
+[INFO] |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile
+[INFO] |  +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile
+[INFO] |  +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+[INFO] |  +- dnsjava:dnsjava:jar:3.6.1:compile
+[INFO] |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] +- org.apache.hadoop:hadoop-hdfs-client:jar:3.4.2:compile
+[INFO] |  +- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
+[INFO] |  \- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:3.4.2:compile
+[INFO] |  +- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] |  +- io.netty:netty-all:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-dns:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-haproxy:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-http:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-http2:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-memcache:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-mqtt:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-redis:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-smtp:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-socks:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-stomp:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-codec-xml:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-handler-proxy:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-handler-ssl-ocsp:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-resolver-dns:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-rxtx:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-sctp:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-udt:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-classes-kqueue:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-resolver-dns-classes-macos:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.127.Final:runtime
+[INFO] |  |  +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.127.Final:runtime
+[INFO] |  |  +- io.netty:netty-transport-native-epoll:jar:linux-riscv64:4.1.127.Final:runtime
+[INFO] |  |  +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.127.Final:runtime
+[INFO] |  |  +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.127.Final:runtime
+[INFO] |  |  +- io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64:4.1.127.Final:runtime
+[INFO] |  |  \- io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64:4.1.127.Final:runtime
+[INFO] |  \- org.fusesource.leveldbjni:leveldbjni-all:jar:1.8:compile
+[INFO] +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:3.4.2:compile
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-client:jar:3.4.2:compile
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-common:jar:3.4.2:compile
+[INFO] |  |  +- com.sun.jersey:jersey-client:jar:1.19.4:compile
+[INFO] |  |  +- com.google.inject:guice:jar:4.2.3:compile
+[INFO] |  |  |  \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] |  |  +- com.sun.jersey.contribs:jersey-guice:jar:1.19.4:compile
+[INFO] |  |  \- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.6:compile
+[INFO] |  \- com.google.inject.extensions:guice-servlet:jar:4.2.3:compile
+[INFO] +- org.keycloak:keycloak-admin-client:jar:26.0.6:test
+[INFO] |  +- org.keycloak:keycloak-client-common-synced:jar:26.0.6:test
+[INFO] |  |  +- org.jboss.logging:jboss-logging:jar:3.6.0.Final:test
+[INFO] |  |  \- org.jboss.logging:commons-logging-jboss-logging:jar:1.0.0.Final:test
+[INFO] |  +- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.18.6:compile
+[INFO] |  +- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.18.6:compile
+[INFO] |  +- org.eclipse.microprofile.openapi:microprofile-openapi-api:jar:3.1.1:test
+[INFO] |  +- org.jboss.resteasy:resteasy-client:jar:6.2.9.Final:test
+[INFO] |  |  +- org.jboss.resteasy:resteasy-client-api:jar:6.2.9.Final:test
+[INFO] |  |  +- org.jboss.resteasy:resteasy-core-spi:jar:6.2.9.Final:test
+[INFO] |  |  |  \- jakarta.validation:jakarta.validation-api:jar:3.0.2:test
+[INFO] |  |  +- org.jboss.resteasy:resteasy-core:jar:6.2.9.Final:test
+[INFO] |  |  |  +- org.jboss:jandex:jar:2.4.5.Final:test
+[INFO] |  |  |  +- org.eclipse.angus:angus-activation:jar:1.0.0:test
+[INFO] |  |  |  \- com.ibm.async:asyncutil:jar:0.1.0:test
+[INFO] |  |  +- jakarta.ws.rs:jakarta.ws.rs-api:jar:3.1.0:test
+[INFO] |  |  \- org.reactivestreams:reactive-streams:jar:1.0.4:test
+[INFO] |  +- org.jboss.resteasy:resteasy-multipart-provider:jar:6.2.9.Final:test
+[INFO] |  |  +- jakarta.mail:jakarta.mail-api:jar:2.1.2:test
+[INFO] |  |  +- org.eclipse.angus:angus-mail:jar:1.0.0:test
+[INFO] |  |  +- org.apache.james:apache-mime4j-dom:jar:0.8.11:test
+[INFO] |  |  |  \- org.apache.james:apache-mime4j-core:jar:0.8.11:test
+[INFO] |  |  \- org.apache.james:apache-mime4j-storage:jar:0.8.11:test
+[INFO] |  +- org.jboss.resteasy:resteasy-jackson2-provider:jar:6.2.9.Final:test
+[INFO] |  |  +- com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:jar:2.18.6:test
+[INFO] |  |  +- com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:jar:2.18.6:test
+[INFO] |  |  +- com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:jar:2.18.6:test
+[INFO] |  |  \- com.github.java-json-tools:json-patch:jar:1.13:test
+[INFO] |  |     +- com.github.java-json-tools:msg-simple:jar:1.2:test
+[INFO] |  |     |  \- com.github.java-json-tools:btf:jar:1.3:test
+[INFO] |  |     \- com.github.java-json-tools:jackson-coreutils:jar:2.0:test
+[INFO] |  \- org.jboss.resteasy:resteasy-jaxb-provider:jar:6.2.9.Final:test
+[INFO] |     +- jakarta.xml.bind:jakarta.xml.bind-api:jar:3.0.1:test
+[INFO] |     +- org.glassfish.jaxb:codemodel:jar:4.0.3:test
+[INFO] |     +- org.glassfish.jaxb:jaxb-core:jar:4.0.3:test
+[INFO] |     +- org.glassfish.jaxb:jaxb-jxc:jar:4.0.3:test
+[INFO] |     +- org.glassfish.jaxb:jaxb-runtime:jar:4.0.3:runtime
+[INFO] |     +- org.glassfish.jaxb:txw2:jar:4.0.3:test
+[INFO] |     +- org.glassfish.jaxb:jaxb-xjc:jar:4.0.3:test
+[INFO] |     +- org.glassfish.jaxb:xsom:jar:4.0.3:test
+[INFO] |     +- com.sun.istack:istack-commons-runtime:jar:4.1.2:test
+[INFO] |     +- com.sun.istack:istack-commons-tools:jar:4.1.2:test
+[INFO] |     +- com.sun.xml.bind.external:relaxng-datatype:jar:4.0.3:test
+[INFO] |     \- com.sun.xml.bind.external:rngom:jar:4.0.3:test
+[INFO] +- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:test
+[INFO] +- org.testcontainers:testcontainers:jar:1.21.4:test
+[INFO] |  +- org.rnorth.duct-tape:duct-tape:jar:1.0.8:test
+[INFO] |  +- com.github.docker-java:docker-java-api:jar:3.4.2:test
+[INFO] |  \- com.github.docker-java:docker-java-transport-zerodep:jar:3.4.2:test
+[INFO] |     +- com.github.docker-java:docker-java-transport:jar:3.4.2:test
+[INFO] |     \- net.java.dev.jna:jna:jar:5.13.0:test
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO] 
+[INFO] --------------< org.apache.hive:hive-metastore-packaging >--------------
+[INFO] Building Hive Metastore Packaging 4.3.0-SNAPSHOT                   [9/9]
+[INFO]   from packaging/pom.xml
+[INFO] --------------------------------[ pom ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-metastore-packaging ---
+[INFO] org.apache.hive:hive-metastore-packaging:pom:4.3.0-SNAPSHOT
+[INFO] +- org.apache.hive:hive-metastore:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.hive:hive-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive:hive-classification:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.avro:avro:jar:1.12.0:compile
+[INFO] |  |  +- javax.servlet:javax.servlet-api:jar:3.1.0:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-http:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-rewrite:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-webapp:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  \- org.eclipse.jetty:jetty-xml:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- joda-time:joda-time:jar:2.13.0:compile
+[INFO] |  |  +- org.apache.logging.log4j:log4j-web:jar:2.25.3:compile
+[INFO] |  |  +- net.sf.jpam:jpam:jar:1.1:compile
+[INFO] |  |  +- org.apache.tez:tez-api:jar:0.10.5:compile
+[INFO] |  |  +- org.fusesource.jansi:jansi:jar:2.4.0:compile
+[INFO] |  |  +- com.tdunning:json:jar:1.8:compile
+[INFO] |  |  +- io.opentelemetry:opentelemetry-api:jar:1.60.1:compile
+[INFO] |  |  |  \- io.opentelemetry:opentelemetry-context:jar:1.60.1:compile
+[INFO] |  |  |     \- io.opentelemetry:opentelemetry-common:jar:1.60.1:compile
+[INFO] |  |  +- io.opentelemetry:opentelemetry-exporter-otlp:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-sdk-logs:jar:1.60.1:compile
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-exporter-otlp-common:jar:1.60.1:runtime
+[INFO] |  |  |  |  \- io.opentelemetry:opentelemetry-exporter-common:jar:1.60.1:runtime
+[INFO] |  |  |  +- io.opentelemetry:opentelemetry-exporter-sender-okhttp:jar:1.60.1:runtime
+[INFO] |  |  |  |  \- com.squareup.okhttp3:okhttp-jvm:jar:5.3.2:runtime
+[INFO] |  |  |  |     +- com.squareup.okio:okio-jvm:jar:3.16.4:runtime
+[INFO] |  |  |  |     \- org.jetbrains.kotlin:kotlin-stdlib:jar:2.2.21:runtime
+[INFO] |  |  |  \- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.60.1:runtime
+[INFO] |  |  +- io.opentelemetry:opentelemetry-sdk:jar:1.60.1:compile
+[INFO] |  |  |  \- io.opentelemetry:opentelemetry-sdk-common:jar:1.60.1:compile
+[INFO] |  |  \- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |  |     +- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] |  |     +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |  |     \- org.objenesis:objenesis:jar:3.3:runtime
+[INFO] |  +- org.apache.hive:hive-serde:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive:hive-service-rpc:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- com.google.code.findbugs:jsr305:jar:3.0.0:compile
+[INFO] |  |  +- com.carrotsearch:hppc:jar:0.7.2:compile
+[INFO] |  |  +- com.google.flatbuffers:flatbuffers-java:jar:1.12.0:compile
+[INFO] |  |  +- com.opencsv:opencsv:jar:5.9:compile
+[INFO] |  |  +- org.apache.parquet:parquet-hadoop-bundle:jar:1.16.0:compile
+[INFO] |  |  \- com.esri.geometry:esri-geometry-api:jar:2.2.4:compile
+[INFO] |  +- org.apache.hive:hive-shims:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive.shims:hive-shims-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  \- org.apache.hive.shims:hive-shims-0.23:jar:4.3.0-SNAPSHOT:runtime
+[INFO] |  |     \- org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:3.4.2:runtime
+[INFO] |  |        +- org.apache.hadoop:hadoop-yarn-server-common:jar:3.4.2:runtime
+[INFO] |  |        |  +- javax.cache:cache-api:jar:1.1.1:runtime
+[INFO] |  |        |  +- org.ehcache:ehcache:jar:3.8.2:runtime
+[INFO] |  |        |  |  \- org.glassfish.jaxb:jaxb-runtime:jar:2.3.1:runtime
+[INFO] |  |        |  |     +- org.glassfish.jaxb:txw2:jar:2.3.1:runtime
+[INFO] |  |        |  |     +- com.sun.istack:istack-commons-runtime:jar:3.0.7:runtime
+[INFO] |  |        |  |     +- org.jvnet.staxex:stax-ex:jar:1.8:runtime
+[INFO] |  |        |  |     \- com.sun.xml.fastinfoset:FastInfoset:jar:1.2.15:runtime
+[INFO] |  |        |  \- com.microsoft.sqlserver:mssql-jdbc:jar:6.2.1.jre8:runtime
+[INFO] |  |        +- org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:jar:3.4.2:runtime
+[INFO] |  |        |  \- de.ruedigermoeller:fst:jar:2.50:runtime
+[INFO] |  |        +- org.apache.hadoop:hadoop-yarn-server-web-proxy:jar:3.4.2:runtime
+[INFO] |  |        |  \- org.bouncycastle:bcpkix-jdk18on:jar:1.78.1:runtime
+[INFO] |  |        |     \- org.bouncycastle:bcutil-jdk18on:jar:1.78.1:runtime
+[INFO] |  |        \- org.jsonschema2pojo:jsonschema2pojo-core:jar:1.0.2:runtime
+[INFO] |  |           \- com.sun.codemodel:codemodel:jar:2.6:runtime
+[INFO] |  +- org.apache.hive:hive-standalone-metastore-client:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- javolution:javolution:jar:5.5.1:compile
+[INFO] |  +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  |  +- com.google.errorprone:error_prone_annotations:jar:2.0.18:compile
+[INFO] |  |  +- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] |  |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile
+[INFO] |  +- commons-cli:commons-cli:jar:1.5.0:compile
+[INFO] |  +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] |  +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] |  +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:compile
+[INFO] |  |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:compile
+[INFO] |  \- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] +- org.apache.hive:hive-standalone-metastore-rest-catalog:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.springframework.boot:spring-boot-starter-web:jar:2.7.18:compile
+[INFO] |  |  +- org.springframework.boot:spring-boot-starter:jar:2.7.18:compile
+[INFO] |  |  |  +- org.springframework.boot:spring-boot:jar:2.7.18:compile
+[INFO] |  |  |  +- org.springframework.boot:spring-boot-autoconfigure:jar:2.7.18:compile
+[INFO] |  |  |  \- org.yaml:snakeyaml:jar:1.30:compile
+[INFO] |  |  +- org.springframework.boot:spring-boot-starter-json:jar:2.7.18:compile
+[INFO] |  |  |  +- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.18.6:compile
+[INFO] |  |  |  +- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.18.6:compile
+[INFO] |  |  |  \- com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.18.6:compile
+[INFO] |  |  +- org.springframework:spring-web:jar:5.3.31:compile
+[INFO] |  |  \- org.springframework:spring-webmvc:jar:5.3.31:compile
+[INFO] |  |     +- org.springframework:spring-aop:jar:5.3.31:compile
+[INFO] |  |     +- org.springframework:spring-context:jar:5.3.31:compile
+[INFO] |  |     \- org.springframework:spring-expression:jar:5.3.31:compile
+[INFO] |  +- org.springframework.boot:spring-boot-starter-jetty:jar:2.7.18:compile
+[INFO] |  |  +- jakarta.websocket:jakarta.websocket-api:jar:1.1.2:compile
+[INFO] |  |  +- org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.83:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-servlets:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  \- org.eclipse.jetty:jetty-continuation:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty.websocket:websocket-server:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.eclipse.jetty.websocket:websocket-common:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  +- org.eclipse.jetty.websocket:websocket-client:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  |  \- org.eclipse.jetty:jetty-client:jar:9.4.57.v20241219:compile
+[INFO] |  |  |  \- org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty.websocket:javax-websocket-server-impl:jar:9.4.57.v20241219:compile
+[INFO] |  |     +- org.eclipse.jetty:jetty-annotations:jar:9.4.57.v20241219:compile
+[INFO] |  |     |  +- org.eclipse.jetty:jetty-plus:jar:9.4.57.v20241219:compile
+[INFO] |  |     |  +- org.ow2.asm:asm:jar:9.7.1:compile
+[INFO] |  |     |  \- org.ow2.asm:asm-commons:jar:9.7.1:compile
+[INFO] |  |     |     \- org.ow2.asm:asm-tree:jar:9.7.1:compile
+[INFO] |  |     \- org.eclipse.jetty.websocket:javax-websocket-client-impl:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.springframework.boot:spring-boot-starter-actuator:jar:2.7.18:compile
+[INFO] |  |  +- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.7.18:compile
+[INFO] |  |  |  \- org.springframework.boot:spring-boot-actuator:jar:2.7.18:compile
+[INFO] |  |  \- io.micrometer:micrometer-core:jar:1.9.17:compile
+[INFO] |  |     +- org.hdrhistogram:HdrHistogram:jar:2.1.12:compile
+[INFO] |  |     \- org.latencyutils:LatencyUtils:jar:2.0.3:runtime
+[INFO] |  +- io.micrometer:micrometer-registry-prometheus:jar:1.9.17:compile
+[INFO] |  |  \- io.prometheus:simpleclient_common:jar:0.15.0:compile
+[INFO] |  |     \- io.prometheus:simpleclient:jar:0.15.0:compile
+[INFO] |  |        +- io.prometheus:simpleclient_tracer_otel:jar:0.15.0:compile
+[INFO] |  |        |  \- io.prometheus:simpleclient_tracer_common:jar:0.15.0:compile
+[INFO] |  |        \- io.prometheus:simpleclient_tracer_otel_agent:jar:0.15.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile
+[INFO] |  |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile
+[INFO] |  |  +- com.nimbusds:nimbus-jose-jwt:jar:9.37.2:compile
+[INFO] |  |  +- org.apache.kerby:kerb-core:jar:2.0.3:compile
+[INFO] |  |  |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile
+[INFO] |  |  |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile
+[INFO] |  |  |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile
+[INFO] |  |  +- org.apache.kerby:kerb-util:jar:2.0.3:compile
+[INFO] |  |  |  +- org.apache.kerby:kerby-config:jar:2.0.3:compile
+[INFO] |  |  |  \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile
+[INFO] |  |  \- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-common:jar:3.4.2:compile
+[INFO] |  |  +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile
+[INFO] |  |  +- commons-net:commons-net:jar:3.9.0:compile
+[INFO] |  |  +- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile
+[INFO] |  |  +- javax.servlet.jsp:jsp-api:jar:2.1:runtime
+[INFO] |  |  +- com.sun.jersey:jersey-core:jar:1.19.4:compile
+[INFO] |  |  |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile
+[INFO] |  |  +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile
+[INFO] |  |  +- com.github.pjfanning:jersey-json:jar:1.22.0:compile
+[INFO] |  |  |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] |  |  +- org.codehaus.jettison:jettison:jar:1.5.4:compile
+[INFO] |  |  +- com.sun.jersey:jersey-server:jar:1.19.4:compile
+[INFO] |  |  +- org.apache.commons:commons-configuration2:jar:2.10.1:compile
+[INFO] |  |  +- com.google.re2j:re2j:jar:1.1:compile
+[INFO] |  |  +- com.jcraft:jsch:jar:0.1.55:compile
+[INFO] |  |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile
+[INFO] |  |  +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile
+[INFO] |  |  +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+[INFO] |  |  +- dnsjava:dnsjava:jar:3.6.1:compile
+[INFO] |  |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] |  +- org.apache.hadoop:hadoop-hdfs-client:jar:3.4.2:compile
+[INFO] |  |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile
+[INFO] |  +- org.apache.hadoop:hadoop-hdfs:jar:3.4.2:compile
+[INFO] |  |  +- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] |  |  +- io.netty:netty-all:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-dns:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-haproxy:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-http:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-http2:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-memcache:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-mqtt:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-redis:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-smtp:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-socks:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-stomp:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-codec-xml:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-handler-proxy:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-handler-ssl-ocsp:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-resolver-dns:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-rxtx:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-sctp:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-udt:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-classes-kqueue:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-resolver-dns-classes-macos:jar:4.1.127.Final:compile
+[INFO] |  |  |  +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.127.Final:runtime
+[INFO] |  |  |  +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.127.Final:runtime
+[INFO] |  |  |  +- io.netty:netty-transport-native-epoll:jar:linux-riscv64:4.1.127.Final:runtime
+[INFO] |  |  |  +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.127.Final:runtime
+[INFO] |  |  |  +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.127.Final:runtime
+[INFO] |  |  |  +- io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64:4.1.127.Final:runtime
+[INFO] |  |  |  \- io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64:4.1.127.Final:runtime
+[INFO] |  |  \- org.fusesource.leveldbjni:leveldbjni-all:jar:1.8:compile
+[INFO] |  \- org.apache.hadoop:hadoop-mapreduce-client-core:jar:3.4.2:compile
+[INFO] |     +- org.apache.hadoop:hadoop-yarn-client:jar:3.4.2:compile
+[INFO] |     +- org.apache.hadoop:hadoop-yarn-common:jar:3.4.2:compile
+[INFO] |     |  +- com.sun.jersey:jersey-client:jar:1.19.4:compile
+[INFO] |     |  +- com.google.inject:guice:jar:4.2.3:compile
+[INFO] |     |  |  \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] |     |  +- com.sun.jersey.contribs:jersey-guice:jar:1.19.4:compile
+[INFO] |     |  \- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.6:compile
+[INFO] |     \- com.google.inject.extensions:guice-servlet:jar:4.2.3:compile
+[INFO] +- org.apache.hive:hive-exec:jar:core:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.graalvm.js:js-scriptengine:jar:23.0.8:compile
+[INFO] |  |  \- org.graalvm.sdk:graal-sdk:jar:23.0.8:compile
+[INFO] |  +- org.graalvm.js:js:jar:23.0.8:compile
+[INFO] |  |  +- org.graalvm.regex:regex:jar:23.0.8:compile
+[INFO] |  |  +- org.graalvm.truffle:truffle-api:jar:23.0.8:compile
+[INFO] |  |  \- com.ibm.icu:icu4j:jar:72.1:compile
+[INFO] |  +- org.apache.atlas:atlas-client-v2:jar:2.4.0:compile
+[INFO] |  |  \- cglib:cglib:jar:2.2.2:compile
+[INFO] |  |     \- asm:asm:jar:3.3.1:compile
+[INFO] |  +- org.apache.atlas:atlas-client-common:jar:2.4.0:compile
+[INFO] |  |  \- javax.xml.bind:jaxb-api:jar:2.3.1:compile
+[INFO] |  |     \- javax.activation:javax.activation-api:jar:1.2.0:compile
+[INFO] |  +- org.apache.atlas:atlas-intg:jar:2.4.0:compile
+[INFO] |  |  +- com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.18.6:compile
+[INFO] |  |  +- com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.18.6:compile
+[INFO] |  |  +- commons-validator:commons-validator:jar:1.6:compile
+[INFO] |  |  |  \- commons-digester:commons-digester:jar:1.8.1:compile
+[INFO] |  |  \- javax.inject:javax.inject:jar:1:compile
+[INFO] |  +- commons-configuration:commons-configuration:jar:1.10:compile
+[INFO] |  |  +- commons-lang:commons-lang:jar:2.6:compile
+[INFO] |  |  \- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] |  +- org.apache.commons:commons-dbcp2:jar:2.14.0:compile
+[INFO] |  |  +- org.apache.commons:commons-pool2:jar:2.13.0:compile
+[INFO] |  |  \- jakarta.transaction:jakarta.transaction-api:jar:1.3.3:compile
+[INFO] |  +- org.apache.commons:commons-math3:jar:3.6.1:compile
+[INFO] |  +- org.apache.hive:hive-vector-code-gen:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.hive:hive-llap-tez:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  +- org.apache.hive:hive-llap-client:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |  \- org.apache.hive:hive-llap-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  |     +- io.jsonwebtoken:jjwt-api:jar:0.10.5:compile
+[INFO] |  |     +- io.jsonwebtoken:jjwt-impl:jar:0.10.5:compile
+[INFO] |  |     \- io.jsonwebtoken:jjwt-jackson:jar:0.10.5:compile
+[INFO] |  +- com.amazonaws.secretsmanager:aws-secretsmanager-caching-java:jar:2.2.0:compile
+[INFO] |  |  \- com.github.spotbugs:spotbugs-annotations:jar:4.9.8:compile
+[INFO] |  +- commons-codec:commons-codec:jar:1.15:compile
+[INFO] |  +- commons-io:commons-io:jar:2.16.1:compile
+[INFO] |  +- org.apache.commons:commons-collections4:jar:4.4:compile
+[INFO] |  +- commons-collections:commons-collections:jar:3.2.2:compile
+[INFO] |  +- org.apache.commons:commons-text:jar:1.10.0:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-1.2-api:jar:2.25.3:compile
+[INFO] |  |  \- org.apache.logging.log4j:log4j-api:jar:2.25.3:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-core:jar:2.25.3:compile
+[INFO] |  +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.25.3:compile
+[INFO] |  +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |  |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |  |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] |  +- org.apache.ant:ant:jar:1.10.15:compile
+[INFO] |  |  \- org.apache.ant:ant-launcher:jar:1.10.15:compile
+[INFO] |  +- org.apache.commons:commons-compress:jar:1.26.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-registry:jar:3.4.2:compile
+[INFO] |  |  \- org.apache.hadoop:hadoop-registry:jar:3.4.2:compile
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-api:jar:3.4.2:compile
+[INFO] |  +- org.apache.ivy:ivy:jar:2.5.2:compile
+[INFO] |  +- org.apache.zookeeper:zookeeper:jar:3.8.4:compile
+[INFO] |  |  +- org.apache.zookeeper:zookeeper-jute:jar:3.8.4:compile
+[INFO] |  |  \- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] |  +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] |  +- org.apache.curator:apache-curator:pom:5.7.1:compile
+[INFO] |  +- org.codehaus.groovy:groovy-all:jar:2.4.21:compile
+[INFO] |  +- org.datanucleus:datanucleus-core:jar:6.0.11:compile
+[INFO] |  +- com.google.code.gson:gson:jar:2.9.0:compile
+[INFO] |  +- stax:stax-api:jar:1.0.1:compile
+[INFO] |  +- org.reflections:reflections:jar:0.10.2:compile
+[INFO] |  |  \- org.javassist:javassist:jar:3.28.0-GA:compile
+[INFO] |  +- com.jayway.jsonpath:json-path:jar:2.9.0:runtime
+[INFO] |  |  \- net.minidev:json-smart:jar:2.5.0:compile
+[INFO] |  |     \- net.minidev:accessors-smart:jar:2.5.0:compile
+[INFO] |  +- org.codehaus.janino:commons-compiler:jar:3.1.12:runtime
+[INFO] |  +- org.codehaus.janino:janino:jar:3.1.12:runtime
+[INFO] |  \- com.sun.jersey.contribs:jersey-multipart:jar:1.19.4:compile
+[INFO] |     \- org.jvnet.mimepull:mimepull:jar:1.9.3:compile
+[INFO] +- org.apache.hive:hive-iceberg-handler:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  \- org.apache.hadoop:hadoop-client:jar:3.4.2:compile
+[INFO] |     \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:3.4.2:compile
+[INFO] |        +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:3.4.2:compile
+[INFO] |        \- org.slf4j:slf4j-reload4j:jar:1.7.36:compile
+[INFO] |           \- ch.qos.reload4j:reload4j:jar:1.2.19:compile
+[INFO] +- org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  |  \- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] |  +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] |  +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] |  +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-api:jar:3.4.1:compile
+[INFO] |  |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  |  +- org.jetbrains:annotations:jar:17.0.0:compile
+[INFO] |  |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |  |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |  |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] |  +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] |  +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] |  +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] |  +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] |  +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] |  +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.httpcomponents.client5:httpclient5:jar:5.3.1:compile
+[INFO] |  |  \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.4:compile
+[INFO] |  +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] |  +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] |  +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] |  \- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] |     +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |     \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] +- org.apache.hive:hive-standalone-metastore-server:jar:4.3.0-SNAPSHOT:compile
+[INFO] |  +- org.apache.datasketches:datasketches-hive:jar:2.0.0:compile
+[INFO] |  |  \- org.apache.datasketches:datasketches-java:jar:6.0.0:compile
+[INFO] |  |     \- org.apache.datasketches:datasketches-memory:jar:2.2.0:compile
+[INFO] |  +- org.antlr:antlr4-runtime:jar:4.9.3:compile
+[INFO] |  +- commons-beanutils:commons-beanutils:jar:1.9.4:compile
+[INFO] |  +- org.datanucleus:datanucleus-api-jdo:jar:6.0.5:compile
+[INFO] |  +- org.datanucleus:datanucleus-rdbms:jar:6.0.11:compile
+[INFO] |  +- org.datanucleus:javax.jdo:jar:3.2.0-release:compile
+[INFO] |  |  +- javax.transaction:javax.transaction-api:jar:1.3:compile
+[INFO] |  |  \- org.glassfish.corba:glassfish-corba-omgapi:jar:4.2.2:compile
+[INFO] |  +- sqlline:sqlline:jar:1.9.0:compile
+[INFO] |  +- org.jline:jline:jar:3.25.0:compile
+[INFO] |  +- com.cronutils:cron-utils:jar:9.2.1:compile
+[INFO] |  +- org.eclipse.jetty:jetty-util:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-server:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty:jetty-io:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.eclipse.jetty:jetty-servlet:jar:9.4.57.v20241219:compile
+[INFO] |  |  +- org.eclipse.jetty:jetty-security:jar:9.4.57.v20241219:compile
+[INFO] |  |  \- org.eclipse.jetty:jetty-util-ajax:jar:9.4.57.v20241219:compile
+[INFO] |  +- org.springframework:spring-jdbc:jar:5.3.39:compile
+[INFO] |  +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |  |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |  +- com.nimbusds:oauth2-oidc-sdk:jar:11.28:compile
+[INFO] |  |  +- com.github.stephenc.jcip:jcip-annotations:jar:1.0-1:compile
+[INFO] |  |  +- com.nimbusds:content-type:jar:2.3:compile
+[INFO] |  |  \- com.nimbusds:lang-tag:jar:1.7:compile
+[INFO] |  \- org.pac4j:pac4j-core:jar:4.5.8:compile
+[INFO] \- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO]    +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO]    \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] ------------------------------------------------------------------------
+[INFO] Reactor Summary for Hive Standalone Metastore 4.3.0-SNAPSHOT:
+[INFO] 
+[INFO] Hive Standalone Metastore .......................... SUCCESS [  0.485 s]
+[INFO] Hive Standalone Metastore Common Code .............. SUCCESS [  0.316 s]
+[INFO] Hive Metastore Client .............................. SUCCESS [  0.032 s]
+[INFO] Hive Metastore Server .............................. SUCCESS [  0.351 s]
+[INFO] Hive Metastore Tools ............................... SUCCESS [  0.006 s]
+[INFO] Hive Metastore Tools common libraries .............. SUCCESS [  0.020 s]
+[INFO] Hive metastore benchmarks .......................... SUCCESS [  0.414 s]
+[INFO] Hive Metastore REST Catalog ........................ SUCCESS [  0.193 s]
+[INFO] Hive Metastore Packaging ........................... SUCCESS [  0.091 s]
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time:  2.217 s
+[INFO] Finished at: 2026-07-27T17:35:57+02:00
+[INFO] ------------------------------------------------------------------------
+[INFO] 9 goals, 9 executed
+[WARNING] 
+[WARNING] 1 build scan custom value was not captured:
+[WARNING]  - Maximum custom value value length (100,000) exceeded: Git status
diff --git a/standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/client/ThriftHiveMetaStoreClient.java b/standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/client/ThriftHiveMetaStoreClient.java
index 4cce91d84b19..baed237af294 100644
--- a/standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/client/ThriftHiveMetaStoreClient.java
+++ b/standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/client/ThriftHiveMetaStoreClient.java
@@ -47,12 +47,13 @@
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.StringUtils;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TConfiguration;
 import org.apache.thrift.TException;
@@ -610,14 +611,11 @@ protected HttpClientBuilder createHttpClientBuilder() throws MetaException {
         throw new MetaException("For auth mode JWT, valid signed jwt token must be provided in the "
             + "environment variable HMS_JWT");
       }
-      httpClientBuilder.addInterceptorFirst(new HttpRequestInterceptor() {
-        @Override
-        public void process(HttpRequest httpRequest, HttpContext httpContext)
-            throws HttpException, IOException {
-          httpRequest.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + jwtToken);
-          for (Map.Entry<String, String> entry : additionalHeaders.entrySet()) {
-            httpRequest.addHeader(entry.getKey(), entry.getValue());
-          }
+      httpClientBuilder.addRequestInterceptorFirst((httpRequest, entity, httpContext) ->
+      {
+        httpRequest.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + jwtToken);
+        for (Map.Entry<String, String> entry : additionalHeaders.entrySet()) {
+          httpRequest.addHeader(entry.getKey(), entry.getValue());
         }
       });
     } else {
@@ -630,14 +628,10 @@ public void process(HttpRequest httpRequest, HttpContext httpContext)
         }
       }
       final String httpUser = user;
-      httpClientBuilder.addInterceptorFirst(new HttpRequestInterceptor() {
-        @Override
-        public void process(HttpRequest httpRequest, HttpContext httpContext)
-            throws HttpException, IOException {
-          httpRequest.addHeader(MetaStoreUtils.USER_NAME_HTTP_HEADER, httpUser);
-          for (Map.Entry<String, String> entry : additionalHeaders.entrySet()) {
-            httpRequest.addHeader(entry.getKey(), entry.getValue());
-          }
+      httpClientBuilder.addRequestInterceptorFirst((httpRequest, entity, httpContext) -> {
+        httpRequest.addHeader(MetaStoreUtils.USER_NAME_HTTP_HEADER, httpUser);
+        for (Map.Entry<String, String> entry : additionalHeaders.entrySet()) {
+          httpRequest.addHeader(entry.getKey(), entry.getValue());
         }
       });
     }
diff --git a/standalone-metastore/metastore-common/deptree.txt b/standalone-metastore/metastore-common/deptree.txt
new file mode 100644
index 000000000000..0c05fc2a751d
--- /dev/null
+++ b/standalone-metastore/metastore-common/deptree.txt
@@ -0,0 +1,211 @@
+[INFO] Scanning for projects...
+[WARNING] 
+[WARNING] Some problems were encountered while building the effective model for org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT
+[WARNING] 'parent.relativePath' of POM org.apache.hive:hive-standalone-metastore:4.3.0-SNAPSHOT (/home/invisibleprogrammer/work/hive/standalone-metastore/pom.xml) points at org.apache.hive:hive instead of org.apache:apache, please verify your project structure @ org.apache.hive:hive-standalone-metastore:4.3.0-SNAPSHOT, /home/invisibleprogrammer/work/hive/standalone-metastore/pom.xml, line 17, column 11
+[WARNING] 
+[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
+[WARNING] 
+[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
+[WARNING] 
+[WARNING] This build will only read from the build cache, since the clean lifecycle is not part of the build invocation.
+[INFO] 
+[INFO] ----------< org.apache.hive:hive-standalone-metastore-common >----------
+[INFO] Building Hive Standalone Metastore Common Code 4.3.0-SNAPSHOT
+[INFO]   from pom.xml
+[INFO] --------------------------------[ jar ]---------------------------------
+[INFO] 
+[INFO] --- dependency:3.8.1:tree (default-cli) @ hive-standalone-metastore-common ---
+[INFO] org.apache.hive:hive-standalone-metastore-common:jar:4.3.0-SNAPSHOT
+[INFO] +- org.apache.commons:commons-jexl3:jar:3.3:compile
+[INFO] |  \- commons-logging:commons-logging:jar:1.2:compile
+[INFO] +- io.grpc:grpc-netty-shaded:jar:1.72.0:compile
+[INFO] |  +- io.grpc:grpc-util:jar:1.72.0:runtime
+[INFO] |  +- io.grpc:grpc-core:jar:1.72.0:compile
+[INFO] |  |  +- com.google.android:annotations:jar:4.1.1.4:runtime
+[INFO] |  |  \- io.grpc:grpc-context:jar:1.72.0:runtime
+[INFO] |  +- com.google.errorprone:error_prone_annotations:jar:2.30.0:compile
+[INFO] |  +- io.perfmark:perfmark-api:jar:0.27.0:runtime
+[INFO] |  +- io.grpc:grpc-api:jar:1.72.0:compile
+[INFO] |  \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.24:compile
+[INFO] +- io.grpc:grpc-protobuf:jar:1.72.0:compile
+[INFO] |  +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
+[INFO] |  +- com.google.api.grpc:proto-google-common-protos:jar:2.51.0:compile
+[INFO] |  \- io.grpc:grpc-protobuf-lite:jar:1.72.0:runtime
+[INFO] +- io.grpc:grpc-stub:jar:1.72.0:compile
+[INFO] +- javax.annotation:javax.annotation-api:jar:1.3.2:compile
+[INFO] +- org.apache.orc:orc-core:jar:2.1.2:compile
+[INFO] |  +- org.apache.orc:orc-shims:jar:2.1.2:compile
+[INFO] |  +- org.apache.orc:orc-format:jar:1.1.0:compile
+[INFO] |  +- io.airlift:aircompressor:jar:2.0.2:compile
+[INFO] |  +- com.github.luben:zstd-jni:jar:1.5.6-10:compile
+[INFO] |  +- org.apache.hadoop:hadoop-client-api:jar:3.4.1:compile
+[INFO] |  +- org.apache.hadoop:hadoop-client-runtime:jar:3.4.1:runtime
+[INFO] |  +- org.jetbrains:annotations:jar:17.0.0:compile
+[INFO] |  +- org.threeten:threeten-extra:jar:1.8.0:compile
+[INFO] |  \- com.aayushatharva.brotli4j:brotli4j:jar:1.18.0:compile
+[INFO] |     +- com.aayushatharva.brotli4j:service:jar:1.18.0:compile
+[INFO] |     \- com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.18.0:compile
+[INFO] +- com.fasterxml.jackson.core:jackson-databind:jar:2.18.6:compile
+[INFO] |  +- com.fasterxml.jackson.core:jackson-annotations:jar:2.18.6:compile
+[INFO] |  \- com.fasterxml.jackson.core:jackson-core:jar:2.18.6:compile
+[INFO] +- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:jar:0.1.2:compile
+[INFO] +- com.google.guava:guava:jar:22.0:compile
+[INFO] |  \- com.google.j2objc:j2objc-annotations:jar:1.1:compile
+[INFO] +- com.google.protobuf:protobuf-java:jar:3.25.5:compile
+[INFO] +- com.zaxxer:HikariCP:jar:4.0.3:compile
+[INFO] +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile
+[INFO] +- io.dropwizard.metrics:metrics-jvm:jar:3.1.0:compile
+[INFO] +- io.dropwizard.metrics:metrics-json:jar:3.1.0:compile
+[INFO] +- javolution:javolution:jar:5.5.1:compile
+[INFO] +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] |  \- org.antlr:antlr-runtime:jar:3.3:compile
+[INFO] |     \- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] |        \- antlr:antlr:jar:2.7.7:compile
+[INFO] +- org.apache.commons:commons-lang3:jar:3.17.0:compile
+[INFO] +- org.apache.derby:derby:jar:10.17.1.0:runtime
+[INFO] |  \- org.apache.derby:derbyshared:jar:10.17.1.0:runtime
+[INFO] +- org.apache.hadoop:hadoop-common:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:jar:1.4.0:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-annotations:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.4.0:compile (optional)
+[INFO] |  +- commons-cli:commons-cli:jar:1.9.0:compile (optional)
+[INFO] |  +- org.apache.commons:commons-math3:jar:3.6.1:compile (optional)
+[INFO] |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:compile (optional)
+[INFO] |  +- commons-codec:commons-codec:jar:1.15:compile (optional)
+[INFO] |  +- commons-io:commons-io:jar:2.16.1:compile
+[INFO] |  +- commons-net:commons-net:jar:3.9.0:compile (optional)
+[INFO] |  +- org.apache.commons:commons-collections4:jar:4.4:compile (optional)
+[INFO] |  +- javax.servlet:javax.servlet-api:jar:3.1.0:compile (optional)
+[INFO] |  +- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile (optional)
+[INFO] |  +- javax.servlet.jsp:jsp-api:jar:2.1:runtime (optional)
+[INFO] |  +- com.sun.jersey:jersey-core:jar:1.19.4:compile (optional)
+[INFO] |  |  \- javax.ws.rs:jsr311-api:jar:1.1.1:compile (optional)
+[INFO] |  +- com.sun.jersey:jersey-servlet:jar:1.19.4:compile (optional)
+[INFO] |  +- com.github.pjfanning:jersey-json:jar:1.22.0:compile (optional)
+[INFO] |  |  \- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile (optional)
+[INFO] |  +- org.codehaus.jettison:jettison:jar:1.5.4:compile (optional)
+[INFO] |  +- com.sun.jersey:jersey-server:jar:1.19.4:compile (optional)
+[INFO] |  +- org.apache.commons:commons-configuration2:jar:2.10.1:compile (optional)
+[INFO] |  +- org.apache.commons:commons-text:jar:1.10.0:compile (optional)
+[INFO] |  +- org.apache.avro:avro:jar:1.11.4:compile (optional)
+[INFO] |  +- com.google.re2j:re2j:jar:1.1:compile (optional)
+[INFO] |  +- com.google.code.gson:gson:jar:2.9.0:compile
+[INFO] |  +- org.apache.hadoop:hadoop-auth:jar:3.4.2:compile (optional)
+[INFO] |  |  \- org.apache.kerby:kerb-util:jar:2.0.3:compile (optional)
+[INFO] |  |     +- org.apache.kerby:kerby-config:jar:2.0.3:compile (optional)
+[INFO] |  |     \- org.apache.kerby:kerb-crypto:jar:2.0.3:compile (optional)
+[INFO] |  +- com.jcraft:jsch:jar:0.1.55:compile (optional)
+[INFO] |  +- io.netty:netty-handler:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-common:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-resolver:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-buffer:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport:jar:4.1.127.Final:compile
+[INFO] |  |  +- io.netty:netty-transport-native-unix-common:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-codec:jar:4.1.127.Final:compile
+[INFO] |  +- io.netty:netty-transport-native-epoll:jar:4.1.127.Final:compile
+[INFO] |  |  \- io.netty:netty-transport-classes-epoll:jar:4.1.127.Final:compile
+[INFO] |  +- org.apache.commons:commons-compress:jar:1.26.1:compile (optional)
+[INFO] |  +- org.bouncycastle:bcprov-jdk18on:jar:1.78.1:compile (optional)
+[INFO] |  +- org.apache.kerby:kerb-core:jar:2.0.3:compile (optional)
+[INFO] |  |  \- org.apache.kerby:kerby-pkix:jar:2.0.3:compile (optional)
+[INFO] |  |     +- org.apache.kerby:kerby-asn1:jar:2.0.3:compile (optional)
+[INFO] |  |     \- org.apache.kerby:kerby-util:jar:2.0.3:compile (optional)
+[INFO] |  +- org.codehaus.woodstox:stax2-api:jar:4.2.1:compile (optional)
+[INFO] |  +- com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile (optional)
+[INFO] |  +- dnsjava:dnsjava:jar:3.6.1:compile (optional)
+[INFO] |  \- org.xerial.snappy:snappy-java:jar:1.1.10.4:compile
+[INFO] +- org.apache.hadoop:hadoop-distcp:jar:3.4.2:provided
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:3.4.2:compile (optional)
+[INFO] |  +- commons-daemon:commons-daemon:jar:1.0.13:compile (optional)
+[INFO] |  \- org.fusesource.leveldbjni:leveldbjni-all:jar:1.8:compile (optional)
+[INFO] +- org.apache.hadoop:hadoop-hdfs-client:jar:3.4.2:compile (optional)
+[INFO] |  \- org.apache.httpcomponents:httpcore:jar:4.4.13:compile (optional)
+[INFO] +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-client:jar:3.4.2:compile (optional)
+[INFO] |  |  +- org.eclipse.jetty.websocket:websocket-client:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-client:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  |  \- org.eclipse.jetty:jetty-http:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  +- org.eclipse.jetty:jetty-io:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |  \- org.eclipse.jetty.websocket:websocket-common:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  |     \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  \- org.apache.hadoop:hadoop-yarn-api:jar:3.4.2:compile (optional)
+[INFO] |  +- org.apache.hadoop:hadoop-yarn-common:jar:3.4.2:compile (optional)
+[INFO] |  |  +- javax.xml.bind:jaxb-api:jar:2.2.11:compile (optional)
+[INFO] |  |  +- org.eclipse.jetty:jetty-util:jar:9.4.57.v20241219:compile (optional)
+[INFO] |  |  +- com.sun.jersey:jersey-client:jar:1.19.4:compile (optional)
+[INFO] |  |  +- com.google.inject:guice:jar:4.2.3:compile (optional)
+[INFO] |  |  |  +- javax.inject:javax.inject:jar:1:compile (optional)
+[INFO] |  |  |  \- aopalliance:aopalliance:jar:1.0:compile (optional)
+[INFO] |  |  +- com.sun.jersey.contribs:jersey-guice:jar:1.19.4:compile (optional)
+[INFO] |  |  +- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.6:compile (optional)
+[INFO] |  |  \- com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.18.6:compile (optional)
+[INFO] |  |     \- com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.18.6:compile (optional)
+[INFO] |  +- com.google.inject.extensions:guice-servlet:jar:4.2.3:compile (optional)
+[INFO] |  \- io.netty:netty-all:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-dns:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-haproxy:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-http:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-http2:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-memcache:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-mqtt:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-redis:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-smtp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-socks:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-stomp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-codec-xml:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-handler-proxy:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-handler-ssl-ocsp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-resolver-dns:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-rxtx:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-sctp:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-udt:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-classes-kqueue:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-resolver-dns-classes-macos:jar:4.1.127.Final:compile (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-epoll:jar:linux-riscv64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] |     +- io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64:4.1.127.Final:runtime (optional)
+[INFO] |     \- io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64:4.1.127.Final:runtime (optional)
+[INFO] +- org.apache.hive:hive-storage-api:jar:4.3.0-SNAPSHOT:compile
+[INFO] +- org.apache.httpcomponents.client5:httpclient5:jar:5.6.2:compile
+[INFO] |  \- org.apache.httpcomponents.core5:httpcore5-h2:jar:5.4.3:compile
+[INFO] +- org.apache.httpcomponents.core5:httpcore5:jar:5.4.3:compile
+[INFO] +- org.apache.thrift:libfb303:jar:0.9.3:compile
+[INFO] +- org.apache.thrift:libthrift:jar:0.23.0:compile
+[INFO] |  +- jakarta.servlet:jakarta.servlet-api:jar:5.0.0:runtime
+[INFO] |  \- jakarta.annotation:jakarta.annotation-api:jar:2.1.1:runtime
+[INFO] +- org.skyscreamer:jsonassert:jar:1.4.0:test
+[INFO] |  \- com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:test
+[INFO] +- org.apache.zookeeper:zookeeper:jar:3.8.4:compile
+[INFO] |  +- org.apache.zookeeper:zookeeper-jute:jar:3.8.4:compile
+[INFO] |  \- org.apache.yetus:audience-annotations:jar:0.12.0:compile
+[INFO] +- com.github.ben-manes.caffeine:caffeine:jar:2.8.4:compile
+[INFO] |  \- org.checkerframework:checker-qual:jar:3.4.0:compile
+[INFO] +- org.apache.curator:curator-recipes:jar:5.7.1:compile
+[INFO] +- org.apache.curator:curator-framework:jar:5.7.1:compile
+[INFO] |  \- org.apache.curator:curator-client:jar:5.7.1:compile
+[INFO] +- org.slf4j:slf4j-api:jar:1.7.30:compile
+[INFO] +- org.springframework.ldap:spring-ldap-core:jar:2.4.4:compile
+[INFO] |  +- org.springframework:spring-core:jar:5.3.39:compile
+[INFO] |  |  \- org.springframework:spring-jcl:jar:5.3.39:compile
+[INFO] |  +- org.springframework:spring-beans:jar:5.3.39:compile
+[INFO] |  \- org.springframework:spring-tx:jar:5.3.39:compile
+[INFO] +- junit:junit:jar:4.13.2:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- org.mockito:mockito-core:jar:5.17.0:test
+[INFO] |  +- net.bytebuddy:byte-buddy:jar:1.15.11:test
+[INFO] |  +- net.bytebuddy:byte-buddy-agent:jar:1.15.11:test
+[INFO] |  \- org.objenesis:objenesis:jar:3.3:test
+[INFO] \- org.slf4j:slf4j-simple:jar:1.7.30:test
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time:  1.535 s
+[INFO] Finished at: 2026-07-27T17:36:47+02:00
+[INFO] ------------------------------------------------------------------------
+[INFO] 1 goals, 1 executed
+[WARNING] 
+[WARNING] 1 build scan custom value was not captured:
+[WARNING]  - Maximum custom value value length (100,000) exceeded: Git status
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index 640e68d8ad18..a0accf5d6e64 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -239,6 +239,16 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-storage-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
+      <version>${httpcomponents5.client.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
+      <version>${httpcomponents5.core.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libfb303</artifactId>
@@ -246,6 +256,7 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <version>${libthrift.version}</version>
     </dependency>
     <dependency>
       <groupId>org.skyscreamer</groupId>
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService.cpp
new file mode 100644
index 000000000000..6db1b83cf66b
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService.cpp
@@ -0,0 +1,4476 @@
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#include "FacebookService.h"
+
+namespace facebook { namespace fb303 {
+
+
+FacebookService_getName_args::~FacebookService_getName_args() noexcept {
+}
+
+FacebookService_getName_args::FacebookService_getName_args() noexcept {
+}
+
+uint32_t FacebookService_getName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getName_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getName_pargs::~FacebookService_getName_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getName_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getName_result::~FacebookService_getName_result() noexcept {
+}
+
+FacebookService_getName_result::FacebookService_getName_result() noexcept
+   : success() {
+}
+
+uint32_t FacebookService_getName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getName_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getName_presult::~FacebookService_getName_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getVersion_args::~FacebookService_getVersion_args() noexcept {
+}
+
+FacebookService_getVersion_args::FacebookService_getVersion_args() noexcept {
+}
+
+uint32_t FacebookService_getVersion_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getVersion_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getVersion_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getVersion_pargs::~FacebookService_getVersion_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getVersion_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getVersion_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getVersion_result::~FacebookService_getVersion_result() noexcept {
+}
+
+FacebookService_getVersion_result::FacebookService_getVersion_result() noexcept
+   : success() {
+}
+
+uint32_t FacebookService_getVersion_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getVersion_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getVersion_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getVersion_presult::~FacebookService_getVersion_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getVersion_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getStatus_args::~FacebookService_getStatus_args() noexcept {
+}
+
+FacebookService_getStatus_args::FacebookService_getStatus_args() noexcept {
+}
+
+uint32_t FacebookService_getStatus_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getStatus_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getStatus_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getStatus_pargs::~FacebookService_getStatus_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getStatus_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getStatus_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getStatus_result::~FacebookService_getStatus_result() noexcept {
+}
+
+FacebookService_getStatus_result::FacebookService_getStatus_result() noexcept
+   : success(static_cast<fb_status::type>(0)) {
+}
+
+uint32_t FacebookService_getStatus_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast0;
+          xfer += iprot->readI32(ecast0);
+          this->success = static_cast<fb_status::type>(ecast0);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getStatus_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getStatus_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_I32, 0);
+    xfer += oprot->writeI32(static_cast<int32_t>(this->success));
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getStatus_presult::~FacebookService_getStatus_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getStatus_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast1;
+          xfer += iprot->readI32(ecast1);
+          (*(this->success)) = static_cast<fb_status::type>(ecast1);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getStatusDetails_args::~FacebookService_getStatusDetails_args() noexcept {
+}
+
+FacebookService_getStatusDetails_args::FacebookService_getStatusDetails_args() noexcept {
+}
+
+uint32_t FacebookService_getStatusDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getStatusDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getStatusDetails_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getStatusDetails_pargs::~FacebookService_getStatusDetails_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getStatusDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getStatusDetails_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getStatusDetails_result::~FacebookService_getStatusDetails_result() noexcept {
+}
+
+FacebookService_getStatusDetails_result::FacebookService_getStatusDetails_result() noexcept
+   : success() {
+}
+
+uint32_t FacebookService_getStatusDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getStatusDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getStatusDetails_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getStatusDetails_presult::~FacebookService_getStatusDetails_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getStatusDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getCounters_args::~FacebookService_getCounters_args() noexcept {
+}
+
+FacebookService_getCounters_args::FacebookService_getCounters_args() noexcept {
+}
+
+uint32_t FacebookService_getCounters_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getCounters_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getCounters_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCounters_pargs::~FacebookService_getCounters_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getCounters_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getCounters_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCounters_result::~FacebookService_getCounters_result() noexcept {
+}
+
+FacebookService_getCounters_result::FacebookService_getCounters_result() noexcept {
+}
+
+uint32_t FacebookService_getCounters_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            this->success.clear();
+            uint32_t _size2;
+            ::apache::thrift::protocol::TType _ktype3;
+            ::apache::thrift::protocol::TType _vtype4;
+            xfer += iprot->readMapBegin(_ktype3, _vtype4, _size2);
+            uint32_t _i6;
+            for (_i6 = 0; _i6 < _size2; ++_i6)
+            {
+              std::string _key7;
+              xfer += iprot->readString(_key7);
+              int64_t& _val8 = this->success[_key7];
+              xfer += iprot->readI64(_val8);
+            }
+            xfer += iprot->readMapEnd();
+          }
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getCounters_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getCounters_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
+    {
+      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->success.size()));
+      std::map<std::string, int64_t> ::const_iterator _iter9;
+      for (_iter9 = this->success.begin(); _iter9 != this->success.end(); ++_iter9)
+      {
+        xfer += oprot->writeString(_iter9->first);
+        xfer += oprot->writeI64(_iter9->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCounters_presult::~FacebookService_getCounters_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getCounters_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size10;
+            ::apache::thrift::protocol::TType _ktype11;
+            ::apache::thrift::protocol::TType _vtype12;
+            xfer += iprot->readMapBegin(_ktype11, _vtype12, _size10);
+            uint32_t _i14;
+            for (_i14 = 0; _i14 < _size10; ++_i14)
+            {
+              std::string _key15;
+              xfer += iprot->readString(_key15);
+              int64_t& _val16 = (*(this->success))[_key15];
+              xfer += iprot->readI64(_val16);
+            }
+            xfer += iprot->readMapEnd();
+          }
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getCounter_args::~FacebookService_getCounter_args() noexcept {
+}
+
+FacebookService_getCounter_args::FacebookService_getCounter_args() noexcept
+   : key() {
+}
+
+uint32_t FacebookService_getCounter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->key);
+          this->__isset.key = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getCounter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getCounter_args");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->key);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCounter_pargs::~FacebookService_getCounter_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getCounter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getCounter_pargs");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->key)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCounter_result::~FacebookService_getCounter_result() noexcept {
+}
+
+FacebookService_getCounter_result::FacebookService_getCounter_result() noexcept
+   : success(0) {
+}
+
+uint32_t FacebookService_getCounter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getCounter_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getCounter_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_I64, 0);
+    xfer += oprot->writeI64(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCounter_presult::~FacebookService_getCounter_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getCounter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_setOption_args::~FacebookService_setOption_args() noexcept {
+}
+
+FacebookService_setOption_args::FacebookService_setOption_args() noexcept
+   : key(),
+     value() {
+}
+
+uint32_t FacebookService_setOption_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->key);
+          this->__isset.key = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->value);
+          this->__isset.value = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_setOption_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_setOption_args");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->key);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->value);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_setOption_pargs::~FacebookService_setOption_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_setOption_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_setOption_pargs");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->key)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->value)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_setOption_result::~FacebookService_setOption_result() noexcept {
+}
+
+FacebookService_setOption_result::FacebookService_setOption_result() noexcept {
+}
+
+uint32_t FacebookService_setOption_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_setOption_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_setOption_result");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_setOption_presult::~FacebookService_setOption_presult() noexcept {
+}
+
+
+uint32_t FacebookService_setOption_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getOption_args::~FacebookService_getOption_args() noexcept {
+}
+
+FacebookService_getOption_args::FacebookService_getOption_args() noexcept
+   : key() {
+}
+
+uint32_t FacebookService_getOption_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->key);
+          this->__isset.key = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getOption_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getOption_args");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->key);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getOption_pargs::~FacebookService_getOption_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getOption_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getOption_pargs");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->key)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getOption_result::~FacebookService_getOption_result() noexcept {
+}
+
+FacebookService_getOption_result::FacebookService_getOption_result() noexcept
+   : success() {
+}
+
+uint32_t FacebookService_getOption_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getOption_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getOption_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getOption_presult::~FacebookService_getOption_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getOption_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getOptions_args::~FacebookService_getOptions_args() noexcept {
+}
+
+FacebookService_getOptions_args::FacebookService_getOptions_args() noexcept {
+}
+
+uint32_t FacebookService_getOptions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getOptions_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getOptions_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getOptions_pargs::~FacebookService_getOptions_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getOptions_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getOptions_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getOptions_result::~FacebookService_getOptions_result() noexcept {
+}
+
+FacebookService_getOptions_result::FacebookService_getOptions_result() noexcept {
+}
+
+uint32_t FacebookService_getOptions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            this->success.clear();
+            uint32_t _size17;
+            ::apache::thrift::protocol::TType _ktype18;
+            ::apache::thrift::protocol::TType _vtype19;
+            xfer += iprot->readMapBegin(_ktype18, _vtype19, _size17);
+            uint32_t _i21;
+            for (_i21 = 0; _i21 < _size17; ++_i21)
+            {
+              std::string _key22;
+              xfer += iprot->readString(_key22);
+              std::string& _val23 = this->success[_key22];
+              xfer += iprot->readString(_val23);
+            }
+            xfer += iprot->readMapEnd();
+          }
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getOptions_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getOptions_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
+    {
+      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
+      std::map<std::string, std::string> ::const_iterator _iter24;
+      for (_iter24 = this->success.begin(); _iter24 != this->success.end(); ++_iter24)
+      {
+        xfer += oprot->writeString(_iter24->first);
+        xfer += oprot->writeString(_iter24->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getOptions_presult::~FacebookService_getOptions_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getOptions_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size25;
+            ::apache::thrift::protocol::TType _ktype26;
+            ::apache::thrift::protocol::TType _vtype27;
+            xfer += iprot->readMapBegin(_ktype26, _vtype27, _size25);
+            uint32_t _i29;
+            for (_i29 = 0; _i29 < _size25; ++_i29)
+            {
+              std::string _key30;
+              xfer += iprot->readString(_key30);
+              std::string& _val31 = (*(this->success))[_key30];
+              xfer += iprot->readString(_val31);
+            }
+            xfer += iprot->readMapEnd();
+          }
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_getCpuProfile_args::~FacebookService_getCpuProfile_args() noexcept {
+}
+
+FacebookService_getCpuProfile_args::FacebookService_getCpuProfile_args() noexcept
+   : profileDurationInSec(0) {
+}
+
+uint32_t FacebookService_getCpuProfile_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->profileDurationInSec);
+          this->__isset.profileDurationInSec = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getCpuProfile_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getCpuProfile_args");
+
+  xfer += oprot->writeFieldBegin("profileDurationInSec", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->profileDurationInSec);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCpuProfile_pargs::~FacebookService_getCpuProfile_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_getCpuProfile_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_getCpuProfile_pargs");
+
+  xfer += oprot->writeFieldBegin("profileDurationInSec", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32((*(this->profileDurationInSec)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCpuProfile_result::~FacebookService_getCpuProfile_result() noexcept {
+}
+
+FacebookService_getCpuProfile_result::FacebookService_getCpuProfile_result() noexcept
+   : success() {
+}
+
+uint32_t FacebookService_getCpuProfile_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_getCpuProfile_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_getCpuProfile_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_getCpuProfile_presult::~FacebookService_getCpuProfile_presult() noexcept {
+}
+
+
+uint32_t FacebookService_getCpuProfile_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_aliveSince_args::~FacebookService_aliveSince_args() noexcept {
+}
+
+FacebookService_aliveSince_args::FacebookService_aliveSince_args() noexcept {
+}
+
+uint32_t FacebookService_aliveSince_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_aliveSince_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_aliveSince_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_aliveSince_pargs::~FacebookService_aliveSince_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_aliveSince_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_aliveSince_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_aliveSince_result::~FacebookService_aliveSince_result() noexcept {
+}
+
+FacebookService_aliveSince_result::FacebookService_aliveSince_result() noexcept
+   : success(0) {
+}
+
+uint32_t FacebookService_aliveSince_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_aliveSince_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("FacebookService_aliveSince_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_I64, 0);
+    xfer += oprot->writeI64(this->success);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_aliveSince_presult::~FacebookService_aliveSince_presult() noexcept {
+}
+
+
+uint32_t FacebookService_aliveSince_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+
+FacebookService_reinitialize_args::~FacebookService_reinitialize_args() noexcept {
+}
+
+FacebookService_reinitialize_args::FacebookService_reinitialize_args() noexcept {
+}
+
+uint32_t FacebookService_reinitialize_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_reinitialize_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_reinitialize_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_reinitialize_pargs::~FacebookService_reinitialize_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_reinitialize_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_reinitialize_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_shutdown_args::~FacebookService_shutdown_args() noexcept {
+}
+
+FacebookService_shutdown_args::FacebookService_shutdown_args() noexcept {
+}
+
+uint32_t FacebookService_shutdown_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t FacebookService_shutdown_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_shutdown_args");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+
+FacebookService_shutdown_pargs::~FacebookService_shutdown_pargs() noexcept {
+}
+
+
+uint32_t FacebookService_shutdown_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FacebookService_shutdown_pargs");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void FacebookServiceClient::getName(std::string& _return)
+{
+  send_getName();
+  recv_getName(_return);
+}
+
+void FacebookServiceClient::send_getName()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getName", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getName_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getName(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getName") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getName_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getName failed: unknown result");
+}
+
+void FacebookServiceClient::getVersion(std::string& _return)
+{
+  send_getVersion();
+  recv_getVersion(_return);
+}
+
+void FacebookServiceClient::send_getVersion()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getVersion", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getVersion_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getVersion(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getVersion") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getVersion_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getVersion failed: unknown result");
+}
+
+fb_status::type FacebookServiceClient::getStatus()
+{
+  send_getStatus();
+  return recv_getStatus();
+}
+
+void FacebookServiceClient::send_getStatus()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getStatus", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getStatus_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+fb_status::type FacebookServiceClient::recv_getStatus()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getStatus") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  fb_status::type _return;
+  FacebookService_getStatus_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getStatus failed: unknown result");
+}
+
+void FacebookServiceClient::getStatusDetails(std::string& _return)
+{
+  send_getStatusDetails();
+  recv_getStatusDetails(_return);
+}
+
+void FacebookServiceClient::send_getStatusDetails()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getStatusDetails", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getStatusDetails_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getStatusDetails(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getStatusDetails") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getStatusDetails_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getStatusDetails failed: unknown result");
+}
+
+void FacebookServiceClient::getCounters(std::map<std::string, int64_t> & _return)
+{
+  send_getCounters();
+  recv_getCounters(_return);
+}
+
+void FacebookServiceClient::send_getCounters()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getCounters", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getCounters_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getCounters(std::map<std::string, int64_t> & _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getCounters") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getCounters_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getCounters failed: unknown result");
+}
+
+int64_t FacebookServiceClient::getCounter(const std::string& key)
+{
+  send_getCounter(key);
+  return recv_getCounter();
+}
+
+void FacebookServiceClient::send_getCounter(const std::string& key)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getCounter", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getCounter_pargs args;
+  args.key = &key;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+int64_t FacebookServiceClient::recv_getCounter()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getCounter") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  int64_t _return;
+  FacebookService_getCounter_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getCounter failed: unknown result");
+}
+
+void FacebookServiceClient::setOption(const std::string& key, const std::string& value)
+{
+  send_setOption(key, value);
+  recv_setOption();
+}
+
+void FacebookServiceClient::send_setOption(const std::string& key, const std::string& value)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("setOption", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_setOption_pargs args;
+  args.key = &key;
+  args.value = &value;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_setOption()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("setOption") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_setOption_presult result;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  return;
+}
+
+void FacebookServiceClient::getOption(std::string& _return, const std::string& key)
+{
+  send_getOption(key);
+  recv_getOption(_return);
+}
+
+void FacebookServiceClient::send_getOption(const std::string& key)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getOption", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getOption_pargs args;
+  args.key = &key;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getOption(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getOption") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getOption_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getOption failed: unknown result");
+}
+
+void FacebookServiceClient::getOptions(std::map<std::string, std::string> & _return)
+{
+  send_getOptions();
+  recv_getOptions(_return);
+}
+
+void FacebookServiceClient::send_getOptions()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getOptions", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getOptions_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getOptions(std::map<std::string, std::string> & _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getOptions") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getOptions_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getOptions failed: unknown result");
+}
+
+void FacebookServiceClient::getCpuProfile(std::string& _return, const int32_t profileDurationInSec)
+{
+  send_getCpuProfile(profileDurationInSec);
+  recv_getCpuProfile(_return);
+}
+
+void FacebookServiceClient::send_getCpuProfile(const int32_t profileDurationInSec)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("getCpuProfile", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getCpuProfile_pargs args;
+  args.profileDurationInSec = &profileDurationInSec;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::recv_getCpuProfile(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("getCpuProfile") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  FacebookService_getCpuProfile_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getCpuProfile failed: unknown result");
+}
+
+int64_t FacebookServiceClient::aliveSince()
+{
+  send_aliveSince();
+  return recv_aliveSince();
+}
+
+void FacebookServiceClient::send_aliveSince()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("aliveSince", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_aliveSince_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+int64_t FacebookServiceClient::recv_aliveSince()
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("aliveSince") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  int64_t _return;
+  FacebookService_aliveSince_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    return _return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "aliveSince failed: unknown result");
+}
+
+void FacebookServiceClient::reinitialize()
+{
+  send_reinitialize();
+}
+
+void FacebookServiceClient::send_reinitialize()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("reinitialize", ::apache::thrift::protocol::T_ONEWAY, cseqid);
+
+  FacebookService_reinitialize_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void FacebookServiceClient::shutdown()
+{
+  send_shutdown();
+}
+
+void FacebookServiceClient::send_shutdown()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("shutdown", ::apache::thrift::protocol::T_ONEWAY, cseqid);
+
+  FacebookService_shutdown_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+bool FacebookServiceProcessor::dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext) {
+  ProcessMap::iterator pfn;
+  pfn = processMap_.find(fname);
+  if (pfn == processMap_.end()) {
+    iprot->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot->readMessageEnd();
+    iprot->getTransport()->readEnd();
+    ::apache::thrift::TApplicationException x(::apache::thrift::TApplicationException::UNKNOWN_METHOD, "Invalid method name: '"+fname+"'");
+    oprot->writeMessageBegin(fname, ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return true;
+  }
+  (this->*(pfn->second))(seqid, iprot, oprot, callContext);
+  return true;
+}
+
+void FacebookServiceProcessor::process_getName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getName", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getName");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getName");
+  }
+
+  FacebookService_getName_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getName", bytes);
+  }
+
+  FacebookService_getName_result result;
+  try {
+    iface_->getName(result.success);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getName");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getName", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getName");
+  }
+
+  oprot->writeMessageBegin("getName", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getName", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getVersion", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getVersion");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getVersion");
+  }
+
+  FacebookService_getVersion_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getVersion", bytes);
+  }
+
+  FacebookService_getVersion_result result;
+  try {
+    iface_->getVersion(result.success);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getVersion");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getVersion", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getVersion");
+  }
+
+  oprot->writeMessageBegin("getVersion", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getVersion", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getStatus(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getStatus", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getStatus");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getStatus");
+  }
+
+  FacebookService_getStatus_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getStatus", bytes);
+  }
+
+  FacebookService_getStatus_result result;
+  try {
+    result.success = iface_->getStatus();
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getStatus");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getStatus", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getStatus");
+  }
+
+  oprot->writeMessageBegin("getStatus", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getStatus", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getStatusDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getStatusDetails", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getStatusDetails");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getStatusDetails");
+  }
+
+  FacebookService_getStatusDetails_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getStatusDetails", bytes);
+  }
+
+  FacebookService_getStatusDetails_result result;
+  try {
+    iface_->getStatusDetails(result.success);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getStatusDetails");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getStatusDetails", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getStatusDetails");
+  }
+
+  oprot->writeMessageBegin("getStatusDetails", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getStatusDetails", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getCounters(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getCounters", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getCounters");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getCounters");
+  }
+
+  FacebookService_getCounters_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getCounters", bytes);
+  }
+
+  FacebookService_getCounters_result result;
+  try {
+    iface_->getCounters(result.success);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getCounters");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getCounters", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getCounters");
+  }
+
+  oprot->writeMessageBegin("getCounters", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getCounters", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getCounter(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getCounter", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getCounter");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getCounter");
+  }
+
+  FacebookService_getCounter_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getCounter", bytes);
+  }
+
+  FacebookService_getCounter_result result;
+  try {
+    result.success = iface_->getCounter(args.key);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getCounter");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getCounter", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getCounter");
+  }
+
+  oprot->writeMessageBegin("getCounter", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getCounter", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_setOption(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.setOption", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.setOption");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.setOption");
+  }
+
+  FacebookService_setOption_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.setOption", bytes);
+  }
+
+  FacebookService_setOption_result result;
+  try {
+    iface_->setOption(args.key, args.value);
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.setOption");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("setOption", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.setOption");
+  }
+
+  oprot->writeMessageBegin("setOption", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.setOption", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getOption(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getOption", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getOption");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getOption");
+  }
+
+  FacebookService_getOption_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getOption", bytes);
+  }
+
+  FacebookService_getOption_result result;
+  try {
+    iface_->getOption(result.success, args.key);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getOption");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getOption", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getOption");
+  }
+
+  oprot->writeMessageBegin("getOption", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getOption", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getOptions(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getOptions", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getOptions");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getOptions");
+  }
+
+  FacebookService_getOptions_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getOptions", bytes);
+  }
+
+  FacebookService_getOptions_result result;
+  try {
+    iface_->getOptions(result.success);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getOptions");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getOptions", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getOptions");
+  }
+
+  oprot->writeMessageBegin("getOptions", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getOptions", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_getCpuProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.getCpuProfile", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.getCpuProfile");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.getCpuProfile");
+  }
+
+  FacebookService_getCpuProfile_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.getCpuProfile", bytes);
+  }
+
+  FacebookService_getCpuProfile_result result;
+  try {
+    iface_->getCpuProfile(result.success, args.profileDurationInSec);
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.getCpuProfile");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("getCpuProfile", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.getCpuProfile");
+  }
+
+  oprot->writeMessageBegin("getCpuProfile", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.getCpuProfile", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_aliveSince(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.aliveSince", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.aliveSince");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.aliveSince");
+  }
+
+  FacebookService_aliveSince_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.aliveSince", bytes);
+  }
+
+  FacebookService_aliveSince_result result;
+  try {
+    result.success = iface_->aliveSince();
+    result.__isset.success = true;
+  } catch (const std::exception& e) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.aliveSince");
+    }
+
+    ::apache::thrift::TApplicationException x(e.what());
+    oprot->writeMessageBegin("aliveSince", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    x.write(oprot);
+    oprot->writeMessageEnd();
+    oprot->getTransport()->writeEnd();
+    oprot->getTransport()->flush();
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preWrite(ctx, "FacebookService.aliveSince");
+  }
+
+  oprot->writeMessageBegin("aliveSince", ::apache::thrift::protocol::T_REPLY, seqid);
+  result.write(oprot);
+  oprot->writeMessageEnd();
+  bytes = oprot->getTransport()->writeEnd();
+  oprot->getTransport()->flush();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postWrite(ctx, "FacebookService.aliveSince", bytes);
+  }
+}
+
+void FacebookServiceProcessor::process_reinitialize(int32_t, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol*, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.reinitialize", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.reinitialize");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.reinitialize");
+  }
+
+  FacebookService_reinitialize_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.reinitialize", bytes);
+  }
+
+  try {
+    iface_->reinitialize();
+  } catch (const std::exception&) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.reinitialize");
+    }
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->asyncComplete(ctx, "FacebookService.reinitialize");
+  }
+
+  return;
+}
+
+void FacebookServiceProcessor::process_shutdown(int32_t, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol*, void* callContext)
+{
+  void* ctx = nullptr;
+  if (this->eventHandler_.get() != nullptr) {
+    ctx = this->eventHandler_->getContext("FacebookService.shutdown", callContext);
+  }
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "FacebookService.shutdown");
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->preRead(ctx, "FacebookService.shutdown");
+  }
+
+  FacebookService_shutdown_args args;
+  args.read(iprot);
+  iprot->readMessageEnd();
+  uint32_t bytes = iprot->getTransport()->readEnd();
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->postRead(ctx, "FacebookService.shutdown", bytes);
+  }
+
+  try {
+    iface_->shutdown();
+  } catch (const std::exception&) {
+    if (this->eventHandler_.get() != nullptr) {
+      this->eventHandler_->handlerError(ctx, "FacebookService.shutdown");
+    }
+    return;
+  }
+
+  if (this->eventHandler_.get() != nullptr) {
+    this->eventHandler_->asyncComplete(ctx, "FacebookService.shutdown");
+  }
+
+  return;
+}
+
+::std::shared_ptr< ::apache::thrift::TProcessor > FacebookServiceProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) {
+  ::apache::thrift::ReleaseHandler< FacebookServiceIfFactory > cleanup(handlerFactory_);
+  ::std::shared_ptr< FacebookServiceIf > handler(handlerFactory_->getHandler(connInfo), cleanup);
+  ::std::shared_ptr< ::apache::thrift::TProcessor > processor(new FacebookServiceProcessor(handler));
+  return processor;
+}
+
+void FacebookServiceConcurrentClient::getName(std::string& _return)
+{
+  int32_t seqid = send_getName();
+  recv_getName(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getName()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getName", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getName_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getName(std::string& _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getName") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getName_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getName failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::getVersion(std::string& _return)
+{
+  int32_t seqid = send_getVersion();
+  recv_getVersion(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getVersion()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getVersion", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getVersion_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getVersion(std::string& _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getVersion") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getVersion_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getVersion failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+fb_status::type FacebookServiceConcurrentClient::getStatus()
+{
+  int32_t seqid = send_getStatus();
+  return recv_getStatus(seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getStatus()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getStatus", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getStatus_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+fb_status::type FacebookServiceConcurrentClient::recv_getStatus(const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getStatus") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      fb_status::type _return;
+      FacebookService_getStatus_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        sentry.commit();
+        return _return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getStatus failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::getStatusDetails(std::string& _return)
+{
+  int32_t seqid = send_getStatusDetails();
+  recv_getStatusDetails(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getStatusDetails()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getStatusDetails", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getStatusDetails_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getStatusDetails(std::string& _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getStatusDetails") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getStatusDetails_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getStatusDetails failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::getCounters(std::map<std::string, int64_t> & _return)
+{
+  int32_t seqid = send_getCounters();
+  recv_getCounters(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getCounters()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getCounters", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getCounters_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getCounters(std::map<std::string, int64_t> & _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getCounters") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getCounters_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getCounters failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+int64_t FacebookServiceConcurrentClient::getCounter(const std::string& key)
+{
+  int32_t seqid = send_getCounter(key);
+  return recv_getCounter(seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getCounter(const std::string& key)
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getCounter", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getCounter_pargs args;
+  args.key = &key;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+int64_t FacebookServiceConcurrentClient::recv_getCounter(const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getCounter") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      int64_t _return;
+      FacebookService_getCounter_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        sentry.commit();
+        return _return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getCounter failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::setOption(const std::string& key, const std::string& value)
+{
+  int32_t seqid = send_setOption(key, value);
+  recv_setOption(seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_setOption(const std::string& key, const std::string& value)
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("setOption", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_setOption_pargs args;
+  args.key = &key;
+  args.value = &value;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_setOption(const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("setOption") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_setOption_presult result;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      sentry.commit();
+      return;
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::getOption(std::string& _return, const std::string& key)
+{
+  int32_t seqid = send_getOption(key);
+  recv_getOption(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getOption(const std::string& key)
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getOption", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getOption_pargs args;
+  args.key = &key;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getOption(std::string& _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getOption") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getOption_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getOption failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::getOptions(std::map<std::string, std::string> & _return)
+{
+  int32_t seqid = send_getOptions();
+  recv_getOptions(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getOptions()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getOptions", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getOptions_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getOptions(std::map<std::string, std::string> & _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getOptions") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getOptions_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getOptions failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::getCpuProfile(std::string& _return, const int32_t profileDurationInSec)
+{
+  int32_t seqid = send_getCpuProfile(profileDurationInSec);
+  recv_getCpuProfile(_return, seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_getCpuProfile(const int32_t profileDurationInSec)
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("getCpuProfile", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_getCpuProfile_pargs args;
+  args.profileDurationInSec = &profileDurationInSec;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+void FacebookServiceConcurrentClient::recv_getCpuProfile(std::string& _return, const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("getCpuProfile") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      FacebookService_getCpuProfile_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        // _return pointer has now been filled
+        sentry.commit();
+        return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getCpuProfile failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+int64_t FacebookServiceConcurrentClient::aliveSince()
+{
+  int32_t seqid = send_aliveSince();
+  return recv_aliveSince(seqid);
+}
+
+int32_t FacebookServiceConcurrentClient::send_aliveSince()
+{
+  int32_t cseqid = this->sync_->generateSeqId();
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("aliveSince", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  FacebookService_aliveSince_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+  return cseqid;
+}
+
+int64_t FacebookServiceConcurrentClient::recv_aliveSince(const int32_t seqid)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  // the read mutex gets dropped and reacquired as part of waitForWork()
+  // The destructor of this sentry wakes up other clients
+  ::apache::thrift::async::TConcurrentRecvSentry sentry(this->sync_.get(), seqid);
+
+  while(true) {
+    if(!this->sync_->getPending(fname, mtype, rseqid)) {
+      iprot_->readMessageBegin(fname, mtype, rseqid);
+    }
+    if(seqid == rseqid) {
+      if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+        ::apache::thrift::TApplicationException x;
+        x.read(iprot_);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+        sentry.commit();
+        throw x;
+      }
+      if (mtype != ::apache::thrift::protocol::T_REPLY) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+      }
+      if (fname.compare("aliveSince") != 0) {
+        iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+        iprot_->readMessageEnd();
+        iprot_->getTransport()->readEnd();
+
+        // in a bad state, don't commit
+        using ::apache::thrift::protocol::TProtocolException;
+        throw TProtocolException(TProtocolException::INVALID_DATA);
+      }
+      int64_t _return;
+      FacebookService_aliveSince_presult result;
+      result.success = &_return;
+      result.read(iprot_);
+      iprot_->readMessageEnd();
+      iprot_->getTransport()->readEnd();
+
+      if (result.__isset.success) {
+        sentry.commit();
+        return _return;
+      }
+      // in a bad state, don't commit
+      throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "aliveSince failed: unknown result");
+    }
+    // seqid != rseqid
+    this->sync_->updatePending(fname, mtype, rseqid);
+
+    // this will temporarily unlock the readMutex, and let other clients get work done
+    this->sync_->waitForWork(seqid);
+  } // end while(true)
+}
+
+void FacebookServiceConcurrentClient::reinitialize()
+{
+  send_reinitialize();
+}
+
+void FacebookServiceConcurrentClient::send_reinitialize()
+{
+  int32_t cseqid = 0;
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("reinitialize", ::apache::thrift::protocol::T_ONEWAY, cseqid);
+
+  FacebookService_reinitialize_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+}
+
+void FacebookServiceConcurrentClient::shutdown()
+{
+  send_shutdown();
+}
+
+void FacebookServiceConcurrentClient::send_shutdown()
+{
+  int32_t cseqid = 0;
+  ::apache::thrift::async::TConcurrentSendSentry sentry(this->sync_.get());
+  oprot_->writeMessageBegin("shutdown", ::apache::thrift::protocol::T_ONEWAY, cseqid);
+
+  FacebookService_shutdown_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+
+  sentry.commit();
+}
+
+}} // namespace
+
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService.h
new file mode 100644
index 000000000000..d53c459ac4d9
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService.h
@@ -0,0 +1,1673 @@
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#ifndef FacebookService_H
+#define FacebookService_H
+
+#include <thrift/TDispatchProcessor.h>
+#include <thrift/async/TConcurrentClientSyncInfo.h>
+#include <memory>
+#include "fb303_types.h"
+
+namespace facebook { namespace fb303 {
+
+#ifdef _MSC_VER
+  #pragma warning( push )
+  #pragma warning (disable : 4250 ) //inheriting methods via dominance 
+#endif
+
+/**
+ * Standard base service
+ */
+class FacebookServiceIf {
+ public:
+  virtual ~FacebookServiceIf() {}
+
+  /**
+   * Returns a descriptive name of the service
+   */
+  virtual void getName(std::string& _return) = 0;
+
+  /**
+   * Returns the version of the service
+   */
+  virtual void getVersion(std::string& _return) = 0;
+
+  /**
+   * Gets the status of this service
+   */
+  virtual fb_status::type getStatus() = 0;
+
+  /**
+   * User friendly description of status, such as why the service is in
+   * the dead or warning state, or what is being started or stopped.
+   */
+  virtual void getStatusDetails(std::string& _return) = 0;
+
+  /**
+   * Gets the counters for this service
+   */
+  virtual void getCounters(std::map<std::string, int64_t> & _return) = 0;
+
+  /**
+   * Gets the value of a single counter
+   * 
+   * @param key
+   */
+  virtual int64_t getCounter(const std::string& key) = 0;
+
+  /**
+   * Sets an option
+   * 
+   * @param key
+   * @param value
+   */
+  virtual void setOption(const std::string& key, const std::string& value) = 0;
+
+  /**
+   * Gets an option
+   * 
+   * @param key
+   */
+  virtual void getOption(std::string& _return, const std::string& key) = 0;
+
+  /**
+   * Gets all options
+   */
+  virtual void getOptions(std::map<std::string, std::string> & _return) = 0;
+
+  /**
+   * Returns a CPU profile over the given time interval (client and server
+   * must agree on the profile format).
+   * 
+   * @param profileDurationInSec
+   */
+  virtual void getCpuProfile(std::string& _return, const int32_t profileDurationInSec) = 0;
+
+  /**
+   * Returns the unix time that the server has been running since
+   */
+  virtual int64_t aliveSince() = 0;
+
+  /**
+   * Tell the server to reload its configuration, reopen log files, etc
+   */
+  virtual void reinitialize() = 0;
+
+  /**
+   * Suggest a shutdown to the server
+   */
+  virtual void shutdown() = 0;
+};
+
+class FacebookServiceIfFactory {
+ public:
+  typedef FacebookServiceIf Handler;
+
+  virtual ~FacebookServiceIfFactory() {}
+
+  virtual FacebookServiceIf* getHandler(const ::apache::thrift::TConnectionInfo& connInfo) = 0;
+  virtual void releaseHandler(FacebookServiceIf* /* handler */) = 0;
+  };
+
+class FacebookServiceIfSingletonFactory : virtual public FacebookServiceIfFactory {
+ public:
+  FacebookServiceIfSingletonFactory(const ::std::shared_ptr<FacebookServiceIf>& iface) : iface_(iface) {}
+  virtual ~FacebookServiceIfSingletonFactory() {}
+
+  virtual FacebookServiceIf* getHandler(const ::apache::thrift::TConnectionInfo&) override {
+    return iface_.get();
+  }
+  virtual void releaseHandler(FacebookServiceIf* /* handler */) override {}
+
+ protected:
+  ::std::shared_ptr<FacebookServiceIf> iface_;
+};
+
+class FacebookServiceNull : virtual public FacebookServiceIf {
+ public:
+  virtual ~FacebookServiceNull() {}
+  void getName(std::string& /* _return */) override {
+    return;
+  }
+  void getVersion(std::string& /* _return */) override {
+    return;
+  }
+  fb_status::type getStatus() override {
+    fb_status::type _return = static_cast<fb_status::type>(0);
+    return _return;
+  }
+  void getStatusDetails(std::string& /* _return */) override {
+    return;
+  }
+  void getCounters(std::map<std::string, int64_t> & /* _return */) override {
+    return;
+  }
+  int64_t getCounter(const std::string& /* key */) override {
+    int64_t _return = 0;
+    return _return;
+  }
+  void setOption(const std::string& /* key */, const std::string& /* value */) override {
+    return;
+  }
+  void getOption(std::string& /* _return */, const std::string& /* key */) override {
+    return;
+  }
+  void getOptions(std::map<std::string, std::string> & /* _return */) override {
+    return;
+  }
+  void getCpuProfile(std::string& /* _return */, const int32_t /* profileDurationInSec */) override {
+    return;
+  }
+  int64_t aliveSince() override {
+    int64_t _return = 0;
+    return _return;
+  }
+  void reinitialize() override {
+    return;
+  }
+  void shutdown() override {
+    return;
+  }
+};
+
+
+class FacebookService_getName_args {
+ public:
+
+  FacebookService_getName_args(const FacebookService_getName_args&) noexcept;
+  FacebookService_getName_args& operator=(const FacebookService_getName_args&) noexcept;
+  FacebookService_getName_args() noexcept;
+
+  virtual ~FacebookService_getName_args() noexcept;
+
+  bool operator == (const FacebookService_getName_args & /* rhs */) const;
+  bool operator != (const FacebookService_getName_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getName_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getName_pargs {
+ public:
+
+
+  virtual ~FacebookService_getName_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getName_result__isset {
+  _FacebookService_getName_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getName_result__isset;
+
+class FacebookService_getName_result {
+ public:
+
+  FacebookService_getName_result(const FacebookService_getName_result&);
+  FacebookService_getName_result& operator=(const FacebookService_getName_result&);
+  FacebookService_getName_result() noexcept;
+
+  virtual ~FacebookService_getName_result() noexcept;
+  std::string success;
+
+  _FacebookService_getName_result__isset __isset;
+
+  void __set_success(const std::string& val);
+
+  bool operator == (const FacebookService_getName_result & rhs) const;
+  bool operator != (const FacebookService_getName_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getName_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getName_presult__isset {
+  _FacebookService_getName_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getName_presult__isset;
+
+class FacebookService_getName_presult {
+ public:
+
+
+  virtual ~FacebookService_getName_presult() noexcept;
+  std::string* success;
+
+  _FacebookService_getName_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_getVersion_args {
+ public:
+
+  FacebookService_getVersion_args(const FacebookService_getVersion_args&) noexcept;
+  FacebookService_getVersion_args& operator=(const FacebookService_getVersion_args&) noexcept;
+  FacebookService_getVersion_args() noexcept;
+
+  virtual ~FacebookService_getVersion_args() noexcept;
+
+  bool operator == (const FacebookService_getVersion_args & /* rhs */) const;
+  bool operator != (const FacebookService_getVersion_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getVersion_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getVersion_pargs {
+ public:
+
+
+  virtual ~FacebookService_getVersion_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getVersion_result__isset {
+  _FacebookService_getVersion_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getVersion_result__isset;
+
+class FacebookService_getVersion_result {
+ public:
+
+  FacebookService_getVersion_result(const FacebookService_getVersion_result&);
+  FacebookService_getVersion_result& operator=(const FacebookService_getVersion_result&);
+  FacebookService_getVersion_result() noexcept;
+
+  virtual ~FacebookService_getVersion_result() noexcept;
+  std::string success;
+
+  _FacebookService_getVersion_result__isset __isset;
+
+  void __set_success(const std::string& val);
+
+  bool operator == (const FacebookService_getVersion_result & rhs) const;
+  bool operator != (const FacebookService_getVersion_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getVersion_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getVersion_presult__isset {
+  _FacebookService_getVersion_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getVersion_presult__isset;
+
+class FacebookService_getVersion_presult {
+ public:
+
+
+  virtual ~FacebookService_getVersion_presult() noexcept;
+  std::string* success;
+
+  _FacebookService_getVersion_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_getStatus_args {
+ public:
+
+  FacebookService_getStatus_args(const FacebookService_getStatus_args&) noexcept;
+  FacebookService_getStatus_args& operator=(const FacebookService_getStatus_args&) noexcept;
+  FacebookService_getStatus_args() noexcept;
+
+  virtual ~FacebookService_getStatus_args() noexcept;
+
+  bool operator == (const FacebookService_getStatus_args & /* rhs */) const;
+  bool operator != (const FacebookService_getStatus_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getStatus_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getStatus_pargs {
+ public:
+
+
+  virtual ~FacebookService_getStatus_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getStatus_result__isset {
+  _FacebookService_getStatus_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getStatus_result__isset;
+
+class FacebookService_getStatus_result {
+ public:
+
+  FacebookService_getStatus_result(const FacebookService_getStatus_result&) noexcept;
+  FacebookService_getStatus_result& operator=(const FacebookService_getStatus_result&) noexcept;
+  FacebookService_getStatus_result() noexcept;
+
+  virtual ~FacebookService_getStatus_result() noexcept;
+  /**
+   * 
+   * @see fb_status
+   */
+  fb_status::type success;
+
+  _FacebookService_getStatus_result__isset __isset;
+
+  void __set_success(const fb_status::type val);
+
+  bool operator == (const FacebookService_getStatus_result & rhs) const;
+  bool operator != (const FacebookService_getStatus_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getStatus_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getStatus_presult__isset {
+  _FacebookService_getStatus_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getStatus_presult__isset;
+
+class FacebookService_getStatus_presult {
+ public:
+
+
+  virtual ~FacebookService_getStatus_presult() noexcept;
+  /**
+   * 
+   * @see fb_status
+   */
+  fb_status::type* success;
+
+  _FacebookService_getStatus_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_getStatusDetails_args {
+ public:
+
+  FacebookService_getStatusDetails_args(const FacebookService_getStatusDetails_args&) noexcept;
+  FacebookService_getStatusDetails_args& operator=(const FacebookService_getStatusDetails_args&) noexcept;
+  FacebookService_getStatusDetails_args() noexcept;
+
+  virtual ~FacebookService_getStatusDetails_args() noexcept;
+
+  bool operator == (const FacebookService_getStatusDetails_args & /* rhs */) const;
+  bool operator != (const FacebookService_getStatusDetails_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getStatusDetails_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getStatusDetails_pargs {
+ public:
+
+
+  virtual ~FacebookService_getStatusDetails_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getStatusDetails_result__isset {
+  _FacebookService_getStatusDetails_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getStatusDetails_result__isset;
+
+class FacebookService_getStatusDetails_result {
+ public:
+
+  FacebookService_getStatusDetails_result(const FacebookService_getStatusDetails_result&);
+  FacebookService_getStatusDetails_result& operator=(const FacebookService_getStatusDetails_result&);
+  FacebookService_getStatusDetails_result() noexcept;
+
+  virtual ~FacebookService_getStatusDetails_result() noexcept;
+  std::string success;
+
+  _FacebookService_getStatusDetails_result__isset __isset;
+
+  void __set_success(const std::string& val);
+
+  bool operator == (const FacebookService_getStatusDetails_result & rhs) const;
+  bool operator != (const FacebookService_getStatusDetails_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getStatusDetails_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getStatusDetails_presult__isset {
+  _FacebookService_getStatusDetails_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getStatusDetails_presult__isset;
+
+class FacebookService_getStatusDetails_presult {
+ public:
+
+
+  virtual ~FacebookService_getStatusDetails_presult() noexcept;
+  std::string* success;
+
+  _FacebookService_getStatusDetails_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_getCounters_args {
+ public:
+
+  FacebookService_getCounters_args(const FacebookService_getCounters_args&) noexcept;
+  FacebookService_getCounters_args& operator=(const FacebookService_getCounters_args&) noexcept;
+  FacebookService_getCounters_args() noexcept;
+
+  virtual ~FacebookService_getCounters_args() noexcept;
+
+  bool operator == (const FacebookService_getCounters_args & /* rhs */) const;
+  bool operator != (const FacebookService_getCounters_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getCounters_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getCounters_pargs {
+ public:
+
+
+  virtual ~FacebookService_getCounters_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getCounters_result__isset {
+  _FacebookService_getCounters_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getCounters_result__isset;
+
+class FacebookService_getCounters_result {
+ public:
+
+  FacebookService_getCounters_result(const FacebookService_getCounters_result&);
+  FacebookService_getCounters_result& operator=(const FacebookService_getCounters_result&);
+  FacebookService_getCounters_result() noexcept;
+
+  virtual ~FacebookService_getCounters_result() noexcept;
+  std::map<std::string, int64_t>  success;
+
+  _FacebookService_getCounters_result__isset __isset;
+
+  void __set_success(const std::map<std::string, int64_t> & val);
+
+  bool operator == (const FacebookService_getCounters_result & rhs) const;
+  bool operator != (const FacebookService_getCounters_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getCounters_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getCounters_presult__isset {
+  _FacebookService_getCounters_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getCounters_presult__isset;
+
+class FacebookService_getCounters_presult {
+ public:
+
+
+  virtual ~FacebookService_getCounters_presult() noexcept;
+  std::map<std::string, int64_t> * success;
+
+  _FacebookService_getCounters_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _FacebookService_getCounter_args__isset {
+  _FacebookService_getCounter_args__isset() : key(false) {}
+  bool key :1;
+} _FacebookService_getCounter_args__isset;
+
+class FacebookService_getCounter_args {
+ public:
+
+  FacebookService_getCounter_args(const FacebookService_getCounter_args&);
+  FacebookService_getCounter_args& operator=(const FacebookService_getCounter_args&);
+  FacebookService_getCounter_args() noexcept;
+
+  virtual ~FacebookService_getCounter_args() noexcept;
+  std::string key;
+
+  _FacebookService_getCounter_args__isset __isset;
+
+  void __set_key(const std::string& val);
+
+  bool operator == (const FacebookService_getCounter_args & rhs) const;
+  bool operator != (const FacebookService_getCounter_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getCounter_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getCounter_pargs {
+ public:
+
+
+  virtual ~FacebookService_getCounter_pargs() noexcept;
+  const std::string* key;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getCounter_result__isset {
+  _FacebookService_getCounter_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getCounter_result__isset;
+
+class FacebookService_getCounter_result {
+ public:
+
+  FacebookService_getCounter_result(const FacebookService_getCounter_result&) noexcept;
+  FacebookService_getCounter_result& operator=(const FacebookService_getCounter_result&) noexcept;
+  FacebookService_getCounter_result() noexcept;
+
+  virtual ~FacebookService_getCounter_result() noexcept;
+  int64_t success;
+
+  _FacebookService_getCounter_result__isset __isset;
+
+  void __set_success(const int64_t val);
+
+  bool operator == (const FacebookService_getCounter_result & rhs) const;
+  bool operator != (const FacebookService_getCounter_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getCounter_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getCounter_presult__isset {
+  _FacebookService_getCounter_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getCounter_presult__isset;
+
+class FacebookService_getCounter_presult {
+ public:
+
+
+  virtual ~FacebookService_getCounter_presult() noexcept;
+  int64_t* success;
+
+  _FacebookService_getCounter_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _FacebookService_setOption_args__isset {
+  _FacebookService_setOption_args__isset() : key(false), value(false) {}
+  bool key :1;
+  bool value :1;
+} _FacebookService_setOption_args__isset;
+
+class FacebookService_setOption_args {
+ public:
+
+  FacebookService_setOption_args(const FacebookService_setOption_args&);
+  FacebookService_setOption_args& operator=(const FacebookService_setOption_args&);
+  FacebookService_setOption_args() noexcept;
+
+  virtual ~FacebookService_setOption_args() noexcept;
+  std::string key;
+  std::string value;
+
+  _FacebookService_setOption_args__isset __isset;
+
+  void __set_key(const std::string& val);
+
+  void __set_value(const std::string& val);
+
+  bool operator == (const FacebookService_setOption_args & rhs) const;
+  bool operator != (const FacebookService_setOption_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_setOption_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_setOption_pargs {
+ public:
+
+
+  virtual ~FacebookService_setOption_pargs() noexcept;
+  const std::string* key;
+  const std::string* value;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_setOption_result {
+ public:
+
+  FacebookService_setOption_result(const FacebookService_setOption_result&) noexcept;
+  FacebookService_setOption_result& operator=(const FacebookService_setOption_result&) noexcept;
+  FacebookService_setOption_result() noexcept;
+
+  virtual ~FacebookService_setOption_result() noexcept;
+
+  bool operator == (const FacebookService_setOption_result & /* rhs */) const;
+  bool operator != (const FacebookService_setOption_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_setOption_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_setOption_presult {
+ public:
+
+
+  virtual ~FacebookService_setOption_presult() noexcept;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _FacebookService_getOption_args__isset {
+  _FacebookService_getOption_args__isset() : key(false) {}
+  bool key :1;
+} _FacebookService_getOption_args__isset;
+
+class FacebookService_getOption_args {
+ public:
+
+  FacebookService_getOption_args(const FacebookService_getOption_args&);
+  FacebookService_getOption_args& operator=(const FacebookService_getOption_args&);
+  FacebookService_getOption_args() noexcept;
+
+  virtual ~FacebookService_getOption_args() noexcept;
+  std::string key;
+
+  _FacebookService_getOption_args__isset __isset;
+
+  void __set_key(const std::string& val);
+
+  bool operator == (const FacebookService_getOption_args & rhs) const;
+  bool operator != (const FacebookService_getOption_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getOption_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getOption_pargs {
+ public:
+
+
+  virtual ~FacebookService_getOption_pargs() noexcept;
+  const std::string* key;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getOption_result__isset {
+  _FacebookService_getOption_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getOption_result__isset;
+
+class FacebookService_getOption_result {
+ public:
+
+  FacebookService_getOption_result(const FacebookService_getOption_result&);
+  FacebookService_getOption_result& operator=(const FacebookService_getOption_result&);
+  FacebookService_getOption_result() noexcept;
+
+  virtual ~FacebookService_getOption_result() noexcept;
+  std::string success;
+
+  _FacebookService_getOption_result__isset __isset;
+
+  void __set_success(const std::string& val);
+
+  bool operator == (const FacebookService_getOption_result & rhs) const;
+  bool operator != (const FacebookService_getOption_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getOption_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getOption_presult__isset {
+  _FacebookService_getOption_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getOption_presult__isset;
+
+class FacebookService_getOption_presult {
+ public:
+
+
+  virtual ~FacebookService_getOption_presult() noexcept;
+  std::string* success;
+
+  _FacebookService_getOption_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_getOptions_args {
+ public:
+
+  FacebookService_getOptions_args(const FacebookService_getOptions_args&) noexcept;
+  FacebookService_getOptions_args& operator=(const FacebookService_getOptions_args&) noexcept;
+  FacebookService_getOptions_args() noexcept;
+
+  virtual ~FacebookService_getOptions_args() noexcept;
+
+  bool operator == (const FacebookService_getOptions_args & /* rhs */) const;
+  bool operator != (const FacebookService_getOptions_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getOptions_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getOptions_pargs {
+ public:
+
+
+  virtual ~FacebookService_getOptions_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getOptions_result__isset {
+  _FacebookService_getOptions_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getOptions_result__isset;
+
+class FacebookService_getOptions_result {
+ public:
+
+  FacebookService_getOptions_result(const FacebookService_getOptions_result&);
+  FacebookService_getOptions_result& operator=(const FacebookService_getOptions_result&);
+  FacebookService_getOptions_result() noexcept;
+
+  virtual ~FacebookService_getOptions_result() noexcept;
+  std::map<std::string, std::string>  success;
+
+  _FacebookService_getOptions_result__isset __isset;
+
+  void __set_success(const std::map<std::string, std::string> & val);
+
+  bool operator == (const FacebookService_getOptions_result & rhs) const;
+  bool operator != (const FacebookService_getOptions_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getOptions_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getOptions_presult__isset {
+  _FacebookService_getOptions_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getOptions_presult__isset;
+
+class FacebookService_getOptions_presult {
+ public:
+
+
+  virtual ~FacebookService_getOptions_presult() noexcept;
+  std::map<std::string, std::string> * success;
+
+  _FacebookService_getOptions_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _FacebookService_getCpuProfile_args__isset {
+  _FacebookService_getCpuProfile_args__isset() : profileDurationInSec(false) {}
+  bool profileDurationInSec :1;
+} _FacebookService_getCpuProfile_args__isset;
+
+class FacebookService_getCpuProfile_args {
+ public:
+
+  FacebookService_getCpuProfile_args(const FacebookService_getCpuProfile_args&) noexcept;
+  FacebookService_getCpuProfile_args& operator=(const FacebookService_getCpuProfile_args&) noexcept;
+  FacebookService_getCpuProfile_args() noexcept;
+
+  virtual ~FacebookService_getCpuProfile_args() noexcept;
+  int32_t profileDurationInSec;
+
+  _FacebookService_getCpuProfile_args__isset __isset;
+
+  void __set_profileDurationInSec(const int32_t val);
+
+  bool operator == (const FacebookService_getCpuProfile_args & rhs) const;
+  bool operator != (const FacebookService_getCpuProfile_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getCpuProfile_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_getCpuProfile_pargs {
+ public:
+
+
+  virtual ~FacebookService_getCpuProfile_pargs() noexcept;
+  const int32_t* profileDurationInSec;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getCpuProfile_result__isset {
+  _FacebookService_getCpuProfile_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getCpuProfile_result__isset;
+
+class FacebookService_getCpuProfile_result {
+ public:
+
+  FacebookService_getCpuProfile_result(const FacebookService_getCpuProfile_result&);
+  FacebookService_getCpuProfile_result& operator=(const FacebookService_getCpuProfile_result&);
+  FacebookService_getCpuProfile_result() noexcept;
+
+  virtual ~FacebookService_getCpuProfile_result() noexcept;
+  std::string success;
+
+  _FacebookService_getCpuProfile_result__isset __isset;
+
+  void __set_success(const std::string& val);
+
+  bool operator == (const FacebookService_getCpuProfile_result & rhs) const;
+  bool operator != (const FacebookService_getCpuProfile_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_getCpuProfile_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_getCpuProfile_presult__isset {
+  _FacebookService_getCpuProfile_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_getCpuProfile_presult__isset;
+
+class FacebookService_getCpuProfile_presult {
+ public:
+
+
+  virtual ~FacebookService_getCpuProfile_presult() noexcept;
+  std::string* success;
+
+  _FacebookService_getCpuProfile_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_aliveSince_args {
+ public:
+
+  FacebookService_aliveSince_args(const FacebookService_aliveSince_args&) noexcept;
+  FacebookService_aliveSince_args& operator=(const FacebookService_aliveSince_args&) noexcept;
+  FacebookService_aliveSince_args() noexcept;
+
+  virtual ~FacebookService_aliveSince_args() noexcept;
+
+  bool operator == (const FacebookService_aliveSince_args & /* rhs */) const;
+  bool operator != (const FacebookService_aliveSince_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_aliveSince_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_aliveSince_pargs {
+ public:
+
+
+  virtual ~FacebookService_aliveSince_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_aliveSince_result__isset {
+  _FacebookService_aliveSince_result__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_aliveSince_result__isset;
+
+class FacebookService_aliveSince_result {
+ public:
+
+  FacebookService_aliveSince_result(const FacebookService_aliveSince_result&) noexcept;
+  FacebookService_aliveSince_result& operator=(const FacebookService_aliveSince_result&) noexcept;
+  FacebookService_aliveSince_result() noexcept;
+
+  virtual ~FacebookService_aliveSince_result() noexcept;
+  int64_t success;
+
+  _FacebookService_aliveSince_result__isset __isset;
+
+  void __set_success(const int64_t val);
+
+  bool operator == (const FacebookService_aliveSince_result & rhs) const;
+  bool operator != (const FacebookService_aliveSince_result &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_aliveSince_result & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _FacebookService_aliveSince_presult__isset {
+  _FacebookService_aliveSince_presult__isset() : success(false) {}
+  bool success :1;
+} _FacebookService_aliveSince_presult__isset;
+
+class FacebookService_aliveSince_presult {
+ public:
+
+
+  virtual ~FacebookService_aliveSince_presult() noexcept;
+  int64_t* success;
+
+  _FacebookService_aliveSince_presult__isset __isset;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class FacebookService_reinitialize_args {
+ public:
+
+  FacebookService_reinitialize_args(const FacebookService_reinitialize_args&) noexcept;
+  FacebookService_reinitialize_args& operator=(const FacebookService_reinitialize_args&) noexcept;
+  FacebookService_reinitialize_args() noexcept;
+
+  virtual ~FacebookService_reinitialize_args() noexcept;
+
+  bool operator == (const FacebookService_reinitialize_args & /* rhs */) const;
+  bool operator != (const FacebookService_reinitialize_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_reinitialize_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_reinitialize_pargs {
+ public:
+
+
+  virtual ~FacebookService_reinitialize_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_shutdown_args {
+ public:
+
+  FacebookService_shutdown_args(const FacebookService_shutdown_args&) noexcept;
+  FacebookService_shutdown_args& operator=(const FacebookService_shutdown_args&) noexcept;
+  FacebookService_shutdown_args() noexcept;
+
+  virtual ~FacebookService_shutdown_args() noexcept;
+
+  bool operator == (const FacebookService_shutdown_args & /* rhs */) const;
+  bool operator != (const FacebookService_shutdown_args &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const FacebookService_shutdown_args & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class FacebookService_shutdown_pargs {
+ public:
+
+
+  virtual ~FacebookService_shutdown_pargs() noexcept;
+
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+class FacebookServiceClient : virtual public FacebookServiceIf {
+ public:
+  FacebookServiceClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+    setProtocol(prot);
+  }
+  FacebookServiceClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+    setProtocol(iprot,oprot);
+  }
+ private:
+  void setProtocol(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  setProtocol(prot,prot);
+  }
+  void setProtocol(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+    piprot_=iprot;
+    poprot_=oprot;
+    iprot_ = iprot.get();
+    oprot_ = oprot.get();
+  }
+ public:
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+    return piprot_;
+  }
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+    return poprot_;
+  }
+  /**
+   * Returns a descriptive name of the service
+   */
+  void getName(std::string& _return) override;
+  void send_getName();
+  void recv_getName(std::string& _return);
+  /**
+   * Returns the version of the service
+   */
+  void getVersion(std::string& _return) override;
+  void send_getVersion();
+  void recv_getVersion(std::string& _return);
+  /**
+   * Gets the status of this service
+   */
+  fb_status::type getStatus() override;
+  void send_getStatus();
+  fb_status::type recv_getStatus();
+  /**
+   * User friendly description of status, such as why the service is in
+   * the dead or warning state, or what is being started or stopped.
+   */
+  void getStatusDetails(std::string& _return) override;
+  void send_getStatusDetails();
+  void recv_getStatusDetails(std::string& _return);
+  /**
+   * Gets the counters for this service
+   */
+  void getCounters(std::map<std::string, int64_t> & _return) override;
+  void send_getCounters();
+  void recv_getCounters(std::map<std::string, int64_t> & _return);
+  /**
+   * Gets the value of a single counter
+   * 
+   * @param key
+   */
+  int64_t getCounter(const std::string& key) override;
+  void send_getCounter(const std::string& key);
+  int64_t recv_getCounter();
+  /**
+   * Sets an option
+   * 
+   * @param key
+   * @param value
+   */
+  void setOption(const std::string& key, const std::string& value) override;
+  void send_setOption(const std::string& key, const std::string& value);
+  void recv_setOption();
+  /**
+   * Gets an option
+   * 
+   * @param key
+   */
+  void getOption(std::string& _return, const std::string& key) override;
+  void send_getOption(const std::string& key);
+  void recv_getOption(std::string& _return);
+  /**
+   * Gets all options
+   */
+  void getOptions(std::map<std::string, std::string> & _return) override;
+  void send_getOptions();
+  void recv_getOptions(std::map<std::string, std::string> & _return);
+  /**
+   * Returns a CPU profile over the given time interval (client and server
+   * must agree on the profile format).
+   * 
+   * @param profileDurationInSec
+   */
+  void getCpuProfile(std::string& _return, const int32_t profileDurationInSec) override;
+  void send_getCpuProfile(const int32_t profileDurationInSec);
+  void recv_getCpuProfile(std::string& _return);
+  /**
+   * Returns the unix time that the server has been running since
+   */
+  int64_t aliveSince() override;
+  void send_aliveSince();
+  int64_t recv_aliveSince();
+  /**
+   * Tell the server to reload its configuration, reopen log files, etc
+   */
+  void reinitialize() override;
+  void send_reinitialize();
+  /**
+   * Suggest a shutdown to the server
+   */
+  void shutdown() override;
+  void send_shutdown();
+ protected:
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  ::apache::thrift::protocol::TProtocol* iprot_;
+  ::apache::thrift::protocol::TProtocol* oprot_;
+};
+
+class FacebookServiceProcessor : public ::apache::thrift::TDispatchProcessor {
+ protected:
+  ::std::shared_ptr<FacebookServiceIf> iface_;
+  virtual bool dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext) override;
+ private:
+  typedef  void (FacebookServiceProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*);
+  typedef std::map<std::string, ProcessFunction> ProcessMap;
+  ProcessMap processMap_;
+  void process_getName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getStatus(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getStatusDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getCounters(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getCounter(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_setOption(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getOption(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getOptions(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_getCpuProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_aliveSince(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_reinitialize(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_shutdown(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ public:
+  FacebookServiceProcessor(::std::shared_ptr<FacebookServiceIf> iface) :
+    iface_(iface) {
+    processMap_["getName"] = &FacebookServiceProcessor::process_getName;
+    processMap_["getVersion"] = &FacebookServiceProcessor::process_getVersion;
+    processMap_["getStatus"] = &FacebookServiceProcessor::process_getStatus;
+    processMap_["getStatusDetails"] = &FacebookServiceProcessor::process_getStatusDetails;
+    processMap_["getCounters"] = &FacebookServiceProcessor::process_getCounters;
+    processMap_["getCounter"] = &FacebookServiceProcessor::process_getCounter;
+    processMap_["setOption"] = &FacebookServiceProcessor::process_setOption;
+    processMap_["getOption"] = &FacebookServiceProcessor::process_getOption;
+    processMap_["getOptions"] = &FacebookServiceProcessor::process_getOptions;
+    processMap_["getCpuProfile"] = &FacebookServiceProcessor::process_getCpuProfile;
+    processMap_["aliveSince"] = &FacebookServiceProcessor::process_aliveSince;
+    processMap_["reinitialize"] = &FacebookServiceProcessor::process_reinitialize;
+    processMap_["shutdown"] = &FacebookServiceProcessor::process_shutdown;
+  }
+
+  virtual ~FacebookServiceProcessor() {}
+};
+
+class FacebookServiceProcessorFactory : public ::apache::thrift::TProcessorFactory {
+ public:
+  FacebookServiceProcessorFactory(const ::std::shared_ptr< FacebookServiceIfFactory >& handlerFactory) noexcept :
+      handlerFactory_(handlerFactory) {}
+
+  ::std::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) override;
+
+ protected:
+  ::std::shared_ptr< FacebookServiceIfFactory > handlerFactory_;
+};
+
+class FacebookServiceMultiface : virtual public FacebookServiceIf {
+ public:
+  FacebookServiceMultiface(std::vector<std::shared_ptr<FacebookServiceIf> >& ifaces) : ifaces_(ifaces) {
+  }
+  virtual ~FacebookServiceMultiface() {}
+ protected:
+  std::vector<std::shared_ptr<FacebookServiceIf> > ifaces_;
+  FacebookServiceMultiface() {}
+  void add(::std::shared_ptr<FacebookServiceIf> iface) {
+    ifaces_.push_back(iface);
+  }
+ public:
+  /**
+   * Returns a descriptive name of the service
+   */
+  void getName(std::string& _return) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getName(_return);
+    }
+    ifaces_[i]->getName(_return);
+    return;
+  }
+
+  /**
+   * Returns the version of the service
+   */
+  void getVersion(std::string& _return) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getVersion(_return);
+    }
+    ifaces_[i]->getVersion(_return);
+    return;
+  }
+
+  /**
+   * Gets the status of this service
+   */
+  fb_status::type getStatus() override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getStatus();
+    }
+    return ifaces_[i]->getStatus();
+  }
+
+  /**
+   * User friendly description of status, such as why the service is in
+   * the dead or warning state, or what is being started or stopped.
+   */
+  void getStatusDetails(std::string& _return) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getStatusDetails(_return);
+    }
+    ifaces_[i]->getStatusDetails(_return);
+    return;
+  }
+
+  /**
+   * Gets the counters for this service
+   */
+  void getCounters(std::map<std::string, int64_t> & _return) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getCounters(_return);
+    }
+    ifaces_[i]->getCounters(_return);
+    return;
+  }
+
+  /**
+   * Gets the value of a single counter
+   * 
+   * @param key
+   */
+  int64_t getCounter(const std::string& key) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getCounter(key);
+    }
+    return ifaces_[i]->getCounter(key);
+  }
+
+  /**
+   * Sets an option
+   * 
+   * @param key
+   * @param value
+   */
+  void setOption(const std::string& key, const std::string& value) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->setOption(key, value);
+    }
+    ifaces_[i]->setOption(key, value);
+  }
+
+  /**
+   * Gets an option
+   * 
+   * @param key
+   */
+  void getOption(std::string& _return, const std::string& key) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getOption(_return, key);
+    }
+    ifaces_[i]->getOption(_return, key);
+    return;
+  }
+
+  /**
+   * Gets all options
+   */
+  void getOptions(std::map<std::string, std::string> & _return) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getOptions(_return);
+    }
+    ifaces_[i]->getOptions(_return);
+    return;
+  }
+
+  /**
+   * Returns a CPU profile over the given time interval (client and server
+   * must agree on the profile format).
+   * 
+   * @param profileDurationInSec
+   */
+  void getCpuProfile(std::string& _return, const int32_t profileDurationInSec) override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->getCpuProfile(_return, profileDurationInSec);
+    }
+    ifaces_[i]->getCpuProfile(_return, profileDurationInSec);
+    return;
+  }
+
+  /**
+   * Returns the unix time that the server has been running since
+   */
+  int64_t aliveSince() override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->aliveSince();
+    }
+    return ifaces_[i]->aliveSince();
+  }
+
+  /**
+   * Tell the server to reload its configuration, reopen log files, etc
+   */
+  void reinitialize() override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->reinitialize();
+    }
+    ifaces_[i]->reinitialize();
+  }
+
+  /**
+   * Suggest a shutdown to the server
+   */
+  void shutdown() override {
+    size_t sz = ifaces_.size();
+    size_t i = 0;
+    for (; i < (sz - 1); ++i) {
+      ifaces_[i]->shutdown();
+    }
+    ifaces_[i]->shutdown();
+  }
+
+};
+
+// The 'concurrent' client is a thread safe client that correctly handles
+// out of order responses.  It is slower than the regular client, so should
+// only be used when you need to share a connection among multiple threads
+class FacebookServiceConcurrentClient : virtual public FacebookServiceIf {
+ public:
+  FacebookServiceConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot, std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync) : sync_(sync)
+{
+    setProtocol(prot);
+  }
+  FacebookServiceConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot, std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync) : sync_(sync)
+{
+    setProtocol(iprot,oprot);
+  }
+ private:
+  void setProtocol(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  setProtocol(prot,prot);
+  }
+  void setProtocol(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+    piprot_=iprot;
+    poprot_=oprot;
+    iprot_ = iprot.get();
+    oprot_ = oprot.get();
+  }
+ public:
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+    return piprot_;
+  }
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+    return poprot_;
+  }
+  /**
+   * Returns a descriptive name of the service
+   */
+  void getName(std::string& _return) override;
+  int32_t send_getName();
+  void recv_getName(std::string& _return, const int32_t seqid);
+  /**
+   * Returns the version of the service
+   */
+  void getVersion(std::string& _return) override;
+  int32_t send_getVersion();
+  void recv_getVersion(std::string& _return, const int32_t seqid);
+  /**
+   * Gets the status of this service
+   */
+  fb_status::type getStatus() override;
+  int32_t send_getStatus();
+  fb_status::type recv_getStatus(const int32_t seqid);
+  /**
+   * User friendly description of status, such as why the service is in
+   * the dead or warning state, or what is being started or stopped.
+   */
+  void getStatusDetails(std::string& _return) override;
+  int32_t send_getStatusDetails();
+  void recv_getStatusDetails(std::string& _return, const int32_t seqid);
+  /**
+   * Gets the counters for this service
+   */
+  void getCounters(std::map<std::string, int64_t> & _return) override;
+  int32_t send_getCounters();
+  void recv_getCounters(std::map<std::string, int64_t> & _return, const int32_t seqid);
+  /**
+   * Gets the value of a single counter
+   * 
+   * @param key
+   */
+  int64_t getCounter(const std::string& key) override;
+  int32_t send_getCounter(const std::string& key);
+  int64_t recv_getCounter(const int32_t seqid);
+  /**
+   * Sets an option
+   * 
+   * @param key
+   * @param value
+   */
+  void setOption(const std::string& key, const std::string& value) override;
+  int32_t send_setOption(const std::string& key, const std::string& value);
+  void recv_setOption(const int32_t seqid);
+  /**
+   * Gets an option
+   * 
+   * @param key
+   */
+  void getOption(std::string& _return, const std::string& key) override;
+  int32_t send_getOption(const std::string& key);
+  void recv_getOption(std::string& _return, const int32_t seqid);
+  /**
+   * Gets all options
+   */
+  void getOptions(std::map<std::string, std::string> & _return) override;
+  int32_t send_getOptions();
+  void recv_getOptions(std::map<std::string, std::string> & _return, const int32_t seqid);
+  /**
+   * Returns a CPU profile over the given time interval (client and server
+   * must agree on the profile format).
+   * 
+   * @param profileDurationInSec
+   */
+  void getCpuProfile(std::string& _return, const int32_t profileDurationInSec) override;
+  int32_t send_getCpuProfile(const int32_t profileDurationInSec);
+  void recv_getCpuProfile(std::string& _return, const int32_t seqid);
+  /**
+   * Returns the unix time that the server has been running since
+   */
+  int64_t aliveSince() override;
+  int32_t send_aliveSince();
+  int64_t recv_aliveSince(const int32_t seqid);
+  /**
+   * Tell the server to reload its configuration, reopen log files, etc
+   */
+  void reinitialize() override;
+  void send_reinitialize();
+  /**
+   * Suggest a shutdown to the server
+   */
+  void shutdown() override;
+  void send_shutdown();
+ protected:
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  ::apache::thrift::protocol::TProtocol* iprot_;
+  ::apache::thrift::protocol::TProtocol* oprot_;
+  std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync_;
+};
+
+#ifdef _MSC_VER
+  #pragma warning( pop )
+#endif
+
+}} // namespace
+
+#endif
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService_server.skeleton.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService_server.skeleton.cpp
new file mode 100644
index 000000000000..8ba02a387c26
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/FacebookService_server.skeleton.cpp
@@ -0,0 +1,152 @@
+// This autogenerated skeleton file illustrates how to build a server.
+// You should copy it to another filename to avoid overwriting it.
+
+#include "FacebookService.h"
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/server/TSimpleServer.h>
+#include <thrift/transport/TServerSocket.h>
+#include <thrift/transport/TBufferTransports.h>
+
+using namespace ::apache::thrift;
+using namespace ::apache::thrift::protocol;
+using namespace ::apache::thrift::transport;
+using namespace ::apache::thrift::server;
+
+using namespace  ::facebook::fb303;
+
+class FacebookServiceHandler : virtual public FacebookServiceIf {
+ public:
+  FacebookServiceHandler() {
+    // Your initialization goes here
+  }
+
+  /**
+   * Returns a descriptive name of the service
+   */
+  void getName(std::string& _return) {
+    // Your implementation goes here
+    printf("getName\n");
+  }
+
+  /**
+   * Returns the version of the service
+   */
+  void getVersion(std::string& _return) {
+    // Your implementation goes here
+    printf("getVersion\n");
+  }
+
+  /**
+   * Gets the status of this service
+   */
+  fb_status::type getStatus() {
+    // Your implementation goes here
+    printf("getStatus\n");
+  }
+
+  /**
+   * User friendly description of status, such as why the service is in
+   * the dead or warning state, or what is being started or stopped.
+   */
+  void getStatusDetails(std::string& _return) {
+    // Your implementation goes here
+    printf("getStatusDetails\n");
+  }
+
+  /**
+   * Gets the counters for this service
+   */
+  void getCounters(std::map<std::string, int64_t> & _return) {
+    // Your implementation goes here
+    printf("getCounters\n");
+  }
+
+  /**
+   * Gets the value of a single counter
+   * 
+   * @param key
+   */
+  int64_t getCounter(const std::string& key) {
+    // Your implementation goes here
+    printf("getCounter\n");
+  }
+
+  /**
+   * Sets an option
+   * 
+   * @param key
+   * @param value
+   */
+  void setOption(const std::string& key, const std::string& value) {
+    // Your implementation goes here
+    printf("setOption\n");
+  }
+
+  /**
+   * Gets an option
+   * 
+   * @param key
+   */
+  void getOption(std::string& _return, const std::string& key) {
+    // Your implementation goes here
+    printf("getOption\n");
+  }
+
+  /**
+   * Gets all options
+   */
+  void getOptions(std::map<std::string, std::string> & _return) {
+    // Your implementation goes here
+    printf("getOptions\n");
+  }
+
+  /**
+   * Returns a CPU profile over the given time interval (client and server
+   * must agree on the profile format).
+   * 
+   * @param profileDurationInSec
+   */
+  void getCpuProfile(std::string& _return, const int32_t profileDurationInSec) {
+    // Your implementation goes here
+    printf("getCpuProfile\n");
+  }
+
+  /**
+   * Returns the unix time that the server has been running since
+   */
+  int64_t aliveSince() {
+    // Your implementation goes here
+    printf("aliveSince\n");
+  }
+
+  /**
+   * Tell the server to reload its configuration, reopen log files, etc
+   */
+  void reinitialize() {
+    // Your implementation goes here
+    printf("reinitialize\n");
+  }
+
+  /**
+   * Suggest a shutdown to the server
+   */
+  void shutdown() {
+    // Your implementation goes here
+    printf("shutdown\n");
+  }
+
+};
+
+int main(int argc, char **argv) {
+  int port = 9090;
+  ::std::shared_ptr<FacebookServiceHandler> handler(new FacebookServiceHandler());
+  ::std::shared_ptr<TProcessor> processor(new FacebookServiceProcessor(handler));
+  ::std::shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
+  ::std::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
+  ::std::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
+
+  TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory);
+  server.serve();
+  return 0;
+}
+
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
index 39d6a2fba049..da227683eb00 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -12,6 +12,8 @@ namespace Apache { namespace Hadoop { namespace Hive {
 ThriftHiveMetastore_abort_Compactions_args::~ThriftHiveMetastore_abort_Compactions_args() noexcept {
 }
 
+ThriftHiveMetastore_abort_Compactions_args::ThriftHiveMetastore_abort_Compactions_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_abort_Compactions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -91,6 +93,8 @@ uint32_t ThriftHiveMetastore_abort_Compactions_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_abort_Compactions_result::~ThriftHiveMetastore_abort_Compactions_result() noexcept {
 }
 
+ThriftHiveMetastore_abort_Compactions_result::ThriftHiveMetastore_abort_Compactions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_abort_Compactions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -199,6 +203,9 @@ uint32_t ThriftHiveMetastore_abort_Compactions_presult::read(::apache::thrift::p
 ThriftHiveMetastore_getMetaConf_args::~ThriftHiveMetastore_getMetaConf_args() noexcept {
 }
 
+ThriftHiveMetastore_getMetaConf_args::ThriftHiveMetastore_getMetaConf_args() noexcept
+   : key() {
+}
 
 uint32_t ThriftHiveMetastore_getMetaConf_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -278,6 +285,9 @@ uint32_t ThriftHiveMetastore_getMetaConf_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_getMetaConf_result::~ThriftHiveMetastore_getMetaConf_result() noexcept {
 }
 
+ThriftHiveMetastore_getMetaConf_result::ThriftHiveMetastore_getMetaConf_result() noexcept
+   : success() {
+}
 
 uint32_t ThriftHiveMetastore_getMetaConf_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -406,6 +416,10 @@ uint32_t ThriftHiveMetastore_getMetaConf_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_setMetaConf_args::~ThriftHiveMetastore_setMetaConf_args() noexcept {
 }
 
+ThriftHiveMetastore_setMetaConf_args::ThriftHiveMetastore_setMetaConf_args() noexcept
+   : key(),
+     value() {
+}
 
 uint32_t ThriftHiveMetastore_setMetaConf_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -501,6 +515,8 @@ uint32_t ThriftHiveMetastore_setMetaConf_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_setMetaConf_result::~ThriftHiveMetastore_setMetaConf_result() noexcept {
 }
 
+ThriftHiveMetastore_setMetaConf_result::ThriftHiveMetastore_setMetaConf_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_setMetaConf_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -609,6 +625,8 @@ uint32_t ThriftHiveMetastore_setMetaConf_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_create_catalog_args::~ThriftHiveMetastore_create_catalog_args() noexcept {
 }
 
+ThriftHiveMetastore_create_catalog_args::ThriftHiveMetastore_create_catalog_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_catalog_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -688,6 +706,8 @@ uint32_t ThriftHiveMetastore_create_catalog_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_create_catalog_result::~ThriftHiveMetastore_create_catalog_result() noexcept {
 }
 
+ThriftHiveMetastore_create_catalog_result::ThriftHiveMetastore_create_catalog_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_catalog_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -836,6 +856,8 @@ uint32_t ThriftHiveMetastore_create_catalog_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_alter_catalog_args::~ThriftHiveMetastore_alter_catalog_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_catalog_args::ThriftHiveMetastore_alter_catalog_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_catalog_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -915,6 +937,8 @@ uint32_t ThriftHiveMetastore_alter_catalog_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_alter_catalog_result::~ThriftHiveMetastore_alter_catalog_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_catalog_result::ThriftHiveMetastore_alter_catalog_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_catalog_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1063,6 +1087,8 @@ uint32_t ThriftHiveMetastore_alter_catalog_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_catalog_args::~ThriftHiveMetastore_get_catalog_args() noexcept {
 }
 
+ThriftHiveMetastore_get_catalog_args::ThriftHiveMetastore_get_catalog_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_catalog_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1142,6 +1168,8 @@ uint32_t ThriftHiveMetastore_get_catalog_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_get_catalog_result::~ThriftHiveMetastore_get_catalog_result() noexcept {
 }
 
+ThriftHiveMetastore_get_catalog_result::ThriftHiveMetastore_get_catalog_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_catalog_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1290,6 +1318,8 @@ uint32_t ThriftHiveMetastore_get_catalog_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_get_catalogs_args::~ThriftHiveMetastore_get_catalogs_args() noexcept {
 }
 
+ThriftHiveMetastore_get_catalogs_args::ThriftHiveMetastore_get_catalogs_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_catalogs_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1348,6 +1378,8 @@ uint32_t ThriftHiveMetastore_get_catalogs_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_get_catalogs_result::~ThriftHiveMetastore_get_catalogs_result() noexcept {
 }
 
+ThriftHiveMetastore_get_catalogs_result::ThriftHiveMetastore_get_catalogs_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_catalogs_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1476,6 +1508,8 @@ uint32_t ThriftHiveMetastore_get_catalogs_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_drop_catalog_args::~ThriftHiveMetastore_drop_catalog_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_catalog_args::ThriftHiveMetastore_drop_catalog_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_catalog_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1555,6 +1589,8 @@ uint32_t ThriftHiveMetastore_drop_catalog_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_drop_catalog_result::~ThriftHiveMetastore_drop_catalog_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_catalog_result::ThriftHiveMetastore_drop_catalog_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_catalog_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1703,6 +1739,8 @@ uint32_t ThriftHiveMetastore_drop_catalog_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_create_database_args::~ThriftHiveMetastore_create_database_args() noexcept {
 }
 
+ThriftHiveMetastore_create_database_args::ThriftHiveMetastore_create_database_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_database_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1782,6 +1820,8 @@ uint32_t ThriftHiveMetastore_create_database_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_create_database_result::~ThriftHiveMetastore_create_database_result() noexcept {
 }
 
+ThriftHiveMetastore_create_database_result::ThriftHiveMetastore_create_database_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_database_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1930,6 +1970,8 @@ uint32_t ThriftHiveMetastore_create_database_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_create_database_req_args::~ThriftHiveMetastore_create_database_req_args() noexcept {
 }
 
+ThriftHiveMetastore_create_database_req_args::ThriftHiveMetastore_create_database_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_database_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2009,6 +2051,8 @@ uint32_t ThriftHiveMetastore_create_database_req_pargs::write(::apache::thrift::
 ThriftHiveMetastore_create_database_req_result::~ThriftHiveMetastore_create_database_req_result() noexcept {
 }
 
+ThriftHiveMetastore_create_database_req_result::ThriftHiveMetastore_create_database_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_database_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2157,6 +2201,9 @@ uint32_t ThriftHiveMetastore_create_database_req_presult::read(::apache::thrift:
 ThriftHiveMetastore_get_database_args::~ThriftHiveMetastore_get_database_args() noexcept {
 }
 
+ThriftHiveMetastore_get_database_args::ThriftHiveMetastore_get_database_args() noexcept
+   : name() {
+}
 
 uint32_t ThriftHiveMetastore_get_database_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2236,6 +2283,8 @@ uint32_t ThriftHiveMetastore_get_database_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_get_database_result::~ThriftHiveMetastore_get_database_result() noexcept {
 }
 
+ThriftHiveMetastore_get_database_result::ThriftHiveMetastore_get_database_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_database_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2384,6 +2433,8 @@ uint32_t ThriftHiveMetastore_get_database_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_get_database_req_args::~ThriftHiveMetastore_get_database_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_database_req_args::ThriftHiveMetastore_get_database_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_database_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2463,6 +2514,8 @@ uint32_t ThriftHiveMetastore_get_database_req_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_get_database_req_result::~ThriftHiveMetastore_get_database_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_database_req_result::ThriftHiveMetastore_get_database_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_database_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2611,6 +2664,11 @@ uint32_t ThriftHiveMetastore_get_database_req_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_drop_database_args::~ThriftHiveMetastore_drop_database_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_database_args::ThriftHiveMetastore_drop_database_args() noexcept
+   : name(),
+     deleteData(0),
+     cascade(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_database_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2722,6 +2780,8 @@ uint32_t ThriftHiveMetastore_drop_database_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_drop_database_result::~ThriftHiveMetastore_drop_database_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_database_result::ThriftHiveMetastore_drop_database_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_database_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2870,6 +2930,8 @@ uint32_t ThriftHiveMetastore_drop_database_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_drop_database_req_args::~ThriftHiveMetastore_drop_database_req_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_database_req_args::ThriftHiveMetastore_drop_database_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_database_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2949,6 +3011,8 @@ uint32_t ThriftHiveMetastore_drop_database_req_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_drop_database_req_result::~ThriftHiveMetastore_drop_database_req_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_database_req_result::ThriftHiveMetastore_drop_database_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_database_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3117,6 +3181,9 @@ uint32_t ThriftHiveMetastore_drop_database_req_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_databases_args::~ThriftHiveMetastore_get_databases_args() noexcept {
 }
 
+ThriftHiveMetastore_get_databases_args::ThriftHiveMetastore_get_databases_args() noexcept
+   : pattern() {
+}
 
 uint32_t ThriftHiveMetastore_get_databases_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3196,6 +3263,8 @@ uint32_t ThriftHiveMetastore_get_databases_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_get_databases_result::~ThriftHiveMetastore_get_databases_result() noexcept {
 }
 
+ThriftHiveMetastore_get_databases_result::ThriftHiveMetastore_get_databases_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_databases_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3356,6 +3425,8 @@ uint32_t ThriftHiveMetastore_get_databases_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_all_databases_args::~ThriftHiveMetastore_get_all_databases_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_databases_args::ThriftHiveMetastore_get_all_databases_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_databases_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3414,6 +3485,8 @@ uint32_t ThriftHiveMetastore_get_all_databases_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_all_databases_result::~ThriftHiveMetastore_get_all_databases_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_databases_result::ThriftHiveMetastore_get_all_databases_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_databases_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3574,6 +3647,8 @@ uint32_t ThriftHiveMetastore_get_all_databases_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_databases_req_args::~ThriftHiveMetastore_get_databases_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_databases_req_args::ThriftHiveMetastore_get_databases_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_databases_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3653,6 +3728,8 @@ uint32_t ThriftHiveMetastore_get_databases_req_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_databases_req_result::~ThriftHiveMetastore_get_databases_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_databases_req_result::ThriftHiveMetastore_get_databases_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_databases_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3781,6 +3858,9 @@ uint32_t ThriftHiveMetastore_get_databases_req_presult::read(::apache::thrift::p
 ThriftHiveMetastore_alter_database_args::~ThriftHiveMetastore_alter_database_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_database_args::ThriftHiveMetastore_alter_database_args() noexcept
+   : dbname() {
+}
 
 uint32_t ThriftHiveMetastore_alter_database_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -3876,6 +3956,8 @@ uint32_t ThriftHiveMetastore_alter_database_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_alter_database_result::~ThriftHiveMetastore_alter_database_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_database_result::ThriftHiveMetastore_alter_database_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_database_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4004,6 +4086,8 @@ uint32_t ThriftHiveMetastore_alter_database_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_alter_database_req_args::~ThriftHiveMetastore_alter_database_req_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_database_req_args::ThriftHiveMetastore_alter_database_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_database_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4083,6 +4167,8 @@ uint32_t ThriftHiveMetastore_alter_database_req_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_alter_database_req_result::~ThriftHiveMetastore_alter_database_req_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_database_req_result::ThriftHiveMetastore_alter_database_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_database_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4211,6 +4297,8 @@ uint32_t ThriftHiveMetastore_alter_database_req_presult::read(::apache::thrift::
 ThriftHiveMetastore_create_dataconnector_req_args::~ThriftHiveMetastore_create_dataconnector_req_args() noexcept {
 }
 
+ThriftHiveMetastore_create_dataconnector_req_args::ThriftHiveMetastore_create_dataconnector_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_dataconnector_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4290,6 +4378,8 @@ uint32_t ThriftHiveMetastore_create_dataconnector_req_pargs::write(::apache::thr
 ThriftHiveMetastore_create_dataconnector_req_result::~ThriftHiveMetastore_create_dataconnector_req_result() noexcept {
 }
 
+ThriftHiveMetastore_create_dataconnector_req_result::ThriftHiveMetastore_create_dataconnector_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_dataconnector_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4438,6 +4528,8 @@ uint32_t ThriftHiveMetastore_create_dataconnector_req_presult::read(::apache::th
 ThriftHiveMetastore_get_dataconnector_req_args::~ThriftHiveMetastore_get_dataconnector_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_dataconnector_req_args::ThriftHiveMetastore_get_dataconnector_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_dataconnector_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4517,6 +4609,8 @@ uint32_t ThriftHiveMetastore_get_dataconnector_req_pargs::write(::apache::thrift
 ThriftHiveMetastore_get_dataconnector_req_result::~ThriftHiveMetastore_get_dataconnector_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_dataconnector_req_result::ThriftHiveMetastore_get_dataconnector_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_dataconnector_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4665,6 +4759,8 @@ uint32_t ThriftHiveMetastore_get_dataconnector_req_presult::read(::apache::thrif
 ThriftHiveMetastore_drop_dataconnector_req_args::~ThriftHiveMetastore_drop_dataconnector_req_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_dataconnector_req_args::ThriftHiveMetastore_drop_dataconnector_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_dataconnector_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4744,6 +4840,8 @@ uint32_t ThriftHiveMetastore_drop_dataconnector_req_pargs::write(::apache::thrif
 ThriftHiveMetastore_drop_dataconnector_req_result::~ThriftHiveMetastore_drop_dataconnector_req_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_dataconnector_req_result::ThriftHiveMetastore_drop_dataconnector_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_dataconnector_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4892,6 +4990,8 @@ uint32_t ThriftHiveMetastore_drop_dataconnector_req_presult::read(::apache::thri
 ThriftHiveMetastore_get_dataconnectors_args::~ThriftHiveMetastore_get_dataconnectors_args() noexcept {
 }
 
+ThriftHiveMetastore_get_dataconnectors_args::ThriftHiveMetastore_get_dataconnectors_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_dataconnectors_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -4950,6 +5050,8 @@ uint32_t ThriftHiveMetastore_get_dataconnectors_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_get_dataconnectors_result::~ThriftHiveMetastore_get_dataconnectors_result() noexcept {
 }
 
+ThriftHiveMetastore_get_dataconnectors_result::ThriftHiveMetastore_get_dataconnectors_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_dataconnectors_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5110,6 +5212,8 @@ uint32_t ThriftHiveMetastore_get_dataconnectors_presult::read(::apache::thrift::
 ThriftHiveMetastore_alter_dataconnector_req_args::~ThriftHiveMetastore_alter_dataconnector_req_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_dataconnector_req_args::ThriftHiveMetastore_alter_dataconnector_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_dataconnector_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5189,6 +5293,8 @@ uint32_t ThriftHiveMetastore_alter_dataconnector_req_pargs::write(::apache::thri
 ThriftHiveMetastore_alter_dataconnector_req_result::~ThriftHiveMetastore_alter_dataconnector_req_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_dataconnector_req_result::ThriftHiveMetastore_alter_dataconnector_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_dataconnector_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5317,6 +5423,9 @@ uint32_t ThriftHiveMetastore_alter_dataconnector_req_presult::read(::apache::thr
 ThriftHiveMetastore_get_type_args::~ThriftHiveMetastore_get_type_args() noexcept {
 }
 
+ThriftHiveMetastore_get_type_args::ThriftHiveMetastore_get_type_args() noexcept
+   : name() {
+}
 
 uint32_t ThriftHiveMetastore_get_type_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5396,6 +5505,8 @@ uint32_t ThriftHiveMetastore_get_type_pargs::write(::apache::thrift::protocol::T
 ThriftHiveMetastore_get_type_result::~ThriftHiveMetastore_get_type_result() noexcept {
 }
 
+ThriftHiveMetastore_get_type_result::ThriftHiveMetastore_get_type_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_type_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5544,6 +5655,8 @@ uint32_t ThriftHiveMetastore_get_type_presult::read(::apache::thrift::protocol::
 ThriftHiveMetastore_create_type_args::~ThriftHiveMetastore_create_type_args() noexcept {
 }
 
+ThriftHiveMetastore_create_type_args::ThriftHiveMetastore_create_type_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_type_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5623,6 +5736,9 @@ uint32_t ThriftHiveMetastore_create_type_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_create_type_result::~ThriftHiveMetastore_create_type_result() noexcept {
 }
 
+ThriftHiveMetastore_create_type_result::ThriftHiveMetastore_create_type_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_create_type_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5791,6 +5907,9 @@ uint32_t ThriftHiveMetastore_create_type_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_drop_type_args::~ThriftHiveMetastore_drop_type_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_type_args::ThriftHiveMetastore_drop_type_args() noexcept
+   : type() {
+}
 
 uint32_t ThriftHiveMetastore_drop_type_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -5870,6 +5989,9 @@ uint32_t ThriftHiveMetastore_drop_type_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_drop_type_result::~ThriftHiveMetastore_drop_type_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_type_result::ThriftHiveMetastore_drop_type_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_type_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6018,6 +6140,9 @@ uint32_t ThriftHiveMetastore_drop_type_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_get_type_all_args::~ThriftHiveMetastore_get_type_all_args() noexcept {
 }
 
+ThriftHiveMetastore_get_type_all_args::ThriftHiveMetastore_get_type_all_args() noexcept
+   : name() {
+}
 
 uint32_t ThriftHiveMetastore_get_type_all_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6097,6 +6222,8 @@ uint32_t ThriftHiveMetastore_get_type_all_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_get_type_all_result::~ThriftHiveMetastore_get_type_all_result() noexcept {
 }
 
+ThriftHiveMetastore_get_type_all_result::ThriftHiveMetastore_get_type_all_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_type_all_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6264,6 +6391,10 @@ uint32_t ThriftHiveMetastore_get_type_all_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_get_fields_args::~ThriftHiveMetastore_get_fields_args() noexcept {
 }
 
+ThriftHiveMetastore_get_fields_args::ThriftHiveMetastore_get_fields_args() noexcept
+   : db_name(),
+     table_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_fields_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6359,6 +6490,8 @@ uint32_t ThriftHiveMetastore_get_fields_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_get_fields_result::~ThriftHiveMetastore_get_fields_result() noexcept {
 }
 
+ThriftHiveMetastore_get_fields_result::ThriftHiveMetastore_get_fields_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_fields_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6559,6 +6692,10 @@ uint32_t ThriftHiveMetastore_get_fields_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_get_fields_with_environment_context_args::~ThriftHiveMetastore_get_fields_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_get_fields_with_environment_context_args::ThriftHiveMetastore_get_fields_with_environment_context_args() noexcept
+   : db_name(),
+     table_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_fields_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6670,6 +6807,8 @@ uint32_t ThriftHiveMetastore_get_fields_with_environment_context_pargs::write(::
 ThriftHiveMetastore_get_fields_with_environment_context_result::~ThriftHiveMetastore_get_fields_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_get_fields_with_environment_context_result::ThriftHiveMetastore_get_fields_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_fields_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6870,6 +7009,8 @@ uint32_t ThriftHiveMetastore_get_fields_with_environment_context_presult::read(:
 ThriftHiveMetastore_get_fields_req_args::~ThriftHiveMetastore_get_fields_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_fields_req_args::ThriftHiveMetastore_get_fields_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_fields_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -6949,6 +7090,8 @@ uint32_t ThriftHiveMetastore_get_fields_req_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_fields_req_result::~ThriftHiveMetastore_get_fields_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_fields_req_result::ThriftHiveMetastore_get_fields_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_fields_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7117,6 +7260,10 @@ uint32_t ThriftHiveMetastore_get_fields_req_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_get_schema_args::~ThriftHiveMetastore_get_schema_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_args::ThriftHiveMetastore_get_schema_args() noexcept
+   : db_name(),
+     table_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7212,6 +7359,8 @@ uint32_t ThriftHiveMetastore_get_schema_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_get_schema_result::~ThriftHiveMetastore_get_schema_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_result::ThriftHiveMetastore_get_schema_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7412,6 +7561,10 @@ uint32_t ThriftHiveMetastore_get_schema_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_get_schema_with_environment_context_args::~ThriftHiveMetastore_get_schema_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_with_environment_context_args::ThriftHiveMetastore_get_schema_with_environment_context_args() noexcept
+   : db_name(),
+     table_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7523,6 +7676,8 @@ uint32_t ThriftHiveMetastore_get_schema_with_environment_context_pargs::write(::
 ThriftHiveMetastore_get_schema_with_environment_context_result::~ThriftHiveMetastore_get_schema_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_with_environment_context_result::ThriftHiveMetastore_get_schema_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7723,6 +7878,8 @@ uint32_t ThriftHiveMetastore_get_schema_with_environment_context_presult::read(:
 ThriftHiveMetastore_get_schema_req_args::~ThriftHiveMetastore_get_schema_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_req_args::ThriftHiveMetastore_get_schema_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7802,6 +7959,8 @@ uint32_t ThriftHiveMetastore_get_schema_req_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_schema_req_result::~ThriftHiveMetastore_get_schema_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_req_result::ThriftHiveMetastore_get_schema_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -7970,6 +8129,8 @@ uint32_t ThriftHiveMetastore_get_schema_req_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_create_table_args::~ThriftHiveMetastore_create_table_args() noexcept {
 }
 
+ThriftHiveMetastore_create_table_args::ThriftHiveMetastore_create_table_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -8049,6 +8210,8 @@ uint32_t ThriftHiveMetastore_create_table_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_create_table_result::~ThriftHiveMetastore_create_table_result() noexcept {
 }
 
+ThriftHiveMetastore_create_table_result::ThriftHiveMetastore_create_table_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -8217,6 +8380,8 @@ uint32_t ThriftHiveMetastore_create_table_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_create_table_with_environment_context_args::~ThriftHiveMetastore_create_table_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_create_table_with_environment_context_args::ThriftHiveMetastore_create_table_with_environment_context_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -8312,6 +8477,8 @@ uint32_t ThriftHiveMetastore_create_table_with_environment_context_pargs::write(
 ThriftHiveMetastore_create_table_with_environment_context_result::~ThriftHiveMetastore_create_table_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_create_table_with_environment_context_result::ThriftHiveMetastore_create_table_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -8480,6 +8647,8 @@ uint32_t ThriftHiveMetastore_create_table_with_environment_context_presult::read
 ThriftHiveMetastore_create_table_with_constraints_args::~ThriftHiveMetastore_create_table_with_constraints_args() noexcept {
 }
 
+ThriftHiveMetastore_create_table_with_constraints_args::ThriftHiveMetastore_create_table_with_constraints_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_with_constraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -8823,6 +8992,8 @@ uint32_t ThriftHiveMetastore_create_table_with_constraints_pargs::write(::apache
 ThriftHiveMetastore_create_table_with_constraints_result::~ThriftHiveMetastore_create_table_with_constraints_result() noexcept {
 }
 
+ThriftHiveMetastore_create_table_with_constraints_result::ThriftHiveMetastore_create_table_with_constraints_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_with_constraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -8991,6 +9162,8 @@ uint32_t ThriftHiveMetastore_create_table_with_constraints_presult::read(::apach
 ThriftHiveMetastore_create_table_req_args::~ThriftHiveMetastore_create_table_req_args() noexcept {
 }
 
+ThriftHiveMetastore_create_table_req_args::ThriftHiveMetastore_create_table_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9070,6 +9243,8 @@ uint32_t ThriftHiveMetastore_create_table_req_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_create_table_req_result::~ThriftHiveMetastore_create_table_req_result() noexcept {
 }
 
+ThriftHiveMetastore_create_table_req_result::ThriftHiveMetastore_create_table_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_table_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9238,6 +9413,8 @@ uint32_t ThriftHiveMetastore_create_table_req_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_drop_constraint_args::~ThriftHiveMetastore_drop_constraint_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_constraint_args::ThriftHiveMetastore_drop_constraint_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_constraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9317,6 +9494,8 @@ uint32_t ThriftHiveMetastore_drop_constraint_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_drop_constraint_result::~ThriftHiveMetastore_drop_constraint_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_constraint_result::ThriftHiveMetastore_drop_constraint_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_constraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9445,6 +9624,8 @@ uint32_t ThriftHiveMetastore_drop_constraint_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_add_primary_key_args::~ThriftHiveMetastore_add_primary_key_args() noexcept {
 }
 
+ThriftHiveMetastore_add_primary_key_args::ThriftHiveMetastore_add_primary_key_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_primary_key_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9524,6 +9705,8 @@ uint32_t ThriftHiveMetastore_add_primary_key_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_add_primary_key_result::~ThriftHiveMetastore_add_primary_key_result() noexcept {
 }
 
+ThriftHiveMetastore_add_primary_key_result::ThriftHiveMetastore_add_primary_key_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_primary_key_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9652,6 +9835,8 @@ uint32_t ThriftHiveMetastore_add_primary_key_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_add_foreign_key_args::~ThriftHiveMetastore_add_foreign_key_args() noexcept {
 }
 
+ThriftHiveMetastore_add_foreign_key_args::ThriftHiveMetastore_add_foreign_key_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_foreign_key_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9731,6 +9916,8 @@ uint32_t ThriftHiveMetastore_add_foreign_key_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_add_foreign_key_result::~ThriftHiveMetastore_add_foreign_key_result() noexcept {
 }
 
+ThriftHiveMetastore_add_foreign_key_result::ThriftHiveMetastore_add_foreign_key_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_foreign_key_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9859,6 +10046,8 @@ uint32_t ThriftHiveMetastore_add_foreign_key_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_add_unique_constraint_args::~ThriftHiveMetastore_add_unique_constraint_args() noexcept {
 }
 
+ThriftHiveMetastore_add_unique_constraint_args::ThriftHiveMetastore_add_unique_constraint_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_unique_constraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -9938,6 +10127,8 @@ uint32_t ThriftHiveMetastore_add_unique_constraint_pargs::write(::apache::thrift
 ThriftHiveMetastore_add_unique_constraint_result::~ThriftHiveMetastore_add_unique_constraint_result() noexcept {
 }
 
+ThriftHiveMetastore_add_unique_constraint_result::ThriftHiveMetastore_add_unique_constraint_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_unique_constraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10066,6 +10257,8 @@ uint32_t ThriftHiveMetastore_add_unique_constraint_presult::read(::apache::thrif
 ThriftHiveMetastore_add_not_null_constraint_args::~ThriftHiveMetastore_add_not_null_constraint_args() noexcept {
 }
 
+ThriftHiveMetastore_add_not_null_constraint_args::ThriftHiveMetastore_add_not_null_constraint_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_not_null_constraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10145,6 +10338,8 @@ uint32_t ThriftHiveMetastore_add_not_null_constraint_pargs::write(::apache::thri
 ThriftHiveMetastore_add_not_null_constraint_result::~ThriftHiveMetastore_add_not_null_constraint_result() noexcept {
 }
 
+ThriftHiveMetastore_add_not_null_constraint_result::ThriftHiveMetastore_add_not_null_constraint_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_not_null_constraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10273,6 +10468,8 @@ uint32_t ThriftHiveMetastore_add_not_null_constraint_presult::read(::apache::thr
 ThriftHiveMetastore_add_default_constraint_args::~ThriftHiveMetastore_add_default_constraint_args() noexcept {
 }
 
+ThriftHiveMetastore_add_default_constraint_args::ThriftHiveMetastore_add_default_constraint_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_default_constraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10352,6 +10549,8 @@ uint32_t ThriftHiveMetastore_add_default_constraint_pargs::write(::apache::thrif
 ThriftHiveMetastore_add_default_constraint_result::~ThriftHiveMetastore_add_default_constraint_result() noexcept {
 }
 
+ThriftHiveMetastore_add_default_constraint_result::ThriftHiveMetastore_add_default_constraint_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_default_constraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10480,6 +10679,8 @@ uint32_t ThriftHiveMetastore_add_default_constraint_presult::read(::apache::thri
 ThriftHiveMetastore_add_check_constraint_args::~ThriftHiveMetastore_add_check_constraint_args() noexcept {
 }
 
+ThriftHiveMetastore_add_check_constraint_args::ThriftHiveMetastore_add_check_constraint_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_check_constraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10559,6 +10760,8 @@ uint32_t ThriftHiveMetastore_add_check_constraint_pargs::write(::apache::thrift:
 ThriftHiveMetastore_add_check_constraint_result::~ThriftHiveMetastore_add_check_constraint_result() noexcept {
 }
 
+ThriftHiveMetastore_add_check_constraint_result::ThriftHiveMetastore_add_check_constraint_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_check_constraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10687,6 +10890,8 @@ uint32_t ThriftHiveMetastore_add_check_constraint_presult::read(::apache::thrift
 ThriftHiveMetastore_translate_table_dryrun_args::~ThriftHiveMetastore_translate_table_dryrun_args() noexcept {
 }
 
+ThriftHiveMetastore_translate_table_dryrun_args::ThriftHiveMetastore_translate_table_dryrun_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_translate_table_dryrun_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10766,6 +10971,8 @@ uint32_t ThriftHiveMetastore_translate_table_dryrun_pargs::write(::apache::thrif
 ThriftHiveMetastore_translate_table_dryrun_result::~ThriftHiveMetastore_translate_table_dryrun_result() noexcept {
 }
 
+ThriftHiveMetastore_translate_table_dryrun_result::ThriftHiveMetastore_translate_table_dryrun_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_translate_table_dryrun_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -10954,6 +11161,11 @@ uint32_t ThriftHiveMetastore_translate_table_dryrun_presult::read(::apache::thri
 ThriftHiveMetastore_drop_table_args::~ThriftHiveMetastore_drop_table_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_table_args::ThriftHiveMetastore_drop_table_args() noexcept
+   : dbname(),
+     name(),
+     deleteData(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_table_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11065,6 +11277,8 @@ uint32_t ThriftHiveMetastore_drop_table_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_drop_table_result::~ThriftHiveMetastore_drop_table_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_table_result::ThriftHiveMetastore_drop_table_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_table_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11193,6 +11407,11 @@ uint32_t ThriftHiveMetastore_drop_table_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_drop_table_with_environment_context_args::~ThriftHiveMetastore_drop_table_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_table_with_environment_context_args::ThriftHiveMetastore_drop_table_with_environment_context_args() noexcept
+   : dbname(),
+     name(),
+     deleteData(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_table_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11320,6 +11539,8 @@ uint32_t ThriftHiveMetastore_drop_table_with_environment_context_pargs::write(::
 ThriftHiveMetastore_drop_table_with_environment_context_result::~ThriftHiveMetastore_drop_table_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_table_with_environment_context_result::ThriftHiveMetastore_drop_table_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_table_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11448,6 +11669,8 @@ uint32_t ThriftHiveMetastore_drop_table_with_environment_context_presult::read(:
 ThriftHiveMetastore_drop_table_req_args::~ThriftHiveMetastore_drop_table_req_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_table_req_args::ThriftHiveMetastore_drop_table_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_table_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11527,6 +11750,8 @@ uint32_t ThriftHiveMetastore_drop_table_req_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_drop_table_req_result::~ThriftHiveMetastore_drop_table_req_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_table_req_result::ThriftHiveMetastore_drop_table_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_table_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11675,6 +11900,10 @@ uint32_t ThriftHiveMetastore_drop_table_req_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_truncate_table_args::~ThriftHiveMetastore_truncate_table_args() noexcept {
 }
 
+ThriftHiveMetastore_truncate_table_args::ThriftHiveMetastore_truncate_table_args() noexcept
+   : dbName(),
+     tableName() {
+}
 
 uint32_t ThriftHiveMetastore_truncate_table_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11814,6 +12043,8 @@ uint32_t ThriftHiveMetastore_truncate_table_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_truncate_table_result::~ThriftHiveMetastore_truncate_table_result() noexcept {
 }
 
+ThriftHiveMetastore_truncate_table_result::ThriftHiveMetastore_truncate_table_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_truncate_table_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -11922,6 +12153,8 @@ uint32_t ThriftHiveMetastore_truncate_table_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_truncate_table_req_args::~ThriftHiveMetastore_truncate_table_req_args() noexcept {
 }
 
+ThriftHiveMetastore_truncate_table_req_args::ThriftHiveMetastore_truncate_table_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_truncate_table_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12001,6 +12234,8 @@ uint32_t ThriftHiveMetastore_truncate_table_req_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_truncate_table_req_result::~ThriftHiveMetastore_truncate_table_req_result() noexcept {
 }
 
+ThriftHiveMetastore_truncate_table_req_result::ThriftHiveMetastore_truncate_table_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_truncate_table_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12129,6 +12364,10 @@ uint32_t ThriftHiveMetastore_truncate_table_req_presult::read(::apache::thrift::
 ThriftHiveMetastore_get_tables_args::~ThriftHiveMetastore_get_tables_args() noexcept {
 }
 
+ThriftHiveMetastore_get_tables_args::ThriftHiveMetastore_get_tables_args() noexcept
+   : db_name(),
+     pattern() {
+}
 
 uint32_t ThriftHiveMetastore_get_tables_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12224,6 +12463,8 @@ uint32_t ThriftHiveMetastore_get_tables_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_get_tables_result::~ThriftHiveMetastore_get_tables_result() noexcept {
 }
 
+ThriftHiveMetastore_get_tables_result::ThriftHiveMetastore_get_tables_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_tables_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12384,6 +12625,11 @@ uint32_t ThriftHiveMetastore_get_tables_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_get_tables_by_type_args::~ThriftHiveMetastore_get_tables_by_type_args() noexcept {
 }
 
+ThriftHiveMetastore_get_tables_by_type_args::ThriftHiveMetastore_get_tables_by_type_args() noexcept
+   : db_name(),
+     pattern(),
+     tableType() {
+}
 
 uint32_t ThriftHiveMetastore_get_tables_by_type_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12495,6 +12741,8 @@ uint32_t ThriftHiveMetastore_get_tables_by_type_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_get_tables_by_type_result::~ThriftHiveMetastore_get_tables_by_type_result() noexcept {
 }
 
+ThriftHiveMetastore_get_tables_by_type_result::ThriftHiveMetastore_get_tables_by_type_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_tables_by_type_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12655,6 +12903,8 @@ uint32_t ThriftHiveMetastore_get_tables_by_type_presult::read(::apache::thrift::
 ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args::~ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args::ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12713,6 +12963,8 @@ uint32_t ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_par
 ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result::~ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result::ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12873,6 +13125,9 @@ uint32_t ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_pre
 ThriftHiveMetastore_get_materialized_views_for_rewriting_args::~ThriftHiveMetastore_get_materialized_views_for_rewriting_args() noexcept {
 }
 
+ThriftHiveMetastore_get_materialized_views_for_rewriting_args::ThriftHiveMetastore_get_materialized_views_for_rewriting_args() noexcept
+   : db_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_materialized_views_for_rewriting_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -12952,6 +13207,8 @@ uint32_t ThriftHiveMetastore_get_materialized_views_for_rewriting_pargs::write(:
 ThriftHiveMetastore_get_materialized_views_for_rewriting_result::~ThriftHiveMetastore_get_materialized_views_for_rewriting_result() noexcept {
 }
 
+ThriftHiveMetastore_get_materialized_views_for_rewriting_result::ThriftHiveMetastore_get_materialized_views_for_rewriting_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_materialized_views_for_rewriting_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13112,6 +13369,10 @@ uint32_t ThriftHiveMetastore_get_materialized_views_for_rewriting_presult::read(
 ThriftHiveMetastore_get_table_meta_args::~ThriftHiveMetastore_get_table_meta_args() noexcept {
 }
 
+ThriftHiveMetastore_get_table_meta_args::ThriftHiveMetastore_get_table_meta_args() noexcept
+   : db_patterns(),
+     tbl_patterns() {
+}
 
 uint32_t ThriftHiveMetastore_get_table_meta_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13251,6 +13512,8 @@ uint32_t ThriftHiveMetastore_get_table_meta_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_table_meta_result::~ThriftHiveMetastore_get_table_meta_result() noexcept {
 }
 
+ThriftHiveMetastore_get_table_meta_result::ThriftHiveMetastore_get_table_meta_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_meta_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13411,6 +13674,9 @@ uint32_t ThriftHiveMetastore_get_table_meta_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_get_all_tables_args::~ThriftHiveMetastore_get_all_tables_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_tables_args::ThriftHiveMetastore_get_all_tables_args() noexcept
+   : db_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_all_tables_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13490,6 +13756,8 @@ uint32_t ThriftHiveMetastore_get_all_tables_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_all_tables_result::~ThriftHiveMetastore_get_all_tables_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_tables_result::ThriftHiveMetastore_get_all_tables_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_tables_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13650,6 +13918,8 @@ uint32_t ThriftHiveMetastore_get_all_tables_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_get_tables_ext_args::~ThriftHiveMetastore_get_tables_ext_args() noexcept {
 }
 
+ThriftHiveMetastore_get_tables_ext_args::ThriftHiveMetastore_get_tables_ext_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_tables_ext_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13729,6 +13999,8 @@ uint32_t ThriftHiveMetastore_get_tables_ext_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_tables_ext_result::~ThriftHiveMetastore_get_tables_ext_result() noexcept {
 }
 
+ThriftHiveMetastore_get_tables_ext_result::ThriftHiveMetastore_get_tables_ext_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_tables_ext_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13889,6 +14161,8 @@ uint32_t ThriftHiveMetastore_get_tables_ext_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_get_table_req_args::~ThriftHiveMetastore_get_table_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_table_req_args::ThriftHiveMetastore_get_table_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -13968,6 +14242,8 @@ uint32_t ThriftHiveMetastore_get_table_req_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_get_table_req_result::~ThriftHiveMetastore_get_table_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_table_req_result::ThriftHiveMetastore_get_table_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14116,6 +14392,8 @@ uint32_t ThriftHiveMetastore_get_table_req_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_table_objects_by_name_req_args::~ThriftHiveMetastore_get_table_objects_by_name_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_table_objects_by_name_req_args::ThriftHiveMetastore_get_table_objects_by_name_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_objects_by_name_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14195,6 +14473,8 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_req_pargs::write(::apache
 ThriftHiveMetastore_get_table_objects_by_name_req_result::~ThriftHiveMetastore_get_table_objects_by_name_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_table_objects_by_name_req_result::ThriftHiveMetastore_get_table_objects_by_name_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_objects_by_name_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14363,6 +14643,9 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_req_presult::read(::apach
 ThriftHiveMetastore_get_materialization_invalidation_info_args::~ThriftHiveMetastore_get_materialization_invalidation_info_args() noexcept {
 }
 
+ThriftHiveMetastore_get_materialization_invalidation_info_args::ThriftHiveMetastore_get_materialization_invalidation_info_args() noexcept
+   : validTxnList() {
+}
 
 uint32_t ThriftHiveMetastore_get_materialization_invalidation_info_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14458,6 +14741,8 @@ uint32_t ThriftHiveMetastore_get_materialization_invalidation_info_pargs::write(
 ThriftHiveMetastore_get_materialization_invalidation_info_result::~ThriftHiveMetastore_get_materialization_invalidation_info_result() noexcept {
 }
 
+ThriftHiveMetastore_get_materialization_invalidation_info_result::ThriftHiveMetastore_get_materialization_invalidation_info_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_materialization_invalidation_info_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14626,6 +14911,11 @@ uint32_t ThriftHiveMetastore_get_materialization_invalidation_info_presult::read
 ThriftHiveMetastore_update_creation_metadata_args::~ThriftHiveMetastore_update_creation_metadata_args() noexcept {
 }
 
+ThriftHiveMetastore_update_creation_metadata_args::ThriftHiveMetastore_update_creation_metadata_args() noexcept
+   : catName(),
+     dbname(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_update_creation_metadata_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14753,6 +15043,8 @@ uint32_t ThriftHiveMetastore_update_creation_metadata_pargs::write(::apache::thr
 ThriftHiveMetastore_update_creation_metadata_result::~ThriftHiveMetastore_update_creation_metadata_result() noexcept {
 }
 
+ThriftHiveMetastore_update_creation_metadata_result::ThriftHiveMetastore_update_creation_metadata_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_creation_metadata_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -14901,6 +15193,11 @@ uint32_t ThriftHiveMetastore_update_creation_metadata_presult::read(::apache::th
 ThriftHiveMetastore_get_table_names_by_filter_args::~ThriftHiveMetastore_get_table_names_by_filter_args() noexcept {
 }
 
+ThriftHiveMetastore_get_table_names_by_filter_args::ThriftHiveMetastore_get_table_names_by_filter_args() noexcept
+   : dbname(),
+     filter(),
+     max_tables(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_table_names_by_filter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15012,6 +15309,8 @@ uint32_t ThriftHiveMetastore_get_table_names_by_filter_pargs::write(::apache::th
 ThriftHiveMetastore_get_table_names_by_filter_result::~ThriftHiveMetastore_get_table_names_by_filter_result() noexcept {
 }
 
+ThriftHiveMetastore_get_table_names_by_filter_result::ThriftHiveMetastore_get_table_names_by_filter_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_names_by_filter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15212,6 +15511,10 @@ uint32_t ThriftHiveMetastore_get_table_names_by_filter_presult::read(::apache::t
 ThriftHiveMetastore_alter_table_args::~ThriftHiveMetastore_alter_table_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_args::ThriftHiveMetastore_alter_table_args() noexcept
+   : dbname(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15323,6 +15626,8 @@ uint32_t ThriftHiveMetastore_alter_table_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_alter_table_result::~ThriftHiveMetastore_alter_table_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_result::ThriftHiveMetastore_alter_table_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15451,6 +15756,10 @@ uint32_t ThriftHiveMetastore_alter_table_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_alter_table_with_environment_context_args::~ThriftHiveMetastore_alter_table_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_with_environment_context_args::ThriftHiveMetastore_alter_table_with_environment_context_args() noexcept
+   : dbname(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15578,6 +15887,8 @@ uint32_t ThriftHiveMetastore_alter_table_with_environment_context_pargs::write(:
 ThriftHiveMetastore_alter_table_with_environment_context_result::~ThriftHiveMetastore_alter_table_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_with_environment_context_result::ThriftHiveMetastore_alter_table_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15706,6 +16017,11 @@ uint32_t ThriftHiveMetastore_alter_table_with_environment_context_presult::read(
 ThriftHiveMetastore_alter_table_with_cascade_args::~ThriftHiveMetastore_alter_table_with_cascade_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_with_cascade_args::ThriftHiveMetastore_alter_table_with_cascade_args() noexcept
+   : dbname(),
+     tbl_name(),
+     cascade(0) {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_with_cascade_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15833,6 +16149,8 @@ uint32_t ThriftHiveMetastore_alter_table_with_cascade_pargs::write(::apache::thr
 ThriftHiveMetastore_alter_table_with_cascade_result::~ThriftHiveMetastore_alter_table_with_cascade_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_with_cascade_result::ThriftHiveMetastore_alter_table_with_cascade_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_with_cascade_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -15961,6 +16279,8 @@ uint32_t ThriftHiveMetastore_alter_table_with_cascade_presult::read(::apache::th
 ThriftHiveMetastore_alter_table_req_args::~ThriftHiveMetastore_alter_table_req_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_req_args::ThriftHiveMetastore_alter_table_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16040,6 +16360,8 @@ uint32_t ThriftHiveMetastore_alter_table_req_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_alter_table_req_result::~ThriftHiveMetastore_alter_table_req_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_table_req_result::ThriftHiveMetastore_alter_table_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_table_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16188,6 +16510,8 @@ uint32_t ThriftHiveMetastore_alter_table_req_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_update_table_params_args::~ThriftHiveMetastore_update_table_params_args() noexcept {
 }
 
+ThriftHiveMetastore_update_table_params_args::ThriftHiveMetastore_update_table_params_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_table_params_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16295,6 +16619,8 @@ uint32_t ThriftHiveMetastore_update_table_params_pargs::write(::apache::thrift::
 ThriftHiveMetastore_update_table_params_result::~ThriftHiveMetastore_update_table_params_result() noexcept {
 }
 
+ThriftHiveMetastore_update_table_params_result::ThriftHiveMetastore_update_table_params_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_table_params_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16403,6 +16729,8 @@ uint32_t ThriftHiveMetastore_update_table_params_presult::read(::apache::thrift:
 ThriftHiveMetastore_add_partition_args::~ThriftHiveMetastore_add_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_add_partition_args::ThriftHiveMetastore_add_partition_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16482,6 +16810,8 @@ uint32_t ThriftHiveMetastore_add_partition_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_add_partition_result::~ThriftHiveMetastore_add_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_add_partition_result::ThriftHiveMetastore_add_partition_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16650,6 +16980,8 @@ uint32_t ThriftHiveMetastore_add_partition_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_add_partition_with_environment_context_args::~ThriftHiveMetastore_add_partition_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_add_partition_with_environment_context_args::ThriftHiveMetastore_add_partition_with_environment_context_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partition_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16745,6 +17077,8 @@ uint32_t ThriftHiveMetastore_add_partition_with_environment_context_pargs::write
 ThriftHiveMetastore_add_partition_with_environment_context_result::~ThriftHiveMetastore_add_partition_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_add_partition_with_environment_context_result::ThriftHiveMetastore_add_partition_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partition_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -16913,6 +17247,8 @@ uint32_t ThriftHiveMetastore_add_partition_with_environment_context_presult::rea
 ThriftHiveMetastore_add_partitions_args::~ThriftHiveMetastore_add_partitions_args() noexcept {
 }
 
+ThriftHiveMetastore_add_partitions_args::ThriftHiveMetastore_add_partitions_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partitions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17020,6 +17356,9 @@ uint32_t ThriftHiveMetastore_add_partitions_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_add_partitions_result::~ThriftHiveMetastore_add_partitions_result() noexcept {
 }
 
+ThriftHiveMetastore_add_partitions_result::ThriftHiveMetastore_add_partitions_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_add_partitions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17188,6 +17527,8 @@ uint32_t ThriftHiveMetastore_add_partitions_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_add_partitions_pspec_args::~ThriftHiveMetastore_add_partitions_pspec_args() noexcept {
 }
 
+ThriftHiveMetastore_add_partitions_pspec_args::ThriftHiveMetastore_add_partitions_pspec_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partitions_pspec_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17295,6 +17636,9 @@ uint32_t ThriftHiveMetastore_add_partitions_pspec_pargs::write(::apache::thrift:
 ThriftHiveMetastore_add_partitions_pspec_result::~ThriftHiveMetastore_add_partitions_pspec_result() noexcept {
 }
 
+ThriftHiveMetastore_add_partitions_pspec_result::ThriftHiveMetastore_add_partitions_pspec_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_add_partitions_pspec_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17463,6 +17807,10 @@ uint32_t ThriftHiveMetastore_add_partitions_pspec_presult::read(::apache::thrift
 ThriftHiveMetastore_append_partition_args::~ThriftHiveMetastore_append_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_args::ThriftHiveMetastore_append_partition_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17602,6 +17950,8 @@ uint32_t ThriftHiveMetastore_append_partition_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_append_partition_result::~ThriftHiveMetastore_append_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_result::ThriftHiveMetastore_append_partition_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17770,6 +18120,8 @@ uint32_t ThriftHiveMetastore_append_partition_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_add_partitions_req_args::~ThriftHiveMetastore_add_partitions_req_args() noexcept {
 }
 
+ThriftHiveMetastore_add_partitions_req_args::ThriftHiveMetastore_add_partitions_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partitions_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -17849,6 +18201,8 @@ uint32_t ThriftHiveMetastore_add_partitions_req_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_add_partitions_req_result::~ThriftHiveMetastore_add_partitions_req_result() noexcept {
 }
 
+ThriftHiveMetastore_add_partitions_req_result::ThriftHiveMetastore_add_partitions_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_partitions_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18017,6 +18371,10 @@ uint32_t ThriftHiveMetastore_add_partitions_req_presult::read(::apache::thrift::
 ThriftHiveMetastore_append_partition_with_environment_context_args::~ThriftHiveMetastore_append_partition_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_with_environment_context_args::ThriftHiveMetastore_append_partition_with_environment_context_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18172,6 +18530,8 @@ uint32_t ThriftHiveMetastore_append_partition_with_environment_context_pargs::wr
 ThriftHiveMetastore_append_partition_with_environment_context_result::~ThriftHiveMetastore_append_partition_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_with_environment_context_result::ThriftHiveMetastore_append_partition_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18340,6 +18700,8 @@ uint32_t ThriftHiveMetastore_append_partition_with_environment_context_presult::
 ThriftHiveMetastore_append_partition_req_args::~ThriftHiveMetastore_append_partition_req_args() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_req_args::ThriftHiveMetastore_append_partition_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18419,6 +18781,8 @@ uint32_t ThriftHiveMetastore_append_partition_req_pargs::write(::apache::thrift:
 ThriftHiveMetastore_append_partition_req_result::~ThriftHiveMetastore_append_partition_req_result() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_req_result::ThriftHiveMetastore_append_partition_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18587,6 +18951,11 @@ uint32_t ThriftHiveMetastore_append_partition_req_presult::read(::apache::thrift
 ThriftHiveMetastore_append_partition_by_name_args::~ThriftHiveMetastore_append_partition_by_name_args() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_by_name_args::ThriftHiveMetastore_append_partition_by_name_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name() {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_by_name_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18698,6 +19067,8 @@ uint32_t ThriftHiveMetastore_append_partition_by_name_pargs::write(::apache::thr
 ThriftHiveMetastore_append_partition_by_name_result::~ThriftHiveMetastore_append_partition_by_name_result() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_by_name_result::ThriftHiveMetastore_append_partition_by_name_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_by_name_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18866,6 +19237,11 @@ uint32_t ThriftHiveMetastore_append_partition_by_name_presult::read(::apache::th
 ThriftHiveMetastore_append_partition_by_name_with_environment_context_args::~ThriftHiveMetastore_append_partition_by_name_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_by_name_with_environment_context_args::ThriftHiveMetastore_append_partition_by_name_with_environment_context_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name() {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_by_name_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -18993,6 +19369,8 @@ uint32_t ThriftHiveMetastore_append_partition_by_name_with_environment_context_p
 ThriftHiveMetastore_append_partition_by_name_with_environment_context_result::~ThriftHiveMetastore_append_partition_by_name_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_append_partition_by_name_with_environment_context_result::ThriftHiveMetastore_append_partition_by_name_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_append_partition_by_name_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -19161,6 +19539,11 @@ uint32_t ThriftHiveMetastore_append_partition_by_name_with_environment_context_p
 ThriftHiveMetastore_drop_partition_args::~ThriftHiveMetastore_drop_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_args::ThriftHiveMetastore_drop_partition_args() noexcept
+   : db_name(),
+     tbl_name(),
+     deleteData(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -19316,6 +19699,9 @@ uint32_t ThriftHiveMetastore_drop_partition_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_drop_partition_result::~ThriftHiveMetastore_drop_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_result::ThriftHiveMetastore_drop_partition_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -19464,6 +19850,11 @@ uint32_t ThriftHiveMetastore_drop_partition_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_drop_partition_with_environment_context_args::~ThriftHiveMetastore_drop_partition_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_with_environment_context_args::ThriftHiveMetastore_drop_partition_with_environment_context_args() noexcept
+   : db_name(),
+     tbl_name(),
+     deleteData(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -19635,6 +20026,9 @@ uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_pargs::writ
 ThriftHiveMetastore_drop_partition_with_environment_context_result::~ThriftHiveMetastore_drop_partition_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_with_environment_context_result::ThriftHiveMetastore_drop_partition_with_environment_context_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -19783,6 +20177,8 @@ uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_presult::re
 ThriftHiveMetastore_drop_partition_req_args::~ThriftHiveMetastore_drop_partition_req_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_req_args::ThriftHiveMetastore_drop_partition_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -19862,6 +20258,9 @@ uint32_t ThriftHiveMetastore_drop_partition_req_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_drop_partition_req_result::~ThriftHiveMetastore_drop_partition_req_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_req_result::ThriftHiveMetastore_drop_partition_req_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20010,6 +20409,12 @@ uint32_t ThriftHiveMetastore_drop_partition_req_presult::read(::apache::thrift::
 ThriftHiveMetastore_drop_partition_by_name_args::~ThriftHiveMetastore_drop_partition_by_name_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_by_name_args::ThriftHiveMetastore_drop_partition_by_name_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name(),
+     deleteData(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_by_name_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20137,6 +20542,9 @@ uint32_t ThriftHiveMetastore_drop_partition_by_name_pargs::write(::apache::thrif
 ThriftHiveMetastore_drop_partition_by_name_result::~ThriftHiveMetastore_drop_partition_by_name_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_by_name_result::ThriftHiveMetastore_drop_partition_by_name_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_by_name_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20285,6 +20693,12 @@ uint32_t ThriftHiveMetastore_drop_partition_by_name_presult::read(::apache::thri
 ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args::~ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args::ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name(),
+     deleteData(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20428,6 +20842,9 @@ uint32_t ThriftHiveMetastore_drop_partition_by_name_with_environment_context_par
 ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result::~ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result::ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20576,6 +20993,8 @@ uint32_t ThriftHiveMetastore_drop_partition_by_name_with_environment_context_pre
 ThriftHiveMetastore_drop_partitions_req_args::~ThriftHiveMetastore_drop_partitions_req_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_partitions_req_args::ThriftHiveMetastore_drop_partitions_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_partitions_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20655,6 +21074,8 @@ uint32_t ThriftHiveMetastore_drop_partitions_req_pargs::write(::apache::thrift::
 ThriftHiveMetastore_drop_partitions_req_result::~ThriftHiveMetastore_drop_partitions_req_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_partitions_req_result::ThriftHiveMetastore_drop_partitions_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_partitions_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20803,6 +21224,10 @@ uint32_t ThriftHiveMetastore_drop_partitions_req_presult::read(::apache::thrift:
 ThriftHiveMetastore_get_partition_args::~ThriftHiveMetastore_get_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_args::ThriftHiveMetastore_get_partition_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -20942,6 +21367,8 @@ uint32_t ThriftHiveMetastore_get_partition_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_get_partition_result::~ThriftHiveMetastore_get_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_result::ThriftHiveMetastore_get_partition_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -21090,6 +21517,8 @@ uint32_t ThriftHiveMetastore_get_partition_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_partition_req_args::~ThriftHiveMetastore_get_partition_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_req_args::ThriftHiveMetastore_get_partition_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -21169,6 +21598,8 @@ uint32_t ThriftHiveMetastore_get_partition_req_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_partition_req_result::~ThriftHiveMetastore_get_partition_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_req_result::ThriftHiveMetastore_get_partition_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -21317,6 +21748,12 @@ uint32_t ThriftHiveMetastore_get_partition_req_presult::read(::apache::thrift::p
 ThriftHiveMetastore_exchange_partition_args::~ThriftHiveMetastore_exchange_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_exchange_partition_args::ThriftHiveMetastore_exchange_partition_args() noexcept
+   : source_db(),
+     source_table_name(),
+     dest_db(),
+     dest_table_name() {
+}
 
 uint32_t ThriftHiveMetastore_exchange_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -21493,6 +21930,8 @@ uint32_t ThriftHiveMetastore_exchange_partition_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_exchange_partition_result::~ThriftHiveMetastore_exchange_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_exchange_partition_result::ThriftHiveMetastore_exchange_partition_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_exchange_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -21681,6 +22120,12 @@ uint32_t ThriftHiveMetastore_exchange_partition_presult::read(::apache::thrift::
 ThriftHiveMetastore_exchange_partitions_args::~ThriftHiveMetastore_exchange_partitions_args() noexcept {
 }
 
+ThriftHiveMetastore_exchange_partitions_args::ThriftHiveMetastore_exchange_partitions_args() noexcept
+   : source_db(),
+     source_table_name(),
+     dest_db(),
+     dest_table_name() {
+}
 
 uint32_t ThriftHiveMetastore_exchange_partitions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -21857,6 +22302,8 @@ uint32_t ThriftHiveMetastore_exchange_partitions_pargs::write(::apache::thrift::
 ThriftHiveMetastore_exchange_partitions_result::~ThriftHiveMetastore_exchange_partitions_result() noexcept {
 }
 
+ThriftHiveMetastore_exchange_partitions_result::ThriftHiveMetastore_exchange_partitions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_exchange_partitions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22077,6 +22524,11 @@ uint32_t ThriftHiveMetastore_exchange_partitions_presult::read(::apache::thrift:
 ThriftHiveMetastore_get_partition_with_auth_args::~ThriftHiveMetastore_get_partition_with_auth_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_with_auth_args::ThriftHiveMetastore_get_partition_with_auth_args() noexcept
+   : db_name(),
+     tbl_name(),
+     user_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_with_auth_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22276,6 +22728,8 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_pargs::write(::apache::thri
 ThriftHiveMetastore_get_partition_with_auth_result::~ThriftHiveMetastore_get_partition_with_auth_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_with_auth_result::ThriftHiveMetastore_get_partition_with_auth_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_with_auth_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22424,6 +22878,11 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_presult::read(::apache::thr
 ThriftHiveMetastore_get_partition_by_name_args::~ThriftHiveMetastore_get_partition_by_name_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_by_name_args::ThriftHiveMetastore_get_partition_by_name_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_by_name_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22535,6 +22994,8 @@ uint32_t ThriftHiveMetastore_get_partition_by_name_pargs::write(::apache::thrift
 ThriftHiveMetastore_get_partition_by_name_result::~ThriftHiveMetastore_get_partition_by_name_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_by_name_result::ThriftHiveMetastore_get_partition_by_name_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_by_name_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22683,6 +23144,11 @@ uint32_t ThriftHiveMetastore_get_partition_by_name_presult::read(::apache::thrif
 ThriftHiveMetastore_get_partitions_args::~ThriftHiveMetastore_get_partitions_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_args::ThriftHiveMetastore_get_partitions_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22794,6 +23260,8 @@ uint32_t ThriftHiveMetastore_get_partitions_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_partitions_result::~ThriftHiveMetastore_get_partitions_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_result::ThriftHiveMetastore_get_partitions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -22974,6 +23442,8 @@ uint32_t ThriftHiveMetastore_get_partitions_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_get_partitions_req_args::~ThriftHiveMetastore_get_partitions_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_req_args::ThriftHiveMetastore_get_partitions_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23053,6 +23523,8 @@ uint32_t ThriftHiveMetastore_get_partitions_req_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_get_partitions_req_result::~ThriftHiveMetastore_get_partitions_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_req_result::ThriftHiveMetastore_get_partitions_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23201,6 +23673,12 @@ uint32_t ThriftHiveMetastore_get_partitions_req_presult::read(::apache::thrift::
 ThriftHiveMetastore_get_partitions_with_auth_args::~ThriftHiveMetastore_get_partitions_with_auth_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_with_auth_args::ThriftHiveMetastore_get_partitions_with_auth_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1),
+     user_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_with_auth_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23372,6 +23850,8 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_pargs::write(::apache::thr
 ThriftHiveMetastore_get_partitions_with_auth_result::~ThriftHiveMetastore_get_partitions_with_auth_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_with_auth_result::ThriftHiveMetastore_get_partitions_with_auth_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_with_auth_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23552,6 +24032,11 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_presult::read(::apache::th
 ThriftHiveMetastore_get_partitions_pspec_args::~ThriftHiveMetastore_get_partitions_pspec_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_pspec_args::ThriftHiveMetastore_get_partitions_pspec_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_pspec_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23663,6 +24148,8 @@ uint32_t ThriftHiveMetastore_get_partitions_pspec_pargs::write(::apache::thrift:
 ThriftHiveMetastore_get_partitions_pspec_result::~ThriftHiveMetastore_get_partitions_pspec_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_pspec_result::ThriftHiveMetastore_get_partitions_pspec_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_pspec_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23843,6 +24330,11 @@ uint32_t ThriftHiveMetastore_get_partitions_pspec_presult::read(::apache::thrift
 ThriftHiveMetastore_get_partition_names_args::~ThriftHiveMetastore_get_partition_names_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_args::ThriftHiveMetastore_get_partition_names_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -23954,6 +24446,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_pargs::write(::apache::thrift::
 ThriftHiveMetastore_get_partition_names_result::~ThriftHiveMetastore_get_partition_names_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_result::ThriftHiveMetastore_get_partition_names_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24134,6 +24628,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_presult::read(::apache::thrift:
 ThriftHiveMetastore_fetch_partition_names_req_args::~ThriftHiveMetastore_fetch_partition_names_req_args() noexcept {
 }
 
+ThriftHiveMetastore_fetch_partition_names_req_args::ThriftHiveMetastore_fetch_partition_names_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_fetch_partition_names_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24213,6 +24709,8 @@ uint32_t ThriftHiveMetastore_fetch_partition_names_req_pargs::write(::apache::th
 ThriftHiveMetastore_fetch_partition_names_req_result::~ThriftHiveMetastore_fetch_partition_names_req_result() noexcept {
 }
 
+ThriftHiveMetastore_fetch_partition_names_req_result::ThriftHiveMetastore_fetch_partition_names_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_fetch_partition_names_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24393,6 +24891,8 @@ uint32_t ThriftHiveMetastore_fetch_partition_names_req_presult::read(::apache::t
 ThriftHiveMetastore_get_partition_values_args::~ThriftHiveMetastore_get_partition_values_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_values_args::ThriftHiveMetastore_get_partition_values_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_values_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24472,6 +24972,8 @@ uint32_t ThriftHiveMetastore_get_partition_values_pargs::write(::apache::thrift:
 ThriftHiveMetastore_get_partition_values_result::~ThriftHiveMetastore_get_partition_values_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_values_result::ThriftHiveMetastore_get_partition_values_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_values_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24620,6 +25122,11 @@ uint32_t ThriftHiveMetastore_get_partition_values_presult::read(::apache::thrift
 ThriftHiveMetastore_get_partitions_ps_args::~ThriftHiveMetastore_get_partitions_ps_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_ps_args::ThriftHiveMetastore_get_partitions_ps_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_ps_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24775,6 +25282,8 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_partitions_ps_result::~ThriftHiveMetastore_get_partitions_ps_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_ps_result::ThriftHiveMetastore_get_partitions_ps_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_ps_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -24955,6 +25464,12 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_partitions_ps_with_auth_args::~ThriftHiveMetastore_get_partitions_ps_with_auth_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_ps_with_auth_args::ThriftHiveMetastore_get_partitions_ps_with_auth_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1),
+     user_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25170,6 +25685,8 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_pargs::write(::apache::
 ThriftHiveMetastore_get_partitions_ps_with_auth_result::~ThriftHiveMetastore_get_partitions_ps_with_auth_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_ps_with_auth_result::ThriftHiveMetastore_get_partitions_ps_with_auth_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25350,6 +25867,8 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_presult::read(::apache:
 ThriftHiveMetastore_get_partitions_ps_with_auth_req_args::~ThriftHiveMetastore_get_partitions_ps_with_auth_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_ps_with_auth_req_args::ThriftHiveMetastore_get_partitions_ps_with_auth_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25429,6 +25948,8 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_req_pargs::write(::apac
 ThriftHiveMetastore_get_partitions_ps_with_auth_req_result::~ThriftHiveMetastore_get_partitions_ps_with_auth_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_ps_with_auth_req_result::ThriftHiveMetastore_get_partitions_ps_with_auth_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25577,6 +26098,11 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_req_presult::read(::apa
 ThriftHiveMetastore_get_partition_names_ps_args::~ThriftHiveMetastore_get_partition_names_ps_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_ps_args::ThriftHiveMetastore_get_partition_names_ps_args() noexcept
+   : db_name(),
+     tbl_name(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_ps_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25732,6 +26258,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_ps_pargs::write(::apache::thrif
 ThriftHiveMetastore_get_partition_names_ps_result::~ThriftHiveMetastore_get_partition_names_ps_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_ps_result::ThriftHiveMetastore_get_partition_names_ps_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_ps_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25912,6 +26440,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_ps_presult::read(::apache::thri
 ThriftHiveMetastore_get_partition_names_ps_req_args::~ThriftHiveMetastore_get_partition_names_ps_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_ps_req_args::ThriftHiveMetastore_get_partition_names_ps_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_ps_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -25991,6 +26521,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_ps_req_pargs::write(::apache::t
 ThriftHiveMetastore_get_partition_names_ps_req_result::~ThriftHiveMetastore_get_partition_names_ps_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_ps_req_result::ThriftHiveMetastore_get_partition_names_ps_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_ps_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26139,6 +26671,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_ps_req_presult::read(::apache::
 ThriftHiveMetastore_get_partition_names_req_args::~ThriftHiveMetastore_get_partition_names_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_req_args::ThriftHiveMetastore_get_partition_names_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26218,6 +26752,8 @@ uint32_t ThriftHiveMetastore_get_partition_names_req_pargs::write(::apache::thri
 ThriftHiveMetastore_get_partition_names_req_result::~ThriftHiveMetastore_get_partition_names_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_names_req_result::ThriftHiveMetastore_get_partition_names_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_names_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26398,6 +26934,12 @@ uint32_t ThriftHiveMetastore_get_partition_names_req_presult::read(::apache::thr
 ThriftHiveMetastore_get_partitions_by_filter_args::~ThriftHiveMetastore_get_partitions_by_filter_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_filter_args::ThriftHiveMetastore_get_partitions_by_filter_args() noexcept
+   : db_name(),
+     tbl_name(),
+     filter(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_filter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26525,6 +27067,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_filter_pargs::write(::apache::thr
 ThriftHiveMetastore_get_partitions_by_filter_result::~ThriftHiveMetastore_get_partitions_by_filter_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_filter_result::ThriftHiveMetastore_get_partitions_by_filter_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_filter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26705,6 +27249,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_filter_presult::read(::apache::th
 ThriftHiveMetastore_get_partitions_by_filter_req_args::~ThriftHiveMetastore_get_partitions_by_filter_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_filter_req_args::ThriftHiveMetastore_get_partitions_by_filter_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_filter_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26784,6 +27330,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_filter_req_pargs::write(::apache:
 ThriftHiveMetastore_get_partitions_by_filter_req_result::~ThriftHiveMetastore_get_partitions_by_filter_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_filter_req_result::ThriftHiveMetastore_get_partitions_by_filter_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_filter_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -26964,6 +27512,12 @@ uint32_t ThriftHiveMetastore_get_partitions_by_filter_req_presult::read(::apache
 ThriftHiveMetastore_get_part_specs_by_filter_args::~ThriftHiveMetastore_get_part_specs_by_filter_args() noexcept {
 }
 
+ThriftHiveMetastore_get_part_specs_by_filter_args::ThriftHiveMetastore_get_part_specs_by_filter_args() noexcept
+   : db_name(),
+     tbl_name(),
+     filter(),
+     max_parts(-1) {
+}
 
 uint32_t ThriftHiveMetastore_get_part_specs_by_filter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27091,6 +27645,8 @@ uint32_t ThriftHiveMetastore_get_part_specs_by_filter_pargs::write(::apache::thr
 ThriftHiveMetastore_get_part_specs_by_filter_result::~ThriftHiveMetastore_get_part_specs_by_filter_result() noexcept {
 }
 
+ThriftHiveMetastore_get_part_specs_by_filter_result::ThriftHiveMetastore_get_part_specs_by_filter_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_part_specs_by_filter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27271,6 +27827,8 @@ uint32_t ThriftHiveMetastore_get_part_specs_by_filter_presult::read(::apache::th
 ThriftHiveMetastore_get_partitions_by_expr_args::~ThriftHiveMetastore_get_partitions_by_expr_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_expr_args::ThriftHiveMetastore_get_partitions_by_expr_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_expr_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27350,6 +27908,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_expr_pargs::write(::apache::thrif
 ThriftHiveMetastore_get_partitions_by_expr_result::~ThriftHiveMetastore_get_partitions_by_expr_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_expr_result::ThriftHiveMetastore_get_partitions_by_expr_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_expr_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27498,6 +28058,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_expr_presult::read(::apache::thri
 ThriftHiveMetastore_get_partitions_spec_by_expr_args::~ThriftHiveMetastore_get_partitions_spec_by_expr_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_spec_by_expr_args::ThriftHiveMetastore_get_partitions_spec_by_expr_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_spec_by_expr_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27577,6 +28139,8 @@ uint32_t ThriftHiveMetastore_get_partitions_spec_by_expr_pargs::write(::apache::
 ThriftHiveMetastore_get_partitions_spec_by_expr_result::~ThriftHiveMetastore_get_partitions_spec_by_expr_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_spec_by_expr_result::ThriftHiveMetastore_get_partitions_spec_by_expr_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_spec_by_expr_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27725,6 +28289,11 @@ uint32_t ThriftHiveMetastore_get_partitions_spec_by_expr_presult::read(::apache:
 ThriftHiveMetastore_get_num_partitions_by_filter_args::~ThriftHiveMetastore_get_num_partitions_by_filter_args() noexcept {
 }
 
+ThriftHiveMetastore_get_num_partitions_by_filter_args::ThriftHiveMetastore_get_num_partitions_by_filter_args() noexcept
+   : db_name(),
+     tbl_name(),
+     filter() {
+}
 
 uint32_t ThriftHiveMetastore_get_num_partitions_by_filter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27836,6 +28405,9 @@ uint32_t ThriftHiveMetastore_get_num_partitions_by_filter_pargs::write(::apache:
 ThriftHiveMetastore_get_num_partitions_by_filter_result::~ThriftHiveMetastore_get_num_partitions_by_filter_result() noexcept {
 }
 
+ThriftHiveMetastore_get_num_partitions_by_filter_result::ThriftHiveMetastore_get_num_partitions_by_filter_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_get_num_partitions_by_filter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -27984,6 +28556,10 @@ uint32_t ThriftHiveMetastore_get_num_partitions_by_filter_presult::read(::apache
 ThriftHiveMetastore_get_partitions_by_names_args::~ThriftHiveMetastore_get_partitions_by_names_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_names_args::ThriftHiveMetastore_get_partitions_by_names_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_names_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28123,6 +28699,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_names_pargs::write(::apache::thri
 ThriftHiveMetastore_get_partitions_by_names_result::~ThriftHiveMetastore_get_partitions_by_names_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_names_result::ThriftHiveMetastore_get_partitions_by_names_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_names_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28323,6 +28901,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_names_presult::read(::apache::thr
 ThriftHiveMetastore_get_partitions_by_names_req_args::~ThriftHiveMetastore_get_partitions_by_names_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_names_req_args::ThriftHiveMetastore_get_partitions_by_names_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_names_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28402,6 +28982,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_names_req_pargs::write(::apache::
 ThriftHiveMetastore_get_partitions_by_names_req_result::~ThriftHiveMetastore_get_partitions_by_names_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_by_names_req_result::ThriftHiveMetastore_get_partitions_by_names_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_by_names_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28570,6 +29152,8 @@ uint32_t ThriftHiveMetastore_get_partitions_by_names_req_presult::read(::apache:
 ThriftHiveMetastore_get_properties_args::~ThriftHiveMetastore_get_properties_args() noexcept {
 }
 
+ThriftHiveMetastore_get_properties_args::ThriftHiveMetastore_get_properties_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_properties_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28649,6 +29233,8 @@ uint32_t ThriftHiveMetastore_get_properties_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_properties_result::~ThriftHiveMetastore_get_properties_result() noexcept {
 }
 
+ThriftHiveMetastore_get_properties_result::ThriftHiveMetastore_get_properties_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_properties_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28797,6 +29383,8 @@ uint32_t ThriftHiveMetastore_get_properties_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_set_properties_args::~ThriftHiveMetastore_set_properties_args() noexcept {
 }
 
+ThriftHiveMetastore_set_properties_args::ThriftHiveMetastore_set_properties_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_set_properties_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -28876,6 +29464,9 @@ uint32_t ThriftHiveMetastore_set_properties_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_set_properties_result::~ThriftHiveMetastore_set_properties_result() noexcept {
 }
 
+ThriftHiveMetastore_set_properties_result::ThriftHiveMetastore_set_properties_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_set_properties_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29024,6 +29615,10 @@ uint32_t ThriftHiveMetastore_set_properties_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_alter_partition_args::~ThriftHiveMetastore_alter_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_partition_args::ThriftHiveMetastore_alter_partition_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_alter_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29135,6 +29730,8 @@ uint32_t ThriftHiveMetastore_alter_partition_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_alter_partition_result::~ThriftHiveMetastore_alter_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_partition_result::ThriftHiveMetastore_alter_partition_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29263,6 +29860,10 @@ uint32_t ThriftHiveMetastore_alter_partition_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_alter_partitions_args::~ThriftHiveMetastore_alter_partitions_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_partitions_args::ThriftHiveMetastore_alter_partitions_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_alter_partitions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29402,6 +30003,8 @@ uint32_t ThriftHiveMetastore_alter_partitions_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_alter_partitions_result::~ThriftHiveMetastore_alter_partitions_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_partitions_result::ThriftHiveMetastore_alter_partitions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_partitions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29530,6 +30133,10 @@ uint32_t ThriftHiveMetastore_alter_partitions_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_alter_partitions_with_environment_context_args::~ThriftHiveMetastore_alter_partitions_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_partitions_with_environment_context_args::ThriftHiveMetastore_alter_partitions_with_environment_context_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_alter_partitions_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29685,6 +30292,8 @@ uint32_t ThriftHiveMetastore_alter_partitions_with_environment_context_pargs::wr
 ThriftHiveMetastore_alter_partitions_with_environment_context_result::~ThriftHiveMetastore_alter_partitions_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_partitions_with_environment_context_result::ThriftHiveMetastore_alter_partitions_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_partitions_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29813,6 +30422,8 @@ uint32_t ThriftHiveMetastore_alter_partitions_with_environment_context_presult::
 ThriftHiveMetastore_alter_partitions_req_args::~ThriftHiveMetastore_alter_partitions_req_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_partitions_req_args::ThriftHiveMetastore_alter_partitions_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_partitions_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -29892,6 +30503,8 @@ uint32_t ThriftHiveMetastore_alter_partitions_req_pargs::write(::apache::thrift:
 ThriftHiveMetastore_alter_partitions_req_result::~ThriftHiveMetastore_alter_partitions_req_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_partitions_req_result::ThriftHiveMetastore_alter_partitions_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_partitions_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30040,6 +30653,10 @@ uint32_t ThriftHiveMetastore_alter_partitions_req_presult::read(::apache::thrift
 ThriftHiveMetastore_alter_partition_with_environment_context_args::~ThriftHiveMetastore_alter_partition_with_environment_context_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_partition_with_environment_context_args::ThriftHiveMetastore_alter_partition_with_environment_context_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_alter_partition_with_environment_context_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30167,6 +30784,8 @@ uint32_t ThriftHiveMetastore_alter_partition_with_environment_context_pargs::wri
 ThriftHiveMetastore_alter_partition_with_environment_context_result::~ThriftHiveMetastore_alter_partition_with_environment_context_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_partition_with_environment_context_result::ThriftHiveMetastore_alter_partition_with_environment_context_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_partition_with_environment_context_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30295,6 +30914,10 @@ uint32_t ThriftHiveMetastore_alter_partition_with_environment_context_presult::r
 ThriftHiveMetastore_rename_partition_args::~ThriftHiveMetastore_rename_partition_args() noexcept {
 }
 
+ThriftHiveMetastore_rename_partition_args::ThriftHiveMetastore_rename_partition_args() noexcept
+   : db_name(),
+     tbl_name() {
+}
 
 uint32_t ThriftHiveMetastore_rename_partition_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30450,6 +31073,8 @@ uint32_t ThriftHiveMetastore_rename_partition_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_rename_partition_result::~ThriftHiveMetastore_rename_partition_result() noexcept {
 }
 
+ThriftHiveMetastore_rename_partition_result::ThriftHiveMetastore_rename_partition_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_rename_partition_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30578,6 +31203,8 @@ uint32_t ThriftHiveMetastore_rename_partition_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_rename_partition_req_args::~ThriftHiveMetastore_rename_partition_req_args() noexcept {
 }
 
+ThriftHiveMetastore_rename_partition_req_args::ThriftHiveMetastore_rename_partition_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_rename_partition_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30657,6 +31284,8 @@ uint32_t ThriftHiveMetastore_rename_partition_req_pargs::write(::apache::thrift:
 ThriftHiveMetastore_rename_partition_req_result::~ThriftHiveMetastore_rename_partition_req_result() noexcept {
 }
 
+ThriftHiveMetastore_rename_partition_req_result::ThriftHiveMetastore_rename_partition_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_rename_partition_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30805,6 +31434,9 @@ uint32_t ThriftHiveMetastore_rename_partition_req_presult::read(::apache::thrift
 ThriftHiveMetastore_partition_name_has_valid_characters_args::~ThriftHiveMetastore_partition_name_has_valid_characters_args() noexcept {
 }
 
+ThriftHiveMetastore_partition_name_has_valid_characters_args::ThriftHiveMetastore_partition_name_has_valid_characters_args() noexcept
+   : throw_exception(0) {
+}
 
 uint32_t ThriftHiveMetastore_partition_name_has_valid_characters_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -30928,6 +31560,9 @@ uint32_t ThriftHiveMetastore_partition_name_has_valid_characters_pargs::write(::
 ThriftHiveMetastore_partition_name_has_valid_characters_result::~ThriftHiveMetastore_partition_name_has_valid_characters_result() noexcept {
 }
 
+ThriftHiveMetastore_partition_name_has_valid_characters_result::ThriftHiveMetastore_partition_name_has_valid_characters_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_partition_name_has_valid_characters_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31056,6 +31691,10 @@ uint32_t ThriftHiveMetastore_partition_name_has_valid_characters_presult::read(:
 ThriftHiveMetastore_get_config_value_args::~ThriftHiveMetastore_get_config_value_args() noexcept {
 }
 
+ThriftHiveMetastore_get_config_value_args::ThriftHiveMetastore_get_config_value_args() noexcept
+   : name(),
+     defaultValue() {
+}
 
 uint32_t ThriftHiveMetastore_get_config_value_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31151,6 +31790,9 @@ uint32_t ThriftHiveMetastore_get_config_value_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_get_config_value_result::~ThriftHiveMetastore_get_config_value_result() noexcept {
 }
 
+ThriftHiveMetastore_get_config_value_result::ThriftHiveMetastore_get_config_value_result() noexcept
+   : success() {
+}
 
 uint32_t ThriftHiveMetastore_get_config_value_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31279,6 +31921,9 @@ uint32_t ThriftHiveMetastore_get_config_value_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_partition_name_to_vals_args::~ThriftHiveMetastore_partition_name_to_vals_args() noexcept {
 }
 
+ThriftHiveMetastore_partition_name_to_vals_args::ThriftHiveMetastore_partition_name_to_vals_args() noexcept
+   : part_name() {
+}
 
 uint32_t ThriftHiveMetastore_partition_name_to_vals_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31358,6 +32003,8 @@ uint32_t ThriftHiveMetastore_partition_name_to_vals_pargs::write(::apache::thrif
 ThriftHiveMetastore_partition_name_to_vals_result::~ThriftHiveMetastore_partition_name_to_vals_result() noexcept {
 }
 
+ThriftHiveMetastore_partition_name_to_vals_result::ThriftHiveMetastore_partition_name_to_vals_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_partition_name_to_vals_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31518,6 +32165,9 @@ uint32_t ThriftHiveMetastore_partition_name_to_vals_presult::read(::apache::thri
 ThriftHiveMetastore_partition_name_to_spec_args::~ThriftHiveMetastore_partition_name_to_spec_args() noexcept {
 }
 
+ThriftHiveMetastore_partition_name_to_spec_args::ThriftHiveMetastore_partition_name_to_spec_args() noexcept
+   : part_name() {
+}
 
 uint32_t ThriftHiveMetastore_partition_name_to_spec_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31597,6 +32247,8 @@ uint32_t ThriftHiveMetastore_partition_name_to_spec_pargs::write(::apache::thrif
 ThriftHiveMetastore_partition_name_to_spec_result::~ThriftHiveMetastore_partition_name_to_spec_result() noexcept {
 }
 
+ThriftHiveMetastore_partition_name_to_spec_result::ThriftHiveMetastore_partition_name_to_spec_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_partition_name_to_spec_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31764,6 +32416,11 @@ uint32_t ThriftHiveMetastore_partition_name_to_spec_presult::read(::apache::thri
 ThriftHiveMetastore_markPartitionForEvent_args::~ThriftHiveMetastore_markPartitionForEvent_args() noexcept {
 }
 
+ThriftHiveMetastore_markPartitionForEvent_args::ThriftHiveMetastore_markPartitionForEvent_args() noexcept
+   : db_name(),
+     tbl_name(),
+     eventType(static_cast<PartitionEventType::type>(0)) {
+}
 
 uint32_t ThriftHiveMetastore_markPartitionForEvent_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -31926,6 +32583,8 @@ uint32_t ThriftHiveMetastore_markPartitionForEvent_pargs::write(::apache::thrift
 ThriftHiveMetastore_markPartitionForEvent_result::~ThriftHiveMetastore_markPartitionForEvent_result() noexcept {
 }
 
+ThriftHiveMetastore_markPartitionForEvent_result::ThriftHiveMetastore_markPartitionForEvent_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_markPartitionForEvent_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32134,6 +32793,11 @@ uint32_t ThriftHiveMetastore_markPartitionForEvent_presult::read(::apache::thrif
 ThriftHiveMetastore_isPartitionMarkedForEvent_args::~ThriftHiveMetastore_isPartitionMarkedForEvent_args() noexcept {
 }
 
+ThriftHiveMetastore_isPartitionMarkedForEvent_args::ThriftHiveMetastore_isPartitionMarkedForEvent_args() noexcept
+   : db_name(),
+     tbl_name(),
+     eventType(static_cast<PartitionEventType::type>(0)) {
+}
 
 uint32_t ThriftHiveMetastore_isPartitionMarkedForEvent_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32296,6 +32960,9 @@ uint32_t ThriftHiveMetastore_isPartitionMarkedForEvent_pargs::write(::apache::th
 ThriftHiveMetastore_isPartitionMarkedForEvent_result::~ThriftHiveMetastore_isPartitionMarkedForEvent_result() noexcept {
 }
 
+ThriftHiveMetastore_isPartitionMarkedForEvent_result::ThriftHiveMetastore_isPartitionMarkedForEvent_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_isPartitionMarkedForEvent_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32524,6 +33191,8 @@ uint32_t ThriftHiveMetastore_isPartitionMarkedForEvent_presult::read(::apache::t
 ThriftHiveMetastore_get_primary_keys_args::~ThriftHiveMetastore_get_primary_keys_args() noexcept {
 }
 
+ThriftHiveMetastore_get_primary_keys_args::ThriftHiveMetastore_get_primary_keys_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_primary_keys_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32603,6 +33272,8 @@ uint32_t ThriftHiveMetastore_get_primary_keys_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_get_primary_keys_result::~ThriftHiveMetastore_get_primary_keys_result() noexcept {
 }
 
+ThriftHiveMetastore_get_primary_keys_result::ThriftHiveMetastore_get_primary_keys_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_primary_keys_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32751,6 +33422,8 @@ uint32_t ThriftHiveMetastore_get_primary_keys_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_get_foreign_keys_args::~ThriftHiveMetastore_get_foreign_keys_args() noexcept {
 }
 
+ThriftHiveMetastore_get_foreign_keys_args::ThriftHiveMetastore_get_foreign_keys_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_foreign_keys_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32830,6 +33503,8 @@ uint32_t ThriftHiveMetastore_get_foreign_keys_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_get_foreign_keys_result::~ThriftHiveMetastore_get_foreign_keys_result() noexcept {
 }
 
+ThriftHiveMetastore_get_foreign_keys_result::ThriftHiveMetastore_get_foreign_keys_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_foreign_keys_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -32978,6 +33653,8 @@ uint32_t ThriftHiveMetastore_get_foreign_keys_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_get_unique_constraints_args::~ThriftHiveMetastore_get_unique_constraints_args() noexcept {
 }
 
+ThriftHiveMetastore_get_unique_constraints_args::ThriftHiveMetastore_get_unique_constraints_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_unique_constraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33057,6 +33734,8 @@ uint32_t ThriftHiveMetastore_get_unique_constraints_pargs::write(::apache::thrif
 ThriftHiveMetastore_get_unique_constraints_result::~ThriftHiveMetastore_get_unique_constraints_result() noexcept {
 }
 
+ThriftHiveMetastore_get_unique_constraints_result::ThriftHiveMetastore_get_unique_constraints_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_unique_constraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33205,6 +33884,8 @@ uint32_t ThriftHiveMetastore_get_unique_constraints_presult::read(::apache::thri
 ThriftHiveMetastore_get_not_null_constraints_args::~ThriftHiveMetastore_get_not_null_constraints_args() noexcept {
 }
 
+ThriftHiveMetastore_get_not_null_constraints_args::ThriftHiveMetastore_get_not_null_constraints_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_not_null_constraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33284,6 +33965,8 @@ uint32_t ThriftHiveMetastore_get_not_null_constraints_pargs::write(::apache::thr
 ThriftHiveMetastore_get_not_null_constraints_result::~ThriftHiveMetastore_get_not_null_constraints_result() noexcept {
 }
 
+ThriftHiveMetastore_get_not_null_constraints_result::ThriftHiveMetastore_get_not_null_constraints_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_not_null_constraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33432,6 +34115,8 @@ uint32_t ThriftHiveMetastore_get_not_null_constraints_presult::read(::apache::th
 ThriftHiveMetastore_get_default_constraints_args::~ThriftHiveMetastore_get_default_constraints_args() noexcept {
 }
 
+ThriftHiveMetastore_get_default_constraints_args::ThriftHiveMetastore_get_default_constraints_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_default_constraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33511,6 +34196,8 @@ uint32_t ThriftHiveMetastore_get_default_constraints_pargs::write(::apache::thri
 ThriftHiveMetastore_get_default_constraints_result::~ThriftHiveMetastore_get_default_constraints_result() noexcept {
 }
 
+ThriftHiveMetastore_get_default_constraints_result::ThriftHiveMetastore_get_default_constraints_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_default_constraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33659,6 +34346,8 @@ uint32_t ThriftHiveMetastore_get_default_constraints_presult::read(::apache::thr
 ThriftHiveMetastore_get_check_constraints_args::~ThriftHiveMetastore_get_check_constraints_args() noexcept {
 }
 
+ThriftHiveMetastore_get_check_constraints_args::ThriftHiveMetastore_get_check_constraints_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_check_constraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33738,6 +34427,8 @@ uint32_t ThriftHiveMetastore_get_check_constraints_pargs::write(::apache::thrift
 ThriftHiveMetastore_get_check_constraints_result::~ThriftHiveMetastore_get_check_constraints_result() noexcept {
 }
 
+ThriftHiveMetastore_get_check_constraints_result::ThriftHiveMetastore_get_check_constraints_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_check_constraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33886,6 +34577,8 @@ uint32_t ThriftHiveMetastore_get_check_constraints_presult::read(::apache::thrif
 ThriftHiveMetastore_get_all_table_constraints_args::~ThriftHiveMetastore_get_all_table_constraints_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_table_constraints_args::ThriftHiveMetastore_get_all_table_constraints_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_table_constraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -33965,6 +34658,8 @@ uint32_t ThriftHiveMetastore_get_all_table_constraints_pargs::write(::apache::th
 ThriftHiveMetastore_get_all_table_constraints_result::~ThriftHiveMetastore_get_all_table_constraints_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_table_constraints_result::ThriftHiveMetastore_get_all_table_constraints_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_table_constraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34113,6 +34808,8 @@ uint32_t ThriftHiveMetastore_get_all_table_constraints_presult::read(::apache::t
 ThriftHiveMetastore_update_table_column_statistics_args::~ThriftHiveMetastore_update_table_column_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_update_table_column_statistics_args::ThriftHiveMetastore_update_table_column_statistics_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_table_column_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34192,6 +34889,9 @@ uint32_t ThriftHiveMetastore_update_table_column_statistics_pargs::write(::apach
 ThriftHiveMetastore_update_table_column_statistics_result::~ThriftHiveMetastore_update_table_column_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_update_table_column_statistics_result::ThriftHiveMetastore_update_table_column_statistics_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_update_table_column_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34380,6 +35080,8 @@ uint32_t ThriftHiveMetastore_update_table_column_statistics_presult::read(::apac
 ThriftHiveMetastore_update_partition_column_statistics_args::~ThriftHiveMetastore_update_partition_column_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_update_partition_column_statistics_args::ThriftHiveMetastore_update_partition_column_statistics_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_partition_column_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34459,6 +35161,9 @@ uint32_t ThriftHiveMetastore_update_partition_column_statistics_pargs::write(::a
 ThriftHiveMetastore_update_partition_column_statistics_result::~ThriftHiveMetastore_update_partition_column_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_update_partition_column_statistics_result::ThriftHiveMetastore_update_partition_column_statistics_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_update_partition_column_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34647,6 +35352,8 @@ uint32_t ThriftHiveMetastore_update_partition_column_statistics_presult::read(::
 ThriftHiveMetastore_update_table_column_statistics_req_args::~ThriftHiveMetastore_update_table_column_statistics_req_args() noexcept {
 }
 
+ThriftHiveMetastore_update_table_column_statistics_req_args::ThriftHiveMetastore_update_table_column_statistics_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_table_column_statistics_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34726,6 +35433,8 @@ uint32_t ThriftHiveMetastore_update_table_column_statistics_req_pargs::write(::a
 ThriftHiveMetastore_update_table_column_statistics_req_result::~ThriftHiveMetastore_update_table_column_statistics_req_result() noexcept {
 }
 
+ThriftHiveMetastore_update_table_column_statistics_req_result::ThriftHiveMetastore_update_table_column_statistics_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_table_column_statistics_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34914,6 +35623,8 @@ uint32_t ThriftHiveMetastore_update_table_column_statistics_req_presult::read(::
 ThriftHiveMetastore_update_partition_column_statistics_req_args::~ThriftHiveMetastore_update_partition_column_statistics_req_args() noexcept {
 }
 
+ThriftHiveMetastore_update_partition_column_statistics_req_args::ThriftHiveMetastore_update_partition_column_statistics_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_partition_column_statistics_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -34993,6 +35704,8 @@ uint32_t ThriftHiveMetastore_update_partition_column_statistics_req_pargs::write
 ThriftHiveMetastore_update_partition_column_statistics_req_result::~ThriftHiveMetastore_update_partition_column_statistics_req_result() noexcept {
 }
 
+ThriftHiveMetastore_update_partition_column_statistics_req_result::ThriftHiveMetastore_update_partition_column_statistics_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_partition_column_statistics_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35181,6 +35894,8 @@ uint32_t ThriftHiveMetastore_update_partition_column_statistics_req_presult::rea
 ThriftHiveMetastore_update_transaction_statistics_args::~ThriftHiveMetastore_update_transaction_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_update_transaction_statistics_args::ThriftHiveMetastore_update_transaction_statistics_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_transaction_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35260,6 +35975,8 @@ uint32_t ThriftHiveMetastore_update_transaction_statistics_pargs::write(::apache
 ThriftHiveMetastore_update_transaction_statistics_result::~ThriftHiveMetastore_update_transaction_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_update_transaction_statistics_result::ThriftHiveMetastore_update_transaction_statistics_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_transaction_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35368,6 +36085,11 @@ uint32_t ThriftHiveMetastore_update_transaction_statistics_presult::read(::apach
 ThriftHiveMetastore_get_table_column_statistics_args::~ThriftHiveMetastore_get_table_column_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_get_table_column_statistics_args::ThriftHiveMetastore_get_table_column_statistics_args() noexcept
+   : db_name(),
+     tbl_name(),
+     col_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_table_column_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35479,6 +36201,8 @@ uint32_t ThriftHiveMetastore_get_table_column_statistics_pargs::write(::apache::
 ThriftHiveMetastore_get_table_column_statistics_result::~ThriftHiveMetastore_get_table_column_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_get_table_column_statistics_result::ThriftHiveMetastore_get_table_column_statistics_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_column_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35667,6 +36391,12 @@ uint32_t ThriftHiveMetastore_get_table_column_statistics_presult::read(::apache:
 ThriftHiveMetastore_get_partition_column_statistics_args::~ThriftHiveMetastore_get_partition_column_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_column_statistics_args::ThriftHiveMetastore_get_partition_column_statistics_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name(),
+     col_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_column_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35794,6 +36524,8 @@ uint32_t ThriftHiveMetastore_get_partition_column_statistics_pargs::write(::apac
 ThriftHiveMetastore_get_partition_column_statistics_result::~ThriftHiveMetastore_get_partition_column_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partition_column_statistics_result::ThriftHiveMetastore_get_partition_column_statistics_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partition_column_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -35982,6 +36714,8 @@ uint32_t ThriftHiveMetastore_get_partition_column_statistics_presult::read(::apa
 ThriftHiveMetastore_get_table_statistics_req_args::~ThriftHiveMetastore_get_table_statistics_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_table_statistics_req_args::ThriftHiveMetastore_get_table_statistics_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_statistics_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36061,6 +36795,8 @@ uint32_t ThriftHiveMetastore_get_table_statistics_req_pargs::write(::apache::thr
 ThriftHiveMetastore_get_table_statistics_req_result::~ThriftHiveMetastore_get_table_statistics_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_table_statistics_req_result::ThriftHiveMetastore_get_table_statistics_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_table_statistics_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36209,6 +36945,8 @@ uint32_t ThriftHiveMetastore_get_table_statistics_req_presult::read(::apache::th
 ThriftHiveMetastore_get_partitions_statistics_req_args::~ThriftHiveMetastore_get_partitions_statistics_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_statistics_req_args::ThriftHiveMetastore_get_partitions_statistics_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_statistics_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36288,6 +37026,8 @@ uint32_t ThriftHiveMetastore_get_partitions_statistics_req_pargs::write(::apache
 ThriftHiveMetastore_get_partitions_statistics_req_result::~ThriftHiveMetastore_get_partitions_statistics_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_statistics_req_result::ThriftHiveMetastore_get_partitions_statistics_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_statistics_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36436,6 +37176,8 @@ uint32_t ThriftHiveMetastore_get_partitions_statistics_req_presult::read(::apach
 ThriftHiveMetastore_get_aggr_stats_for_args::~ThriftHiveMetastore_get_aggr_stats_for_args() noexcept {
 }
 
+ThriftHiveMetastore_get_aggr_stats_for_args::ThriftHiveMetastore_get_aggr_stats_for_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_aggr_stats_for_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36515,6 +37257,8 @@ uint32_t ThriftHiveMetastore_get_aggr_stats_for_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_get_aggr_stats_for_result::~ThriftHiveMetastore_get_aggr_stats_for_result() noexcept {
 }
 
+ThriftHiveMetastore_get_aggr_stats_for_result::ThriftHiveMetastore_get_aggr_stats_for_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_aggr_stats_for_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36663,6 +37407,8 @@ uint32_t ThriftHiveMetastore_get_aggr_stats_for_presult::read(::apache::thrift::
 ThriftHiveMetastore_set_aggr_stats_for_args::~ThriftHiveMetastore_set_aggr_stats_for_args() noexcept {
 }
 
+ThriftHiveMetastore_set_aggr_stats_for_args::ThriftHiveMetastore_set_aggr_stats_for_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_set_aggr_stats_for_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36742,6 +37488,9 @@ uint32_t ThriftHiveMetastore_set_aggr_stats_for_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_set_aggr_stats_for_result::~ThriftHiveMetastore_set_aggr_stats_for_result() noexcept {
 }
 
+ThriftHiveMetastore_set_aggr_stats_for_result::ThriftHiveMetastore_set_aggr_stats_for_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_set_aggr_stats_for_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -36930,6 +37679,13 @@ uint32_t ThriftHiveMetastore_set_aggr_stats_for_presult::read(::apache::thrift::
 ThriftHiveMetastore_delete_partition_column_statistics_args::~ThriftHiveMetastore_delete_partition_column_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_delete_partition_column_statistics_args::ThriftHiveMetastore_delete_partition_column_statistics_args() noexcept
+   : db_name(),
+     tbl_name(),
+     part_name(),
+     col_name(),
+     engine() {
+}
 
 uint32_t ThriftHiveMetastore_delete_partition_column_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37073,6 +37829,9 @@ uint32_t ThriftHiveMetastore_delete_partition_column_statistics_pargs::write(::a
 ThriftHiveMetastore_delete_partition_column_statistics_result::~ThriftHiveMetastore_delete_partition_column_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_delete_partition_column_statistics_result::ThriftHiveMetastore_delete_partition_column_statistics_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_delete_partition_column_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37261,6 +38020,12 @@ uint32_t ThriftHiveMetastore_delete_partition_column_statistics_presult::read(::
 ThriftHiveMetastore_delete_table_column_statistics_args::~ThriftHiveMetastore_delete_table_column_statistics_args() noexcept {
 }
 
+ThriftHiveMetastore_delete_table_column_statistics_args::ThriftHiveMetastore_delete_table_column_statistics_args() noexcept
+   : db_name(),
+     tbl_name(),
+     col_name(),
+     engine() {
+}
 
 uint32_t ThriftHiveMetastore_delete_table_column_statistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37388,6 +38153,9 @@ uint32_t ThriftHiveMetastore_delete_table_column_statistics_pargs::write(::apach
 ThriftHiveMetastore_delete_table_column_statistics_result::~ThriftHiveMetastore_delete_table_column_statistics_result() noexcept {
 }
 
+ThriftHiveMetastore_delete_table_column_statistics_result::ThriftHiveMetastore_delete_table_column_statistics_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_delete_table_column_statistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37576,6 +38344,8 @@ uint32_t ThriftHiveMetastore_delete_table_column_statistics_presult::read(::apac
 ThriftHiveMetastore_delete_column_statistics_req_args::~ThriftHiveMetastore_delete_column_statistics_req_args() noexcept {
 }
 
+ThriftHiveMetastore_delete_column_statistics_req_args::ThriftHiveMetastore_delete_column_statistics_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_delete_column_statistics_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37655,6 +38425,9 @@ uint32_t ThriftHiveMetastore_delete_column_statistics_req_pargs::write(::apache:
 ThriftHiveMetastore_delete_column_statistics_req_result::~ThriftHiveMetastore_delete_column_statistics_req_result() noexcept {
 }
 
+ThriftHiveMetastore_delete_column_statistics_req_result::ThriftHiveMetastore_delete_column_statistics_req_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_delete_column_statistics_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37843,6 +38616,8 @@ uint32_t ThriftHiveMetastore_delete_column_statistics_req_presult::read(::apache
 ThriftHiveMetastore_create_function_args::~ThriftHiveMetastore_create_function_args() noexcept {
 }
 
+ThriftHiveMetastore_create_function_args::ThriftHiveMetastore_create_function_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_function_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -37922,6 +38697,8 @@ uint32_t ThriftHiveMetastore_create_function_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_create_function_result::~ThriftHiveMetastore_create_function_result() noexcept {
 }
 
+ThriftHiveMetastore_create_function_result::ThriftHiveMetastore_create_function_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_function_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38090,6 +38867,10 @@ uint32_t ThriftHiveMetastore_create_function_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_drop_function_args::~ThriftHiveMetastore_drop_function_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_function_args::ThriftHiveMetastore_drop_function_args() noexcept
+   : dbName(),
+     funcName() {
+}
 
 uint32_t ThriftHiveMetastore_drop_function_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38185,6 +38966,8 @@ uint32_t ThriftHiveMetastore_drop_function_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_drop_function_result::~ThriftHiveMetastore_drop_function_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_function_result::ThriftHiveMetastore_drop_function_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_function_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38313,6 +39096,10 @@ uint32_t ThriftHiveMetastore_drop_function_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_alter_function_args::~ThriftHiveMetastore_alter_function_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_function_args::ThriftHiveMetastore_alter_function_args() noexcept
+   : dbName(),
+     funcName() {
+}
 
 uint32_t ThriftHiveMetastore_alter_function_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38424,6 +39211,8 @@ uint32_t ThriftHiveMetastore_alter_function_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_alter_function_result::~ThriftHiveMetastore_alter_function_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_function_result::ThriftHiveMetastore_alter_function_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_function_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38552,6 +39341,10 @@ uint32_t ThriftHiveMetastore_alter_function_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_get_functions_args::~ThriftHiveMetastore_get_functions_args() noexcept {
 }
 
+ThriftHiveMetastore_get_functions_args::ThriftHiveMetastore_get_functions_args() noexcept
+   : dbName(),
+     pattern() {
+}
 
 uint32_t ThriftHiveMetastore_get_functions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38647,6 +39440,8 @@ uint32_t ThriftHiveMetastore_get_functions_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_get_functions_result::~ThriftHiveMetastore_get_functions_result() noexcept {
 }
 
+ThriftHiveMetastore_get_functions_result::ThriftHiveMetastore_get_functions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_functions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38807,6 +39602,8 @@ uint32_t ThriftHiveMetastore_get_functions_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_functions_req_args::~ThriftHiveMetastore_get_functions_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_functions_req_args::ThriftHiveMetastore_get_functions_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_functions_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -38886,6 +39683,8 @@ uint32_t ThriftHiveMetastore_get_functions_req_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_functions_req_result::~ThriftHiveMetastore_get_functions_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_functions_req_result::ThriftHiveMetastore_get_functions_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_functions_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39014,6 +39813,10 @@ uint32_t ThriftHiveMetastore_get_functions_req_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_function_args::~ThriftHiveMetastore_get_function_args() noexcept {
 }
 
+ThriftHiveMetastore_get_function_args::ThriftHiveMetastore_get_function_args() noexcept
+   : dbName(),
+     funcName() {
+}
 
 uint32_t ThriftHiveMetastore_get_function_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39109,6 +39912,8 @@ uint32_t ThriftHiveMetastore_get_function_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_get_function_result::~ThriftHiveMetastore_get_function_result() noexcept {
 }
 
+ThriftHiveMetastore_get_function_result::ThriftHiveMetastore_get_function_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_function_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39257,6 +40062,8 @@ uint32_t ThriftHiveMetastore_get_function_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_get_all_functions_args::~ThriftHiveMetastore_get_all_functions_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_functions_args::ThriftHiveMetastore_get_all_functions_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_functions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39315,6 +40122,8 @@ uint32_t ThriftHiveMetastore_get_all_functions_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_all_functions_result::~ThriftHiveMetastore_get_all_functions_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_functions_result::ThriftHiveMetastore_get_all_functions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_functions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39443,6 +40252,8 @@ uint32_t ThriftHiveMetastore_get_all_functions_presult::read(::apache::thrift::p
 ThriftHiveMetastore_create_role_args::~ThriftHiveMetastore_create_role_args() noexcept {
 }
 
+ThriftHiveMetastore_create_role_args::ThriftHiveMetastore_create_role_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_role_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39522,6 +40333,9 @@ uint32_t ThriftHiveMetastore_create_role_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_create_role_result::~ThriftHiveMetastore_create_role_result() noexcept {
 }
 
+ThriftHiveMetastore_create_role_result::ThriftHiveMetastore_create_role_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_create_role_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39650,6 +40464,9 @@ uint32_t ThriftHiveMetastore_create_role_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_drop_role_args::~ThriftHiveMetastore_drop_role_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_role_args::ThriftHiveMetastore_drop_role_args() noexcept
+   : role_name() {
+}
 
 uint32_t ThriftHiveMetastore_drop_role_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39729,6 +40546,9 @@ uint32_t ThriftHiveMetastore_drop_role_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_drop_role_result::~ThriftHiveMetastore_drop_role_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_role_result::ThriftHiveMetastore_drop_role_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_drop_role_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39857,6 +40677,8 @@ uint32_t ThriftHiveMetastore_drop_role_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_get_role_names_args::~ThriftHiveMetastore_get_role_names_args() noexcept {
 }
 
+ThriftHiveMetastore_get_role_names_args::ThriftHiveMetastore_get_role_names_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_role_names_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -39915,6 +40737,8 @@ uint32_t ThriftHiveMetastore_get_role_names_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_get_role_names_result::~ThriftHiveMetastore_get_role_names_result() noexcept {
 }
 
+ThriftHiveMetastore_get_role_names_result::ThriftHiveMetastore_get_role_names_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_role_names_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40075,6 +40899,14 @@ uint32_t ThriftHiveMetastore_get_role_names_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_grant_role_args::~ThriftHiveMetastore_grant_role_args() noexcept {
 }
 
+ThriftHiveMetastore_grant_role_args::ThriftHiveMetastore_grant_role_args() noexcept
+   : role_name(),
+     principal_name(),
+     principal_type(static_cast<PrincipalType::type>(0)),
+     grantor(),
+     grantorType(static_cast<PrincipalType::type>(0)),
+     grant_option(0) {
+}
 
 uint32_t ThriftHiveMetastore_grant_role_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40238,6 +41070,9 @@ uint32_t ThriftHiveMetastore_grant_role_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_grant_role_result::~ThriftHiveMetastore_grant_role_result() noexcept {
 }
 
+ThriftHiveMetastore_grant_role_result::ThriftHiveMetastore_grant_role_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_grant_role_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40366,6 +41201,11 @@ uint32_t ThriftHiveMetastore_grant_role_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_revoke_role_args::~ThriftHiveMetastore_revoke_role_args() noexcept {
 }
 
+ThriftHiveMetastore_revoke_role_args::ThriftHiveMetastore_revoke_role_args() noexcept
+   : role_name(),
+     principal_name(),
+     principal_type(static_cast<PrincipalType::type>(0)) {
+}
 
 uint32_t ThriftHiveMetastore_revoke_role_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40479,6 +41319,9 @@ uint32_t ThriftHiveMetastore_revoke_role_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_revoke_role_result::~ThriftHiveMetastore_revoke_role_result() noexcept {
 }
 
+ThriftHiveMetastore_revoke_role_result::ThriftHiveMetastore_revoke_role_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_revoke_role_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40607,6 +41450,10 @@ uint32_t ThriftHiveMetastore_revoke_role_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_list_roles_args::~ThriftHiveMetastore_list_roles_args() noexcept {
 }
 
+ThriftHiveMetastore_list_roles_args::ThriftHiveMetastore_list_roles_args() noexcept
+   : principal_name(),
+     principal_type(static_cast<PrincipalType::type>(0)) {
+}
 
 uint32_t ThriftHiveMetastore_list_roles_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40704,6 +41551,8 @@ uint32_t ThriftHiveMetastore_list_roles_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_list_roles_result::~ThriftHiveMetastore_list_roles_result() noexcept {
 }
 
+ThriftHiveMetastore_list_roles_result::ThriftHiveMetastore_list_roles_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_list_roles_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40864,6 +41713,8 @@ uint32_t ThriftHiveMetastore_list_roles_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_grant_revoke_role_args::~ThriftHiveMetastore_grant_revoke_role_args() noexcept {
 }
 
+ThriftHiveMetastore_grant_revoke_role_args::ThriftHiveMetastore_grant_revoke_role_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_grant_revoke_role_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -40943,6 +41794,8 @@ uint32_t ThriftHiveMetastore_grant_revoke_role_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_grant_revoke_role_result::~ThriftHiveMetastore_grant_revoke_role_result() noexcept {
 }
 
+ThriftHiveMetastore_grant_revoke_role_result::ThriftHiveMetastore_grant_revoke_role_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_grant_revoke_role_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41071,6 +41924,8 @@ uint32_t ThriftHiveMetastore_grant_revoke_role_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_principals_in_role_args::~ThriftHiveMetastore_get_principals_in_role_args() noexcept {
 }
 
+ThriftHiveMetastore_get_principals_in_role_args::ThriftHiveMetastore_get_principals_in_role_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_principals_in_role_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41150,6 +42005,8 @@ uint32_t ThriftHiveMetastore_get_principals_in_role_pargs::write(::apache::thrif
 ThriftHiveMetastore_get_principals_in_role_result::~ThriftHiveMetastore_get_principals_in_role_result() noexcept {
 }
 
+ThriftHiveMetastore_get_principals_in_role_result::ThriftHiveMetastore_get_principals_in_role_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_principals_in_role_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41278,6 +42135,8 @@ uint32_t ThriftHiveMetastore_get_principals_in_role_presult::read(::apache::thri
 ThriftHiveMetastore_get_role_grants_for_principal_args::~ThriftHiveMetastore_get_role_grants_for_principal_args() noexcept {
 }
 
+ThriftHiveMetastore_get_role_grants_for_principal_args::ThriftHiveMetastore_get_role_grants_for_principal_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_role_grants_for_principal_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41357,6 +42216,8 @@ uint32_t ThriftHiveMetastore_get_role_grants_for_principal_pargs::write(::apache
 ThriftHiveMetastore_get_role_grants_for_principal_result::~ThriftHiveMetastore_get_role_grants_for_principal_result() noexcept {
 }
 
+ThriftHiveMetastore_get_role_grants_for_principal_result::ThriftHiveMetastore_get_role_grants_for_principal_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_role_grants_for_principal_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41485,6 +42346,9 @@ uint32_t ThriftHiveMetastore_get_role_grants_for_principal_presult::read(::apach
 ThriftHiveMetastore_get_privilege_set_args::~ThriftHiveMetastore_get_privilege_set_args() noexcept {
 }
 
+ThriftHiveMetastore_get_privilege_set_args::ThriftHiveMetastore_get_privilege_set_args() noexcept
+   : user_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_privilege_set_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41624,6 +42488,8 @@ uint32_t ThriftHiveMetastore_get_privilege_set_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_privilege_set_result::~ThriftHiveMetastore_get_privilege_set_result() noexcept {
 }
 
+ThriftHiveMetastore_get_privilege_set_result::ThriftHiveMetastore_get_privilege_set_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_privilege_set_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41752,6 +42618,10 @@ uint32_t ThriftHiveMetastore_get_privilege_set_presult::read(::apache::thrift::p
 ThriftHiveMetastore_list_privileges_args::~ThriftHiveMetastore_list_privileges_args() noexcept {
 }
 
+ThriftHiveMetastore_list_privileges_args::ThriftHiveMetastore_list_privileges_args() noexcept
+   : principal_name(),
+     principal_type(static_cast<PrincipalType::type>(0)) {
+}
 
 uint32_t ThriftHiveMetastore_list_privileges_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -41865,6 +42735,8 @@ uint32_t ThriftHiveMetastore_list_privileges_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_list_privileges_result::~ThriftHiveMetastore_list_privileges_result() noexcept {
 }
 
+ThriftHiveMetastore_list_privileges_result::ThriftHiveMetastore_list_privileges_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_list_privileges_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42025,6 +42897,8 @@ uint32_t ThriftHiveMetastore_list_privileges_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_grant_privileges_args::~ThriftHiveMetastore_grant_privileges_args() noexcept {
 }
 
+ThriftHiveMetastore_grant_privileges_args::ThriftHiveMetastore_grant_privileges_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_grant_privileges_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42104,6 +42978,9 @@ uint32_t ThriftHiveMetastore_grant_privileges_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_grant_privileges_result::~ThriftHiveMetastore_grant_privileges_result() noexcept {
 }
 
+ThriftHiveMetastore_grant_privileges_result::ThriftHiveMetastore_grant_privileges_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_grant_privileges_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42232,6 +43109,8 @@ uint32_t ThriftHiveMetastore_grant_privileges_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_revoke_privileges_args::~ThriftHiveMetastore_revoke_privileges_args() noexcept {
 }
 
+ThriftHiveMetastore_revoke_privileges_args::ThriftHiveMetastore_revoke_privileges_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_revoke_privileges_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42311,6 +43190,9 @@ uint32_t ThriftHiveMetastore_revoke_privileges_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_revoke_privileges_result::~ThriftHiveMetastore_revoke_privileges_result() noexcept {
 }
 
+ThriftHiveMetastore_revoke_privileges_result::ThriftHiveMetastore_revoke_privileges_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_revoke_privileges_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42439,6 +43321,8 @@ uint32_t ThriftHiveMetastore_revoke_privileges_presult::read(::apache::thrift::p
 ThriftHiveMetastore_grant_revoke_privileges_args::~ThriftHiveMetastore_grant_revoke_privileges_args() noexcept {
 }
 
+ThriftHiveMetastore_grant_revoke_privileges_args::ThriftHiveMetastore_grant_revoke_privileges_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_grant_revoke_privileges_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42518,6 +43402,8 @@ uint32_t ThriftHiveMetastore_grant_revoke_privileges_pargs::write(::apache::thri
 ThriftHiveMetastore_grant_revoke_privileges_result::~ThriftHiveMetastore_grant_revoke_privileges_result() noexcept {
 }
 
+ThriftHiveMetastore_grant_revoke_privileges_result::ThriftHiveMetastore_grant_revoke_privileges_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_grant_revoke_privileges_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42646,6 +43532,9 @@ uint32_t ThriftHiveMetastore_grant_revoke_privileges_presult::read(::apache::thr
 ThriftHiveMetastore_refresh_privileges_args::~ThriftHiveMetastore_refresh_privileges_args() noexcept {
 }
 
+ThriftHiveMetastore_refresh_privileges_args::ThriftHiveMetastore_refresh_privileges_args() noexcept
+   : authorizer() {
+}
 
 uint32_t ThriftHiveMetastore_refresh_privileges_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42757,6 +43646,8 @@ uint32_t ThriftHiveMetastore_refresh_privileges_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_refresh_privileges_result::~ThriftHiveMetastore_refresh_privileges_result() noexcept {
 }
 
+ThriftHiveMetastore_refresh_privileges_result::ThriftHiveMetastore_refresh_privileges_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_refresh_privileges_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -42885,6 +43776,9 @@ uint32_t ThriftHiveMetastore_refresh_privileges_presult::read(::apache::thrift::
 ThriftHiveMetastore_set_ugi_args::~ThriftHiveMetastore_set_ugi_args() noexcept {
 }
 
+ThriftHiveMetastore_set_ugi_args::ThriftHiveMetastore_set_ugi_args() noexcept
+   : user_name() {
+}
 
 uint32_t ThriftHiveMetastore_set_ugi_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43008,6 +43902,8 @@ uint32_t ThriftHiveMetastore_set_ugi_pargs::write(::apache::thrift::protocol::TP
 ThriftHiveMetastore_set_ugi_result::~ThriftHiveMetastore_set_ugi_result() noexcept {
 }
 
+ThriftHiveMetastore_set_ugi_result::ThriftHiveMetastore_set_ugi_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_set_ugi_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43168,6 +44064,10 @@ uint32_t ThriftHiveMetastore_set_ugi_presult::read(::apache::thrift::protocol::T
 ThriftHiveMetastore_get_delegation_token_args::~ThriftHiveMetastore_get_delegation_token_args() noexcept {
 }
 
+ThriftHiveMetastore_get_delegation_token_args::ThriftHiveMetastore_get_delegation_token_args() noexcept
+   : token_owner(),
+     renewer_kerberos_principal_name() {
+}
 
 uint32_t ThriftHiveMetastore_get_delegation_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43263,6 +44163,9 @@ uint32_t ThriftHiveMetastore_get_delegation_token_pargs::write(::apache::thrift:
 ThriftHiveMetastore_get_delegation_token_result::~ThriftHiveMetastore_get_delegation_token_result() noexcept {
 }
 
+ThriftHiveMetastore_get_delegation_token_result::ThriftHiveMetastore_get_delegation_token_result() noexcept
+   : success() {
+}
 
 uint32_t ThriftHiveMetastore_get_delegation_token_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43391,6 +44294,9 @@ uint32_t ThriftHiveMetastore_get_delegation_token_presult::read(::apache::thrift
 ThriftHiveMetastore_renew_delegation_token_args::~ThriftHiveMetastore_renew_delegation_token_args() noexcept {
 }
 
+ThriftHiveMetastore_renew_delegation_token_args::ThriftHiveMetastore_renew_delegation_token_args() noexcept
+   : token_str_form() {
+}
 
 uint32_t ThriftHiveMetastore_renew_delegation_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43470,6 +44376,9 @@ uint32_t ThriftHiveMetastore_renew_delegation_token_pargs::write(::apache::thrif
 ThriftHiveMetastore_renew_delegation_token_result::~ThriftHiveMetastore_renew_delegation_token_result() noexcept {
 }
 
+ThriftHiveMetastore_renew_delegation_token_result::ThriftHiveMetastore_renew_delegation_token_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_renew_delegation_token_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43598,6 +44507,9 @@ uint32_t ThriftHiveMetastore_renew_delegation_token_presult::read(::apache::thri
 ThriftHiveMetastore_cancel_delegation_token_args::~ThriftHiveMetastore_cancel_delegation_token_args() noexcept {
 }
 
+ThriftHiveMetastore_cancel_delegation_token_args::ThriftHiveMetastore_cancel_delegation_token_args() noexcept
+   : token_str_form() {
+}
 
 uint32_t ThriftHiveMetastore_cancel_delegation_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43677,6 +44589,8 @@ uint32_t ThriftHiveMetastore_cancel_delegation_token_pargs::write(::apache::thri
 ThriftHiveMetastore_cancel_delegation_token_result::~ThriftHiveMetastore_cancel_delegation_token_result() noexcept {
 }
 
+ThriftHiveMetastore_cancel_delegation_token_result::ThriftHiveMetastore_cancel_delegation_token_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_cancel_delegation_token_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43785,6 +44699,10 @@ uint32_t ThriftHiveMetastore_cancel_delegation_token_presult::read(::apache::thr
 ThriftHiveMetastore_add_token_args::~ThriftHiveMetastore_add_token_args() noexcept {
 }
 
+ThriftHiveMetastore_add_token_args::ThriftHiveMetastore_add_token_args() noexcept
+   : token_identifier(),
+     delegation_token() {
+}
 
 uint32_t ThriftHiveMetastore_add_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43880,6 +44798,9 @@ uint32_t ThriftHiveMetastore_add_token_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_add_token_result::~ThriftHiveMetastore_add_token_result() noexcept {
 }
 
+ThriftHiveMetastore_add_token_result::ThriftHiveMetastore_add_token_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_add_token_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -43988,6 +44909,9 @@ uint32_t ThriftHiveMetastore_add_token_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_remove_token_args::~ThriftHiveMetastore_remove_token_args() noexcept {
 }
 
+ThriftHiveMetastore_remove_token_args::ThriftHiveMetastore_remove_token_args() noexcept
+   : token_identifier() {
+}
 
 uint32_t ThriftHiveMetastore_remove_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44067,6 +44991,9 @@ uint32_t ThriftHiveMetastore_remove_token_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_remove_token_result::~ThriftHiveMetastore_remove_token_result() noexcept {
 }
 
+ThriftHiveMetastore_remove_token_result::ThriftHiveMetastore_remove_token_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_remove_token_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44175,6 +45102,9 @@ uint32_t ThriftHiveMetastore_remove_token_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_get_token_args::~ThriftHiveMetastore_get_token_args() noexcept {
 }
 
+ThriftHiveMetastore_get_token_args::ThriftHiveMetastore_get_token_args() noexcept
+   : token_identifier() {
+}
 
 uint32_t ThriftHiveMetastore_get_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44254,6 +45184,9 @@ uint32_t ThriftHiveMetastore_get_token_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_get_token_result::~ThriftHiveMetastore_get_token_result() noexcept {
 }
 
+ThriftHiveMetastore_get_token_result::ThriftHiveMetastore_get_token_result() noexcept
+   : success() {
+}
 
 uint32_t ThriftHiveMetastore_get_token_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44362,6 +45295,8 @@ uint32_t ThriftHiveMetastore_get_token_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_get_all_token_identifiers_args::~ThriftHiveMetastore_get_all_token_identifiers_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_token_identifiers_args::ThriftHiveMetastore_get_all_token_identifiers_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_token_identifiers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44420,6 +45355,8 @@ uint32_t ThriftHiveMetastore_get_all_token_identifiers_pargs::write(::apache::th
 ThriftHiveMetastore_get_all_token_identifiers_result::~ThriftHiveMetastore_get_all_token_identifiers_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_token_identifiers_result::ThriftHiveMetastore_get_all_token_identifiers_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_token_identifiers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44560,6 +45497,9 @@ uint32_t ThriftHiveMetastore_get_all_token_identifiers_presult::read(::apache::t
 ThriftHiveMetastore_add_master_key_args::~ThriftHiveMetastore_add_master_key_args() noexcept {
 }
 
+ThriftHiveMetastore_add_master_key_args::ThriftHiveMetastore_add_master_key_args() noexcept
+   : key() {
+}
 
 uint32_t ThriftHiveMetastore_add_master_key_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44639,6 +45579,9 @@ uint32_t ThriftHiveMetastore_add_master_key_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_add_master_key_result::~ThriftHiveMetastore_add_master_key_result() noexcept {
 }
 
+ThriftHiveMetastore_add_master_key_result::ThriftHiveMetastore_add_master_key_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_add_master_key_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44767,6 +45710,10 @@ uint32_t ThriftHiveMetastore_add_master_key_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_update_master_key_args::~ThriftHiveMetastore_update_master_key_args() noexcept {
 }
 
+ThriftHiveMetastore_update_master_key_args::ThriftHiveMetastore_update_master_key_args() noexcept
+   : seq_number(0),
+     key() {
+}
 
 uint32_t ThriftHiveMetastore_update_master_key_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44862,6 +45809,8 @@ uint32_t ThriftHiveMetastore_update_master_key_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_update_master_key_result::~ThriftHiveMetastore_update_master_key_result() noexcept {
 }
 
+ThriftHiveMetastore_update_master_key_result::ThriftHiveMetastore_update_master_key_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_master_key_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -44990,6 +45939,9 @@ uint32_t ThriftHiveMetastore_update_master_key_presult::read(::apache::thrift::p
 ThriftHiveMetastore_remove_master_key_args::~ThriftHiveMetastore_remove_master_key_args() noexcept {
 }
 
+ThriftHiveMetastore_remove_master_key_args::ThriftHiveMetastore_remove_master_key_args() noexcept
+   : key_seq(0) {
+}
 
 uint32_t ThriftHiveMetastore_remove_master_key_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45069,6 +46021,9 @@ uint32_t ThriftHiveMetastore_remove_master_key_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_remove_master_key_result::~ThriftHiveMetastore_remove_master_key_result() noexcept {
 }
 
+ThriftHiveMetastore_remove_master_key_result::ThriftHiveMetastore_remove_master_key_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_remove_master_key_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45177,6 +46132,8 @@ uint32_t ThriftHiveMetastore_remove_master_key_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_master_keys_args::~ThriftHiveMetastore_get_master_keys_args() noexcept {
 }
 
+ThriftHiveMetastore_get_master_keys_args::ThriftHiveMetastore_get_master_keys_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_master_keys_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45235,6 +46192,8 @@ uint32_t ThriftHiveMetastore_get_master_keys_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_get_master_keys_result::~ThriftHiveMetastore_get_master_keys_result() noexcept {
 }
 
+ThriftHiveMetastore_get_master_keys_result::ThriftHiveMetastore_get_master_keys_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_master_keys_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45375,6 +46334,8 @@ uint32_t ThriftHiveMetastore_get_master_keys_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_get_open_txns_args::~ThriftHiveMetastore_get_open_txns_args() noexcept {
 }
 
+ThriftHiveMetastore_get_open_txns_args::ThriftHiveMetastore_get_open_txns_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_open_txns_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45433,6 +46394,8 @@ uint32_t ThriftHiveMetastore_get_open_txns_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_get_open_txns_result::~ThriftHiveMetastore_get_open_txns_result() noexcept {
 }
 
+ThriftHiveMetastore_get_open_txns_result::ThriftHiveMetastore_get_open_txns_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_open_txns_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45541,6 +46504,8 @@ uint32_t ThriftHiveMetastore_get_open_txns_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_open_txns_info_args::~ThriftHiveMetastore_get_open_txns_info_args() noexcept {
 }
 
+ThriftHiveMetastore_get_open_txns_info_args::ThriftHiveMetastore_get_open_txns_info_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_open_txns_info_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45599,6 +46564,8 @@ uint32_t ThriftHiveMetastore_get_open_txns_info_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_get_open_txns_info_result::~ThriftHiveMetastore_get_open_txns_info_result() noexcept {
 }
 
+ThriftHiveMetastore_get_open_txns_info_result::ThriftHiveMetastore_get_open_txns_info_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_open_txns_info_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45707,6 +46674,8 @@ uint32_t ThriftHiveMetastore_get_open_txns_info_presult::read(::apache::thrift::
 ThriftHiveMetastore_open_txns_args::~ThriftHiveMetastore_open_txns_args() noexcept {
 }
 
+ThriftHiveMetastore_open_txns_args::ThriftHiveMetastore_open_txns_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_open_txns_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45786,6 +46755,8 @@ uint32_t ThriftHiveMetastore_open_txns_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_open_txns_result::~ThriftHiveMetastore_open_txns_result() noexcept {
 }
 
+ThriftHiveMetastore_open_txns_result::ThriftHiveMetastore_open_txns_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_open_txns_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45894,6 +46865,8 @@ uint32_t ThriftHiveMetastore_open_txns_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_abort_txn_args::~ThriftHiveMetastore_abort_txn_args() noexcept {
 }
 
+ThriftHiveMetastore_abort_txn_args::ThriftHiveMetastore_abort_txn_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_abort_txn_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -45973,6 +46946,8 @@ uint32_t ThriftHiveMetastore_abort_txn_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_abort_txn_result::~ThriftHiveMetastore_abort_txn_result() noexcept {
 }
 
+ThriftHiveMetastore_abort_txn_result::ThriftHiveMetastore_abort_txn_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_abort_txn_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46081,6 +47056,8 @@ uint32_t ThriftHiveMetastore_abort_txn_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_abort_txns_args::~ThriftHiveMetastore_abort_txns_args() noexcept {
 }
 
+ThriftHiveMetastore_abort_txns_args::ThriftHiveMetastore_abort_txns_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_abort_txns_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46160,6 +47137,8 @@ uint32_t ThriftHiveMetastore_abort_txns_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_abort_txns_result::~ThriftHiveMetastore_abort_txns_result() noexcept {
 }
 
+ThriftHiveMetastore_abort_txns_result::ThriftHiveMetastore_abort_txns_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_abort_txns_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46268,6 +47247,8 @@ uint32_t ThriftHiveMetastore_abort_txns_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_commit_txn_args::~ThriftHiveMetastore_commit_txn_args() noexcept {
 }
 
+ThriftHiveMetastore_commit_txn_args::ThriftHiveMetastore_commit_txn_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_commit_txn_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46347,6 +47328,8 @@ uint32_t ThriftHiveMetastore_commit_txn_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_commit_txn_result::~ThriftHiveMetastore_commit_txn_result() noexcept {
 }
 
+ThriftHiveMetastore_commit_txn_result::ThriftHiveMetastore_commit_txn_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_commit_txn_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46475,6 +47458,9 @@ uint32_t ThriftHiveMetastore_commit_txn_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_get_latest_txnid_in_conflict_args::~ThriftHiveMetastore_get_latest_txnid_in_conflict_args() noexcept {
 }
 
+ThriftHiveMetastore_get_latest_txnid_in_conflict_args::ThriftHiveMetastore_get_latest_txnid_in_conflict_args() noexcept
+   : txnId(0) {
+}
 
 uint32_t ThriftHiveMetastore_get_latest_txnid_in_conflict_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46554,6 +47540,9 @@ uint32_t ThriftHiveMetastore_get_latest_txnid_in_conflict_pargs::write(::apache:
 ThriftHiveMetastore_get_latest_txnid_in_conflict_result::~ThriftHiveMetastore_get_latest_txnid_in_conflict_result() noexcept {
 }
 
+ThriftHiveMetastore_get_latest_txnid_in_conflict_result::ThriftHiveMetastore_get_latest_txnid_in_conflict_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_get_latest_txnid_in_conflict_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46682,6 +47671,8 @@ uint32_t ThriftHiveMetastore_get_latest_txnid_in_conflict_presult::read(::apache
 ThriftHiveMetastore_repl_tbl_writeid_state_args::~ThriftHiveMetastore_repl_tbl_writeid_state_args() noexcept {
 }
 
+ThriftHiveMetastore_repl_tbl_writeid_state_args::ThriftHiveMetastore_repl_tbl_writeid_state_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_repl_tbl_writeid_state_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46761,6 +47752,8 @@ uint32_t ThriftHiveMetastore_repl_tbl_writeid_state_pargs::write(::apache::thrif
 ThriftHiveMetastore_repl_tbl_writeid_state_result::~ThriftHiveMetastore_repl_tbl_writeid_state_result() noexcept {
 }
 
+ThriftHiveMetastore_repl_tbl_writeid_state_result::ThriftHiveMetastore_repl_tbl_writeid_state_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_repl_tbl_writeid_state_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46838,6 +47831,8 @@ uint32_t ThriftHiveMetastore_repl_tbl_writeid_state_presult::read(::apache::thri
 ThriftHiveMetastore_get_valid_write_ids_args::~ThriftHiveMetastore_get_valid_write_ids_args() noexcept {
 }
 
+ThriftHiveMetastore_get_valid_write_ids_args::ThriftHiveMetastore_get_valid_write_ids_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_valid_write_ids_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -46917,6 +47912,8 @@ uint32_t ThriftHiveMetastore_get_valid_write_ids_pargs::write(::apache::thrift::
 ThriftHiveMetastore_get_valid_write_ids_result::~ThriftHiveMetastore_get_valid_write_ids_result() noexcept {
 }
 
+ThriftHiveMetastore_get_valid_write_ids_result::ThriftHiveMetastore_get_valid_write_ids_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_valid_write_ids_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47065,6 +48062,9 @@ uint32_t ThriftHiveMetastore_get_valid_write_ids_presult::read(::apache::thrift:
 ThriftHiveMetastore_add_write_ids_to_min_history_args::~ThriftHiveMetastore_add_write_ids_to_min_history_args() noexcept {
 }
 
+ThriftHiveMetastore_add_write_ids_to_min_history_args::ThriftHiveMetastore_add_write_ids_to_min_history_args() noexcept
+   : txnId(0) {
+}
 
 uint32_t ThriftHiveMetastore_add_write_ids_to_min_history_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47193,6 +48193,8 @@ uint32_t ThriftHiveMetastore_add_write_ids_to_min_history_pargs::write(::apache:
 ThriftHiveMetastore_add_write_ids_to_min_history_result::~ThriftHiveMetastore_add_write_ids_to_min_history_result() noexcept {
 }
 
+ThriftHiveMetastore_add_write_ids_to_min_history_result::ThriftHiveMetastore_add_write_ids_to_min_history_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_write_ids_to_min_history_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47301,6 +48303,8 @@ uint32_t ThriftHiveMetastore_add_write_ids_to_min_history_presult::read(::apache
 ThriftHiveMetastore_allocate_table_write_ids_args::~ThriftHiveMetastore_allocate_table_write_ids_args() noexcept {
 }
 
+ThriftHiveMetastore_allocate_table_write_ids_args::ThriftHiveMetastore_allocate_table_write_ids_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_allocate_table_write_ids_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47380,6 +48384,8 @@ uint32_t ThriftHiveMetastore_allocate_table_write_ids_pargs::write(::apache::thr
 ThriftHiveMetastore_allocate_table_write_ids_result::~ThriftHiveMetastore_allocate_table_write_ids_result() noexcept {
 }
 
+ThriftHiveMetastore_allocate_table_write_ids_result::ThriftHiveMetastore_allocate_table_write_ids_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_allocate_table_write_ids_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47548,6 +48554,8 @@ uint32_t ThriftHiveMetastore_allocate_table_write_ids_presult::read(::apache::th
 ThriftHiveMetastore_get_max_allocated_table_write_id_args::~ThriftHiveMetastore_get_max_allocated_table_write_id_args() noexcept {
 }
 
+ThriftHiveMetastore_get_max_allocated_table_write_id_args::ThriftHiveMetastore_get_max_allocated_table_write_id_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_max_allocated_table_write_id_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47627,6 +48635,8 @@ uint32_t ThriftHiveMetastore_get_max_allocated_table_write_id_pargs::write(::apa
 ThriftHiveMetastore_get_max_allocated_table_write_id_result::~ThriftHiveMetastore_get_max_allocated_table_write_id_result() noexcept {
 }
 
+ThriftHiveMetastore_get_max_allocated_table_write_id_result::ThriftHiveMetastore_get_max_allocated_table_write_id_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_max_allocated_table_write_id_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47755,6 +48765,8 @@ uint32_t ThriftHiveMetastore_get_max_allocated_table_write_id_presult::read(::ap
 ThriftHiveMetastore_seed_write_id_args::~ThriftHiveMetastore_seed_write_id_args() noexcept {
 }
 
+ThriftHiveMetastore_seed_write_id_args::ThriftHiveMetastore_seed_write_id_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_seed_write_id_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47834,6 +48846,8 @@ uint32_t ThriftHiveMetastore_seed_write_id_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_seed_write_id_result::~ThriftHiveMetastore_seed_write_id_result() noexcept {
 }
 
+ThriftHiveMetastore_seed_write_id_result::ThriftHiveMetastore_seed_write_id_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_seed_write_id_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -47942,6 +48956,8 @@ uint32_t ThriftHiveMetastore_seed_write_id_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_seed_txn_id_args::~ThriftHiveMetastore_seed_txn_id_args() noexcept {
 }
 
+ThriftHiveMetastore_seed_txn_id_args::ThriftHiveMetastore_seed_txn_id_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_seed_txn_id_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48021,6 +49037,8 @@ uint32_t ThriftHiveMetastore_seed_txn_id_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_seed_txn_id_result::~ThriftHiveMetastore_seed_txn_id_result() noexcept {
 }
 
+ThriftHiveMetastore_seed_txn_id_result::ThriftHiveMetastore_seed_txn_id_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_seed_txn_id_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48129,6 +49147,8 @@ uint32_t ThriftHiveMetastore_seed_txn_id_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_lock_args::~ThriftHiveMetastore_lock_args() noexcept {
 }
 
+ThriftHiveMetastore_lock_args::ThriftHiveMetastore_lock_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_lock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48208,6 +49228,8 @@ uint32_t ThriftHiveMetastore_lock_pargs::write(::apache::thrift::protocol::TProt
 ThriftHiveMetastore_lock_result::~ThriftHiveMetastore_lock_result() noexcept {
 }
 
+ThriftHiveMetastore_lock_result::ThriftHiveMetastore_lock_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_lock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48356,6 +49378,8 @@ uint32_t ThriftHiveMetastore_lock_presult::read(::apache::thrift::protocol::TPro
 ThriftHiveMetastore_check_lock_args::~ThriftHiveMetastore_check_lock_args() noexcept {
 }
 
+ThriftHiveMetastore_check_lock_args::ThriftHiveMetastore_check_lock_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_check_lock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48435,6 +49459,8 @@ uint32_t ThriftHiveMetastore_check_lock_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_check_lock_result::~ThriftHiveMetastore_check_lock_result() noexcept {
 }
 
+ThriftHiveMetastore_check_lock_result::ThriftHiveMetastore_check_lock_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_check_lock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48603,6 +49629,8 @@ uint32_t ThriftHiveMetastore_check_lock_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_unlock_args::~ThriftHiveMetastore_unlock_args() noexcept {
 }
 
+ThriftHiveMetastore_unlock_args::ThriftHiveMetastore_unlock_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_unlock_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48682,6 +49710,8 @@ uint32_t ThriftHiveMetastore_unlock_pargs::write(::apache::thrift::protocol::TPr
 ThriftHiveMetastore_unlock_result::~ThriftHiveMetastore_unlock_result() noexcept {
 }
 
+ThriftHiveMetastore_unlock_result::ThriftHiveMetastore_unlock_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_unlock_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48810,6 +49840,8 @@ uint32_t ThriftHiveMetastore_unlock_presult::read(::apache::thrift::protocol::TP
 ThriftHiveMetastore_show_locks_args::~ThriftHiveMetastore_show_locks_args() noexcept {
 }
 
+ThriftHiveMetastore_show_locks_args::ThriftHiveMetastore_show_locks_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_show_locks_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48889,6 +49921,8 @@ uint32_t ThriftHiveMetastore_show_locks_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_show_locks_result::~ThriftHiveMetastore_show_locks_result() noexcept {
 }
 
+ThriftHiveMetastore_show_locks_result::ThriftHiveMetastore_show_locks_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_show_locks_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -48997,6 +50031,8 @@ uint32_t ThriftHiveMetastore_show_locks_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_heartbeat_args::~ThriftHiveMetastore_heartbeat_args() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_args::ThriftHiveMetastore_heartbeat_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49076,6 +50112,8 @@ uint32_t ThriftHiveMetastore_heartbeat_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_heartbeat_result::~ThriftHiveMetastore_heartbeat_result() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_result::ThriftHiveMetastore_heartbeat_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49224,6 +50262,8 @@ uint32_t ThriftHiveMetastore_heartbeat_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_heartbeat_txn_range_args::~ThriftHiveMetastore_heartbeat_txn_range_args() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_txn_range_args::ThriftHiveMetastore_heartbeat_txn_range_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_txn_range_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49303,6 +50343,8 @@ uint32_t ThriftHiveMetastore_heartbeat_txn_range_pargs::write(::apache::thrift::
 ThriftHiveMetastore_heartbeat_txn_range_result::~ThriftHiveMetastore_heartbeat_txn_range_result() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_txn_range_result::ThriftHiveMetastore_heartbeat_txn_range_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_txn_range_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49411,6 +50453,8 @@ uint32_t ThriftHiveMetastore_heartbeat_txn_range_presult::read(::apache::thrift:
 ThriftHiveMetastore_compact_args::~ThriftHiveMetastore_compact_args() noexcept {
 }
 
+ThriftHiveMetastore_compact_args::ThriftHiveMetastore_compact_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_compact_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49490,6 +50534,8 @@ uint32_t ThriftHiveMetastore_compact_pargs::write(::apache::thrift::protocol::TP
 ThriftHiveMetastore_compact_result::~ThriftHiveMetastore_compact_result() noexcept {
 }
 
+ThriftHiveMetastore_compact_result::ThriftHiveMetastore_compact_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_compact_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49567,6 +50613,8 @@ uint32_t ThriftHiveMetastore_compact_presult::read(::apache::thrift::protocol::T
 ThriftHiveMetastore_compact2_args::~ThriftHiveMetastore_compact2_args() noexcept {
 }
 
+ThriftHiveMetastore_compact2_args::ThriftHiveMetastore_compact2_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_compact2_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49646,6 +50694,8 @@ uint32_t ThriftHiveMetastore_compact2_pargs::write(::apache::thrift::protocol::T
 ThriftHiveMetastore_compact2_result::~ThriftHiveMetastore_compact2_result() noexcept {
 }
 
+ThriftHiveMetastore_compact2_result::ThriftHiveMetastore_compact2_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_compact2_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49754,6 +50804,8 @@ uint32_t ThriftHiveMetastore_compact2_presult::read(::apache::thrift::protocol::
 ThriftHiveMetastore_show_compact_args::~ThriftHiveMetastore_show_compact_args() noexcept {
 }
 
+ThriftHiveMetastore_show_compact_args::ThriftHiveMetastore_show_compact_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_show_compact_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49833,6 +50885,8 @@ uint32_t ThriftHiveMetastore_show_compact_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_show_compact_result::~ThriftHiveMetastore_show_compact_result() noexcept {
 }
 
+ThriftHiveMetastore_show_compact_result::ThriftHiveMetastore_show_compact_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_show_compact_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -49941,6 +50995,10 @@ uint32_t ThriftHiveMetastore_show_compact_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_submit_for_cleanup_args::~ThriftHiveMetastore_submit_for_cleanup_args() noexcept {
 }
 
+ThriftHiveMetastore_submit_for_cleanup_args::ThriftHiveMetastore_submit_for_cleanup_args() noexcept
+   : o2(0),
+     o3(0) {
+}
 
 uint32_t ThriftHiveMetastore_submit_for_cleanup_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50052,6 +51110,9 @@ uint32_t ThriftHiveMetastore_submit_for_cleanup_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_submit_for_cleanup_result::~ThriftHiveMetastore_submit_for_cleanup_result() noexcept {
 }
 
+ThriftHiveMetastore_submit_for_cleanup_result::ThriftHiveMetastore_submit_for_cleanup_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_submit_for_cleanup_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50180,6 +51241,8 @@ uint32_t ThriftHiveMetastore_submit_for_cleanup_presult::read(::apache::thrift::
 ThriftHiveMetastore_add_dynamic_partitions_args::~ThriftHiveMetastore_add_dynamic_partitions_args() noexcept {
 }
 
+ThriftHiveMetastore_add_dynamic_partitions_args::ThriftHiveMetastore_add_dynamic_partitions_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_dynamic_partitions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50259,6 +51322,8 @@ uint32_t ThriftHiveMetastore_add_dynamic_partitions_pargs::write(::apache::thrif
 ThriftHiveMetastore_add_dynamic_partitions_result::~ThriftHiveMetastore_add_dynamic_partitions_result() noexcept {
 }
 
+ThriftHiveMetastore_add_dynamic_partitions_result::ThriftHiveMetastore_add_dynamic_partitions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_dynamic_partitions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50387,6 +51452,9 @@ uint32_t ThriftHiveMetastore_add_dynamic_partitions_presult::read(::apache::thri
 ThriftHiveMetastore_find_next_compact_args::~ThriftHiveMetastore_find_next_compact_args() noexcept {
 }
 
+ThriftHiveMetastore_find_next_compact_args::ThriftHiveMetastore_find_next_compact_args() noexcept
+   : workerId() {
+}
 
 uint32_t ThriftHiveMetastore_find_next_compact_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50466,6 +51534,8 @@ uint32_t ThriftHiveMetastore_find_next_compact_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_find_next_compact_result::~ThriftHiveMetastore_find_next_compact_result() noexcept {
 }
 
+ThriftHiveMetastore_find_next_compact_result::ThriftHiveMetastore_find_next_compact_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_next_compact_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50594,6 +51664,8 @@ uint32_t ThriftHiveMetastore_find_next_compact_presult::read(::apache::thrift::p
 ThriftHiveMetastore_find_next_compact2_args::~ThriftHiveMetastore_find_next_compact2_args() noexcept {
 }
 
+ThriftHiveMetastore_find_next_compact2_args::ThriftHiveMetastore_find_next_compact2_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_next_compact2_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50673,6 +51745,8 @@ uint32_t ThriftHiveMetastore_find_next_compact2_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_find_next_compact2_result::~ThriftHiveMetastore_find_next_compact2_result() noexcept {
 }
 
+ThriftHiveMetastore_find_next_compact2_result::ThriftHiveMetastore_find_next_compact2_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_next_compact2_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50801,6 +51875,9 @@ uint32_t ThriftHiveMetastore_find_next_compact2_presult::read(::apache::thrift::
 ThriftHiveMetastore_update_compactor_state_args::~ThriftHiveMetastore_update_compactor_state_args() noexcept {
 }
 
+ThriftHiveMetastore_update_compactor_state_args::ThriftHiveMetastore_update_compactor_state_args() noexcept
+   : txn_id(0) {
+}
 
 uint32_t ThriftHiveMetastore_update_compactor_state_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50896,6 +51973,8 @@ uint32_t ThriftHiveMetastore_update_compactor_state_pargs::write(::apache::thrif
 ThriftHiveMetastore_update_compactor_state_result::~ThriftHiveMetastore_update_compactor_state_result() noexcept {
 }
 
+ThriftHiveMetastore_update_compactor_state_result::ThriftHiveMetastore_update_compactor_state_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_compactor_state_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -50973,6 +52052,8 @@ uint32_t ThriftHiveMetastore_update_compactor_state_presult::read(::apache::thri
 ThriftHiveMetastore_find_columns_with_stats_args::~ThriftHiveMetastore_find_columns_with_stats_args() noexcept {
 }
 
+ThriftHiveMetastore_find_columns_with_stats_args::ThriftHiveMetastore_find_columns_with_stats_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_columns_with_stats_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51052,6 +52133,8 @@ uint32_t ThriftHiveMetastore_find_columns_with_stats_pargs::write(::apache::thri
 ThriftHiveMetastore_find_columns_with_stats_result::~ThriftHiveMetastore_find_columns_with_stats_result() noexcept {
 }
 
+ThriftHiveMetastore_find_columns_with_stats_result::ThriftHiveMetastore_find_columns_with_stats_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_columns_with_stats_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51192,6 +52275,8 @@ uint32_t ThriftHiveMetastore_find_columns_with_stats_presult::read(::apache::thr
 ThriftHiveMetastore_mark_cleaned_args::~ThriftHiveMetastore_mark_cleaned_args() noexcept {
 }
 
+ThriftHiveMetastore_mark_cleaned_args::ThriftHiveMetastore_mark_cleaned_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_cleaned_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51271,6 +52356,8 @@ uint32_t ThriftHiveMetastore_mark_cleaned_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_mark_cleaned_result::~ThriftHiveMetastore_mark_cleaned_result() noexcept {
 }
 
+ThriftHiveMetastore_mark_cleaned_result::ThriftHiveMetastore_mark_cleaned_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_cleaned_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51379,6 +52466,8 @@ uint32_t ThriftHiveMetastore_mark_cleaned_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_mark_compacted_args::~ThriftHiveMetastore_mark_compacted_args() noexcept {
 }
 
+ThriftHiveMetastore_mark_compacted_args::ThriftHiveMetastore_mark_compacted_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_compacted_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51458,6 +52547,8 @@ uint32_t ThriftHiveMetastore_mark_compacted_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_mark_compacted_result::~ThriftHiveMetastore_mark_compacted_result() noexcept {
 }
 
+ThriftHiveMetastore_mark_compacted_result::ThriftHiveMetastore_mark_compacted_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_compacted_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51566,6 +52657,8 @@ uint32_t ThriftHiveMetastore_mark_compacted_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_mark_failed_args::~ThriftHiveMetastore_mark_failed_args() noexcept {
 }
 
+ThriftHiveMetastore_mark_failed_args::ThriftHiveMetastore_mark_failed_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_failed_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51645,6 +52738,8 @@ uint32_t ThriftHiveMetastore_mark_failed_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_mark_failed_result::~ThriftHiveMetastore_mark_failed_result() noexcept {
 }
 
+ThriftHiveMetastore_mark_failed_result::ThriftHiveMetastore_mark_failed_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_failed_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51753,6 +52848,8 @@ uint32_t ThriftHiveMetastore_mark_failed_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_mark_refused_args::~ThriftHiveMetastore_mark_refused_args() noexcept {
 }
 
+ThriftHiveMetastore_mark_refused_args::ThriftHiveMetastore_mark_refused_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_refused_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51832,6 +52929,8 @@ uint32_t ThriftHiveMetastore_mark_refused_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_mark_refused_result::~ThriftHiveMetastore_mark_refused_result() noexcept {
 }
 
+ThriftHiveMetastore_mark_refused_result::ThriftHiveMetastore_mark_refused_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_mark_refused_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -51940,6 +53039,8 @@ uint32_t ThriftHiveMetastore_mark_refused_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_update_compaction_metrics_data_args::~ThriftHiveMetastore_update_compaction_metrics_data_args() noexcept {
 }
 
+ThriftHiveMetastore_update_compaction_metrics_data_args::ThriftHiveMetastore_update_compaction_metrics_data_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_update_compaction_metrics_data_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52019,6 +53120,9 @@ uint32_t ThriftHiveMetastore_update_compaction_metrics_data_pargs::write(::apach
 ThriftHiveMetastore_update_compaction_metrics_data_result::~ThriftHiveMetastore_update_compaction_metrics_data_result() noexcept {
 }
 
+ThriftHiveMetastore_update_compaction_metrics_data_result::ThriftHiveMetastore_update_compaction_metrics_data_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_update_compaction_metrics_data_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52147,6 +53251,8 @@ uint32_t ThriftHiveMetastore_update_compaction_metrics_data_presult::read(::apac
 ThriftHiveMetastore_remove_compaction_metrics_data_args::~ThriftHiveMetastore_remove_compaction_metrics_data_args() noexcept {
 }
 
+ThriftHiveMetastore_remove_compaction_metrics_data_args::ThriftHiveMetastore_remove_compaction_metrics_data_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_remove_compaction_metrics_data_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52226,6 +53332,8 @@ uint32_t ThriftHiveMetastore_remove_compaction_metrics_data_pargs::write(::apach
 ThriftHiveMetastore_remove_compaction_metrics_data_result::~ThriftHiveMetastore_remove_compaction_metrics_data_result() noexcept {
 }
 
+ThriftHiveMetastore_remove_compaction_metrics_data_result::ThriftHiveMetastore_remove_compaction_metrics_data_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_remove_compaction_metrics_data_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52334,6 +53442,10 @@ uint32_t ThriftHiveMetastore_remove_compaction_metrics_data_presult::read(::apac
 ThriftHiveMetastore_set_hadoop_jobid_args::~ThriftHiveMetastore_set_hadoop_jobid_args() noexcept {
 }
 
+ThriftHiveMetastore_set_hadoop_jobid_args::ThriftHiveMetastore_set_hadoop_jobid_args() noexcept
+   : jobId(),
+     cq_id(0) {
+}
 
 uint32_t ThriftHiveMetastore_set_hadoop_jobid_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52429,6 +53541,8 @@ uint32_t ThriftHiveMetastore_set_hadoop_jobid_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_set_hadoop_jobid_result::~ThriftHiveMetastore_set_hadoop_jobid_result() noexcept {
 }
 
+ThriftHiveMetastore_set_hadoop_jobid_result::ThriftHiveMetastore_set_hadoop_jobid_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_set_hadoop_jobid_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52506,6 +53620,8 @@ uint32_t ThriftHiveMetastore_set_hadoop_jobid_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_get_latest_committed_compaction_info_args::~ThriftHiveMetastore_get_latest_committed_compaction_info_args() noexcept {
 }
 
+ThriftHiveMetastore_get_latest_committed_compaction_info_args::ThriftHiveMetastore_get_latest_committed_compaction_info_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_latest_committed_compaction_info_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52585,6 +53701,8 @@ uint32_t ThriftHiveMetastore_get_latest_committed_compaction_info_pargs::write(:
 ThriftHiveMetastore_get_latest_committed_compaction_info_result::~ThriftHiveMetastore_get_latest_committed_compaction_info_result() noexcept {
 }
 
+ThriftHiveMetastore_get_latest_committed_compaction_info_result::ThriftHiveMetastore_get_latest_committed_compaction_info_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_latest_committed_compaction_info_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52693,6 +53811,8 @@ uint32_t ThriftHiveMetastore_get_latest_committed_compaction_info_presult::read(
 ThriftHiveMetastore_get_next_notification_args::~ThriftHiveMetastore_get_next_notification_args() noexcept {
 }
 
+ThriftHiveMetastore_get_next_notification_args::ThriftHiveMetastore_get_next_notification_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_next_notification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52772,6 +53892,8 @@ uint32_t ThriftHiveMetastore_get_next_notification_pargs::write(::apache::thrift
 ThriftHiveMetastore_get_next_notification_result::~ThriftHiveMetastore_get_next_notification_result() noexcept {
 }
 
+ThriftHiveMetastore_get_next_notification_result::ThriftHiveMetastore_get_next_notification_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_next_notification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52880,6 +54002,8 @@ uint32_t ThriftHiveMetastore_get_next_notification_presult::read(::apache::thrif
 ThriftHiveMetastore_get_current_notificationEventId_args::~ThriftHiveMetastore_get_current_notificationEventId_args() noexcept {
 }
 
+ThriftHiveMetastore_get_current_notificationEventId_args::ThriftHiveMetastore_get_current_notificationEventId_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_current_notificationEventId_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -52938,6 +54062,8 @@ uint32_t ThriftHiveMetastore_get_current_notificationEventId_pargs::write(::apac
 ThriftHiveMetastore_get_current_notificationEventId_result::~ThriftHiveMetastore_get_current_notificationEventId_result() noexcept {
 }
 
+ThriftHiveMetastore_get_current_notificationEventId_result::ThriftHiveMetastore_get_current_notificationEventId_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_current_notificationEventId_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53046,6 +54172,8 @@ uint32_t ThriftHiveMetastore_get_current_notificationEventId_presult::read(::apa
 ThriftHiveMetastore_get_notification_events_count_args::~ThriftHiveMetastore_get_notification_events_count_args() noexcept {
 }
 
+ThriftHiveMetastore_get_notification_events_count_args::ThriftHiveMetastore_get_notification_events_count_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_notification_events_count_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53125,6 +54253,8 @@ uint32_t ThriftHiveMetastore_get_notification_events_count_pargs::write(::apache
 ThriftHiveMetastore_get_notification_events_count_result::~ThriftHiveMetastore_get_notification_events_count_result() noexcept {
 }
 
+ThriftHiveMetastore_get_notification_events_count_result::ThriftHiveMetastore_get_notification_events_count_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_notification_events_count_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53233,6 +54363,8 @@ uint32_t ThriftHiveMetastore_get_notification_events_count_presult::read(::apach
 ThriftHiveMetastore_fire_listener_event_args::~ThriftHiveMetastore_fire_listener_event_args() noexcept {
 }
 
+ThriftHiveMetastore_fire_listener_event_args::ThriftHiveMetastore_fire_listener_event_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_fire_listener_event_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53312,6 +54444,8 @@ uint32_t ThriftHiveMetastore_fire_listener_event_pargs::write(::apache::thrift::
 ThriftHiveMetastore_fire_listener_event_result::~ThriftHiveMetastore_fire_listener_event_result() noexcept {
 }
 
+ThriftHiveMetastore_fire_listener_event_result::ThriftHiveMetastore_fire_listener_event_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_fire_listener_event_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53420,6 +54554,8 @@ uint32_t ThriftHiveMetastore_fire_listener_event_presult::read(::apache::thrift:
 ThriftHiveMetastore_flushCache_args::~ThriftHiveMetastore_flushCache_args() noexcept {
 }
 
+ThriftHiveMetastore_flushCache_args::ThriftHiveMetastore_flushCache_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_flushCache_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53478,6 +54614,8 @@ uint32_t ThriftHiveMetastore_flushCache_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_flushCache_result::~ThriftHiveMetastore_flushCache_result() noexcept {
 }
 
+ThriftHiveMetastore_flushCache_result::ThriftHiveMetastore_flushCache_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_flushCache_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53555,6 +54693,8 @@ uint32_t ThriftHiveMetastore_flushCache_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_add_write_notification_log_args::~ThriftHiveMetastore_add_write_notification_log_args() noexcept {
 }
 
+ThriftHiveMetastore_add_write_notification_log_args::ThriftHiveMetastore_add_write_notification_log_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_write_notification_log_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53634,6 +54774,8 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_pargs::write(::apache::t
 ThriftHiveMetastore_add_write_notification_log_result::~ThriftHiveMetastore_add_write_notification_log_result() noexcept {
 }
 
+ThriftHiveMetastore_add_write_notification_log_result::ThriftHiveMetastore_add_write_notification_log_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_write_notification_log_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53742,6 +54884,8 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_presult::read(::apache::
 ThriftHiveMetastore_add_write_notification_log_in_batch_args::~ThriftHiveMetastore_add_write_notification_log_in_batch_args() noexcept {
 }
 
+ThriftHiveMetastore_add_write_notification_log_in_batch_args::ThriftHiveMetastore_add_write_notification_log_in_batch_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_write_notification_log_in_batch_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53821,6 +54965,8 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_in_batch_pargs::write(::
 ThriftHiveMetastore_add_write_notification_log_in_batch_result::~ThriftHiveMetastore_add_write_notification_log_in_batch_result() noexcept {
 }
 
+ThriftHiveMetastore_add_write_notification_log_in_batch_result::ThriftHiveMetastore_add_write_notification_log_in_batch_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_write_notification_log_in_batch_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -53929,6 +55075,8 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_in_batch_presult::read(:
 ThriftHiveMetastore_cm_recycle_args::~ThriftHiveMetastore_cm_recycle_args() noexcept {
 }
 
+ThriftHiveMetastore_cm_recycle_args::ThriftHiveMetastore_cm_recycle_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_cm_recycle_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54008,6 +55156,8 @@ uint32_t ThriftHiveMetastore_cm_recycle_pargs::write(::apache::thrift::protocol:
 ThriftHiveMetastore_cm_recycle_result::~ThriftHiveMetastore_cm_recycle_result() noexcept {
 }
 
+ThriftHiveMetastore_cm_recycle_result::ThriftHiveMetastore_cm_recycle_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_cm_recycle_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54136,6 +55286,8 @@ uint32_t ThriftHiveMetastore_cm_recycle_presult::read(::apache::thrift::protocol
 ThriftHiveMetastore_get_file_metadata_by_expr_args::~ThriftHiveMetastore_get_file_metadata_by_expr_args() noexcept {
 }
 
+ThriftHiveMetastore_get_file_metadata_by_expr_args::ThriftHiveMetastore_get_file_metadata_by_expr_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_file_metadata_by_expr_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54215,6 +55367,8 @@ uint32_t ThriftHiveMetastore_get_file_metadata_by_expr_pargs::write(::apache::th
 ThriftHiveMetastore_get_file_metadata_by_expr_result::~ThriftHiveMetastore_get_file_metadata_by_expr_result() noexcept {
 }
 
+ThriftHiveMetastore_get_file_metadata_by_expr_result::ThriftHiveMetastore_get_file_metadata_by_expr_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_file_metadata_by_expr_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54323,6 +55477,8 @@ uint32_t ThriftHiveMetastore_get_file_metadata_by_expr_presult::read(::apache::t
 ThriftHiveMetastore_get_file_metadata_args::~ThriftHiveMetastore_get_file_metadata_args() noexcept {
 }
 
+ThriftHiveMetastore_get_file_metadata_args::ThriftHiveMetastore_get_file_metadata_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_file_metadata_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54402,6 +55558,8 @@ uint32_t ThriftHiveMetastore_get_file_metadata_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_file_metadata_result::~ThriftHiveMetastore_get_file_metadata_result() noexcept {
 }
 
+ThriftHiveMetastore_get_file_metadata_result::ThriftHiveMetastore_get_file_metadata_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_file_metadata_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54510,6 +55668,8 @@ uint32_t ThriftHiveMetastore_get_file_metadata_presult::read(::apache::thrift::p
 ThriftHiveMetastore_put_file_metadata_args::~ThriftHiveMetastore_put_file_metadata_args() noexcept {
 }
 
+ThriftHiveMetastore_put_file_metadata_args::ThriftHiveMetastore_put_file_metadata_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_put_file_metadata_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54589,6 +55749,8 @@ uint32_t ThriftHiveMetastore_put_file_metadata_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_put_file_metadata_result::~ThriftHiveMetastore_put_file_metadata_result() noexcept {
 }
 
+ThriftHiveMetastore_put_file_metadata_result::ThriftHiveMetastore_put_file_metadata_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_put_file_metadata_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54697,6 +55859,8 @@ uint32_t ThriftHiveMetastore_put_file_metadata_presult::read(::apache::thrift::p
 ThriftHiveMetastore_clear_file_metadata_args::~ThriftHiveMetastore_clear_file_metadata_args() noexcept {
 }
 
+ThriftHiveMetastore_clear_file_metadata_args::ThriftHiveMetastore_clear_file_metadata_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_clear_file_metadata_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54776,6 +55940,8 @@ uint32_t ThriftHiveMetastore_clear_file_metadata_pargs::write(::apache::thrift::
 ThriftHiveMetastore_clear_file_metadata_result::~ThriftHiveMetastore_clear_file_metadata_result() noexcept {
 }
 
+ThriftHiveMetastore_clear_file_metadata_result::ThriftHiveMetastore_clear_file_metadata_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_clear_file_metadata_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54884,6 +56050,8 @@ uint32_t ThriftHiveMetastore_clear_file_metadata_presult::read(::apache::thrift:
 ThriftHiveMetastore_cache_file_metadata_args::~ThriftHiveMetastore_cache_file_metadata_args() noexcept {
 }
 
+ThriftHiveMetastore_cache_file_metadata_args::ThriftHiveMetastore_cache_file_metadata_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_cache_file_metadata_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -54963,6 +56131,8 @@ uint32_t ThriftHiveMetastore_cache_file_metadata_pargs::write(::apache::thrift::
 ThriftHiveMetastore_cache_file_metadata_result::~ThriftHiveMetastore_cache_file_metadata_result() noexcept {
 }
 
+ThriftHiveMetastore_cache_file_metadata_result::ThriftHiveMetastore_cache_file_metadata_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_cache_file_metadata_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55071,6 +56241,8 @@ uint32_t ThriftHiveMetastore_cache_file_metadata_presult::read(::apache::thrift:
 ThriftHiveMetastore_get_metastore_db_uuid_args::~ThriftHiveMetastore_get_metastore_db_uuid_args() noexcept {
 }
 
+ThriftHiveMetastore_get_metastore_db_uuid_args::ThriftHiveMetastore_get_metastore_db_uuid_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_metastore_db_uuid_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55129,6 +56301,9 @@ uint32_t ThriftHiveMetastore_get_metastore_db_uuid_pargs::write(::apache::thrift
 ThriftHiveMetastore_get_metastore_db_uuid_result::~ThriftHiveMetastore_get_metastore_db_uuid_result() noexcept {
 }
 
+ThriftHiveMetastore_get_metastore_db_uuid_result::ThriftHiveMetastore_get_metastore_db_uuid_result() noexcept
+   : success() {
+}
 
 uint32_t ThriftHiveMetastore_get_metastore_db_uuid_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55257,6 +56432,8 @@ uint32_t ThriftHiveMetastore_get_metastore_db_uuid_presult::read(::apache::thrif
 ThriftHiveMetastore_create_resource_plan_args::~ThriftHiveMetastore_create_resource_plan_args() noexcept {
 }
 
+ThriftHiveMetastore_create_resource_plan_args::ThriftHiveMetastore_create_resource_plan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_resource_plan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55336,6 +56513,8 @@ uint32_t ThriftHiveMetastore_create_resource_plan_pargs::write(::apache::thrift:
 ThriftHiveMetastore_create_resource_plan_result::~ThriftHiveMetastore_create_resource_plan_result() noexcept {
 }
 
+ThriftHiveMetastore_create_resource_plan_result::ThriftHiveMetastore_create_resource_plan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_resource_plan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55504,6 +56683,8 @@ uint32_t ThriftHiveMetastore_create_resource_plan_presult::read(::apache::thrift
 ThriftHiveMetastore_get_resource_plan_args::~ThriftHiveMetastore_get_resource_plan_args() noexcept {
 }
 
+ThriftHiveMetastore_get_resource_plan_args::ThriftHiveMetastore_get_resource_plan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_resource_plan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55583,6 +56764,8 @@ uint32_t ThriftHiveMetastore_get_resource_plan_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_resource_plan_result::~ThriftHiveMetastore_get_resource_plan_result() noexcept {
 }
 
+ThriftHiveMetastore_get_resource_plan_result::ThriftHiveMetastore_get_resource_plan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_resource_plan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55731,6 +56914,8 @@ uint32_t ThriftHiveMetastore_get_resource_plan_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_active_resource_plan_args::~ThriftHiveMetastore_get_active_resource_plan_args() noexcept {
 }
 
+ThriftHiveMetastore_get_active_resource_plan_args::ThriftHiveMetastore_get_active_resource_plan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_active_resource_plan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55810,6 +56995,8 @@ uint32_t ThriftHiveMetastore_get_active_resource_plan_pargs::write(::apache::thr
 ThriftHiveMetastore_get_active_resource_plan_result::~ThriftHiveMetastore_get_active_resource_plan_result() noexcept {
 }
 
+ThriftHiveMetastore_get_active_resource_plan_result::ThriftHiveMetastore_get_active_resource_plan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_active_resource_plan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -55938,6 +57125,8 @@ uint32_t ThriftHiveMetastore_get_active_resource_plan_presult::read(::apache::th
 ThriftHiveMetastore_get_all_resource_plans_args::~ThriftHiveMetastore_get_all_resource_plans_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_resource_plans_args::ThriftHiveMetastore_get_all_resource_plans_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_resource_plans_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56017,6 +57206,8 @@ uint32_t ThriftHiveMetastore_get_all_resource_plans_pargs::write(::apache::thrif
 ThriftHiveMetastore_get_all_resource_plans_result::~ThriftHiveMetastore_get_all_resource_plans_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_resource_plans_result::ThriftHiveMetastore_get_all_resource_plans_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_resource_plans_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56145,6 +57336,8 @@ uint32_t ThriftHiveMetastore_get_all_resource_plans_presult::read(::apache::thri
 ThriftHiveMetastore_alter_resource_plan_args::~ThriftHiveMetastore_alter_resource_plan_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_resource_plan_args::ThriftHiveMetastore_alter_resource_plan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_resource_plan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56224,6 +57417,8 @@ uint32_t ThriftHiveMetastore_alter_resource_plan_pargs::write(::apache::thrift::
 ThriftHiveMetastore_alter_resource_plan_result::~ThriftHiveMetastore_alter_resource_plan_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_resource_plan_result::ThriftHiveMetastore_alter_resource_plan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_resource_plan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56392,6 +57587,8 @@ uint32_t ThriftHiveMetastore_alter_resource_plan_presult::read(::apache::thrift:
 ThriftHiveMetastore_validate_resource_plan_args::~ThriftHiveMetastore_validate_resource_plan_args() noexcept {
 }
 
+ThriftHiveMetastore_validate_resource_plan_args::ThriftHiveMetastore_validate_resource_plan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_validate_resource_plan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56471,6 +57668,8 @@ uint32_t ThriftHiveMetastore_validate_resource_plan_pargs::write(::apache::thrif
 ThriftHiveMetastore_validate_resource_plan_result::~ThriftHiveMetastore_validate_resource_plan_result() noexcept {
 }
 
+ThriftHiveMetastore_validate_resource_plan_result::ThriftHiveMetastore_validate_resource_plan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_validate_resource_plan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56619,6 +57818,8 @@ uint32_t ThriftHiveMetastore_validate_resource_plan_presult::read(::apache::thri
 ThriftHiveMetastore_drop_resource_plan_args::~ThriftHiveMetastore_drop_resource_plan_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_resource_plan_args::ThriftHiveMetastore_drop_resource_plan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_resource_plan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56698,6 +57899,8 @@ uint32_t ThriftHiveMetastore_drop_resource_plan_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_drop_resource_plan_result::~ThriftHiveMetastore_drop_resource_plan_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_resource_plan_result::ThriftHiveMetastore_drop_resource_plan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_resource_plan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56866,6 +58069,8 @@ uint32_t ThriftHiveMetastore_drop_resource_plan_presult::read(::apache::thrift::
 ThriftHiveMetastore_create_wm_trigger_args::~ThriftHiveMetastore_create_wm_trigger_args() noexcept {
 }
 
+ThriftHiveMetastore_create_wm_trigger_args::ThriftHiveMetastore_create_wm_trigger_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_wm_trigger_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -56945,6 +58150,8 @@ uint32_t ThriftHiveMetastore_create_wm_trigger_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_create_wm_trigger_result::~ThriftHiveMetastore_create_wm_trigger_result() noexcept {
 }
 
+ThriftHiveMetastore_create_wm_trigger_result::ThriftHiveMetastore_create_wm_trigger_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_wm_trigger_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57133,6 +58340,8 @@ uint32_t ThriftHiveMetastore_create_wm_trigger_presult::read(::apache::thrift::p
 ThriftHiveMetastore_alter_wm_trigger_args::~ThriftHiveMetastore_alter_wm_trigger_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_wm_trigger_args::ThriftHiveMetastore_alter_wm_trigger_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_wm_trigger_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57212,6 +58421,8 @@ uint32_t ThriftHiveMetastore_alter_wm_trigger_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_alter_wm_trigger_result::~ThriftHiveMetastore_alter_wm_trigger_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_wm_trigger_result::ThriftHiveMetastore_alter_wm_trigger_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_wm_trigger_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57380,6 +58591,8 @@ uint32_t ThriftHiveMetastore_alter_wm_trigger_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_drop_wm_trigger_args::~ThriftHiveMetastore_drop_wm_trigger_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_wm_trigger_args::ThriftHiveMetastore_drop_wm_trigger_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_wm_trigger_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57459,6 +58672,8 @@ uint32_t ThriftHiveMetastore_drop_wm_trigger_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_drop_wm_trigger_result::~ThriftHiveMetastore_drop_wm_trigger_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_wm_trigger_result::ThriftHiveMetastore_drop_wm_trigger_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_wm_trigger_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57627,6 +58842,8 @@ uint32_t ThriftHiveMetastore_drop_wm_trigger_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_get_triggers_for_resourceplan_args::~ThriftHiveMetastore_get_triggers_for_resourceplan_args() noexcept {
 }
 
+ThriftHiveMetastore_get_triggers_for_resourceplan_args::ThriftHiveMetastore_get_triggers_for_resourceplan_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_triggers_for_resourceplan_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57706,6 +58923,8 @@ uint32_t ThriftHiveMetastore_get_triggers_for_resourceplan_pargs::write(::apache
 ThriftHiveMetastore_get_triggers_for_resourceplan_result::~ThriftHiveMetastore_get_triggers_for_resourceplan_result() noexcept {
 }
 
+ThriftHiveMetastore_get_triggers_for_resourceplan_result::ThriftHiveMetastore_get_triggers_for_resourceplan_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_triggers_for_resourceplan_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57854,6 +59073,8 @@ uint32_t ThriftHiveMetastore_get_triggers_for_resourceplan_presult::read(::apach
 ThriftHiveMetastore_create_wm_pool_args::~ThriftHiveMetastore_create_wm_pool_args() noexcept {
 }
 
+ThriftHiveMetastore_create_wm_pool_args::ThriftHiveMetastore_create_wm_pool_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_wm_pool_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -57933,6 +59154,8 @@ uint32_t ThriftHiveMetastore_create_wm_pool_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_create_wm_pool_result::~ThriftHiveMetastore_create_wm_pool_result() noexcept {
 }
 
+ThriftHiveMetastore_create_wm_pool_result::ThriftHiveMetastore_create_wm_pool_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_wm_pool_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58121,6 +59344,8 @@ uint32_t ThriftHiveMetastore_create_wm_pool_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_alter_wm_pool_args::~ThriftHiveMetastore_alter_wm_pool_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_wm_pool_args::ThriftHiveMetastore_alter_wm_pool_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_wm_pool_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58200,6 +59425,8 @@ uint32_t ThriftHiveMetastore_alter_wm_pool_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_alter_wm_pool_result::~ThriftHiveMetastore_alter_wm_pool_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_wm_pool_result::ThriftHiveMetastore_alter_wm_pool_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_wm_pool_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58388,6 +59615,8 @@ uint32_t ThriftHiveMetastore_alter_wm_pool_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_drop_wm_pool_args::~ThriftHiveMetastore_drop_wm_pool_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_wm_pool_args::ThriftHiveMetastore_drop_wm_pool_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_wm_pool_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58467,6 +59696,8 @@ uint32_t ThriftHiveMetastore_drop_wm_pool_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_drop_wm_pool_result::~ThriftHiveMetastore_drop_wm_pool_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_wm_pool_result::ThriftHiveMetastore_drop_wm_pool_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_wm_pool_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58635,6 +59866,8 @@ uint32_t ThriftHiveMetastore_drop_wm_pool_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_create_or_update_wm_mapping_args::~ThriftHiveMetastore_create_or_update_wm_mapping_args() noexcept {
 }
 
+ThriftHiveMetastore_create_or_update_wm_mapping_args::ThriftHiveMetastore_create_or_update_wm_mapping_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_or_update_wm_mapping_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58714,6 +59947,8 @@ uint32_t ThriftHiveMetastore_create_or_update_wm_mapping_pargs::write(::apache::
 ThriftHiveMetastore_create_or_update_wm_mapping_result::~ThriftHiveMetastore_create_or_update_wm_mapping_result() noexcept {
 }
 
+ThriftHiveMetastore_create_or_update_wm_mapping_result::ThriftHiveMetastore_create_or_update_wm_mapping_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_or_update_wm_mapping_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58902,6 +60137,8 @@ uint32_t ThriftHiveMetastore_create_or_update_wm_mapping_presult::read(::apache:
 ThriftHiveMetastore_drop_wm_mapping_args::~ThriftHiveMetastore_drop_wm_mapping_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_wm_mapping_args::ThriftHiveMetastore_drop_wm_mapping_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_wm_mapping_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -58981,6 +60218,8 @@ uint32_t ThriftHiveMetastore_drop_wm_mapping_pargs::write(::apache::thrift::prot
 ThriftHiveMetastore_drop_wm_mapping_result::~ThriftHiveMetastore_drop_wm_mapping_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_wm_mapping_result::ThriftHiveMetastore_drop_wm_mapping_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_wm_mapping_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59149,6 +60388,8 @@ uint32_t ThriftHiveMetastore_drop_wm_mapping_presult::read(::apache::thrift::pro
 ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args::~ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args() noexcept {
 }
 
+ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args::ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59228,6 +60469,8 @@ uint32_t ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_pargs::wr
 ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result::~ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result() noexcept {
 }
 
+ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result::ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59416,6 +60659,8 @@ uint32_t ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_presult::
 ThriftHiveMetastore_create_ischema_args::~ThriftHiveMetastore_create_ischema_args() noexcept {
 }
 
+ThriftHiveMetastore_create_ischema_args::ThriftHiveMetastore_create_ischema_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_ischema_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59495,6 +60740,8 @@ uint32_t ThriftHiveMetastore_create_ischema_pargs::write(::apache::thrift::proto
 ThriftHiveMetastore_create_ischema_result::~ThriftHiveMetastore_create_ischema_result() noexcept {
 }
 
+ThriftHiveMetastore_create_ischema_result::ThriftHiveMetastore_create_ischema_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_ischema_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59643,6 +60890,8 @@ uint32_t ThriftHiveMetastore_create_ischema_presult::read(::apache::thrift::prot
 ThriftHiveMetastore_alter_ischema_args::~ThriftHiveMetastore_alter_ischema_args() noexcept {
 }
 
+ThriftHiveMetastore_alter_ischema_args::ThriftHiveMetastore_alter_ischema_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_ischema_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59722,6 +60971,8 @@ uint32_t ThriftHiveMetastore_alter_ischema_pargs::write(::apache::thrift::protoc
 ThriftHiveMetastore_alter_ischema_result::~ThriftHiveMetastore_alter_ischema_result() noexcept {
 }
 
+ThriftHiveMetastore_alter_ischema_result::ThriftHiveMetastore_alter_ischema_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_alter_ischema_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59850,6 +61101,8 @@ uint32_t ThriftHiveMetastore_alter_ischema_presult::read(::apache::thrift::proto
 ThriftHiveMetastore_get_ischema_args::~ThriftHiveMetastore_get_ischema_args() noexcept {
 }
 
+ThriftHiveMetastore_get_ischema_args::ThriftHiveMetastore_get_ischema_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_ischema_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -59929,6 +61182,8 @@ uint32_t ThriftHiveMetastore_get_ischema_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_get_ischema_result::~ThriftHiveMetastore_get_ischema_result() noexcept {
 }
 
+ThriftHiveMetastore_get_ischema_result::ThriftHiveMetastore_get_ischema_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_ischema_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60077,6 +61332,8 @@ uint32_t ThriftHiveMetastore_get_ischema_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_drop_ischema_args::~ThriftHiveMetastore_drop_ischema_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_ischema_args::ThriftHiveMetastore_drop_ischema_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_ischema_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60156,6 +61413,8 @@ uint32_t ThriftHiveMetastore_drop_ischema_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_drop_ischema_result::~ThriftHiveMetastore_drop_ischema_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_ischema_result::ThriftHiveMetastore_drop_ischema_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_ischema_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60304,6 +61563,8 @@ uint32_t ThriftHiveMetastore_drop_ischema_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_add_schema_version_args::~ThriftHiveMetastore_add_schema_version_args() noexcept {
 }
 
+ThriftHiveMetastore_add_schema_version_args::ThriftHiveMetastore_add_schema_version_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_schema_version_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60383,6 +61644,8 @@ uint32_t ThriftHiveMetastore_add_schema_version_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_add_schema_version_result::~ThriftHiveMetastore_add_schema_version_result() noexcept {
 }
 
+ThriftHiveMetastore_add_schema_version_result::ThriftHiveMetastore_add_schema_version_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_schema_version_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60531,6 +61794,8 @@ uint32_t ThriftHiveMetastore_add_schema_version_presult::read(::apache::thrift::
 ThriftHiveMetastore_get_schema_version_args::~ThriftHiveMetastore_get_schema_version_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_version_args::ThriftHiveMetastore_get_schema_version_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_version_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60610,6 +61875,8 @@ uint32_t ThriftHiveMetastore_get_schema_version_pargs::write(::apache::thrift::p
 ThriftHiveMetastore_get_schema_version_result::~ThriftHiveMetastore_get_schema_version_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_version_result::ThriftHiveMetastore_get_schema_version_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_version_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60758,6 +62025,8 @@ uint32_t ThriftHiveMetastore_get_schema_version_presult::read(::apache::thrift::
 ThriftHiveMetastore_get_schema_latest_version_args::~ThriftHiveMetastore_get_schema_latest_version_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_latest_version_args::ThriftHiveMetastore_get_schema_latest_version_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_latest_version_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60837,6 +62106,8 @@ uint32_t ThriftHiveMetastore_get_schema_latest_version_pargs::write(::apache::th
 ThriftHiveMetastore_get_schema_latest_version_result::~ThriftHiveMetastore_get_schema_latest_version_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_latest_version_result::ThriftHiveMetastore_get_schema_latest_version_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_latest_version_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -60985,6 +62256,8 @@ uint32_t ThriftHiveMetastore_get_schema_latest_version_presult::read(::apache::t
 ThriftHiveMetastore_get_schema_all_versions_args::~ThriftHiveMetastore_get_schema_all_versions_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_all_versions_args::ThriftHiveMetastore_get_schema_all_versions_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_all_versions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61064,6 +62337,8 @@ uint32_t ThriftHiveMetastore_get_schema_all_versions_pargs::write(::apache::thri
 ThriftHiveMetastore_get_schema_all_versions_result::~ThriftHiveMetastore_get_schema_all_versions_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schema_all_versions_result::ThriftHiveMetastore_get_schema_all_versions_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schema_all_versions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61244,6 +62519,8 @@ uint32_t ThriftHiveMetastore_get_schema_all_versions_presult::read(::apache::thr
 ThriftHiveMetastore_drop_schema_version_args::~ThriftHiveMetastore_drop_schema_version_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_schema_version_args::ThriftHiveMetastore_drop_schema_version_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_schema_version_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61323,6 +62600,8 @@ uint32_t ThriftHiveMetastore_drop_schema_version_pargs::write(::apache::thrift::
 ThriftHiveMetastore_drop_schema_version_result::~ThriftHiveMetastore_drop_schema_version_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_schema_version_result::ThriftHiveMetastore_drop_schema_version_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_schema_version_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61451,6 +62730,8 @@ uint32_t ThriftHiveMetastore_drop_schema_version_presult::read(::apache::thrift:
 ThriftHiveMetastore_get_schemas_by_cols_args::~ThriftHiveMetastore_get_schemas_by_cols_args() noexcept {
 }
 
+ThriftHiveMetastore_get_schemas_by_cols_args::ThriftHiveMetastore_get_schemas_by_cols_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schemas_by_cols_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61530,6 +62811,8 @@ uint32_t ThriftHiveMetastore_get_schemas_by_cols_pargs::write(::apache::thrift::
 ThriftHiveMetastore_get_schemas_by_cols_result::~ThriftHiveMetastore_get_schemas_by_cols_result() noexcept {
 }
 
+ThriftHiveMetastore_get_schemas_by_cols_result::ThriftHiveMetastore_get_schemas_by_cols_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_schemas_by_cols_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61658,6 +62941,8 @@ uint32_t ThriftHiveMetastore_get_schemas_by_cols_presult::read(::apache::thrift:
 ThriftHiveMetastore_map_schema_version_to_serde_args::~ThriftHiveMetastore_map_schema_version_to_serde_args() noexcept {
 }
 
+ThriftHiveMetastore_map_schema_version_to_serde_args::ThriftHiveMetastore_map_schema_version_to_serde_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_map_schema_version_to_serde_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61737,6 +63022,8 @@ uint32_t ThriftHiveMetastore_map_schema_version_to_serde_pargs::write(::apache::
 ThriftHiveMetastore_map_schema_version_to_serde_result::~ThriftHiveMetastore_map_schema_version_to_serde_result() noexcept {
 }
 
+ThriftHiveMetastore_map_schema_version_to_serde_result::ThriftHiveMetastore_map_schema_version_to_serde_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_map_schema_version_to_serde_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61865,6 +63152,8 @@ uint32_t ThriftHiveMetastore_map_schema_version_to_serde_presult::read(::apache:
 ThriftHiveMetastore_set_schema_version_state_args::~ThriftHiveMetastore_set_schema_version_state_args() noexcept {
 }
 
+ThriftHiveMetastore_set_schema_version_state_args::ThriftHiveMetastore_set_schema_version_state_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_set_schema_version_state_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -61944,6 +63233,8 @@ uint32_t ThriftHiveMetastore_set_schema_version_state_pargs::write(::apache::thr
 ThriftHiveMetastore_set_schema_version_state_result::~ThriftHiveMetastore_set_schema_version_state_result() noexcept {
 }
 
+ThriftHiveMetastore_set_schema_version_state_result::ThriftHiveMetastore_set_schema_version_state_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_set_schema_version_state_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62092,6 +63383,8 @@ uint32_t ThriftHiveMetastore_set_schema_version_state_presult::read(::apache::th
 ThriftHiveMetastore_add_serde_args::~ThriftHiveMetastore_add_serde_args() noexcept {
 }
 
+ThriftHiveMetastore_add_serde_args::ThriftHiveMetastore_add_serde_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_serde_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62171,6 +63464,8 @@ uint32_t ThriftHiveMetastore_add_serde_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_add_serde_result::~ThriftHiveMetastore_add_serde_result() noexcept {
 }
 
+ThriftHiveMetastore_add_serde_result::ThriftHiveMetastore_add_serde_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_serde_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62299,6 +63594,8 @@ uint32_t ThriftHiveMetastore_add_serde_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_get_serde_args::~ThriftHiveMetastore_get_serde_args() noexcept {
 }
 
+ThriftHiveMetastore_get_serde_args::ThriftHiveMetastore_get_serde_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_serde_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62378,6 +63675,8 @@ uint32_t ThriftHiveMetastore_get_serde_pargs::write(::apache::thrift::protocol::
 ThriftHiveMetastore_get_serde_result::~ThriftHiveMetastore_get_serde_result() noexcept {
 }
 
+ThriftHiveMetastore_get_serde_result::ThriftHiveMetastore_get_serde_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_serde_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62526,6 +63825,11 @@ uint32_t ThriftHiveMetastore_get_serde_presult::read(::apache::thrift::protocol:
 ThriftHiveMetastore_get_lock_materialization_rebuild_args::~ThriftHiveMetastore_get_lock_materialization_rebuild_args() noexcept {
 }
 
+ThriftHiveMetastore_get_lock_materialization_rebuild_args::ThriftHiveMetastore_get_lock_materialization_rebuild_args() noexcept
+   : dbName(),
+     tableName(),
+     txnId(0) {
+}
 
 uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62637,6 +63941,8 @@ uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_pargs::write(::apa
 ThriftHiveMetastore_get_lock_materialization_rebuild_result::~ThriftHiveMetastore_get_lock_materialization_rebuild_result() noexcept {
 }
 
+ThriftHiveMetastore_get_lock_materialization_rebuild_result::ThriftHiveMetastore_get_lock_materialization_rebuild_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62745,6 +64051,11 @@ uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_presult::read(::ap
 ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args::~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args::ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args() noexcept
+   : dbName(),
+     tableName(),
+     txnId(0) {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62856,6 +64167,9 @@ uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_pargs::write
 ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result::~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result::ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -62964,6 +64278,8 @@ uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_presult::rea
 ThriftHiveMetastore_get_lock_materialization_rebuild_req_args::~ThriftHiveMetastore_get_lock_materialization_rebuild_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_lock_materialization_rebuild_req_args::ThriftHiveMetastore_get_lock_materialization_rebuild_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63043,6 +64359,8 @@ uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_req_pargs::write(:
 ThriftHiveMetastore_get_lock_materialization_rebuild_req_result::~ThriftHiveMetastore_get_lock_materialization_rebuild_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_lock_materialization_rebuild_req_result::ThriftHiveMetastore_get_lock_materialization_rebuild_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63151,6 +64469,8 @@ uint32_t ThriftHiveMetastore_get_lock_materialization_rebuild_req_presult::read(
 ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args::~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args::ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63230,6 +64550,9 @@ uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_pargs::w
 ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result::~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result() noexcept {
 }
 
+ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result::ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result() noexcept
+   : success(0) {
+}
 
 uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63338,6 +64661,8 @@ uint32_t ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_presult:
 ThriftHiveMetastore_add_runtime_stats_args::~ThriftHiveMetastore_add_runtime_stats_args() noexcept {
 }
 
+ThriftHiveMetastore_add_runtime_stats_args::ThriftHiveMetastore_add_runtime_stats_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_runtime_stats_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63417,6 +64742,8 @@ uint32_t ThriftHiveMetastore_add_runtime_stats_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_add_runtime_stats_result::~ThriftHiveMetastore_add_runtime_stats_result() noexcept {
 }
 
+ThriftHiveMetastore_add_runtime_stats_result::ThriftHiveMetastore_add_runtime_stats_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_runtime_stats_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63525,6 +64852,8 @@ uint32_t ThriftHiveMetastore_add_runtime_stats_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_runtime_stats_args::~ThriftHiveMetastore_get_runtime_stats_args() noexcept {
 }
 
+ThriftHiveMetastore_get_runtime_stats_args::ThriftHiveMetastore_get_runtime_stats_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_runtime_stats_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63604,6 +64933,8 @@ uint32_t ThriftHiveMetastore_get_runtime_stats_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_runtime_stats_result::~ThriftHiveMetastore_get_runtime_stats_result() noexcept {
 }
 
+ThriftHiveMetastore_get_runtime_stats_result::ThriftHiveMetastore_get_runtime_stats_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_runtime_stats_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63764,6 +65095,8 @@ uint32_t ThriftHiveMetastore_get_runtime_stats_presult::read(::apache::thrift::p
 ThriftHiveMetastore_get_partitions_with_specs_args::~ThriftHiveMetastore_get_partitions_with_specs_args() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_with_specs_args::ThriftHiveMetastore_get_partitions_with_specs_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_with_specs_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63843,6 +65176,8 @@ uint32_t ThriftHiveMetastore_get_partitions_with_specs_pargs::write(::apache::th
 ThriftHiveMetastore_get_partitions_with_specs_result::~ThriftHiveMetastore_get_partitions_with_specs_result() noexcept {
 }
 
+ThriftHiveMetastore_get_partitions_with_specs_result::ThriftHiveMetastore_get_partitions_with_specs_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_partitions_with_specs_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -63971,6 +65306,8 @@ uint32_t ThriftHiveMetastore_get_partitions_with_specs_presult::read(::apache::t
 ThriftHiveMetastore_scheduled_query_poll_args::~ThriftHiveMetastore_scheduled_query_poll_args() noexcept {
 }
 
+ThriftHiveMetastore_scheduled_query_poll_args::ThriftHiveMetastore_scheduled_query_poll_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_scheduled_query_poll_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64050,6 +65387,8 @@ uint32_t ThriftHiveMetastore_scheduled_query_poll_pargs::write(::apache::thrift:
 ThriftHiveMetastore_scheduled_query_poll_result::~ThriftHiveMetastore_scheduled_query_poll_result() noexcept {
 }
 
+ThriftHiveMetastore_scheduled_query_poll_result::ThriftHiveMetastore_scheduled_query_poll_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_scheduled_query_poll_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64178,6 +65517,8 @@ uint32_t ThriftHiveMetastore_scheduled_query_poll_presult::read(::apache::thrift
 ThriftHiveMetastore_scheduled_query_maintenance_args::~ThriftHiveMetastore_scheduled_query_maintenance_args() noexcept {
 }
 
+ThriftHiveMetastore_scheduled_query_maintenance_args::ThriftHiveMetastore_scheduled_query_maintenance_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_scheduled_query_maintenance_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64257,6 +65598,8 @@ uint32_t ThriftHiveMetastore_scheduled_query_maintenance_pargs::write(::apache::
 ThriftHiveMetastore_scheduled_query_maintenance_result::~ThriftHiveMetastore_scheduled_query_maintenance_result() noexcept {
 }
 
+ThriftHiveMetastore_scheduled_query_maintenance_result::ThriftHiveMetastore_scheduled_query_maintenance_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_scheduled_query_maintenance_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64425,6 +65768,8 @@ uint32_t ThriftHiveMetastore_scheduled_query_maintenance_presult::read(::apache:
 ThriftHiveMetastore_scheduled_query_progress_args::~ThriftHiveMetastore_scheduled_query_progress_args() noexcept {
 }
 
+ThriftHiveMetastore_scheduled_query_progress_args::ThriftHiveMetastore_scheduled_query_progress_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_scheduled_query_progress_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64504,6 +65849,8 @@ uint32_t ThriftHiveMetastore_scheduled_query_progress_pargs::write(::apache::thr
 ThriftHiveMetastore_scheduled_query_progress_result::~ThriftHiveMetastore_scheduled_query_progress_result() noexcept {
 }
 
+ThriftHiveMetastore_scheduled_query_progress_result::ThriftHiveMetastore_scheduled_query_progress_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_scheduled_query_progress_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64632,6 +65979,8 @@ uint32_t ThriftHiveMetastore_scheduled_query_progress_presult::read(::apache::th
 ThriftHiveMetastore_get_scheduled_query_args::~ThriftHiveMetastore_get_scheduled_query_args() noexcept {
 }
 
+ThriftHiveMetastore_get_scheduled_query_args::ThriftHiveMetastore_get_scheduled_query_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_scheduled_query_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64711,6 +66060,8 @@ uint32_t ThriftHiveMetastore_get_scheduled_query_pargs::write(::apache::thrift::
 ThriftHiveMetastore_get_scheduled_query_result::~ThriftHiveMetastore_get_scheduled_query_result() noexcept {
 }
 
+ThriftHiveMetastore_get_scheduled_query_result::ThriftHiveMetastore_get_scheduled_query_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_scheduled_query_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64859,6 +66210,8 @@ uint32_t ThriftHiveMetastore_get_scheduled_query_presult::read(::apache::thrift:
 ThriftHiveMetastore_add_replication_metrics_args::~ThriftHiveMetastore_add_replication_metrics_args() noexcept {
 }
 
+ThriftHiveMetastore_add_replication_metrics_args::ThriftHiveMetastore_add_replication_metrics_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_replication_metrics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -64938,6 +66291,8 @@ uint32_t ThriftHiveMetastore_add_replication_metrics_pargs::write(::apache::thri
 ThriftHiveMetastore_add_replication_metrics_result::~ThriftHiveMetastore_add_replication_metrics_result() noexcept {
 }
 
+ThriftHiveMetastore_add_replication_metrics_result::ThriftHiveMetastore_add_replication_metrics_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_replication_metrics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65046,6 +66401,8 @@ uint32_t ThriftHiveMetastore_add_replication_metrics_presult::read(::apache::thr
 ThriftHiveMetastore_get_replication_metrics_args::~ThriftHiveMetastore_get_replication_metrics_args() noexcept {
 }
 
+ThriftHiveMetastore_get_replication_metrics_args::ThriftHiveMetastore_get_replication_metrics_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_replication_metrics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65125,6 +66482,8 @@ uint32_t ThriftHiveMetastore_get_replication_metrics_pargs::write(::apache::thri
 ThriftHiveMetastore_get_replication_metrics_result::~ThriftHiveMetastore_get_replication_metrics_result() noexcept {
 }
 
+ThriftHiveMetastore_get_replication_metrics_result::ThriftHiveMetastore_get_replication_metrics_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_replication_metrics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65253,6 +66612,8 @@ uint32_t ThriftHiveMetastore_get_replication_metrics_presult::read(::apache::thr
 ThriftHiveMetastore_get_open_txns_req_args::~ThriftHiveMetastore_get_open_txns_req_args() noexcept {
 }
 
+ThriftHiveMetastore_get_open_txns_req_args::ThriftHiveMetastore_get_open_txns_req_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_open_txns_req_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65332,6 +66693,8 @@ uint32_t ThriftHiveMetastore_get_open_txns_req_pargs::write(::apache::thrift::pr
 ThriftHiveMetastore_get_open_txns_req_result::~ThriftHiveMetastore_get_open_txns_req_result() noexcept {
 }
 
+ThriftHiveMetastore_get_open_txns_req_result::ThriftHiveMetastore_get_open_txns_req_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_open_txns_req_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65440,6 +66803,8 @@ uint32_t ThriftHiveMetastore_get_open_txns_req_presult::read(::apache::thrift::p
 ThriftHiveMetastore_create_stored_procedure_args::~ThriftHiveMetastore_create_stored_procedure_args() noexcept {
 }
 
+ThriftHiveMetastore_create_stored_procedure_args::ThriftHiveMetastore_create_stored_procedure_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_stored_procedure_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65519,6 +66884,8 @@ uint32_t ThriftHiveMetastore_create_stored_procedure_pargs::write(::apache::thri
 ThriftHiveMetastore_create_stored_procedure_result::~ThriftHiveMetastore_create_stored_procedure_result() noexcept {
 }
 
+ThriftHiveMetastore_create_stored_procedure_result::ThriftHiveMetastore_create_stored_procedure_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_create_stored_procedure_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65647,6 +67014,8 @@ uint32_t ThriftHiveMetastore_create_stored_procedure_presult::read(::apache::thr
 ThriftHiveMetastore_get_stored_procedure_args::~ThriftHiveMetastore_get_stored_procedure_args() noexcept {
 }
 
+ThriftHiveMetastore_get_stored_procedure_args::ThriftHiveMetastore_get_stored_procedure_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_stored_procedure_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65726,6 +67095,8 @@ uint32_t ThriftHiveMetastore_get_stored_procedure_pargs::write(::apache::thrift:
 ThriftHiveMetastore_get_stored_procedure_result::~ThriftHiveMetastore_get_stored_procedure_result() noexcept {
 }
 
+ThriftHiveMetastore_get_stored_procedure_result::ThriftHiveMetastore_get_stored_procedure_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_stored_procedure_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65874,6 +67245,8 @@ uint32_t ThriftHiveMetastore_get_stored_procedure_presult::read(::apache::thrift
 ThriftHiveMetastore_drop_stored_procedure_args::~ThriftHiveMetastore_drop_stored_procedure_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_stored_procedure_args::ThriftHiveMetastore_drop_stored_procedure_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_stored_procedure_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -65953,6 +67326,8 @@ uint32_t ThriftHiveMetastore_drop_stored_procedure_pargs::write(::apache::thrift
 ThriftHiveMetastore_drop_stored_procedure_result::~ThriftHiveMetastore_drop_stored_procedure_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_stored_procedure_result::ThriftHiveMetastore_drop_stored_procedure_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_stored_procedure_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66061,6 +67436,8 @@ uint32_t ThriftHiveMetastore_drop_stored_procedure_presult::read(::apache::thrif
 ThriftHiveMetastore_get_all_stored_procedures_args::~ThriftHiveMetastore_get_all_stored_procedures_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_stored_procedures_args::ThriftHiveMetastore_get_all_stored_procedures_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_stored_procedures_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66140,6 +67517,8 @@ uint32_t ThriftHiveMetastore_get_all_stored_procedures_pargs::write(::apache::th
 ThriftHiveMetastore_get_all_stored_procedures_result::~ThriftHiveMetastore_get_all_stored_procedures_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_stored_procedures_result::ThriftHiveMetastore_get_all_stored_procedures_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_stored_procedures_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66300,6 +67679,8 @@ uint32_t ThriftHiveMetastore_get_all_stored_procedures_presult::read(::apache::t
 ThriftHiveMetastore_find_package_args::~ThriftHiveMetastore_find_package_args() noexcept {
 }
 
+ThriftHiveMetastore_find_package_args::ThriftHiveMetastore_find_package_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_package_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66379,6 +67760,8 @@ uint32_t ThriftHiveMetastore_find_package_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_find_package_result::~ThriftHiveMetastore_find_package_result() noexcept {
 }
 
+ThriftHiveMetastore_find_package_result::ThriftHiveMetastore_find_package_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_find_package_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66527,6 +67910,8 @@ uint32_t ThriftHiveMetastore_find_package_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_add_package_args::~ThriftHiveMetastore_add_package_args() noexcept {
 }
 
+ThriftHiveMetastore_add_package_args::ThriftHiveMetastore_add_package_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_package_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66606,6 +67991,8 @@ uint32_t ThriftHiveMetastore_add_package_pargs::write(::apache::thrift::protocol
 ThriftHiveMetastore_add_package_result::~ThriftHiveMetastore_add_package_result() noexcept {
 }
 
+ThriftHiveMetastore_add_package_result::ThriftHiveMetastore_add_package_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_add_package_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66714,6 +68101,8 @@ uint32_t ThriftHiveMetastore_add_package_presult::read(::apache::thrift::protoco
 ThriftHiveMetastore_get_all_packages_args::~ThriftHiveMetastore_get_all_packages_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_packages_args::ThriftHiveMetastore_get_all_packages_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_packages_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66793,6 +68182,8 @@ uint32_t ThriftHiveMetastore_get_all_packages_pargs::write(::apache::thrift::pro
 ThriftHiveMetastore_get_all_packages_result::~ThriftHiveMetastore_get_all_packages_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_packages_result::ThriftHiveMetastore_get_all_packages_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_packages_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -66953,6 +68344,8 @@ uint32_t ThriftHiveMetastore_get_all_packages_presult::read(::apache::thrift::pr
 ThriftHiveMetastore_drop_package_args::~ThriftHiveMetastore_drop_package_args() noexcept {
 }
 
+ThriftHiveMetastore_drop_package_args::ThriftHiveMetastore_drop_package_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_package_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -67032,6 +68425,8 @@ uint32_t ThriftHiveMetastore_drop_package_pargs::write(::apache::thrift::protoco
 ThriftHiveMetastore_drop_package_result::~ThriftHiveMetastore_drop_package_result() noexcept {
 }
 
+ThriftHiveMetastore_drop_package_result::ThriftHiveMetastore_drop_package_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_drop_package_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -67140,6 +68535,8 @@ uint32_t ThriftHiveMetastore_drop_package_presult::read(::apache::thrift::protoc
 ThriftHiveMetastore_get_all_write_event_info_args::~ThriftHiveMetastore_get_all_write_event_info_args() noexcept {
 }
 
+ThriftHiveMetastore_get_all_write_event_info_args::ThriftHiveMetastore_get_all_write_event_info_args() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_write_event_info_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -67219,6 +68616,8 @@ uint32_t ThriftHiveMetastore_get_all_write_event_info_pargs::write(::apache::thr
 ThriftHiveMetastore_get_all_write_event_info_result::~ThriftHiveMetastore_get_all_write_event_info_result() noexcept {
 }
 
+ThriftHiveMetastore_get_all_write_event_info_result::ThriftHiveMetastore_get_all_write_event_info_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_all_write_event_info_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -67379,6 +68778,9 @@ uint32_t ThriftHiveMetastore_get_all_write_event_info_presult::read(::apache::th
 ThriftHiveMetastore_get_replayed_txns_for_policy_args::~ThriftHiveMetastore_get_replayed_txns_for_policy_args() noexcept {
 }
 
+ThriftHiveMetastore_get_replayed_txns_for_policy_args::ThriftHiveMetastore_get_replayed_txns_for_policy_args() noexcept
+   : policyName() {
+}
 
 uint32_t ThriftHiveMetastore_get_replayed_txns_for_policy_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -67458,6 +68860,8 @@ uint32_t ThriftHiveMetastore_get_replayed_txns_for_policy_pargs::write(::apache:
 ThriftHiveMetastore_get_replayed_txns_for_policy_result::~ThriftHiveMetastore_get_replayed_txns_for_policy_result() noexcept {
 }
 
+ThriftHiveMetastore_get_replayed_txns_for_policy_result::ThriftHiveMetastore_get_replayed_txns_for_policy_result() noexcept {
+}
 
 uint32_t ThriftHiveMetastore_get_replayed_txns_for_policy_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
index 33f1aabb80a0..8577b787351a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -1250,8 +1250,7 @@ class ThriftHiveMetastore_abort_Compactions_args {
 
   ThriftHiveMetastore_abort_Compactions_args(const ThriftHiveMetastore_abort_Compactions_args&);
   ThriftHiveMetastore_abort_Compactions_args& operator=(const ThriftHiveMetastore_abort_Compactions_args&);
-  ThriftHiveMetastore_abort_Compactions_args() noexcept {
-  }
+  ThriftHiveMetastore_abort_Compactions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_abort_Compactions_args() noexcept;
   AbortCompactionRequest rqst;
@@ -1260,12 +1259,7 @@ class ThriftHiveMetastore_abort_Compactions_args {
 
   void __set_rqst(const AbortCompactionRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_abort_Compactions_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_abort_Compactions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_abort_Compactions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1299,8 +1293,7 @@ class ThriftHiveMetastore_abort_Compactions_result {
 
   ThriftHiveMetastore_abort_Compactions_result(const ThriftHiveMetastore_abort_Compactions_result&);
   ThriftHiveMetastore_abort_Compactions_result& operator=(const ThriftHiveMetastore_abort_Compactions_result&);
-  ThriftHiveMetastore_abort_Compactions_result() noexcept {
-  }
+  ThriftHiveMetastore_abort_Compactions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_abort_Compactions_result() noexcept;
   AbortCompactResponse success;
@@ -1309,12 +1302,7 @@ class ThriftHiveMetastore_abort_Compactions_result {
 
   void __set_success(const AbortCompactResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_abort_Compactions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_abort_Compactions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_abort_Compactions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1354,9 +1342,7 @@ class ThriftHiveMetastore_getMetaConf_args {
 
   ThriftHiveMetastore_getMetaConf_args(const ThriftHiveMetastore_getMetaConf_args&);
   ThriftHiveMetastore_getMetaConf_args& operator=(const ThriftHiveMetastore_getMetaConf_args&);
-  ThriftHiveMetastore_getMetaConf_args() noexcept
-                                       : key() {
-  }
+  ThriftHiveMetastore_getMetaConf_args() noexcept;
 
   virtual ~ThriftHiveMetastore_getMetaConf_args() noexcept;
   std::string key;
@@ -1365,12 +1351,7 @@ class ThriftHiveMetastore_getMetaConf_args {
 
   void __set_key(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_getMetaConf_args & rhs) const
-  {
-    if (!(key == rhs.key))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_getMetaConf_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_getMetaConf_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1405,9 +1386,7 @@ class ThriftHiveMetastore_getMetaConf_result {
 
   ThriftHiveMetastore_getMetaConf_result(const ThriftHiveMetastore_getMetaConf_result&);
   ThriftHiveMetastore_getMetaConf_result& operator=(const ThriftHiveMetastore_getMetaConf_result&);
-  ThriftHiveMetastore_getMetaConf_result() noexcept
-                                         : success() {
-  }
+  ThriftHiveMetastore_getMetaConf_result() noexcept;
 
   virtual ~ThriftHiveMetastore_getMetaConf_result() noexcept;
   std::string success;
@@ -1419,14 +1398,7 @@ class ThriftHiveMetastore_getMetaConf_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_getMetaConf_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_getMetaConf_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_getMetaConf_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1469,10 +1441,7 @@ class ThriftHiveMetastore_setMetaConf_args {
 
   ThriftHiveMetastore_setMetaConf_args(const ThriftHiveMetastore_setMetaConf_args&);
   ThriftHiveMetastore_setMetaConf_args& operator=(const ThriftHiveMetastore_setMetaConf_args&);
-  ThriftHiveMetastore_setMetaConf_args() noexcept
-                                       : key(),
-                                         value() {
-  }
+  ThriftHiveMetastore_setMetaConf_args() noexcept;
 
   virtual ~ThriftHiveMetastore_setMetaConf_args() noexcept;
   std::string key;
@@ -1484,14 +1453,7 @@ class ThriftHiveMetastore_setMetaConf_args {
 
   void __set_value(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_setMetaConf_args & rhs) const
-  {
-    if (!(key == rhs.key))
-      return false;
-    if (!(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_setMetaConf_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_setMetaConf_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1526,8 +1488,7 @@ class ThriftHiveMetastore_setMetaConf_result {
 
   ThriftHiveMetastore_setMetaConf_result(const ThriftHiveMetastore_setMetaConf_result&);
   ThriftHiveMetastore_setMetaConf_result& operator=(const ThriftHiveMetastore_setMetaConf_result&);
-  ThriftHiveMetastore_setMetaConf_result() noexcept {
-  }
+  ThriftHiveMetastore_setMetaConf_result() noexcept;
 
   virtual ~ThriftHiveMetastore_setMetaConf_result() noexcept;
   MetaException o1;
@@ -1536,12 +1497,7 @@ class ThriftHiveMetastore_setMetaConf_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_setMetaConf_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_setMetaConf_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_setMetaConf_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1581,8 +1537,7 @@ class ThriftHiveMetastore_create_catalog_args {
 
   ThriftHiveMetastore_create_catalog_args(const ThriftHiveMetastore_create_catalog_args&);
   ThriftHiveMetastore_create_catalog_args& operator=(const ThriftHiveMetastore_create_catalog_args&);
-  ThriftHiveMetastore_create_catalog_args() noexcept {
-  }
+  ThriftHiveMetastore_create_catalog_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_catalog_args() noexcept;
   CreateCatalogRequest catalog;
@@ -1591,12 +1546,7 @@ class ThriftHiveMetastore_create_catalog_args {
 
   void __set_catalog(const CreateCatalogRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_catalog_args & rhs) const
-  {
-    if (!(catalog == rhs.catalog))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_catalog_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_catalog_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1632,8 +1582,7 @@ class ThriftHiveMetastore_create_catalog_result {
 
   ThriftHiveMetastore_create_catalog_result(const ThriftHiveMetastore_create_catalog_result&);
   ThriftHiveMetastore_create_catalog_result& operator=(const ThriftHiveMetastore_create_catalog_result&);
-  ThriftHiveMetastore_create_catalog_result() noexcept {
-  }
+  ThriftHiveMetastore_create_catalog_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_catalog_result() noexcept;
   AlreadyExistsException o1;
@@ -1648,16 +1597,7 @@ class ThriftHiveMetastore_create_catalog_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_catalog_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_catalog_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_catalog_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1701,8 +1641,7 @@ class ThriftHiveMetastore_alter_catalog_args {
 
   ThriftHiveMetastore_alter_catalog_args(const ThriftHiveMetastore_alter_catalog_args&);
   ThriftHiveMetastore_alter_catalog_args& operator=(const ThriftHiveMetastore_alter_catalog_args&);
-  ThriftHiveMetastore_alter_catalog_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_catalog_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_catalog_args() noexcept;
   AlterCatalogRequest rqst;
@@ -1711,12 +1650,7 @@ class ThriftHiveMetastore_alter_catalog_args {
 
   void __set_rqst(const AlterCatalogRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_catalog_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_catalog_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_catalog_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1752,8 +1686,7 @@ class ThriftHiveMetastore_alter_catalog_result {
 
   ThriftHiveMetastore_alter_catalog_result(const ThriftHiveMetastore_alter_catalog_result&);
   ThriftHiveMetastore_alter_catalog_result& operator=(const ThriftHiveMetastore_alter_catalog_result&);
-  ThriftHiveMetastore_alter_catalog_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_catalog_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_catalog_result() noexcept;
   NoSuchObjectException o1;
@@ -1768,16 +1701,7 @@ class ThriftHiveMetastore_alter_catalog_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_catalog_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_catalog_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_catalog_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1821,8 +1745,7 @@ class ThriftHiveMetastore_get_catalog_args {
 
   ThriftHiveMetastore_get_catalog_args(const ThriftHiveMetastore_get_catalog_args&);
   ThriftHiveMetastore_get_catalog_args& operator=(const ThriftHiveMetastore_get_catalog_args&);
-  ThriftHiveMetastore_get_catalog_args() noexcept {
-  }
+  ThriftHiveMetastore_get_catalog_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_catalog_args() noexcept;
   GetCatalogRequest catName;
@@ -1831,12 +1754,7 @@ class ThriftHiveMetastore_get_catalog_args {
 
   void __set_catName(const GetCatalogRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_catalog_args & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_catalog_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_catalog_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1872,8 +1790,7 @@ class ThriftHiveMetastore_get_catalog_result {
 
   ThriftHiveMetastore_get_catalog_result(const ThriftHiveMetastore_get_catalog_result&);
   ThriftHiveMetastore_get_catalog_result& operator=(const ThriftHiveMetastore_get_catalog_result&);
-  ThriftHiveMetastore_get_catalog_result() noexcept {
-  }
+  ThriftHiveMetastore_get_catalog_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_catalog_result() noexcept;
   GetCatalogResponse success;
@@ -1888,16 +1805,7 @@ class ThriftHiveMetastore_get_catalog_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_catalog_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_catalog_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_catalog_result &rhs) const {
     return !(*this == rhs);
   }
@@ -1937,15 +1845,11 @@ class ThriftHiveMetastore_get_catalogs_args {
 
   ThriftHiveMetastore_get_catalogs_args(const ThriftHiveMetastore_get_catalogs_args&) noexcept;
   ThriftHiveMetastore_get_catalogs_args& operator=(const ThriftHiveMetastore_get_catalogs_args&) noexcept;
-  ThriftHiveMetastore_get_catalogs_args() noexcept {
-  }
+  ThriftHiveMetastore_get_catalogs_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_catalogs_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_catalogs_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_catalogs_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_catalogs_args &rhs) const {
     return !(*this == rhs);
   }
@@ -1979,8 +1883,7 @@ class ThriftHiveMetastore_get_catalogs_result {
 
   ThriftHiveMetastore_get_catalogs_result(const ThriftHiveMetastore_get_catalogs_result&);
   ThriftHiveMetastore_get_catalogs_result& operator=(const ThriftHiveMetastore_get_catalogs_result&);
-  ThriftHiveMetastore_get_catalogs_result() noexcept {
-  }
+  ThriftHiveMetastore_get_catalogs_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_catalogs_result() noexcept;
   GetCatalogsResponse success;
@@ -1992,14 +1895,7 @@ class ThriftHiveMetastore_get_catalogs_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_catalogs_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_catalogs_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_catalogs_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2041,8 +1937,7 @@ class ThriftHiveMetastore_drop_catalog_args {
 
   ThriftHiveMetastore_drop_catalog_args(const ThriftHiveMetastore_drop_catalog_args&);
   ThriftHiveMetastore_drop_catalog_args& operator=(const ThriftHiveMetastore_drop_catalog_args&);
-  ThriftHiveMetastore_drop_catalog_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_catalog_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_catalog_args() noexcept;
   DropCatalogRequest catName;
@@ -2051,12 +1946,7 @@ class ThriftHiveMetastore_drop_catalog_args {
 
   void __set_catName(const DropCatalogRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_catalog_args & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_catalog_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_catalog_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2092,8 +1982,7 @@ class ThriftHiveMetastore_drop_catalog_result {
 
   ThriftHiveMetastore_drop_catalog_result(const ThriftHiveMetastore_drop_catalog_result&);
   ThriftHiveMetastore_drop_catalog_result& operator=(const ThriftHiveMetastore_drop_catalog_result&);
-  ThriftHiveMetastore_drop_catalog_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_catalog_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_catalog_result() noexcept;
   NoSuchObjectException o1;
@@ -2108,16 +1997,7 @@ class ThriftHiveMetastore_drop_catalog_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_catalog_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_catalog_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_catalog_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2161,8 +2041,7 @@ class ThriftHiveMetastore_create_database_args {
 
   ThriftHiveMetastore_create_database_args(const ThriftHiveMetastore_create_database_args&);
   ThriftHiveMetastore_create_database_args& operator=(const ThriftHiveMetastore_create_database_args&);
-  ThriftHiveMetastore_create_database_args() noexcept {
-  }
+  ThriftHiveMetastore_create_database_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_database_args() noexcept;
   Database database;
@@ -2171,12 +2050,7 @@ class ThriftHiveMetastore_create_database_args {
 
   void __set_database(const Database& val);
 
-  bool operator == (const ThriftHiveMetastore_create_database_args & rhs) const
-  {
-    if (!(database == rhs.database))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_database_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_database_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2212,8 +2086,7 @@ class ThriftHiveMetastore_create_database_result {
 
   ThriftHiveMetastore_create_database_result(const ThriftHiveMetastore_create_database_result&);
   ThriftHiveMetastore_create_database_result& operator=(const ThriftHiveMetastore_create_database_result&);
-  ThriftHiveMetastore_create_database_result() noexcept {
-  }
+  ThriftHiveMetastore_create_database_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_database_result() noexcept;
   AlreadyExistsException o1;
@@ -2228,16 +2101,7 @@ class ThriftHiveMetastore_create_database_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_database_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_database_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_database_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2281,8 +2145,7 @@ class ThriftHiveMetastore_create_database_req_args {
 
   ThriftHiveMetastore_create_database_req_args(const ThriftHiveMetastore_create_database_req_args&);
   ThriftHiveMetastore_create_database_req_args& operator=(const ThriftHiveMetastore_create_database_req_args&);
-  ThriftHiveMetastore_create_database_req_args() noexcept {
-  }
+  ThriftHiveMetastore_create_database_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_database_req_args() noexcept;
   CreateDatabaseRequest createDatabaseRequest;
@@ -2291,12 +2154,7 @@ class ThriftHiveMetastore_create_database_req_args {
 
   void __set_createDatabaseRequest(const CreateDatabaseRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_database_req_args & rhs) const
-  {
-    if (!(createDatabaseRequest == rhs.createDatabaseRequest))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_database_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_database_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2332,8 +2190,7 @@ class ThriftHiveMetastore_create_database_req_result {
 
   ThriftHiveMetastore_create_database_req_result(const ThriftHiveMetastore_create_database_req_result&);
   ThriftHiveMetastore_create_database_req_result& operator=(const ThriftHiveMetastore_create_database_req_result&);
-  ThriftHiveMetastore_create_database_req_result() noexcept {
-  }
+  ThriftHiveMetastore_create_database_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_database_req_result() noexcept;
   AlreadyExistsException o1;
@@ -2348,16 +2205,7 @@ class ThriftHiveMetastore_create_database_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_database_req_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_database_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_database_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2401,9 +2249,7 @@ class ThriftHiveMetastore_get_database_args {
 
   ThriftHiveMetastore_get_database_args(const ThriftHiveMetastore_get_database_args&);
   ThriftHiveMetastore_get_database_args& operator=(const ThriftHiveMetastore_get_database_args&);
-  ThriftHiveMetastore_get_database_args() noexcept
-                                        : name() {
-  }
+  ThriftHiveMetastore_get_database_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_database_args() noexcept;
   std::string name;
@@ -2412,12 +2258,7 @@ class ThriftHiveMetastore_get_database_args {
 
   void __set_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_database_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_database_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_database_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2453,8 +2294,7 @@ class ThriftHiveMetastore_get_database_result {
 
   ThriftHiveMetastore_get_database_result(const ThriftHiveMetastore_get_database_result&);
   ThriftHiveMetastore_get_database_result& operator=(const ThriftHiveMetastore_get_database_result&);
-  ThriftHiveMetastore_get_database_result() noexcept {
-  }
+  ThriftHiveMetastore_get_database_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_database_result() noexcept;
   Database success;
@@ -2469,16 +2309,7 @@ class ThriftHiveMetastore_get_database_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_database_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_database_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_database_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2522,8 +2353,7 @@ class ThriftHiveMetastore_get_database_req_args {
 
   ThriftHiveMetastore_get_database_req_args(const ThriftHiveMetastore_get_database_req_args&);
   ThriftHiveMetastore_get_database_req_args& operator=(const ThriftHiveMetastore_get_database_req_args&);
-  ThriftHiveMetastore_get_database_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_database_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_database_req_args() noexcept;
   GetDatabaseRequest request;
@@ -2532,12 +2362,7 @@ class ThriftHiveMetastore_get_database_req_args {
 
   void __set_request(const GetDatabaseRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_database_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_database_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_database_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2573,8 +2398,7 @@ class ThriftHiveMetastore_get_database_req_result {
 
   ThriftHiveMetastore_get_database_req_result(const ThriftHiveMetastore_get_database_req_result&);
   ThriftHiveMetastore_get_database_req_result& operator=(const ThriftHiveMetastore_get_database_req_result&);
-  ThriftHiveMetastore_get_database_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_database_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_database_req_result() noexcept;
   Database success;
@@ -2589,16 +2413,7 @@ class ThriftHiveMetastore_get_database_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_database_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_database_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_database_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2644,11 +2459,7 @@ class ThriftHiveMetastore_drop_database_args {
 
   ThriftHiveMetastore_drop_database_args(const ThriftHiveMetastore_drop_database_args&);
   ThriftHiveMetastore_drop_database_args& operator=(const ThriftHiveMetastore_drop_database_args&);
-  ThriftHiveMetastore_drop_database_args() noexcept
-                                         : name(),
-                                           deleteData(0),
-                                           cascade(0) {
-  }
+  ThriftHiveMetastore_drop_database_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_database_args() noexcept;
   std::string name;
@@ -2663,16 +2474,7 @@ class ThriftHiveMetastore_drop_database_args {
 
   void __set_cascade(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_drop_database_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    if (!(cascade == rhs.cascade))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_database_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_database_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2710,8 +2512,7 @@ class ThriftHiveMetastore_drop_database_result {
 
   ThriftHiveMetastore_drop_database_result(const ThriftHiveMetastore_drop_database_result&);
   ThriftHiveMetastore_drop_database_result& operator=(const ThriftHiveMetastore_drop_database_result&);
-  ThriftHiveMetastore_drop_database_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_database_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_database_result() noexcept;
   NoSuchObjectException o1;
@@ -2726,16 +2527,7 @@ class ThriftHiveMetastore_drop_database_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_database_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_database_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_database_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2779,8 +2571,7 @@ class ThriftHiveMetastore_drop_database_req_args {
 
   ThriftHiveMetastore_drop_database_req_args(const ThriftHiveMetastore_drop_database_req_args&);
   ThriftHiveMetastore_drop_database_req_args& operator=(const ThriftHiveMetastore_drop_database_req_args&);
-  ThriftHiveMetastore_drop_database_req_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_database_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_database_req_args() noexcept;
   DropDatabaseRequest req;
@@ -2789,12 +2580,7 @@ class ThriftHiveMetastore_drop_database_req_args {
 
   void __set_req(const DropDatabaseRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_database_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_database_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_database_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2831,8 +2617,7 @@ class ThriftHiveMetastore_drop_database_req_result {
 
   ThriftHiveMetastore_drop_database_req_result(const ThriftHiveMetastore_drop_database_req_result&);
   ThriftHiveMetastore_drop_database_req_result& operator=(const ThriftHiveMetastore_drop_database_req_result&);
-  ThriftHiveMetastore_drop_database_req_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_database_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_database_req_result() noexcept;
   AsyncOperationResp success;
@@ -2850,18 +2635,7 @@ class ThriftHiveMetastore_drop_database_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_database_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_database_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_database_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -2907,9 +2681,7 @@ class ThriftHiveMetastore_get_databases_args {
 
   ThriftHiveMetastore_get_databases_args(const ThriftHiveMetastore_get_databases_args&);
   ThriftHiveMetastore_get_databases_args& operator=(const ThriftHiveMetastore_get_databases_args&);
-  ThriftHiveMetastore_get_databases_args() noexcept
-                                         : pattern() {
-  }
+  ThriftHiveMetastore_get_databases_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_databases_args() noexcept;
   std::string pattern;
@@ -2918,12 +2690,7 @@ class ThriftHiveMetastore_get_databases_args {
 
   void __set_pattern(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_databases_args & rhs) const
-  {
-    if (!(pattern == rhs.pattern))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_databases_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_databases_args &rhs) const {
     return !(*this == rhs);
   }
@@ -2958,8 +2725,7 @@ class ThriftHiveMetastore_get_databases_result {
 
   ThriftHiveMetastore_get_databases_result(const ThriftHiveMetastore_get_databases_result&);
   ThriftHiveMetastore_get_databases_result& operator=(const ThriftHiveMetastore_get_databases_result&);
-  ThriftHiveMetastore_get_databases_result() noexcept {
-  }
+  ThriftHiveMetastore_get_databases_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_databases_result() noexcept;
   std::vector<std::string>  success;
@@ -2971,14 +2737,7 @@ class ThriftHiveMetastore_get_databases_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_databases_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_databases_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_databases_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3016,15 +2775,11 @@ class ThriftHiveMetastore_get_all_databases_args {
 
   ThriftHiveMetastore_get_all_databases_args(const ThriftHiveMetastore_get_all_databases_args&) noexcept;
   ThriftHiveMetastore_get_all_databases_args& operator=(const ThriftHiveMetastore_get_all_databases_args&) noexcept;
-  ThriftHiveMetastore_get_all_databases_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_databases_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_databases_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_all_databases_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_databases_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_all_databases_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3058,8 +2813,7 @@ class ThriftHiveMetastore_get_all_databases_result {
 
   ThriftHiveMetastore_get_all_databases_result(const ThriftHiveMetastore_get_all_databases_result&);
   ThriftHiveMetastore_get_all_databases_result& operator=(const ThriftHiveMetastore_get_all_databases_result&);
-  ThriftHiveMetastore_get_all_databases_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_databases_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_databases_result() noexcept;
   std::vector<std::string>  success;
@@ -3071,14 +2825,7 @@ class ThriftHiveMetastore_get_all_databases_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_databases_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_databases_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_databases_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3120,8 +2867,7 @@ class ThriftHiveMetastore_get_databases_req_args {
 
   ThriftHiveMetastore_get_databases_req_args(const ThriftHiveMetastore_get_databases_req_args&);
   ThriftHiveMetastore_get_databases_req_args& operator=(const ThriftHiveMetastore_get_databases_req_args&);
-  ThriftHiveMetastore_get_databases_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_databases_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_databases_req_args() noexcept;
   GetDatabaseObjectsRequest request;
@@ -3130,12 +2876,7 @@ class ThriftHiveMetastore_get_databases_req_args {
 
   void __set_request(const GetDatabaseObjectsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_databases_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_databases_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_databases_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3170,8 +2911,7 @@ class ThriftHiveMetastore_get_databases_req_result {
 
   ThriftHiveMetastore_get_databases_req_result(const ThriftHiveMetastore_get_databases_req_result&);
   ThriftHiveMetastore_get_databases_req_result& operator=(const ThriftHiveMetastore_get_databases_req_result&);
-  ThriftHiveMetastore_get_databases_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_databases_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_databases_req_result() noexcept;
   GetDatabaseObjectsResponse success;
@@ -3183,14 +2923,7 @@ class ThriftHiveMetastore_get_databases_req_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_databases_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_databases_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_databases_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3233,9 +2966,7 @@ class ThriftHiveMetastore_alter_database_args {
 
   ThriftHiveMetastore_alter_database_args(const ThriftHiveMetastore_alter_database_args&);
   ThriftHiveMetastore_alter_database_args& operator=(const ThriftHiveMetastore_alter_database_args&);
-  ThriftHiveMetastore_alter_database_args() noexcept
-                                          : dbname() {
-  }
+  ThriftHiveMetastore_alter_database_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_database_args() noexcept;
   std::string dbname;
@@ -3247,14 +2978,7 @@ class ThriftHiveMetastore_alter_database_args {
 
   void __set_db(const Database& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_database_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(db == rhs.db))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_database_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_database_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3290,8 +3014,7 @@ class ThriftHiveMetastore_alter_database_result {
 
   ThriftHiveMetastore_alter_database_result(const ThriftHiveMetastore_alter_database_result&);
   ThriftHiveMetastore_alter_database_result& operator=(const ThriftHiveMetastore_alter_database_result&);
-  ThriftHiveMetastore_alter_database_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_database_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_database_result() noexcept;
   MetaException o1;
@@ -3303,14 +3026,7 @@ class ThriftHiveMetastore_alter_database_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_database_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_database_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_database_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3352,8 +3068,7 @@ class ThriftHiveMetastore_alter_database_req_args {
 
   ThriftHiveMetastore_alter_database_req_args(const ThriftHiveMetastore_alter_database_req_args&);
   ThriftHiveMetastore_alter_database_req_args& operator=(const ThriftHiveMetastore_alter_database_req_args&);
-  ThriftHiveMetastore_alter_database_req_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_database_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_database_req_args() noexcept;
   AlterDatabaseRequest alterDbReq;
@@ -3362,12 +3077,7 @@ class ThriftHiveMetastore_alter_database_req_args {
 
   void __set_alterDbReq(const AlterDatabaseRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_database_req_args & rhs) const
-  {
-    if (!(alterDbReq == rhs.alterDbReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_database_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_database_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3402,8 +3112,7 @@ class ThriftHiveMetastore_alter_database_req_result {
 
   ThriftHiveMetastore_alter_database_req_result(const ThriftHiveMetastore_alter_database_req_result&);
   ThriftHiveMetastore_alter_database_req_result& operator=(const ThriftHiveMetastore_alter_database_req_result&);
-  ThriftHiveMetastore_alter_database_req_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_database_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_database_req_result() noexcept;
   MetaException o1;
@@ -3415,14 +3124,7 @@ class ThriftHiveMetastore_alter_database_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_database_req_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_database_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_database_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3464,8 +3166,7 @@ class ThriftHiveMetastore_create_dataconnector_req_args {
 
   ThriftHiveMetastore_create_dataconnector_req_args(const ThriftHiveMetastore_create_dataconnector_req_args&);
   ThriftHiveMetastore_create_dataconnector_req_args& operator=(const ThriftHiveMetastore_create_dataconnector_req_args&);
-  ThriftHiveMetastore_create_dataconnector_req_args() noexcept {
-  }
+  ThriftHiveMetastore_create_dataconnector_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_dataconnector_req_args() noexcept;
   CreateDataConnectorRequest connectorReq;
@@ -3474,12 +3175,7 @@ class ThriftHiveMetastore_create_dataconnector_req_args {
 
   void __set_connectorReq(const CreateDataConnectorRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_dataconnector_req_args & rhs) const
-  {
-    if (!(connectorReq == rhs.connectorReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_dataconnector_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_dataconnector_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3515,8 +3211,7 @@ class ThriftHiveMetastore_create_dataconnector_req_result {
 
   ThriftHiveMetastore_create_dataconnector_req_result(const ThriftHiveMetastore_create_dataconnector_req_result&);
   ThriftHiveMetastore_create_dataconnector_req_result& operator=(const ThriftHiveMetastore_create_dataconnector_req_result&);
-  ThriftHiveMetastore_create_dataconnector_req_result() noexcept {
-  }
+  ThriftHiveMetastore_create_dataconnector_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_dataconnector_req_result() noexcept;
   AlreadyExistsException o1;
@@ -3531,16 +3226,7 @@ class ThriftHiveMetastore_create_dataconnector_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_dataconnector_req_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_dataconnector_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_dataconnector_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3584,8 +3270,7 @@ class ThriftHiveMetastore_get_dataconnector_req_args {
 
   ThriftHiveMetastore_get_dataconnector_req_args(const ThriftHiveMetastore_get_dataconnector_req_args&);
   ThriftHiveMetastore_get_dataconnector_req_args& operator=(const ThriftHiveMetastore_get_dataconnector_req_args&);
-  ThriftHiveMetastore_get_dataconnector_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_dataconnector_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_dataconnector_req_args() noexcept;
   GetDataConnectorRequest request;
@@ -3594,12 +3279,7 @@ class ThriftHiveMetastore_get_dataconnector_req_args {
 
   void __set_request(const GetDataConnectorRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_dataconnector_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_dataconnector_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_dataconnector_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3635,8 +3315,7 @@ class ThriftHiveMetastore_get_dataconnector_req_result {
 
   ThriftHiveMetastore_get_dataconnector_req_result(const ThriftHiveMetastore_get_dataconnector_req_result&);
   ThriftHiveMetastore_get_dataconnector_req_result& operator=(const ThriftHiveMetastore_get_dataconnector_req_result&);
-  ThriftHiveMetastore_get_dataconnector_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_dataconnector_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_dataconnector_req_result() noexcept;
   DataConnector success;
@@ -3651,16 +3330,7 @@ class ThriftHiveMetastore_get_dataconnector_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_dataconnector_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_dataconnector_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_dataconnector_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3704,8 +3374,7 @@ class ThriftHiveMetastore_drop_dataconnector_req_args {
 
   ThriftHiveMetastore_drop_dataconnector_req_args(const ThriftHiveMetastore_drop_dataconnector_req_args&);
   ThriftHiveMetastore_drop_dataconnector_req_args& operator=(const ThriftHiveMetastore_drop_dataconnector_req_args&);
-  ThriftHiveMetastore_drop_dataconnector_req_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_dataconnector_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_dataconnector_req_args() noexcept;
   DropDataConnectorRequest dropDcReq;
@@ -3714,12 +3383,7 @@ class ThriftHiveMetastore_drop_dataconnector_req_args {
 
   void __set_dropDcReq(const DropDataConnectorRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_dataconnector_req_args & rhs) const
-  {
-    if (!(dropDcReq == rhs.dropDcReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_dataconnector_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_dataconnector_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3755,8 +3419,7 @@ class ThriftHiveMetastore_drop_dataconnector_req_result {
 
   ThriftHiveMetastore_drop_dataconnector_req_result(const ThriftHiveMetastore_drop_dataconnector_req_result&);
   ThriftHiveMetastore_drop_dataconnector_req_result& operator=(const ThriftHiveMetastore_drop_dataconnector_req_result&);
-  ThriftHiveMetastore_drop_dataconnector_req_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_dataconnector_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_dataconnector_req_result() noexcept;
   NoSuchObjectException o1;
@@ -3771,16 +3434,7 @@ class ThriftHiveMetastore_drop_dataconnector_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_dataconnector_req_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_dataconnector_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_dataconnector_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3820,15 +3474,11 @@ class ThriftHiveMetastore_get_dataconnectors_args {
 
   ThriftHiveMetastore_get_dataconnectors_args(const ThriftHiveMetastore_get_dataconnectors_args&) noexcept;
   ThriftHiveMetastore_get_dataconnectors_args& operator=(const ThriftHiveMetastore_get_dataconnectors_args&) noexcept;
-  ThriftHiveMetastore_get_dataconnectors_args() noexcept {
-  }
+  ThriftHiveMetastore_get_dataconnectors_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_dataconnectors_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_dataconnectors_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_dataconnectors_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_dataconnectors_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3862,8 +3512,7 @@ class ThriftHiveMetastore_get_dataconnectors_result {
 
   ThriftHiveMetastore_get_dataconnectors_result(const ThriftHiveMetastore_get_dataconnectors_result&);
   ThriftHiveMetastore_get_dataconnectors_result& operator=(const ThriftHiveMetastore_get_dataconnectors_result&);
-  ThriftHiveMetastore_get_dataconnectors_result() noexcept {
-  }
+  ThriftHiveMetastore_get_dataconnectors_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_dataconnectors_result() noexcept;
   std::vector<std::string>  success;
@@ -3875,14 +3524,7 @@ class ThriftHiveMetastore_get_dataconnectors_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_dataconnectors_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_dataconnectors_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_dataconnectors_result &rhs) const {
     return !(*this == rhs);
   }
@@ -3924,8 +3566,7 @@ class ThriftHiveMetastore_alter_dataconnector_req_args {
 
   ThriftHiveMetastore_alter_dataconnector_req_args(const ThriftHiveMetastore_alter_dataconnector_req_args&);
   ThriftHiveMetastore_alter_dataconnector_req_args& operator=(const ThriftHiveMetastore_alter_dataconnector_req_args&);
-  ThriftHiveMetastore_alter_dataconnector_req_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_dataconnector_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_dataconnector_req_args() noexcept;
   AlterDataConnectorRequest alterReq;
@@ -3934,12 +3575,7 @@ class ThriftHiveMetastore_alter_dataconnector_req_args {
 
   void __set_alterReq(const AlterDataConnectorRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_dataconnector_req_args & rhs) const
-  {
-    if (!(alterReq == rhs.alterReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_dataconnector_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_dataconnector_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -3974,8 +3610,7 @@ class ThriftHiveMetastore_alter_dataconnector_req_result {
 
   ThriftHiveMetastore_alter_dataconnector_req_result(const ThriftHiveMetastore_alter_dataconnector_req_result&);
   ThriftHiveMetastore_alter_dataconnector_req_result& operator=(const ThriftHiveMetastore_alter_dataconnector_req_result&);
-  ThriftHiveMetastore_alter_dataconnector_req_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_dataconnector_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_dataconnector_req_result() noexcept;
   MetaException o1;
@@ -3987,14 +3622,7 @@ class ThriftHiveMetastore_alter_dataconnector_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_dataconnector_req_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_dataconnector_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_dataconnector_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4036,9 +3664,7 @@ class ThriftHiveMetastore_get_type_args {
 
   ThriftHiveMetastore_get_type_args(const ThriftHiveMetastore_get_type_args&);
   ThriftHiveMetastore_get_type_args& operator=(const ThriftHiveMetastore_get_type_args&);
-  ThriftHiveMetastore_get_type_args() noexcept
-                                    : name() {
-  }
+  ThriftHiveMetastore_get_type_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_type_args() noexcept;
   std::string name;
@@ -4047,12 +3673,7 @@ class ThriftHiveMetastore_get_type_args {
 
   void __set_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_type_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_type_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_type_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4088,8 +3709,7 @@ class ThriftHiveMetastore_get_type_result {
 
   ThriftHiveMetastore_get_type_result(const ThriftHiveMetastore_get_type_result&);
   ThriftHiveMetastore_get_type_result& operator=(const ThriftHiveMetastore_get_type_result&);
-  ThriftHiveMetastore_get_type_result() noexcept {
-  }
+  ThriftHiveMetastore_get_type_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_type_result() noexcept;
   Type success;
@@ -4104,16 +3724,7 @@ class ThriftHiveMetastore_get_type_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_type_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_type_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_type_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4157,8 +3768,7 @@ class ThriftHiveMetastore_create_type_args {
 
   ThriftHiveMetastore_create_type_args(const ThriftHiveMetastore_create_type_args&);
   ThriftHiveMetastore_create_type_args& operator=(const ThriftHiveMetastore_create_type_args&);
-  ThriftHiveMetastore_create_type_args() noexcept {
-  }
+  ThriftHiveMetastore_create_type_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_type_args() noexcept;
   Type type;
@@ -4167,12 +3777,7 @@ class ThriftHiveMetastore_create_type_args {
 
   void __set_type(const Type& val);
 
-  bool operator == (const ThriftHiveMetastore_create_type_args & rhs) const
-  {
-    if (!(type == rhs.type))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_type_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_type_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4209,9 +3814,7 @@ class ThriftHiveMetastore_create_type_result {
 
   ThriftHiveMetastore_create_type_result(const ThriftHiveMetastore_create_type_result&);
   ThriftHiveMetastore_create_type_result& operator=(const ThriftHiveMetastore_create_type_result&);
-  ThriftHiveMetastore_create_type_result() noexcept
-                                         : success(0) {
-  }
+  ThriftHiveMetastore_create_type_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_type_result() noexcept;
   bool success;
@@ -4229,18 +3832,7 @@ class ThriftHiveMetastore_create_type_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_type_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_type_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_type_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4286,9 +3878,7 @@ class ThriftHiveMetastore_drop_type_args {
 
   ThriftHiveMetastore_drop_type_args(const ThriftHiveMetastore_drop_type_args&);
   ThriftHiveMetastore_drop_type_args& operator=(const ThriftHiveMetastore_drop_type_args&);
-  ThriftHiveMetastore_drop_type_args() noexcept
-                                     : type() {
-  }
+  ThriftHiveMetastore_drop_type_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_type_args() noexcept;
   std::string type;
@@ -4297,12 +3887,7 @@ class ThriftHiveMetastore_drop_type_args {
 
   void __set_type(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_type_args & rhs) const
-  {
-    if (!(type == rhs.type))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_type_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_type_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4338,9 +3923,7 @@ class ThriftHiveMetastore_drop_type_result {
 
   ThriftHiveMetastore_drop_type_result(const ThriftHiveMetastore_drop_type_result&);
   ThriftHiveMetastore_drop_type_result& operator=(const ThriftHiveMetastore_drop_type_result&);
-  ThriftHiveMetastore_drop_type_result() noexcept
-                                       : success(0) {
-  }
+  ThriftHiveMetastore_drop_type_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_type_result() noexcept;
   bool success;
@@ -4355,16 +3938,7 @@ class ThriftHiveMetastore_drop_type_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_type_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_type_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_type_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4408,9 +3982,7 @@ class ThriftHiveMetastore_get_type_all_args {
 
   ThriftHiveMetastore_get_type_all_args(const ThriftHiveMetastore_get_type_all_args&);
   ThriftHiveMetastore_get_type_all_args& operator=(const ThriftHiveMetastore_get_type_all_args&);
-  ThriftHiveMetastore_get_type_all_args() noexcept
-                                        : name() {
-  }
+  ThriftHiveMetastore_get_type_all_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_type_all_args() noexcept;
   std::string name;
@@ -4419,12 +3991,7 @@ class ThriftHiveMetastore_get_type_all_args {
 
   void __set_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_type_all_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_type_all_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_type_all_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4459,8 +4026,7 @@ class ThriftHiveMetastore_get_type_all_result {
 
   ThriftHiveMetastore_get_type_all_result(const ThriftHiveMetastore_get_type_all_result&);
   ThriftHiveMetastore_get_type_all_result& operator=(const ThriftHiveMetastore_get_type_all_result&);
-  ThriftHiveMetastore_get_type_all_result() noexcept {
-  }
+  ThriftHiveMetastore_get_type_all_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_type_all_result() noexcept;
   std::map<std::string, Type>  success;
@@ -4472,14 +4038,7 @@ class ThriftHiveMetastore_get_type_all_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_type_all_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_type_all_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_type_all_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4522,10 +4081,7 @@ class ThriftHiveMetastore_get_fields_args {
 
   ThriftHiveMetastore_get_fields_args(const ThriftHiveMetastore_get_fields_args&);
   ThriftHiveMetastore_get_fields_args& operator=(const ThriftHiveMetastore_get_fields_args&);
-  ThriftHiveMetastore_get_fields_args() noexcept
-                                      : db_name(),
-                                        table_name() {
-  }
+  ThriftHiveMetastore_get_fields_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_fields_args() noexcept;
   std::string db_name;
@@ -4537,14 +4093,7 @@ class ThriftHiveMetastore_get_fields_args {
 
   void __set_table_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_fields_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_fields_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_fields_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4582,8 +4131,7 @@ class ThriftHiveMetastore_get_fields_result {
 
   ThriftHiveMetastore_get_fields_result(const ThriftHiveMetastore_get_fields_result&);
   ThriftHiveMetastore_get_fields_result& operator=(const ThriftHiveMetastore_get_fields_result&);
-  ThriftHiveMetastore_get_fields_result() noexcept {
-  }
+  ThriftHiveMetastore_get_fields_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_fields_result() noexcept;
   std::vector<FieldSchema>  success;
@@ -4601,18 +4149,7 @@ class ThriftHiveMetastore_get_fields_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_fields_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_fields_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_fields_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4660,10 +4197,7 @@ class ThriftHiveMetastore_get_fields_with_environment_context_args {
 
   ThriftHiveMetastore_get_fields_with_environment_context_args(const ThriftHiveMetastore_get_fields_with_environment_context_args&);
   ThriftHiveMetastore_get_fields_with_environment_context_args& operator=(const ThriftHiveMetastore_get_fields_with_environment_context_args&);
-  ThriftHiveMetastore_get_fields_with_environment_context_args() noexcept
-                                                               : db_name(),
-                                                                 table_name() {
-  }
+  ThriftHiveMetastore_get_fields_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_fields_with_environment_context_args() noexcept;
   std::string db_name;
@@ -4678,16 +4212,7 @@ class ThriftHiveMetastore_get_fields_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_get_fields_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_fields_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_fields_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4726,8 +4251,7 @@ class ThriftHiveMetastore_get_fields_with_environment_context_result {
 
   ThriftHiveMetastore_get_fields_with_environment_context_result(const ThriftHiveMetastore_get_fields_with_environment_context_result&);
   ThriftHiveMetastore_get_fields_with_environment_context_result& operator=(const ThriftHiveMetastore_get_fields_with_environment_context_result&);
-  ThriftHiveMetastore_get_fields_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_get_fields_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_fields_with_environment_context_result() noexcept;
   std::vector<FieldSchema>  success;
@@ -4745,18 +4269,7 @@ class ThriftHiveMetastore_get_fields_with_environment_context_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_fields_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_fields_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_fields_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4802,8 +4315,7 @@ class ThriftHiveMetastore_get_fields_req_args {
 
   ThriftHiveMetastore_get_fields_req_args(const ThriftHiveMetastore_get_fields_req_args&);
   ThriftHiveMetastore_get_fields_req_args& operator=(const ThriftHiveMetastore_get_fields_req_args&);
-  ThriftHiveMetastore_get_fields_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_fields_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_fields_req_args() noexcept;
   GetFieldsRequest req;
@@ -4812,12 +4324,7 @@ class ThriftHiveMetastore_get_fields_req_args {
 
   void __set_req(const GetFieldsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_fields_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_fields_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_fields_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4854,8 +4361,7 @@ class ThriftHiveMetastore_get_fields_req_result {
 
   ThriftHiveMetastore_get_fields_req_result(const ThriftHiveMetastore_get_fields_req_result&);
   ThriftHiveMetastore_get_fields_req_result& operator=(const ThriftHiveMetastore_get_fields_req_result&);
-  ThriftHiveMetastore_get_fields_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_fields_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_fields_req_result() noexcept;
   GetFieldsResponse success;
@@ -4873,18 +4379,7 @@ class ThriftHiveMetastore_get_fields_req_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_fields_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_fields_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_fields_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -4931,10 +4426,7 @@ class ThriftHiveMetastore_get_schema_args {
 
   ThriftHiveMetastore_get_schema_args(const ThriftHiveMetastore_get_schema_args&);
   ThriftHiveMetastore_get_schema_args& operator=(const ThriftHiveMetastore_get_schema_args&);
-  ThriftHiveMetastore_get_schema_args() noexcept
-                                      : db_name(),
-                                        table_name() {
-  }
+  ThriftHiveMetastore_get_schema_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_args() noexcept;
   std::string db_name;
@@ -4946,14 +4438,7 @@ class ThriftHiveMetastore_get_schema_args {
 
   void __set_table_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_args &rhs) const {
     return !(*this == rhs);
   }
@@ -4991,8 +4476,7 @@ class ThriftHiveMetastore_get_schema_result {
 
   ThriftHiveMetastore_get_schema_result(const ThriftHiveMetastore_get_schema_result&);
   ThriftHiveMetastore_get_schema_result& operator=(const ThriftHiveMetastore_get_schema_result&);
-  ThriftHiveMetastore_get_schema_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_result() noexcept;
   std::vector<FieldSchema>  success;
@@ -5010,18 +4494,7 @@ class ThriftHiveMetastore_get_schema_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5069,10 +4542,7 @@ class ThriftHiveMetastore_get_schema_with_environment_context_args {
 
   ThriftHiveMetastore_get_schema_with_environment_context_args(const ThriftHiveMetastore_get_schema_with_environment_context_args&);
   ThriftHiveMetastore_get_schema_with_environment_context_args& operator=(const ThriftHiveMetastore_get_schema_with_environment_context_args&);
-  ThriftHiveMetastore_get_schema_with_environment_context_args() noexcept
-                                                               : db_name(),
-                                                                 table_name() {
-  }
+  ThriftHiveMetastore_get_schema_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_with_environment_context_args() noexcept;
   std::string db_name;
@@ -5087,16 +4557,7 @@ class ThriftHiveMetastore_get_schema_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5135,8 +4596,7 @@ class ThriftHiveMetastore_get_schema_with_environment_context_result {
 
   ThriftHiveMetastore_get_schema_with_environment_context_result(const ThriftHiveMetastore_get_schema_with_environment_context_result&);
   ThriftHiveMetastore_get_schema_with_environment_context_result& operator=(const ThriftHiveMetastore_get_schema_with_environment_context_result&);
-  ThriftHiveMetastore_get_schema_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_with_environment_context_result() noexcept;
   std::vector<FieldSchema>  success;
@@ -5154,18 +4614,7 @@ class ThriftHiveMetastore_get_schema_with_environment_context_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5211,8 +4660,7 @@ class ThriftHiveMetastore_get_schema_req_args {
 
   ThriftHiveMetastore_get_schema_req_args(const ThriftHiveMetastore_get_schema_req_args&);
   ThriftHiveMetastore_get_schema_req_args& operator=(const ThriftHiveMetastore_get_schema_req_args&);
-  ThriftHiveMetastore_get_schema_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_req_args() noexcept;
   GetSchemaRequest req;
@@ -5221,12 +4669,7 @@ class ThriftHiveMetastore_get_schema_req_args {
 
   void __set_req(const GetSchemaRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5263,8 +4706,7 @@ class ThriftHiveMetastore_get_schema_req_result {
 
   ThriftHiveMetastore_get_schema_req_result(const ThriftHiveMetastore_get_schema_req_result&);
   ThriftHiveMetastore_get_schema_req_result& operator=(const ThriftHiveMetastore_get_schema_req_result&);
-  ThriftHiveMetastore_get_schema_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_req_result() noexcept;
   GetSchemaResponse success;
@@ -5282,18 +4724,7 @@ class ThriftHiveMetastore_get_schema_req_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5339,8 +4770,7 @@ class ThriftHiveMetastore_create_table_args {
 
   ThriftHiveMetastore_create_table_args(const ThriftHiveMetastore_create_table_args&);
   ThriftHiveMetastore_create_table_args& operator=(const ThriftHiveMetastore_create_table_args&);
-  ThriftHiveMetastore_create_table_args() noexcept {
-  }
+  ThriftHiveMetastore_create_table_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_args() noexcept;
   Table tbl;
@@ -5349,12 +4779,7 @@ class ThriftHiveMetastore_create_table_args {
 
   void __set_tbl(const Table& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_args & rhs) const
-  {
-    if (!(tbl == rhs.tbl))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5391,8 +4816,7 @@ class ThriftHiveMetastore_create_table_result {
 
   ThriftHiveMetastore_create_table_result(const ThriftHiveMetastore_create_table_result&);
   ThriftHiveMetastore_create_table_result& operator=(const ThriftHiveMetastore_create_table_result&);
-  ThriftHiveMetastore_create_table_result() noexcept {
-  }
+  ThriftHiveMetastore_create_table_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_result() noexcept;
   AlreadyExistsException o1;
@@ -5410,18 +4834,7 @@ class ThriftHiveMetastore_create_table_result {
 
   void __set_o4(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5468,8 +4881,7 @@ class ThriftHiveMetastore_create_table_with_environment_context_args {
 
   ThriftHiveMetastore_create_table_with_environment_context_args(const ThriftHiveMetastore_create_table_with_environment_context_args&);
   ThriftHiveMetastore_create_table_with_environment_context_args& operator=(const ThriftHiveMetastore_create_table_with_environment_context_args&);
-  ThriftHiveMetastore_create_table_with_environment_context_args() noexcept {
-  }
+  ThriftHiveMetastore_create_table_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_with_environment_context_args() noexcept;
   Table tbl;
@@ -5481,14 +4893,7 @@ class ThriftHiveMetastore_create_table_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_with_environment_context_args & rhs) const
-  {
-    if (!(tbl == rhs.tbl))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5526,8 +4931,7 @@ class ThriftHiveMetastore_create_table_with_environment_context_result {
 
   ThriftHiveMetastore_create_table_with_environment_context_result(const ThriftHiveMetastore_create_table_with_environment_context_result&);
   ThriftHiveMetastore_create_table_with_environment_context_result& operator=(const ThriftHiveMetastore_create_table_with_environment_context_result&);
-  ThriftHiveMetastore_create_table_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_create_table_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_with_environment_context_result() noexcept;
   AlreadyExistsException o1;
@@ -5545,18 +4949,7 @@ class ThriftHiveMetastore_create_table_with_environment_context_result {
 
   void __set_o4(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_with_environment_context_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5608,8 +5001,7 @@ class ThriftHiveMetastore_create_table_with_constraints_args {
 
   ThriftHiveMetastore_create_table_with_constraints_args(const ThriftHiveMetastore_create_table_with_constraints_args&);
   ThriftHiveMetastore_create_table_with_constraints_args& operator=(const ThriftHiveMetastore_create_table_with_constraints_args&);
-  ThriftHiveMetastore_create_table_with_constraints_args() noexcept {
-  }
+  ThriftHiveMetastore_create_table_with_constraints_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_with_constraints_args() noexcept;
   Table tbl;
@@ -5636,24 +5028,7 @@ class ThriftHiveMetastore_create_table_with_constraints_args {
 
   void __set_checkConstraints(const std::vector<SQLCheckConstraint> & val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_with_constraints_args & rhs) const
-  {
-    if (!(tbl == rhs.tbl))
-      return false;
-    if (!(primaryKeys == rhs.primaryKeys))
-      return false;
-    if (!(foreignKeys == rhs.foreignKeys))
-      return false;
-    if (!(uniqueConstraints == rhs.uniqueConstraints))
-      return false;
-    if (!(notNullConstraints == rhs.notNullConstraints))
-      return false;
-    if (!(defaultConstraints == rhs.defaultConstraints))
-      return false;
-    if (!(checkConstraints == rhs.checkConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_with_constraints_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_with_constraints_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5696,8 +5071,7 @@ class ThriftHiveMetastore_create_table_with_constraints_result {
 
   ThriftHiveMetastore_create_table_with_constraints_result(const ThriftHiveMetastore_create_table_with_constraints_result&);
   ThriftHiveMetastore_create_table_with_constraints_result& operator=(const ThriftHiveMetastore_create_table_with_constraints_result&);
-  ThriftHiveMetastore_create_table_with_constraints_result() noexcept {
-  }
+  ThriftHiveMetastore_create_table_with_constraints_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_with_constraints_result() noexcept;
   AlreadyExistsException o1;
@@ -5715,18 +5089,7 @@ class ThriftHiveMetastore_create_table_with_constraints_result {
 
   void __set_o4(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_with_constraints_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_with_constraints_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_with_constraints_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5772,8 +5135,7 @@ class ThriftHiveMetastore_create_table_req_args {
 
   ThriftHiveMetastore_create_table_req_args(const ThriftHiveMetastore_create_table_req_args&);
   ThriftHiveMetastore_create_table_req_args& operator=(const ThriftHiveMetastore_create_table_req_args&);
-  ThriftHiveMetastore_create_table_req_args() noexcept {
-  }
+  ThriftHiveMetastore_create_table_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_req_args() noexcept;
   CreateTableRequest request;
@@ -5782,12 +5144,7 @@ class ThriftHiveMetastore_create_table_req_args {
 
   void __set_request(const CreateTableRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5824,8 +5181,7 @@ class ThriftHiveMetastore_create_table_req_result {
 
   ThriftHiveMetastore_create_table_req_result(const ThriftHiveMetastore_create_table_req_result&);
   ThriftHiveMetastore_create_table_req_result& operator=(const ThriftHiveMetastore_create_table_req_result&);
-  ThriftHiveMetastore_create_table_req_result() noexcept {
-  }
+  ThriftHiveMetastore_create_table_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_table_req_result() noexcept;
   AlreadyExistsException o1;
@@ -5843,18 +5199,7 @@ class ThriftHiveMetastore_create_table_req_result {
 
   void __set_o4(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_table_req_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_table_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_table_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -5900,8 +5245,7 @@ class ThriftHiveMetastore_drop_constraint_args {
 
   ThriftHiveMetastore_drop_constraint_args(const ThriftHiveMetastore_drop_constraint_args&);
   ThriftHiveMetastore_drop_constraint_args& operator=(const ThriftHiveMetastore_drop_constraint_args&);
-  ThriftHiveMetastore_drop_constraint_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_constraint_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_constraint_args() noexcept;
   DropConstraintRequest req;
@@ -5910,12 +5254,7 @@ class ThriftHiveMetastore_drop_constraint_args {
 
   void __set_req(const DropConstraintRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_constraint_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_constraint_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_constraint_args &rhs) const {
     return !(*this == rhs);
   }
@@ -5950,8 +5289,7 @@ class ThriftHiveMetastore_drop_constraint_result {
 
   ThriftHiveMetastore_drop_constraint_result(const ThriftHiveMetastore_drop_constraint_result&);
   ThriftHiveMetastore_drop_constraint_result& operator=(const ThriftHiveMetastore_drop_constraint_result&);
-  ThriftHiveMetastore_drop_constraint_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_constraint_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_constraint_result() noexcept;
   NoSuchObjectException o1;
@@ -5963,14 +5301,7 @@ class ThriftHiveMetastore_drop_constraint_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_constraint_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_constraint_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_constraint_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6012,8 +5343,7 @@ class ThriftHiveMetastore_add_primary_key_args {
 
   ThriftHiveMetastore_add_primary_key_args(const ThriftHiveMetastore_add_primary_key_args&);
   ThriftHiveMetastore_add_primary_key_args& operator=(const ThriftHiveMetastore_add_primary_key_args&);
-  ThriftHiveMetastore_add_primary_key_args() noexcept {
-  }
+  ThriftHiveMetastore_add_primary_key_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_primary_key_args() noexcept;
   AddPrimaryKeyRequest req;
@@ -6022,12 +5352,7 @@ class ThriftHiveMetastore_add_primary_key_args {
 
   void __set_req(const AddPrimaryKeyRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_primary_key_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_primary_key_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_primary_key_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6062,8 +5387,7 @@ class ThriftHiveMetastore_add_primary_key_result {
 
   ThriftHiveMetastore_add_primary_key_result(const ThriftHiveMetastore_add_primary_key_result&);
   ThriftHiveMetastore_add_primary_key_result& operator=(const ThriftHiveMetastore_add_primary_key_result&);
-  ThriftHiveMetastore_add_primary_key_result() noexcept {
-  }
+  ThriftHiveMetastore_add_primary_key_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_primary_key_result() noexcept;
   NoSuchObjectException o1;
@@ -6075,14 +5399,7 @@ class ThriftHiveMetastore_add_primary_key_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_primary_key_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_primary_key_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_primary_key_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6124,8 +5441,7 @@ class ThriftHiveMetastore_add_foreign_key_args {
 
   ThriftHiveMetastore_add_foreign_key_args(const ThriftHiveMetastore_add_foreign_key_args&);
   ThriftHiveMetastore_add_foreign_key_args& operator=(const ThriftHiveMetastore_add_foreign_key_args&);
-  ThriftHiveMetastore_add_foreign_key_args() noexcept {
-  }
+  ThriftHiveMetastore_add_foreign_key_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_foreign_key_args() noexcept;
   AddForeignKeyRequest req;
@@ -6134,12 +5450,7 @@ class ThriftHiveMetastore_add_foreign_key_args {
 
   void __set_req(const AddForeignKeyRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_foreign_key_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_foreign_key_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_foreign_key_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6174,8 +5485,7 @@ class ThriftHiveMetastore_add_foreign_key_result {
 
   ThriftHiveMetastore_add_foreign_key_result(const ThriftHiveMetastore_add_foreign_key_result&);
   ThriftHiveMetastore_add_foreign_key_result& operator=(const ThriftHiveMetastore_add_foreign_key_result&);
-  ThriftHiveMetastore_add_foreign_key_result() noexcept {
-  }
+  ThriftHiveMetastore_add_foreign_key_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_foreign_key_result() noexcept;
   NoSuchObjectException o1;
@@ -6187,14 +5497,7 @@ class ThriftHiveMetastore_add_foreign_key_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_foreign_key_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_foreign_key_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_foreign_key_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6236,8 +5539,7 @@ class ThriftHiveMetastore_add_unique_constraint_args {
 
   ThriftHiveMetastore_add_unique_constraint_args(const ThriftHiveMetastore_add_unique_constraint_args&);
   ThriftHiveMetastore_add_unique_constraint_args& operator=(const ThriftHiveMetastore_add_unique_constraint_args&);
-  ThriftHiveMetastore_add_unique_constraint_args() noexcept {
-  }
+  ThriftHiveMetastore_add_unique_constraint_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_unique_constraint_args() noexcept;
   AddUniqueConstraintRequest req;
@@ -6246,12 +5548,7 @@ class ThriftHiveMetastore_add_unique_constraint_args {
 
   void __set_req(const AddUniqueConstraintRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_unique_constraint_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_unique_constraint_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_unique_constraint_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6286,8 +5583,7 @@ class ThriftHiveMetastore_add_unique_constraint_result {
 
   ThriftHiveMetastore_add_unique_constraint_result(const ThriftHiveMetastore_add_unique_constraint_result&);
   ThriftHiveMetastore_add_unique_constraint_result& operator=(const ThriftHiveMetastore_add_unique_constraint_result&);
-  ThriftHiveMetastore_add_unique_constraint_result() noexcept {
-  }
+  ThriftHiveMetastore_add_unique_constraint_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_unique_constraint_result() noexcept;
   NoSuchObjectException o1;
@@ -6299,14 +5595,7 @@ class ThriftHiveMetastore_add_unique_constraint_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_unique_constraint_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_unique_constraint_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_unique_constraint_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6348,8 +5637,7 @@ class ThriftHiveMetastore_add_not_null_constraint_args {
 
   ThriftHiveMetastore_add_not_null_constraint_args(const ThriftHiveMetastore_add_not_null_constraint_args&);
   ThriftHiveMetastore_add_not_null_constraint_args& operator=(const ThriftHiveMetastore_add_not_null_constraint_args&);
-  ThriftHiveMetastore_add_not_null_constraint_args() noexcept {
-  }
+  ThriftHiveMetastore_add_not_null_constraint_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_not_null_constraint_args() noexcept;
   AddNotNullConstraintRequest req;
@@ -6358,12 +5646,7 @@ class ThriftHiveMetastore_add_not_null_constraint_args {
 
   void __set_req(const AddNotNullConstraintRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_not_null_constraint_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_not_null_constraint_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_not_null_constraint_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6398,8 +5681,7 @@ class ThriftHiveMetastore_add_not_null_constraint_result {
 
   ThriftHiveMetastore_add_not_null_constraint_result(const ThriftHiveMetastore_add_not_null_constraint_result&);
   ThriftHiveMetastore_add_not_null_constraint_result& operator=(const ThriftHiveMetastore_add_not_null_constraint_result&);
-  ThriftHiveMetastore_add_not_null_constraint_result() noexcept {
-  }
+  ThriftHiveMetastore_add_not_null_constraint_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_not_null_constraint_result() noexcept;
   NoSuchObjectException o1;
@@ -6411,14 +5693,7 @@ class ThriftHiveMetastore_add_not_null_constraint_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_not_null_constraint_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_not_null_constraint_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_not_null_constraint_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6460,8 +5735,7 @@ class ThriftHiveMetastore_add_default_constraint_args {
 
   ThriftHiveMetastore_add_default_constraint_args(const ThriftHiveMetastore_add_default_constraint_args&);
   ThriftHiveMetastore_add_default_constraint_args& operator=(const ThriftHiveMetastore_add_default_constraint_args&);
-  ThriftHiveMetastore_add_default_constraint_args() noexcept {
-  }
+  ThriftHiveMetastore_add_default_constraint_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_default_constraint_args() noexcept;
   AddDefaultConstraintRequest req;
@@ -6470,12 +5744,7 @@ class ThriftHiveMetastore_add_default_constraint_args {
 
   void __set_req(const AddDefaultConstraintRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_default_constraint_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_default_constraint_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_default_constraint_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6510,8 +5779,7 @@ class ThriftHiveMetastore_add_default_constraint_result {
 
   ThriftHiveMetastore_add_default_constraint_result(const ThriftHiveMetastore_add_default_constraint_result&);
   ThriftHiveMetastore_add_default_constraint_result& operator=(const ThriftHiveMetastore_add_default_constraint_result&);
-  ThriftHiveMetastore_add_default_constraint_result() noexcept {
-  }
+  ThriftHiveMetastore_add_default_constraint_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_default_constraint_result() noexcept;
   NoSuchObjectException o1;
@@ -6523,14 +5791,7 @@ class ThriftHiveMetastore_add_default_constraint_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_default_constraint_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_default_constraint_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_default_constraint_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6572,8 +5833,7 @@ class ThriftHiveMetastore_add_check_constraint_args {
 
   ThriftHiveMetastore_add_check_constraint_args(const ThriftHiveMetastore_add_check_constraint_args&);
   ThriftHiveMetastore_add_check_constraint_args& operator=(const ThriftHiveMetastore_add_check_constraint_args&);
-  ThriftHiveMetastore_add_check_constraint_args() noexcept {
-  }
+  ThriftHiveMetastore_add_check_constraint_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_check_constraint_args() noexcept;
   AddCheckConstraintRequest req;
@@ -6582,12 +5842,7 @@ class ThriftHiveMetastore_add_check_constraint_args {
 
   void __set_req(const AddCheckConstraintRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_check_constraint_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_check_constraint_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_check_constraint_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6622,8 +5877,7 @@ class ThriftHiveMetastore_add_check_constraint_result {
 
   ThriftHiveMetastore_add_check_constraint_result(const ThriftHiveMetastore_add_check_constraint_result&);
   ThriftHiveMetastore_add_check_constraint_result& operator=(const ThriftHiveMetastore_add_check_constraint_result&);
-  ThriftHiveMetastore_add_check_constraint_result() noexcept {
-  }
+  ThriftHiveMetastore_add_check_constraint_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_check_constraint_result() noexcept;
   NoSuchObjectException o1;
@@ -6635,14 +5889,7 @@ class ThriftHiveMetastore_add_check_constraint_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_check_constraint_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_check_constraint_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_check_constraint_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6684,8 +5931,7 @@ class ThriftHiveMetastore_translate_table_dryrun_args {
 
   ThriftHiveMetastore_translate_table_dryrun_args(const ThriftHiveMetastore_translate_table_dryrun_args&);
   ThriftHiveMetastore_translate_table_dryrun_args& operator=(const ThriftHiveMetastore_translate_table_dryrun_args&);
-  ThriftHiveMetastore_translate_table_dryrun_args() noexcept {
-  }
+  ThriftHiveMetastore_translate_table_dryrun_args() noexcept;
 
   virtual ~ThriftHiveMetastore_translate_table_dryrun_args() noexcept;
   CreateTableRequest request;
@@ -6694,12 +5940,7 @@ class ThriftHiveMetastore_translate_table_dryrun_args {
 
   void __set_request(const CreateTableRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_translate_table_dryrun_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_translate_table_dryrun_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_translate_table_dryrun_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6737,8 +5978,7 @@ class ThriftHiveMetastore_translate_table_dryrun_result {
 
   ThriftHiveMetastore_translate_table_dryrun_result(const ThriftHiveMetastore_translate_table_dryrun_result&);
   ThriftHiveMetastore_translate_table_dryrun_result& operator=(const ThriftHiveMetastore_translate_table_dryrun_result&);
-  ThriftHiveMetastore_translate_table_dryrun_result() noexcept {
-  }
+  ThriftHiveMetastore_translate_table_dryrun_result() noexcept;
 
   virtual ~ThriftHiveMetastore_translate_table_dryrun_result() noexcept;
   Table success;
@@ -6759,20 +5999,7 @@ class ThriftHiveMetastore_translate_table_dryrun_result {
 
   void __set_o4(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_translate_table_dryrun_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_translate_table_dryrun_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_translate_table_dryrun_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6822,11 +6049,7 @@ class ThriftHiveMetastore_drop_table_args {
 
   ThriftHiveMetastore_drop_table_args(const ThriftHiveMetastore_drop_table_args&);
   ThriftHiveMetastore_drop_table_args& operator=(const ThriftHiveMetastore_drop_table_args&);
-  ThriftHiveMetastore_drop_table_args() noexcept
-                                      : dbname(),
-                                        name(),
-                                        deleteData(0) {
-  }
+  ThriftHiveMetastore_drop_table_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_table_args() noexcept;
   std::string dbname;
@@ -6841,16 +6064,7 @@ class ThriftHiveMetastore_drop_table_args {
 
   void __set_deleteData(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_drop_table_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(name == rhs.name))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_table_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_table_args &rhs) const {
     return !(*this == rhs);
   }
@@ -6887,8 +6101,7 @@ class ThriftHiveMetastore_drop_table_result {
 
   ThriftHiveMetastore_drop_table_result(const ThriftHiveMetastore_drop_table_result&);
   ThriftHiveMetastore_drop_table_result& operator=(const ThriftHiveMetastore_drop_table_result&);
-  ThriftHiveMetastore_drop_table_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_table_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_table_result() noexcept;
   NoSuchObjectException o1;
@@ -6900,14 +6113,7 @@ class ThriftHiveMetastore_drop_table_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_table_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_table_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_table_result &rhs) const {
     return !(*this == rhs);
   }
@@ -6952,11 +6158,7 @@ class ThriftHiveMetastore_drop_table_with_environment_context_args {
 
   ThriftHiveMetastore_drop_table_with_environment_context_args(const ThriftHiveMetastore_drop_table_with_environment_context_args&);
   ThriftHiveMetastore_drop_table_with_environment_context_args& operator=(const ThriftHiveMetastore_drop_table_with_environment_context_args&);
-  ThriftHiveMetastore_drop_table_with_environment_context_args() noexcept
-                                                               : dbname(),
-                                                                 name(),
-                                                                 deleteData(0) {
-  }
+  ThriftHiveMetastore_drop_table_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_table_with_environment_context_args() noexcept;
   std::string dbname;
@@ -6974,18 +6176,7 @@ class ThriftHiveMetastore_drop_table_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_table_with_environment_context_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(name == rhs.name))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_table_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_table_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7023,8 +6214,7 @@ class ThriftHiveMetastore_drop_table_with_environment_context_result {
 
   ThriftHiveMetastore_drop_table_with_environment_context_result(const ThriftHiveMetastore_drop_table_with_environment_context_result&);
   ThriftHiveMetastore_drop_table_with_environment_context_result& operator=(const ThriftHiveMetastore_drop_table_with_environment_context_result&);
-  ThriftHiveMetastore_drop_table_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_table_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_table_with_environment_context_result() noexcept;
   NoSuchObjectException o1;
@@ -7036,14 +6226,7 @@ class ThriftHiveMetastore_drop_table_with_environment_context_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_table_with_environment_context_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_table_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_table_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7085,8 +6268,7 @@ class ThriftHiveMetastore_drop_table_req_args {
 
   ThriftHiveMetastore_drop_table_req_args(const ThriftHiveMetastore_drop_table_req_args&);
   ThriftHiveMetastore_drop_table_req_args& operator=(const ThriftHiveMetastore_drop_table_req_args&);
-  ThriftHiveMetastore_drop_table_req_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_table_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_table_req_args() noexcept;
   DropTableRequest dropTableReq;
@@ -7095,12 +6277,7 @@ class ThriftHiveMetastore_drop_table_req_args {
 
   void __set_dropTableReq(const DropTableRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_table_req_args & rhs) const
-  {
-    if (!(dropTableReq == rhs.dropTableReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_table_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_table_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7136,8 +6313,7 @@ class ThriftHiveMetastore_drop_table_req_result {
 
   ThriftHiveMetastore_drop_table_req_result(const ThriftHiveMetastore_drop_table_req_result&);
   ThriftHiveMetastore_drop_table_req_result& operator=(const ThriftHiveMetastore_drop_table_req_result&);
-  ThriftHiveMetastore_drop_table_req_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_table_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_table_req_result() noexcept;
   AsyncOperationResp success;
@@ -7152,16 +6328,7 @@ class ThriftHiveMetastore_drop_table_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_table_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_table_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_table_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7207,10 +6374,7 @@ class ThriftHiveMetastore_truncate_table_args {
 
   ThriftHiveMetastore_truncate_table_args(const ThriftHiveMetastore_truncate_table_args&);
   ThriftHiveMetastore_truncate_table_args& operator=(const ThriftHiveMetastore_truncate_table_args&);
-  ThriftHiveMetastore_truncate_table_args() noexcept
-                                          : dbName(),
-                                            tableName() {
-  }
+  ThriftHiveMetastore_truncate_table_args() noexcept;
 
   virtual ~ThriftHiveMetastore_truncate_table_args() noexcept;
   std::string dbName;
@@ -7225,16 +6389,7 @@ class ThriftHiveMetastore_truncate_table_args {
 
   void __set_partNames(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_truncate_table_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(partNames == rhs.partNames))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_truncate_table_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_truncate_table_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7270,8 +6425,7 @@ class ThriftHiveMetastore_truncate_table_result {
 
   ThriftHiveMetastore_truncate_table_result(const ThriftHiveMetastore_truncate_table_result&);
   ThriftHiveMetastore_truncate_table_result& operator=(const ThriftHiveMetastore_truncate_table_result&);
-  ThriftHiveMetastore_truncate_table_result() noexcept {
-  }
+  ThriftHiveMetastore_truncate_table_result() noexcept;
 
   virtual ~ThriftHiveMetastore_truncate_table_result() noexcept;
   MetaException o1;
@@ -7280,12 +6434,7 @@ class ThriftHiveMetastore_truncate_table_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_truncate_table_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_truncate_table_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_truncate_table_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7325,8 +6474,7 @@ class ThriftHiveMetastore_truncate_table_req_args {
 
   ThriftHiveMetastore_truncate_table_req_args(const ThriftHiveMetastore_truncate_table_req_args&);
   ThriftHiveMetastore_truncate_table_req_args& operator=(const ThriftHiveMetastore_truncate_table_req_args&);
-  ThriftHiveMetastore_truncate_table_req_args() noexcept {
-  }
+  ThriftHiveMetastore_truncate_table_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_truncate_table_req_args() noexcept;
   TruncateTableRequest req;
@@ -7335,12 +6483,7 @@ class ThriftHiveMetastore_truncate_table_req_args {
 
   void __set_req(const TruncateTableRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_truncate_table_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_truncate_table_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_truncate_table_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7375,8 +6518,7 @@ class ThriftHiveMetastore_truncate_table_req_result {
 
   ThriftHiveMetastore_truncate_table_req_result(const ThriftHiveMetastore_truncate_table_req_result&);
   ThriftHiveMetastore_truncate_table_req_result& operator=(const ThriftHiveMetastore_truncate_table_req_result&);
-  ThriftHiveMetastore_truncate_table_req_result() noexcept {
-  }
+  ThriftHiveMetastore_truncate_table_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_truncate_table_req_result() noexcept;
   TruncateTableResponse success;
@@ -7388,14 +6530,7 @@ class ThriftHiveMetastore_truncate_table_req_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_truncate_table_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_truncate_table_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_truncate_table_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7438,10 +6573,7 @@ class ThriftHiveMetastore_get_tables_args {
 
   ThriftHiveMetastore_get_tables_args(const ThriftHiveMetastore_get_tables_args&);
   ThriftHiveMetastore_get_tables_args& operator=(const ThriftHiveMetastore_get_tables_args&);
-  ThriftHiveMetastore_get_tables_args() noexcept
-                                      : db_name(),
-                                        pattern() {
-  }
+  ThriftHiveMetastore_get_tables_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_tables_args() noexcept;
   std::string db_name;
@@ -7453,14 +6585,7 @@ class ThriftHiveMetastore_get_tables_args {
 
   void __set_pattern(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_tables_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(pattern == rhs.pattern))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_tables_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_tables_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7496,8 +6621,7 @@ class ThriftHiveMetastore_get_tables_result {
 
   ThriftHiveMetastore_get_tables_result(const ThriftHiveMetastore_get_tables_result&);
   ThriftHiveMetastore_get_tables_result& operator=(const ThriftHiveMetastore_get_tables_result&);
-  ThriftHiveMetastore_get_tables_result() noexcept {
-  }
+  ThriftHiveMetastore_get_tables_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_tables_result() noexcept;
   std::vector<std::string>  success;
@@ -7509,14 +6633,7 @@ class ThriftHiveMetastore_get_tables_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_tables_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_tables_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_tables_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7560,11 +6677,7 @@ class ThriftHiveMetastore_get_tables_by_type_args {
 
   ThriftHiveMetastore_get_tables_by_type_args(const ThriftHiveMetastore_get_tables_by_type_args&);
   ThriftHiveMetastore_get_tables_by_type_args& operator=(const ThriftHiveMetastore_get_tables_by_type_args&);
-  ThriftHiveMetastore_get_tables_by_type_args() noexcept
-                                              : db_name(),
-                                                pattern(),
-                                                tableType() {
-  }
+  ThriftHiveMetastore_get_tables_by_type_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_tables_by_type_args() noexcept;
   std::string db_name;
@@ -7579,16 +6692,7 @@ class ThriftHiveMetastore_get_tables_by_type_args {
 
   void __set_tableType(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_tables_by_type_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(pattern == rhs.pattern))
-      return false;
-    if (!(tableType == rhs.tableType))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_tables_by_type_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_tables_by_type_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7625,8 +6729,7 @@ class ThriftHiveMetastore_get_tables_by_type_result {
 
   ThriftHiveMetastore_get_tables_by_type_result(const ThriftHiveMetastore_get_tables_by_type_result&);
   ThriftHiveMetastore_get_tables_by_type_result& operator=(const ThriftHiveMetastore_get_tables_by_type_result&);
-  ThriftHiveMetastore_get_tables_by_type_result() noexcept {
-  }
+  ThriftHiveMetastore_get_tables_by_type_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_tables_by_type_result() noexcept;
   std::vector<std::string>  success;
@@ -7638,14 +6741,7 @@ class ThriftHiveMetastore_get_tables_by_type_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_tables_by_type_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_tables_by_type_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_tables_by_type_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7683,15 +6779,11 @@ class ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args {
 
   ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args(const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args&) noexcept;
   ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args& operator=(const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args&) noexcept;
-  ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7725,8 +6817,7 @@ class ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result
 
   ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result(const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result&);
   ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result& operator=(const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result&);
-  ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result() noexcept;
   std::vector<Table>  success;
@@ -7738,14 +6829,7 @@ class ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7787,9 +6871,7 @@ class ThriftHiveMetastore_get_materialized_views_for_rewriting_args {
 
   ThriftHiveMetastore_get_materialized_views_for_rewriting_args(const ThriftHiveMetastore_get_materialized_views_for_rewriting_args&);
   ThriftHiveMetastore_get_materialized_views_for_rewriting_args& operator=(const ThriftHiveMetastore_get_materialized_views_for_rewriting_args&);
-  ThriftHiveMetastore_get_materialized_views_for_rewriting_args() noexcept
-                                                                : db_name() {
-  }
+  ThriftHiveMetastore_get_materialized_views_for_rewriting_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_materialized_views_for_rewriting_args() noexcept;
   std::string db_name;
@@ -7798,12 +6880,7 @@ class ThriftHiveMetastore_get_materialized_views_for_rewriting_args {
 
   void __set_db_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_materialized_views_for_rewriting_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_materialized_views_for_rewriting_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_materialized_views_for_rewriting_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7838,8 +6915,7 @@ class ThriftHiveMetastore_get_materialized_views_for_rewriting_result {
 
   ThriftHiveMetastore_get_materialized_views_for_rewriting_result(const ThriftHiveMetastore_get_materialized_views_for_rewriting_result&);
   ThriftHiveMetastore_get_materialized_views_for_rewriting_result& operator=(const ThriftHiveMetastore_get_materialized_views_for_rewriting_result&);
-  ThriftHiveMetastore_get_materialized_views_for_rewriting_result() noexcept {
-  }
+  ThriftHiveMetastore_get_materialized_views_for_rewriting_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_materialized_views_for_rewriting_result() noexcept;
   std::vector<std::string>  success;
@@ -7851,14 +6927,7 @@ class ThriftHiveMetastore_get_materialized_views_for_rewriting_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_materialized_views_for_rewriting_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_materialized_views_for_rewriting_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_materialized_views_for_rewriting_result &rhs) const {
     return !(*this == rhs);
   }
@@ -7902,10 +6971,7 @@ class ThriftHiveMetastore_get_table_meta_args {
 
   ThriftHiveMetastore_get_table_meta_args(const ThriftHiveMetastore_get_table_meta_args&);
   ThriftHiveMetastore_get_table_meta_args& operator=(const ThriftHiveMetastore_get_table_meta_args&);
-  ThriftHiveMetastore_get_table_meta_args() noexcept
-                                          : db_patterns(),
-                                            tbl_patterns() {
-  }
+  ThriftHiveMetastore_get_table_meta_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_meta_args() noexcept;
   std::string db_patterns;
@@ -7920,16 +6986,7 @@ class ThriftHiveMetastore_get_table_meta_args {
 
   void __set_tbl_types(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_meta_args & rhs) const
-  {
-    if (!(db_patterns == rhs.db_patterns))
-      return false;
-    if (!(tbl_patterns == rhs.tbl_patterns))
-      return false;
-    if (!(tbl_types == rhs.tbl_types))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_meta_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_meta_args &rhs) const {
     return !(*this == rhs);
   }
@@ -7966,8 +7023,7 @@ class ThriftHiveMetastore_get_table_meta_result {
 
   ThriftHiveMetastore_get_table_meta_result(const ThriftHiveMetastore_get_table_meta_result&);
   ThriftHiveMetastore_get_table_meta_result& operator=(const ThriftHiveMetastore_get_table_meta_result&);
-  ThriftHiveMetastore_get_table_meta_result() noexcept {
-  }
+  ThriftHiveMetastore_get_table_meta_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_meta_result() noexcept;
   std::vector<TableMeta>  success;
@@ -7979,14 +7035,7 @@ class ThriftHiveMetastore_get_table_meta_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_meta_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_meta_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_meta_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8028,9 +7077,7 @@ class ThriftHiveMetastore_get_all_tables_args {
 
   ThriftHiveMetastore_get_all_tables_args(const ThriftHiveMetastore_get_all_tables_args&);
   ThriftHiveMetastore_get_all_tables_args& operator=(const ThriftHiveMetastore_get_all_tables_args&);
-  ThriftHiveMetastore_get_all_tables_args() noexcept
-                                          : db_name() {
-  }
+  ThriftHiveMetastore_get_all_tables_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_tables_args() noexcept;
   std::string db_name;
@@ -8039,12 +7086,7 @@ class ThriftHiveMetastore_get_all_tables_args {
 
   void __set_db_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_tables_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_tables_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_tables_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8079,8 +7121,7 @@ class ThriftHiveMetastore_get_all_tables_result {
 
   ThriftHiveMetastore_get_all_tables_result(const ThriftHiveMetastore_get_all_tables_result&);
   ThriftHiveMetastore_get_all_tables_result& operator=(const ThriftHiveMetastore_get_all_tables_result&);
-  ThriftHiveMetastore_get_all_tables_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_tables_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_tables_result() noexcept;
   std::vector<std::string>  success;
@@ -8092,14 +7133,7 @@ class ThriftHiveMetastore_get_all_tables_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_tables_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_tables_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_tables_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8141,8 +7175,7 @@ class ThriftHiveMetastore_get_tables_ext_args {
 
   ThriftHiveMetastore_get_tables_ext_args(const ThriftHiveMetastore_get_tables_ext_args&);
   ThriftHiveMetastore_get_tables_ext_args& operator=(const ThriftHiveMetastore_get_tables_ext_args&);
-  ThriftHiveMetastore_get_tables_ext_args() noexcept {
-  }
+  ThriftHiveMetastore_get_tables_ext_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_tables_ext_args() noexcept;
   GetTablesExtRequest req;
@@ -8151,12 +7184,7 @@ class ThriftHiveMetastore_get_tables_ext_args {
 
   void __set_req(const GetTablesExtRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_tables_ext_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_tables_ext_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_tables_ext_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8191,8 +7219,7 @@ class ThriftHiveMetastore_get_tables_ext_result {
 
   ThriftHiveMetastore_get_tables_ext_result(const ThriftHiveMetastore_get_tables_ext_result&);
   ThriftHiveMetastore_get_tables_ext_result& operator=(const ThriftHiveMetastore_get_tables_ext_result&);
-  ThriftHiveMetastore_get_tables_ext_result() noexcept {
-  }
+  ThriftHiveMetastore_get_tables_ext_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_tables_ext_result() noexcept;
   std::vector<ExtendedTableInfo>  success;
@@ -8204,14 +7231,7 @@ class ThriftHiveMetastore_get_tables_ext_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_tables_ext_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_tables_ext_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_tables_ext_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8253,8 +7273,7 @@ class ThriftHiveMetastore_get_table_req_args {
 
   ThriftHiveMetastore_get_table_req_args(const ThriftHiveMetastore_get_table_req_args&);
   ThriftHiveMetastore_get_table_req_args& operator=(const ThriftHiveMetastore_get_table_req_args&);
-  ThriftHiveMetastore_get_table_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_table_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_req_args() noexcept;
   GetTableRequest req;
@@ -8263,12 +7282,7 @@ class ThriftHiveMetastore_get_table_req_args {
 
   void __set_req(const GetTableRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8304,8 +7318,7 @@ class ThriftHiveMetastore_get_table_req_result {
 
   ThriftHiveMetastore_get_table_req_result(const ThriftHiveMetastore_get_table_req_result&);
   ThriftHiveMetastore_get_table_req_result& operator=(const ThriftHiveMetastore_get_table_req_result&);
-  ThriftHiveMetastore_get_table_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_table_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_req_result() noexcept;
   GetTableResult success;
@@ -8320,16 +7333,7 @@ class ThriftHiveMetastore_get_table_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8373,8 +7377,7 @@ class ThriftHiveMetastore_get_table_objects_by_name_req_args {
 
   ThriftHiveMetastore_get_table_objects_by_name_req_args(const ThriftHiveMetastore_get_table_objects_by_name_req_args&);
   ThriftHiveMetastore_get_table_objects_by_name_req_args& operator=(const ThriftHiveMetastore_get_table_objects_by_name_req_args&);
-  ThriftHiveMetastore_get_table_objects_by_name_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_table_objects_by_name_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_objects_by_name_req_args() noexcept;
   GetTablesRequest req;
@@ -8383,12 +7386,7 @@ class ThriftHiveMetastore_get_table_objects_by_name_req_args {
 
   void __set_req(const GetTablesRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_objects_by_name_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_objects_by_name_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_objects_by_name_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8425,8 +7423,7 @@ class ThriftHiveMetastore_get_table_objects_by_name_req_result {
 
   ThriftHiveMetastore_get_table_objects_by_name_req_result(const ThriftHiveMetastore_get_table_objects_by_name_req_result&);
   ThriftHiveMetastore_get_table_objects_by_name_req_result& operator=(const ThriftHiveMetastore_get_table_objects_by_name_req_result&);
-  ThriftHiveMetastore_get_table_objects_by_name_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_table_objects_by_name_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_objects_by_name_req_result() noexcept;
   GetTablesResult success;
@@ -8444,18 +7441,7 @@ class ThriftHiveMetastore_get_table_objects_by_name_req_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_objects_by_name_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_objects_by_name_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_objects_by_name_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8502,9 +7488,7 @@ class ThriftHiveMetastore_get_materialization_invalidation_info_args {
 
   ThriftHiveMetastore_get_materialization_invalidation_info_args(const ThriftHiveMetastore_get_materialization_invalidation_info_args&);
   ThriftHiveMetastore_get_materialization_invalidation_info_args& operator=(const ThriftHiveMetastore_get_materialization_invalidation_info_args&);
-  ThriftHiveMetastore_get_materialization_invalidation_info_args() noexcept
-                                                                 : validTxnList() {
-  }
+  ThriftHiveMetastore_get_materialization_invalidation_info_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_materialization_invalidation_info_args() noexcept;
   CreationMetadata creation_metadata;
@@ -8516,14 +7500,7 @@ class ThriftHiveMetastore_get_materialization_invalidation_info_args {
 
   void __set_validTxnList(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_materialization_invalidation_info_args & rhs) const
-  {
-    if (!(creation_metadata == rhs.creation_metadata))
-      return false;
-    if (!(validTxnList == rhs.validTxnList))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_materialization_invalidation_info_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_materialization_invalidation_info_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8561,8 +7538,7 @@ class ThriftHiveMetastore_get_materialization_invalidation_info_result {
 
   ThriftHiveMetastore_get_materialization_invalidation_info_result(const ThriftHiveMetastore_get_materialization_invalidation_info_result&);
   ThriftHiveMetastore_get_materialization_invalidation_info_result& operator=(const ThriftHiveMetastore_get_materialization_invalidation_info_result&);
-  ThriftHiveMetastore_get_materialization_invalidation_info_result() noexcept {
-  }
+  ThriftHiveMetastore_get_materialization_invalidation_info_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_materialization_invalidation_info_result() noexcept;
   Materialization success;
@@ -8580,18 +7556,7 @@ class ThriftHiveMetastore_get_materialization_invalidation_info_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_materialization_invalidation_info_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_materialization_invalidation_info_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_materialization_invalidation_info_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8640,11 +7605,7 @@ class ThriftHiveMetastore_update_creation_metadata_args {
 
   ThriftHiveMetastore_update_creation_metadata_args(const ThriftHiveMetastore_update_creation_metadata_args&);
   ThriftHiveMetastore_update_creation_metadata_args& operator=(const ThriftHiveMetastore_update_creation_metadata_args&);
-  ThriftHiveMetastore_update_creation_metadata_args() noexcept
-                                                    : catName(),
-                                                      dbname(),
-                                                      tbl_name() {
-  }
+  ThriftHiveMetastore_update_creation_metadata_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_creation_metadata_args() noexcept;
   std::string catName;
@@ -8662,18 +7623,7 @@ class ThriftHiveMetastore_update_creation_metadata_args {
 
   void __set_creation_metadata(const CreationMetadata& val);
 
-  bool operator == (const ThriftHiveMetastore_update_creation_metadata_args & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(creation_metadata == rhs.creation_metadata))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_creation_metadata_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_creation_metadata_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8712,8 +7662,7 @@ class ThriftHiveMetastore_update_creation_metadata_result {
 
   ThriftHiveMetastore_update_creation_metadata_result(const ThriftHiveMetastore_update_creation_metadata_result&);
   ThriftHiveMetastore_update_creation_metadata_result& operator=(const ThriftHiveMetastore_update_creation_metadata_result&);
-  ThriftHiveMetastore_update_creation_metadata_result() noexcept {
-  }
+  ThriftHiveMetastore_update_creation_metadata_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_creation_metadata_result() noexcept;
   MetaException o1;
@@ -8728,16 +7677,7 @@ class ThriftHiveMetastore_update_creation_metadata_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_creation_metadata_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_creation_metadata_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_creation_metadata_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8783,11 +7723,7 @@ class ThriftHiveMetastore_get_table_names_by_filter_args {
 
   ThriftHiveMetastore_get_table_names_by_filter_args(const ThriftHiveMetastore_get_table_names_by_filter_args&);
   ThriftHiveMetastore_get_table_names_by_filter_args& operator=(const ThriftHiveMetastore_get_table_names_by_filter_args&);
-  ThriftHiveMetastore_get_table_names_by_filter_args() noexcept
-                                                     : dbname(),
-                                                       filter(),
-                                                       max_tables(-1) {
-  }
+  ThriftHiveMetastore_get_table_names_by_filter_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_names_by_filter_args() noexcept;
   std::string dbname;
@@ -8802,16 +7738,7 @@ class ThriftHiveMetastore_get_table_names_by_filter_args {
 
   void __set_max_tables(const int16_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_names_by_filter_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(filter == rhs.filter))
-      return false;
-    if (!(max_tables == rhs.max_tables))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_names_by_filter_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_names_by_filter_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8850,8 +7777,7 @@ class ThriftHiveMetastore_get_table_names_by_filter_result {
 
   ThriftHiveMetastore_get_table_names_by_filter_result(const ThriftHiveMetastore_get_table_names_by_filter_result&);
   ThriftHiveMetastore_get_table_names_by_filter_result& operator=(const ThriftHiveMetastore_get_table_names_by_filter_result&);
-  ThriftHiveMetastore_get_table_names_by_filter_result() noexcept {
-  }
+  ThriftHiveMetastore_get_table_names_by_filter_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_names_by_filter_result() noexcept;
   std::vector<std::string>  success;
@@ -8869,18 +7795,7 @@ class ThriftHiveMetastore_get_table_names_by_filter_result {
 
   void __set_o3(const UnknownDBException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_names_by_filter_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_names_by_filter_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_names_by_filter_result &rhs) const {
     return !(*this == rhs);
   }
@@ -8928,10 +7843,7 @@ class ThriftHiveMetastore_alter_table_args {
 
   ThriftHiveMetastore_alter_table_args(const ThriftHiveMetastore_alter_table_args&);
   ThriftHiveMetastore_alter_table_args& operator=(const ThriftHiveMetastore_alter_table_args&);
-  ThriftHiveMetastore_alter_table_args() noexcept
-                                       : dbname(),
-                                         tbl_name() {
-  }
+  ThriftHiveMetastore_alter_table_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_args() noexcept;
   std::string dbname;
@@ -8946,16 +7858,7 @@ class ThriftHiveMetastore_alter_table_args {
 
   void __set_new_tbl(const Table& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_tbl == rhs.new_tbl))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_args &rhs) const {
     return !(*this == rhs);
   }
@@ -8992,8 +7895,7 @@ class ThriftHiveMetastore_alter_table_result {
 
   ThriftHiveMetastore_alter_table_result(const ThriftHiveMetastore_alter_table_result&);
   ThriftHiveMetastore_alter_table_result& operator=(const ThriftHiveMetastore_alter_table_result&);
-  ThriftHiveMetastore_alter_table_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_table_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_result() noexcept;
   InvalidOperationException o1;
@@ -9005,14 +7907,7 @@ class ThriftHiveMetastore_alter_table_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9057,10 +7952,7 @@ class ThriftHiveMetastore_alter_table_with_environment_context_args {
 
   ThriftHiveMetastore_alter_table_with_environment_context_args(const ThriftHiveMetastore_alter_table_with_environment_context_args&);
   ThriftHiveMetastore_alter_table_with_environment_context_args& operator=(const ThriftHiveMetastore_alter_table_with_environment_context_args&);
-  ThriftHiveMetastore_alter_table_with_environment_context_args() noexcept
-                                                                : dbname(),
-                                                                  tbl_name() {
-  }
+  ThriftHiveMetastore_alter_table_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_with_environment_context_args() noexcept;
   std::string dbname;
@@ -9078,18 +7970,7 @@ class ThriftHiveMetastore_alter_table_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_with_environment_context_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_tbl == rhs.new_tbl))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9127,8 +8008,7 @@ class ThriftHiveMetastore_alter_table_with_environment_context_result {
 
   ThriftHiveMetastore_alter_table_with_environment_context_result(const ThriftHiveMetastore_alter_table_with_environment_context_result&);
   ThriftHiveMetastore_alter_table_with_environment_context_result& operator=(const ThriftHiveMetastore_alter_table_with_environment_context_result&);
-  ThriftHiveMetastore_alter_table_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_table_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_with_environment_context_result() noexcept;
   InvalidOperationException o1;
@@ -9140,14 +8020,7 @@ class ThriftHiveMetastore_alter_table_with_environment_context_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_with_environment_context_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9192,11 +8065,7 @@ class ThriftHiveMetastore_alter_table_with_cascade_args {
 
   ThriftHiveMetastore_alter_table_with_cascade_args(const ThriftHiveMetastore_alter_table_with_cascade_args&);
   ThriftHiveMetastore_alter_table_with_cascade_args& operator=(const ThriftHiveMetastore_alter_table_with_cascade_args&);
-  ThriftHiveMetastore_alter_table_with_cascade_args() noexcept
-                                                    : dbname(),
-                                                      tbl_name(),
-                                                      cascade(0) {
-  }
+  ThriftHiveMetastore_alter_table_with_cascade_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_with_cascade_args() noexcept;
   std::string dbname;
@@ -9214,18 +8083,7 @@ class ThriftHiveMetastore_alter_table_with_cascade_args {
 
   void __set_cascade(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_with_cascade_args & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_tbl == rhs.new_tbl))
-      return false;
-    if (!(cascade == rhs.cascade))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_with_cascade_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_with_cascade_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9263,8 +8121,7 @@ class ThriftHiveMetastore_alter_table_with_cascade_result {
 
   ThriftHiveMetastore_alter_table_with_cascade_result(const ThriftHiveMetastore_alter_table_with_cascade_result&);
   ThriftHiveMetastore_alter_table_with_cascade_result& operator=(const ThriftHiveMetastore_alter_table_with_cascade_result&);
-  ThriftHiveMetastore_alter_table_with_cascade_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_table_with_cascade_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_with_cascade_result() noexcept;
   InvalidOperationException o1;
@@ -9276,14 +8133,7 @@ class ThriftHiveMetastore_alter_table_with_cascade_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_with_cascade_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_with_cascade_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_with_cascade_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9325,8 +8175,7 @@ class ThriftHiveMetastore_alter_table_req_args {
 
   ThriftHiveMetastore_alter_table_req_args(const ThriftHiveMetastore_alter_table_req_args&);
   ThriftHiveMetastore_alter_table_req_args& operator=(const ThriftHiveMetastore_alter_table_req_args&);
-  ThriftHiveMetastore_alter_table_req_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_table_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_req_args() noexcept;
   AlterTableRequest req;
@@ -9335,12 +8184,7 @@ class ThriftHiveMetastore_alter_table_req_args {
 
   void __set_req(const AlterTableRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9376,8 +8220,7 @@ class ThriftHiveMetastore_alter_table_req_result {
 
   ThriftHiveMetastore_alter_table_req_result(const ThriftHiveMetastore_alter_table_req_result&);
   ThriftHiveMetastore_alter_table_req_result& operator=(const ThriftHiveMetastore_alter_table_req_result&);
-  ThriftHiveMetastore_alter_table_req_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_table_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_table_req_result() noexcept;
   AlterTableResponse success;
@@ -9392,16 +8235,7 @@ class ThriftHiveMetastore_alter_table_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_table_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_table_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_table_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9445,8 +8279,7 @@ class ThriftHiveMetastore_update_table_params_args {
 
   ThriftHiveMetastore_update_table_params_args(const ThriftHiveMetastore_update_table_params_args&);
   ThriftHiveMetastore_update_table_params_args& operator=(const ThriftHiveMetastore_update_table_params_args&);
-  ThriftHiveMetastore_update_table_params_args() noexcept {
-  }
+  ThriftHiveMetastore_update_table_params_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_table_params_args() noexcept;
   std::vector<TableParamsUpdate>  updates;
@@ -9455,12 +8288,7 @@ class ThriftHiveMetastore_update_table_params_args {
 
   void __set_updates(const std::vector<TableParamsUpdate> & val);
 
-  bool operator == (const ThriftHiveMetastore_update_table_params_args & rhs) const
-  {
-    if (!(updates == rhs.updates))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_table_params_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_table_params_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9494,8 +8322,7 @@ class ThriftHiveMetastore_update_table_params_result {
 
   ThriftHiveMetastore_update_table_params_result(const ThriftHiveMetastore_update_table_params_result&);
   ThriftHiveMetastore_update_table_params_result& operator=(const ThriftHiveMetastore_update_table_params_result&);
-  ThriftHiveMetastore_update_table_params_result() noexcept {
-  }
+  ThriftHiveMetastore_update_table_params_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_table_params_result() noexcept;
   MetaException o1;
@@ -9504,12 +8331,7 @@ class ThriftHiveMetastore_update_table_params_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_table_params_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_table_params_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_table_params_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9549,8 +8371,7 @@ class ThriftHiveMetastore_add_partition_args {
 
   ThriftHiveMetastore_add_partition_args(const ThriftHiveMetastore_add_partition_args&);
   ThriftHiveMetastore_add_partition_args& operator=(const ThriftHiveMetastore_add_partition_args&);
-  ThriftHiveMetastore_add_partition_args() noexcept {
-  }
+  ThriftHiveMetastore_add_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partition_args() noexcept;
   Partition new_part;
@@ -9559,12 +8380,7 @@ class ThriftHiveMetastore_add_partition_args {
 
   void __set_new_part(const Partition& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partition_args & rhs) const
-  {
-    if (!(new_part == rhs.new_part))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9601,8 +8417,7 @@ class ThriftHiveMetastore_add_partition_result {
 
   ThriftHiveMetastore_add_partition_result(const ThriftHiveMetastore_add_partition_result&);
   ThriftHiveMetastore_add_partition_result& operator=(const ThriftHiveMetastore_add_partition_result&);
-  ThriftHiveMetastore_add_partition_result() noexcept {
-  }
+  ThriftHiveMetastore_add_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partition_result() noexcept;
   Partition success;
@@ -9620,18 +8435,7 @@ class ThriftHiveMetastore_add_partition_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partition_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9678,8 +8482,7 @@ class ThriftHiveMetastore_add_partition_with_environment_context_args {
 
   ThriftHiveMetastore_add_partition_with_environment_context_args(const ThriftHiveMetastore_add_partition_with_environment_context_args&);
   ThriftHiveMetastore_add_partition_with_environment_context_args& operator=(const ThriftHiveMetastore_add_partition_with_environment_context_args&);
-  ThriftHiveMetastore_add_partition_with_environment_context_args() noexcept {
-  }
+  ThriftHiveMetastore_add_partition_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partition_with_environment_context_args() noexcept;
   Partition new_part;
@@ -9691,14 +8494,7 @@ class ThriftHiveMetastore_add_partition_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partition_with_environment_context_args & rhs) const
-  {
-    if (!(new_part == rhs.new_part))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partition_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partition_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9736,8 +8532,7 @@ class ThriftHiveMetastore_add_partition_with_environment_context_result {
 
   ThriftHiveMetastore_add_partition_with_environment_context_result(const ThriftHiveMetastore_add_partition_with_environment_context_result&);
   ThriftHiveMetastore_add_partition_with_environment_context_result& operator=(const ThriftHiveMetastore_add_partition_with_environment_context_result&);
-  ThriftHiveMetastore_add_partition_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_add_partition_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partition_with_environment_context_result() noexcept;
   Partition success;
@@ -9755,18 +8550,7 @@ class ThriftHiveMetastore_add_partition_with_environment_context_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partition_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partition_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partition_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9812,8 +8596,7 @@ class ThriftHiveMetastore_add_partitions_args {
 
   ThriftHiveMetastore_add_partitions_args(const ThriftHiveMetastore_add_partitions_args&);
   ThriftHiveMetastore_add_partitions_args& operator=(const ThriftHiveMetastore_add_partitions_args&);
-  ThriftHiveMetastore_add_partitions_args() noexcept {
-  }
+  ThriftHiveMetastore_add_partitions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partitions_args() noexcept;
   std::vector<Partition>  new_parts;
@@ -9822,12 +8605,7 @@ class ThriftHiveMetastore_add_partitions_args {
 
   void __set_new_parts(const std::vector<Partition> & val);
 
-  bool operator == (const ThriftHiveMetastore_add_partitions_args & rhs) const
-  {
-    if (!(new_parts == rhs.new_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partitions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partitions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9864,9 +8642,7 @@ class ThriftHiveMetastore_add_partitions_result {
 
   ThriftHiveMetastore_add_partitions_result(const ThriftHiveMetastore_add_partitions_result&);
   ThriftHiveMetastore_add_partitions_result& operator=(const ThriftHiveMetastore_add_partitions_result&);
-  ThriftHiveMetastore_add_partitions_result() noexcept
-                                            : success(0) {
-  }
+  ThriftHiveMetastore_add_partitions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partitions_result() noexcept;
   int32_t success;
@@ -9884,18 +8660,7 @@ class ThriftHiveMetastore_add_partitions_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partitions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partitions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partitions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -9941,8 +8706,7 @@ class ThriftHiveMetastore_add_partitions_pspec_args {
 
   ThriftHiveMetastore_add_partitions_pspec_args(const ThriftHiveMetastore_add_partitions_pspec_args&);
   ThriftHiveMetastore_add_partitions_pspec_args& operator=(const ThriftHiveMetastore_add_partitions_pspec_args&);
-  ThriftHiveMetastore_add_partitions_pspec_args() noexcept {
-  }
+  ThriftHiveMetastore_add_partitions_pspec_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partitions_pspec_args() noexcept;
   std::vector<PartitionSpec>  new_parts;
@@ -9951,12 +8715,7 @@ class ThriftHiveMetastore_add_partitions_pspec_args {
 
   void __set_new_parts(const std::vector<PartitionSpec> & val);
 
-  bool operator == (const ThriftHiveMetastore_add_partitions_pspec_args & rhs) const
-  {
-    if (!(new_parts == rhs.new_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partitions_pspec_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partitions_pspec_args &rhs) const {
     return !(*this == rhs);
   }
@@ -9993,9 +8752,7 @@ class ThriftHiveMetastore_add_partitions_pspec_result {
 
   ThriftHiveMetastore_add_partitions_pspec_result(const ThriftHiveMetastore_add_partitions_pspec_result&);
   ThriftHiveMetastore_add_partitions_pspec_result& operator=(const ThriftHiveMetastore_add_partitions_pspec_result&);
-  ThriftHiveMetastore_add_partitions_pspec_result() noexcept
-                                                  : success(0) {
-  }
+  ThriftHiveMetastore_add_partitions_pspec_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partitions_pspec_result() noexcept;
   int32_t success;
@@ -10013,18 +8770,7 @@ class ThriftHiveMetastore_add_partitions_pspec_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partitions_pspec_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partitions_pspec_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partitions_pspec_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10072,10 +8818,7 @@ class ThriftHiveMetastore_append_partition_args {
 
   ThriftHiveMetastore_append_partition_args(const ThriftHiveMetastore_append_partition_args&);
   ThriftHiveMetastore_append_partition_args& operator=(const ThriftHiveMetastore_append_partition_args&);
-  ThriftHiveMetastore_append_partition_args() noexcept
-                                            : db_name(),
-                                              tbl_name() {
-  }
+  ThriftHiveMetastore_append_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_args() noexcept;
   std::string db_name;
@@ -10090,16 +8833,7 @@ class ThriftHiveMetastore_append_partition_args {
 
   void __set_part_vals(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10138,8 +8872,7 @@ class ThriftHiveMetastore_append_partition_result {
 
   ThriftHiveMetastore_append_partition_result(const ThriftHiveMetastore_append_partition_result&);
   ThriftHiveMetastore_append_partition_result& operator=(const ThriftHiveMetastore_append_partition_result&);
-  ThriftHiveMetastore_append_partition_result() noexcept {
-  }
+  ThriftHiveMetastore_append_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_result() noexcept;
   Partition success;
@@ -10157,18 +8890,7 @@ class ThriftHiveMetastore_append_partition_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10214,8 +8936,7 @@ class ThriftHiveMetastore_add_partitions_req_args {
 
   ThriftHiveMetastore_add_partitions_req_args(const ThriftHiveMetastore_add_partitions_req_args&);
   ThriftHiveMetastore_add_partitions_req_args& operator=(const ThriftHiveMetastore_add_partitions_req_args&);
-  ThriftHiveMetastore_add_partitions_req_args() noexcept {
-  }
+  ThriftHiveMetastore_add_partitions_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partitions_req_args() noexcept;
   AddPartitionsRequest request;
@@ -10224,12 +8945,7 @@ class ThriftHiveMetastore_add_partitions_req_args {
 
   void __set_request(const AddPartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partitions_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partitions_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partitions_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10266,8 +8982,7 @@ class ThriftHiveMetastore_add_partitions_req_result {
 
   ThriftHiveMetastore_add_partitions_req_result(const ThriftHiveMetastore_add_partitions_req_result&);
   ThriftHiveMetastore_add_partitions_req_result& operator=(const ThriftHiveMetastore_add_partitions_req_result&);
-  ThriftHiveMetastore_add_partitions_req_result() noexcept {
-  }
+  ThriftHiveMetastore_add_partitions_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_partitions_req_result() noexcept;
   AddPartitionsResult success;
@@ -10285,18 +9000,7 @@ class ThriftHiveMetastore_add_partitions_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_partitions_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_partitions_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_partitions_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10345,10 +9049,7 @@ class ThriftHiveMetastore_append_partition_with_environment_context_args {
 
   ThriftHiveMetastore_append_partition_with_environment_context_args(const ThriftHiveMetastore_append_partition_with_environment_context_args&);
   ThriftHiveMetastore_append_partition_with_environment_context_args& operator=(const ThriftHiveMetastore_append_partition_with_environment_context_args&);
-  ThriftHiveMetastore_append_partition_with_environment_context_args() noexcept
-                                                                     : db_name(),
-                                                                       tbl_name() {
-  }
+  ThriftHiveMetastore_append_partition_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_with_environment_context_args() noexcept;
   std::string db_name;
@@ -10366,18 +9067,7 @@ class ThriftHiveMetastore_append_partition_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10417,8 +9107,7 @@ class ThriftHiveMetastore_append_partition_with_environment_context_result {
 
   ThriftHiveMetastore_append_partition_with_environment_context_result(const ThriftHiveMetastore_append_partition_with_environment_context_result&);
   ThriftHiveMetastore_append_partition_with_environment_context_result& operator=(const ThriftHiveMetastore_append_partition_with_environment_context_result&);
-  ThriftHiveMetastore_append_partition_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_append_partition_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_with_environment_context_result() noexcept;
   Partition success;
@@ -10436,18 +9125,7 @@ class ThriftHiveMetastore_append_partition_with_environment_context_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10493,8 +9171,7 @@ class ThriftHiveMetastore_append_partition_req_args {
 
   ThriftHiveMetastore_append_partition_req_args(const ThriftHiveMetastore_append_partition_req_args&);
   ThriftHiveMetastore_append_partition_req_args& operator=(const ThriftHiveMetastore_append_partition_req_args&);
-  ThriftHiveMetastore_append_partition_req_args() noexcept {
-  }
+  ThriftHiveMetastore_append_partition_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_req_args() noexcept;
   AppendPartitionsRequest appendPartitionsReq;
@@ -10503,12 +9180,7 @@ class ThriftHiveMetastore_append_partition_req_args {
 
   void __set_appendPartitionsReq(const AppendPartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_req_args & rhs) const
-  {
-    if (!(appendPartitionsReq == rhs.appendPartitionsReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10545,8 +9217,7 @@ class ThriftHiveMetastore_append_partition_req_result {
 
   ThriftHiveMetastore_append_partition_req_result(const ThriftHiveMetastore_append_partition_req_result&);
   ThriftHiveMetastore_append_partition_req_result& operator=(const ThriftHiveMetastore_append_partition_req_result&);
-  ThriftHiveMetastore_append_partition_req_result() noexcept {
-  }
+  ThriftHiveMetastore_append_partition_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_req_result() noexcept;
   Partition success;
@@ -10564,18 +9235,7 @@ class ThriftHiveMetastore_append_partition_req_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10623,11 +9283,7 @@ class ThriftHiveMetastore_append_partition_by_name_args {
 
   ThriftHiveMetastore_append_partition_by_name_args(const ThriftHiveMetastore_append_partition_by_name_args&);
   ThriftHiveMetastore_append_partition_by_name_args& operator=(const ThriftHiveMetastore_append_partition_by_name_args&);
-  ThriftHiveMetastore_append_partition_by_name_args() noexcept
-                                                    : db_name(),
-                                                      tbl_name(),
-                                                      part_name() {
-  }
+  ThriftHiveMetastore_append_partition_by_name_args() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_by_name_args() noexcept;
   std::string db_name;
@@ -10642,16 +9298,7 @@ class ThriftHiveMetastore_append_partition_by_name_args {
 
   void __set_part_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_by_name_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_by_name_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_by_name_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10690,8 +9337,7 @@ class ThriftHiveMetastore_append_partition_by_name_result {
 
   ThriftHiveMetastore_append_partition_by_name_result(const ThriftHiveMetastore_append_partition_by_name_result&);
   ThriftHiveMetastore_append_partition_by_name_result& operator=(const ThriftHiveMetastore_append_partition_by_name_result&);
-  ThriftHiveMetastore_append_partition_by_name_result() noexcept {
-  }
+  ThriftHiveMetastore_append_partition_by_name_result() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_by_name_result() noexcept;
   Partition success;
@@ -10709,18 +9355,7 @@ class ThriftHiveMetastore_append_partition_by_name_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_by_name_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_by_name_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_by_name_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10769,11 +9404,7 @@ class ThriftHiveMetastore_append_partition_by_name_with_environment_context_args
 
   ThriftHiveMetastore_append_partition_by_name_with_environment_context_args(const ThriftHiveMetastore_append_partition_by_name_with_environment_context_args&);
   ThriftHiveMetastore_append_partition_by_name_with_environment_context_args& operator=(const ThriftHiveMetastore_append_partition_by_name_with_environment_context_args&);
-  ThriftHiveMetastore_append_partition_by_name_with_environment_context_args() noexcept
-                                                                             : db_name(),
-                                                                               tbl_name(),
-                                                                               part_name() {
-  }
+  ThriftHiveMetastore_append_partition_by_name_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_by_name_with_environment_context_args() noexcept;
   std::string db_name;
@@ -10791,18 +9422,7 @@ class ThriftHiveMetastore_append_partition_by_name_with_environment_context_args
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_by_name_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_by_name_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_by_name_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10842,8 +9462,7 @@ class ThriftHiveMetastore_append_partition_by_name_with_environment_context_resu
 
   ThriftHiveMetastore_append_partition_by_name_with_environment_context_result(const ThriftHiveMetastore_append_partition_by_name_with_environment_context_result&);
   ThriftHiveMetastore_append_partition_by_name_with_environment_context_result& operator=(const ThriftHiveMetastore_append_partition_by_name_with_environment_context_result&);
-  ThriftHiveMetastore_append_partition_by_name_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_append_partition_by_name_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_append_partition_by_name_with_environment_context_result() noexcept;
   Partition success;
@@ -10861,18 +9480,7 @@ class ThriftHiveMetastore_append_partition_by_name_with_environment_context_resu
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_append_partition_by_name_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_append_partition_by_name_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_append_partition_by_name_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -10921,11 +9529,7 @@ class ThriftHiveMetastore_drop_partition_args {
 
   ThriftHiveMetastore_drop_partition_args(const ThriftHiveMetastore_drop_partition_args&);
   ThriftHiveMetastore_drop_partition_args& operator=(const ThriftHiveMetastore_drop_partition_args&);
-  ThriftHiveMetastore_drop_partition_args() noexcept
-                                          : db_name(),
-                                            tbl_name(),
-                                            deleteData(0) {
-  }
+  ThriftHiveMetastore_drop_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_args() noexcept;
   std::string db_name;
@@ -10943,18 +9547,7 @@ class ThriftHiveMetastore_drop_partition_args {
 
   void __set_deleteData(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -10993,9 +9586,7 @@ class ThriftHiveMetastore_drop_partition_result {
 
   ThriftHiveMetastore_drop_partition_result(const ThriftHiveMetastore_drop_partition_result&);
   ThriftHiveMetastore_drop_partition_result& operator=(const ThriftHiveMetastore_drop_partition_result&);
-  ThriftHiveMetastore_drop_partition_result() noexcept
-                                            : success(0) {
-  }
+  ThriftHiveMetastore_drop_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_result() noexcept;
   bool success;
@@ -11010,16 +9601,7 @@ class ThriftHiveMetastore_drop_partition_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11067,11 +9649,7 @@ class ThriftHiveMetastore_drop_partition_with_environment_context_args {
 
   ThriftHiveMetastore_drop_partition_with_environment_context_args(const ThriftHiveMetastore_drop_partition_with_environment_context_args&);
   ThriftHiveMetastore_drop_partition_with_environment_context_args& operator=(const ThriftHiveMetastore_drop_partition_with_environment_context_args&);
-  ThriftHiveMetastore_drop_partition_with_environment_context_args() noexcept
-                                                                   : db_name(),
-                                                                     tbl_name(),
-                                                                     deleteData(0) {
-  }
+  ThriftHiveMetastore_drop_partition_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_with_environment_context_args() noexcept;
   std::string db_name;
@@ -11092,20 +9670,7 @@ class ThriftHiveMetastore_drop_partition_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11145,9 +9710,7 @@ class ThriftHiveMetastore_drop_partition_with_environment_context_result {
 
   ThriftHiveMetastore_drop_partition_with_environment_context_result(const ThriftHiveMetastore_drop_partition_with_environment_context_result&);
   ThriftHiveMetastore_drop_partition_with_environment_context_result& operator=(const ThriftHiveMetastore_drop_partition_with_environment_context_result&);
-  ThriftHiveMetastore_drop_partition_with_environment_context_result() noexcept
-                                                                     : success(0) {
-  }
+  ThriftHiveMetastore_drop_partition_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_with_environment_context_result() noexcept;
   bool success;
@@ -11162,16 +9725,7 @@ class ThriftHiveMetastore_drop_partition_with_environment_context_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11215,8 +9769,7 @@ class ThriftHiveMetastore_drop_partition_req_args {
 
   ThriftHiveMetastore_drop_partition_req_args(const ThriftHiveMetastore_drop_partition_req_args&);
   ThriftHiveMetastore_drop_partition_req_args& operator=(const ThriftHiveMetastore_drop_partition_req_args&);
-  ThriftHiveMetastore_drop_partition_req_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_partition_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_req_args() noexcept;
   DropPartitionRequest dropPartitionReq;
@@ -11225,12 +9778,7 @@ class ThriftHiveMetastore_drop_partition_req_args {
 
   void __set_dropPartitionReq(const DropPartitionRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_req_args & rhs) const
-  {
-    if (!(dropPartitionReq == rhs.dropPartitionReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11266,9 +9814,7 @@ class ThriftHiveMetastore_drop_partition_req_result {
 
   ThriftHiveMetastore_drop_partition_req_result(const ThriftHiveMetastore_drop_partition_req_result&);
   ThriftHiveMetastore_drop_partition_req_result& operator=(const ThriftHiveMetastore_drop_partition_req_result&);
-  ThriftHiveMetastore_drop_partition_req_result() noexcept
-                                                : success(0) {
-  }
+  ThriftHiveMetastore_drop_partition_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_req_result() noexcept;
   bool success;
@@ -11283,16 +9829,7 @@ class ThriftHiveMetastore_drop_partition_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11339,12 +9876,7 @@ class ThriftHiveMetastore_drop_partition_by_name_args {
 
   ThriftHiveMetastore_drop_partition_by_name_args(const ThriftHiveMetastore_drop_partition_by_name_args&);
   ThriftHiveMetastore_drop_partition_by_name_args& operator=(const ThriftHiveMetastore_drop_partition_by_name_args&);
-  ThriftHiveMetastore_drop_partition_by_name_args() noexcept
-                                                  : db_name(),
-                                                    tbl_name(),
-                                                    part_name(),
-                                                    deleteData(0) {
-  }
+  ThriftHiveMetastore_drop_partition_by_name_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_by_name_args() noexcept;
   std::string db_name;
@@ -11362,18 +9894,7 @@ class ThriftHiveMetastore_drop_partition_by_name_args {
 
   void __set_deleteData(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_by_name_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11412,9 +9933,7 @@ class ThriftHiveMetastore_drop_partition_by_name_result {
 
   ThriftHiveMetastore_drop_partition_by_name_result(const ThriftHiveMetastore_drop_partition_by_name_result&);
   ThriftHiveMetastore_drop_partition_by_name_result& operator=(const ThriftHiveMetastore_drop_partition_by_name_result&);
-  ThriftHiveMetastore_drop_partition_by_name_result() noexcept
-                                                    : success(0) {
-  }
+  ThriftHiveMetastore_drop_partition_by_name_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_by_name_result() noexcept;
   bool success;
@@ -11429,16 +9948,7 @@ class ThriftHiveMetastore_drop_partition_by_name_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_by_name_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11486,12 +9996,7 @@ class ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args {
 
   ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args(const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args&);
   ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args& operator=(const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args&);
-  ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args() noexcept
-                                                                           : db_name(),
-                                                                             tbl_name(),
-                                                                             part_name(),
-                                                                             deleteData(0) {
-  }
+  ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args() noexcept;
   std::string db_name;
@@ -11512,20 +10017,7 @@ class ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11565,9 +10057,7 @@ class ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result
 
   ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result(const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result&);
   ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result& operator=(const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result&);
-  ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result() noexcept
-                                                                             : success(0) {
-  }
+  ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result() noexcept;
   bool success;
@@ -11582,16 +10072,7 @@ class ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11635,8 +10116,7 @@ class ThriftHiveMetastore_drop_partitions_req_args {
 
   ThriftHiveMetastore_drop_partitions_req_args(const ThriftHiveMetastore_drop_partitions_req_args&);
   ThriftHiveMetastore_drop_partitions_req_args& operator=(const ThriftHiveMetastore_drop_partitions_req_args&);
-  ThriftHiveMetastore_drop_partitions_req_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_partitions_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partitions_req_args() noexcept;
   DropPartitionsRequest req;
@@ -11645,12 +10125,7 @@ class ThriftHiveMetastore_drop_partitions_req_args {
 
   void __set_req(const DropPartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partitions_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partitions_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partitions_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11686,8 +10161,7 @@ class ThriftHiveMetastore_drop_partitions_req_result {
 
   ThriftHiveMetastore_drop_partitions_req_result(const ThriftHiveMetastore_drop_partitions_req_result&);
   ThriftHiveMetastore_drop_partitions_req_result& operator=(const ThriftHiveMetastore_drop_partitions_req_result&);
-  ThriftHiveMetastore_drop_partitions_req_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_partitions_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_partitions_req_result() noexcept;
   DropPartitionsResult success;
@@ -11702,16 +10176,7 @@ class ThriftHiveMetastore_drop_partitions_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_partitions_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_partitions_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_partitions_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11757,10 +10222,7 @@ class ThriftHiveMetastore_get_partition_args {
 
   ThriftHiveMetastore_get_partition_args(const ThriftHiveMetastore_get_partition_args&);
   ThriftHiveMetastore_get_partition_args& operator=(const ThriftHiveMetastore_get_partition_args&);
-  ThriftHiveMetastore_get_partition_args() noexcept
-                                         : db_name(),
-                                           tbl_name() {
-  }
+  ThriftHiveMetastore_get_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_args() noexcept;
   std::string db_name;
@@ -11775,16 +10237,7 @@ class ThriftHiveMetastore_get_partition_args {
 
   void __set_part_vals(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11822,8 +10275,7 @@ class ThriftHiveMetastore_get_partition_result {
 
   ThriftHiveMetastore_get_partition_result(const ThriftHiveMetastore_get_partition_result&);
   ThriftHiveMetastore_get_partition_result& operator=(const ThriftHiveMetastore_get_partition_result&);
-  ThriftHiveMetastore_get_partition_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_result() noexcept;
   Partition success;
@@ -11838,16 +10290,7 @@ class ThriftHiveMetastore_get_partition_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -11891,8 +10334,7 @@ class ThriftHiveMetastore_get_partition_req_args {
 
   ThriftHiveMetastore_get_partition_req_args(const ThriftHiveMetastore_get_partition_req_args&);
   ThriftHiveMetastore_get_partition_req_args& operator=(const ThriftHiveMetastore_get_partition_req_args&);
-  ThriftHiveMetastore_get_partition_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_req_args() noexcept;
   GetPartitionRequest req;
@@ -11901,12 +10343,7 @@ class ThriftHiveMetastore_get_partition_req_args {
 
   void __set_req(const GetPartitionRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -11942,8 +10379,7 @@ class ThriftHiveMetastore_get_partition_req_result {
 
   ThriftHiveMetastore_get_partition_req_result(const ThriftHiveMetastore_get_partition_req_result&);
   ThriftHiveMetastore_get_partition_req_result& operator=(const ThriftHiveMetastore_get_partition_req_result&);
-  ThriftHiveMetastore_get_partition_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_req_result() noexcept;
   GetPartitionResponse success;
@@ -11958,16 +10394,7 @@ class ThriftHiveMetastore_get_partition_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12015,12 +10442,7 @@ class ThriftHiveMetastore_exchange_partition_args {
 
   ThriftHiveMetastore_exchange_partition_args(const ThriftHiveMetastore_exchange_partition_args&);
   ThriftHiveMetastore_exchange_partition_args& operator=(const ThriftHiveMetastore_exchange_partition_args&);
-  ThriftHiveMetastore_exchange_partition_args() noexcept
-                                              : source_db(),
-                                                source_table_name(),
-                                                dest_db(),
-                                                dest_table_name() {
-  }
+  ThriftHiveMetastore_exchange_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_exchange_partition_args() noexcept;
   std::map<std::string, std::string>  partitionSpecs;
@@ -12041,20 +10463,7 @@ class ThriftHiveMetastore_exchange_partition_args {
 
   void __set_dest_table_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_exchange_partition_args & rhs) const
-  {
-    if (!(partitionSpecs == rhs.partitionSpecs))
-      return false;
-    if (!(source_db == rhs.source_db))
-      return false;
-    if (!(source_table_name == rhs.source_table_name))
-      return false;
-    if (!(dest_db == rhs.dest_db))
-      return false;
-    if (!(dest_table_name == rhs.dest_table_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_exchange_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_exchange_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12096,8 +10505,7 @@ class ThriftHiveMetastore_exchange_partition_result {
 
   ThriftHiveMetastore_exchange_partition_result(const ThriftHiveMetastore_exchange_partition_result&);
   ThriftHiveMetastore_exchange_partition_result& operator=(const ThriftHiveMetastore_exchange_partition_result&);
-  ThriftHiveMetastore_exchange_partition_result() noexcept {
-  }
+  ThriftHiveMetastore_exchange_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_exchange_partition_result() noexcept;
   Partition success;
@@ -12118,20 +10526,7 @@ class ThriftHiveMetastore_exchange_partition_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_exchange_partition_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_exchange_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_exchange_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12183,12 +10578,7 @@ class ThriftHiveMetastore_exchange_partitions_args {
 
   ThriftHiveMetastore_exchange_partitions_args(const ThriftHiveMetastore_exchange_partitions_args&);
   ThriftHiveMetastore_exchange_partitions_args& operator=(const ThriftHiveMetastore_exchange_partitions_args&);
-  ThriftHiveMetastore_exchange_partitions_args() noexcept
-                                               : source_db(),
-                                                 source_table_name(),
-                                                 dest_db(),
-                                                 dest_table_name() {
-  }
+  ThriftHiveMetastore_exchange_partitions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_exchange_partitions_args() noexcept;
   std::map<std::string, std::string>  partitionSpecs;
@@ -12209,20 +10599,7 @@ class ThriftHiveMetastore_exchange_partitions_args {
 
   void __set_dest_table_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_exchange_partitions_args & rhs) const
-  {
-    if (!(partitionSpecs == rhs.partitionSpecs))
-      return false;
-    if (!(source_db == rhs.source_db))
-      return false;
-    if (!(source_table_name == rhs.source_table_name))
-      return false;
-    if (!(dest_db == rhs.dest_db))
-      return false;
-    if (!(dest_table_name == rhs.dest_table_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_exchange_partitions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_exchange_partitions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12264,8 +10641,7 @@ class ThriftHiveMetastore_exchange_partitions_result {
 
   ThriftHiveMetastore_exchange_partitions_result(const ThriftHiveMetastore_exchange_partitions_result&);
   ThriftHiveMetastore_exchange_partitions_result& operator=(const ThriftHiveMetastore_exchange_partitions_result&);
-  ThriftHiveMetastore_exchange_partitions_result() noexcept {
-  }
+  ThriftHiveMetastore_exchange_partitions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_exchange_partitions_result() noexcept;
   std::vector<Partition>  success;
@@ -12286,20 +10662,7 @@ class ThriftHiveMetastore_exchange_partitions_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_exchange_partitions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_exchange_partitions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_exchange_partitions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12351,11 +10714,7 @@ class ThriftHiveMetastore_get_partition_with_auth_args {
 
   ThriftHiveMetastore_get_partition_with_auth_args(const ThriftHiveMetastore_get_partition_with_auth_args&);
   ThriftHiveMetastore_get_partition_with_auth_args& operator=(const ThriftHiveMetastore_get_partition_with_auth_args&);
-  ThriftHiveMetastore_get_partition_with_auth_args() noexcept
-                                                   : db_name(),
-                                                     tbl_name(),
-                                                     user_name() {
-  }
+  ThriftHiveMetastore_get_partition_with_auth_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_with_auth_args() noexcept;
   std::string db_name;
@@ -12376,20 +10735,7 @@ class ThriftHiveMetastore_get_partition_with_auth_args {
 
   void __set_group_names(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_with_auth_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(user_name == rhs.user_name))
-      return false;
-    if (!(group_names == rhs.group_names))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_with_auth_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_with_auth_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12429,8 +10775,7 @@ class ThriftHiveMetastore_get_partition_with_auth_result {
 
   ThriftHiveMetastore_get_partition_with_auth_result(const ThriftHiveMetastore_get_partition_with_auth_result&);
   ThriftHiveMetastore_get_partition_with_auth_result& operator=(const ThriftHiveMetastore_get_partition_with_auth_result&);
-  ThriftHiveMetastore_get_partition_with_auth_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_with_auth_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_with_auth_result() noexcept;
   Partition success;
@@ -12445,16 +10790,7 @@ class ThriftHiveMetastore_get_partition_with_auth_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_with_auth_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_with_auth_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_with_auth_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12500,11 +10836,7 @@ class ThriftHiveMetastore_get_partition_by_name_args {
 
   ThriftHiveMetastore_get_partition_by_name_args(const ThriftHiveMetastore_get_partition_by_name_args&);
   ThriftHiveMetastore_get_partition_by_name_args& operator=(const ThriftHiveMetastore_get_partition_by_name_args&);
-  ThriftHiveMetastore_get_partition_by_name_args() noexcept
-                                                 : db_name(),
-                                                   tbl_name(),
-                                                   part_name() {
-  }
+  ThriftHiveMetastore_get_partition_by_name_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_by_name_args() noexcept;
   std::string db_name;
@@ -12519,16 +10851,7 @@ class ThriftHiveMetastore_get_partition_by_name_args {
 
   void __set_part_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_by_name_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_by_name_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_by_name_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12566,8 +10889,7 @@ class ThriftHiveMetastore_get_partition_by_name_result {
 
   ThriftHiveMetastore_get_partition_by_name_result(const ThriftHiveMetastore_get_partition_by_name_result&);
   ThriftHiveMetastore_get_partition_by_name_result& operator=(const ThriftHiveMetastore_get_partition_by_name_result&);
-  ThriftHiveMetastore_get_partition_by_name_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_by_name_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_by_name_result() noexcept;
   Partition success;
@@ -12582,16 +10904,7 @@ class ThriftHiveMetastore_get_partition_by_name_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_by_name_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_by_name_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_by_name_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12637,11 +10950,7 @@ class ThriftHiveMetastore_get_partitions_args {
 
   ThriftHiveMetastore_get_partitions_args(const ThriftHiveMetastore_get_partitions_args&);
   ThriftHiveMetastore_get_partitions_args& operator=(const ThriftHiveMetastore_get_partitions_args&);
-  ThriftHiveMetastore_get_partitions_args() noexcept
-                                          : db_name(),
-                                            tbl_name(),
-                                            max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_partitions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_args() noexcept;
   std::string db_name;
@@ -12656,16 +10965,7 @@ class ThriftHiveMetastore_get_partitions_args {
 
   void __set_max_parts(const int16_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12703,8 +11003,7 @@ class ThriftHiveMetastore_get_partitions_result {
 
   ThriftHiveMetastore_get_partitions_result(const ThriftHiveMetastore_get_partitions_result&);
   ThriftHiveMetastore_get_partitions_result& operator=(const ThriftHiveMetastore_get_partitions_result&);
-  ThriftHiveMetastore_get_partitions_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_result() noexcept;
   std::vector<Partition>  success;
@@ -12719,16 +11018,7 @@ class ThriftHiveMetastore_get_partitions_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12772,8 +11062,7 @@ class ThriftHiveMetastore_get_partitions_req_args {
 
   ThriftHiveMetastore_get_partitions_req_args(const ThriftHiveMetastore_get_partitions_req_args&);
   ThriftHiveMetastore_get_partitions_req_args& operator=(const ThriftHiveMetastore_get_partitions_req_args&);
-  ThriftHiveMetastore_get_partitions_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_req_args() noexcept;
   PartitionsRequest req;
@@ -12782,12 +11071,7 @@ class ThriftHiveMetastore_get_partitions_req_args {
 
   void __set_req(const PartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12823,8 +11107,7 @@ class ThriftHiveMetastore_get_partitions_req_result {
 
   ThriftHiveMetastore_get_partitions_req_result(const ThriftHiveMetastore_get_partitions_req_result&);
   ThriftHiveMetastore_get_partitions_req_result& operator=(const ThriftHiveMetastore_get_partitions_req_result&);
-  ThriftHiveMetastore_get_partitions_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_req_result() noexcept;
   PartitionsResponse success;
@@ -12839,16 +11122,7 @@ class ThriftHiveMetastore_get_partitions_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -12896,12 +11170,7 @@ class ThriftHiveMetastore_get_partitions_with_auth_args {
 
   ThriftHiveMetastore_get_partitions_with_auth_args(const ThriftHiveMetastore_get_partitions_with_auth_args&);
   ThriftHiveMetastore_get_partitions_with_auth_args& operator=(const ThriftHiveMetastore_get_partitions_with_auth_args&);
-  ThriftHiveMetastore_get_partitions_with_auth_args() noexcept
-                                                    : db_name(),
-                                                      tbl_name(),
-                                                      max_parts(-1),
-                                                      user_name() {
-  }
+  ThriftHiveMetastore_get_partitions_with_auth_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_with_auth_args() noexcept;
   std::string db_name;
@@ -12922,20 +11191,7 @@ class ThriftHiveMetastore_get_partitions_with_auth_args {
 
   void __set_group_names(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_with_auth_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    if (!(user_name == rhs.user_name))
-      return false;
-    if (!(group_names == rhs.group_names))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_with_auth_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_with_auth_args &rhs) const {
     return !(*this == rhs);
   }
@@ -12975,8 +11231,7 @@ class ThriftHiveMetastore_get_partitions_with_auth_result {
 
   ThriftHiveMetastore_get_partitions_with_auth_result(const ThriftHiveMetastore_get_partitions_with_auth_result&);
   ThriftHiveMetastore_get_partitions_with_auth_result& operator=(const ThriftHiveMetastore_get_partitions_with_auth_result&);
-  ThriftHiveMetastore_get_partitions_with_auth_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_with_auth_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_with_auth_result() noexcept;
   std::vector<Partition>  success;
@@ -12991,16 +11246,7 @@ class ThriftHiveMetastore_get_partitions_with_auth_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_with_auth_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_with_auth_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_with_auth_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13046,11 +11292,7 @@ class ThriftHiveMetastore_get_partitions_pspec_args {
 
   ThriftHiveMetastore_get_partitions_pspec_args(const ThriftHiveMetastore_get_partitions_pspec_args&);
   ThriftHiveMetastore_get_partitions_pspec_args& operator=(const ThriftHiveMetastore_get_partitions_pspec_args&);
-  ThriftHiveMetastore_get_partitions_pspec_args() noexcept
-                                                : db_name(),
-                                                  tbl_name(),
-                                                  max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_partitions_pspec_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_pspec_args() noexcept;
   std::string db_name;
@@ -13065,16 +11307,7 @@ class ThriftHiveMetastore_get_partitions_pspec_args {
 
   void __set_max_parts(const int32_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_pspec_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_pspec_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_pspec_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13112,8 +11345,7 @@ class ThriftHiveMetastore_get_partitions_pspec_result {
 
   ThriftHiveMetastore_get_partitions_pspec_result(const ThriftHiveMetastore_get_partitions_pspec_result&);
   ThriftHiveMetastore_get_partitions_pspec_result& operator=(const ThriftHiveMetastore_get_partitions_pspec_result&);
-  ThriftHiveMetastore_get_partitions_pspec_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_pspec_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_pspec_result() noexcept;
   std::vector<PartitionSpec>  success;
@@ -13128,16 +11360,7 @@ class ThriftHiveMetastore_get_partitions_pspec_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_pspec_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_pspec_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_pspec_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13183,11 +11406,7 @@ class ThriftHiveMetastore_get_partition_names_args {
 
   ThriftHiveMetastore_get_partition_names_args(const ThriftHiveMetastore_get_partition_names_args&);
   ThriftHiveMetastore_get_partition_names_args& operator=(const ThriftHiveMetastore_get_partition_names_args&);
-  ThriftHiveMetastore_get_partition_names_args() noexcept
-                                               : db_name(),
-                                                 tbl_name(),
-                                                 max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_partition_names_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_args() noexcept;
   std::string db_name;
@@ -13202,16 +11421,7 @@ class ThriftHiveMetastore_get_partition_names_args {
 
   void __set_max_parts(const int16_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13249,8 +11459,7 @@ class ThriftHiveMetastore_get_partition_names_result {
 
   ThriftHiveMetastore_get_partition_names_result(const ThriftHiveMetastore_get_partition_names_result&);
   ThriftHiveMetastore_get_partition_names_result& operator=(const ThriftHiveMetastore_get_partition_names_result&);
-  ThriftHiveMetastore_get_partition_names_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_names_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_result() noexcept;
   std::vector<std::string>  success;
@@ -13265,16 +11474,7 @@ class ThriftHiveMetastore_get_partition_names_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13318,8 +11518,7 @@ class ThriftHiveMetastore_fetch_partition_names_req_args {
 
   ThriftHiveMetastore_fetch_partition_names_req_args(const ThriftHiveMetastore_fetch_partition_names_req_args&);
   ThriftHiveMetastore_fetch_partition_names_req_args& operator=(const ThriftHiveMetastore_fetch_partition_names_req_args&);
-  ThriftHiveMetastore_fetch_partition_names_req_args() noexcept {
-  }
+  ThriftHiveMetastore_fetch_partition_names_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_fetch_partition_names_req_args() noexcept;
   PartitionsRequest partitionReq;
@@ -13328,12 +11527,7 @@ class ThriftHiveMetastore_fetch_partition_names_req_args {
 
   void __set_partitionReq(const PartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_fetch_partition_names_req_args & rhs) const
-  {
-    if (!(partitionReq == rhs.partitionReq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_fetch_partition_names_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_fetch_partition_names_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13369,8 +11563,7 @@ class ThriftHiveMetastore_fetch_partition_names_req_result {
 
   ThriftHiveMetastore_fetch_partition_names_req_result(const ThriftHiveMetastore_fetch_partition_names_req_result&);
   ThriftHiveMetastore_fetch_partition_names_req_result& operator=(const ThriftHiveMetastore_fetch_partition_names_req_result&);
-  ThriftHiveMetastore_fetch_partition_names_req_result() noexcept {
-  }
+  ThriftHiveMetastore_fetch_partition_names_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_fetch_partition_names_req_result() noexcept;
   std::vector<std::string>  success;
@@ -13385,16 +11578,7 @@ class ThriftHiveMetastore_fetch_partition_names_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_fetch_partition_names_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_fetch_partition_names_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_fetch_partition_names_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13438,8 +11622,7 @@ class ThriftHiveMetastore_get_partition_values_args {
 
   ThriftHiveMetastore_get_partition_values_args(const ThriftHiveMetastore_get_partition_values_args&);
   ThriftHiveMetastore_get_partition_values_args& operator=(const ThriftHiveMetastore_get_partition_values_args&);
-  ThriftHiveMetastore_get_partition_values_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_values_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_values_args() noexcept;
   PartitionValuesRequest request;
@@ -13448,12 +11631,7 @@ class ThriftHiveMetastore_get_partition_values_args {
 
   void __set_request(const PartitionValuesRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_values_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_values_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_values_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13489,8 +11667,7 @@ class ThriftHiveMetastore_get_partition_values_result {
 
   ThriftHiveMetastore_get_partition_values_result(const ThriftHiveMetastore_get_partition_values_result&);
   ThriftHiveMetastore_get_partition_values_result& operator=(const ThriftHiveMetastore_get_partition_values_result&);
-  ThriftHiveMetastore_get_partition_values_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_values_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_values_result() noexcept;
   PartitionValuesResponse success;
@@ -13505,16 +11682,7 @@ class ThriftHiveMetastore_get_partition_values_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_values_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_values_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_values_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13561,11 +11729,7 @@ class ThriftHiveMetastore_get_partitions_ps_args {
 
   ThriftHiveMetastore_get_partitions_ps_args(const ThriftHiveMetastore_get_partitions_ps_args&);
   ThriftHiveMetastore_get_partitions_ps_args& operator=(const ThriftHiveMetastore_get_partitions_ps_args&);
-  ThriftHiveMetastore_get_partitions_ps_args() noexcept
-                                             : db_name(),
-                                               tbl_name(),
-                                               max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_partitions_ps_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_ps_args() noexcept;
   std::string db_name;
@@ -13583,18 +11747,7 @@ class ThriftHiveMetastore_get_partitions_ps_args {
 
   void __set_max_parts(const int16_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_ps_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_ps_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_ps_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13633,8 +11786,7 @@ class ThriftHiveMetastore_get_partitions_ps_result {
 
   ThriftHiveMetastore_get_partitions_ps_result(const ThriftHiveMetastore_get_partitions_ps_result&);
   ThriftHiveMetastore_get_partitions_ps_result& operator=(const ThriftHiveMetastore_get_partitions_ps_result&);
-  ThriftHiveMetastore_get_partitions_ps_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_ps_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_ps_result() noexcept;
   std::vector<Partition>  success;
@@ -13649,16 +11801,7 @@ class ThriftHiveMetastore_get_partitions_ps_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_ps_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_ps_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_ps_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13707,12 +11850,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_args {
 
   ThriftHiveMetastore_get_partitions_ps_with_auth_args(const ThriftHiveMetastore_get_partitions_ps_with_auth_args&);
   ThriftHiveMetastore_get_partitions_ps_with_auth_args& operator=(const ThriftHiveMetastore_get_partitions_ps_with_auth_args&);
-  ThriftHiveMetastore_get_partitions_ps_with_auth_args() noexcept
-                                                       : db_name(),
-                                                         tbl_name(),
-                                                         max_parts(-1),
-                                                         user_name() {
-  }
+  ThriftHiveMetastore_get_partitions_ps_with_auth_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_ps_with_auth_args() noexcept;
   std::string db_name;
@@ -13736,22 +11874,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_args {
 
   void __set_group_names(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    if (!(user_name == rhs.user_name))
-      return false;
-    if (!(group_names == rhs.group_names))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_ps_with_auth_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13792,8 +11915,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_result {
 
   ThriftHiveMetastore_get_partitions_ps_with_auth_result(const ThriftHiveMetastore_get_partitions_ps_with_auth_result&);
   ThriftHiveMetastore_get_partitions_ps_with_auth_result& operator=(const ThriftHiveMetastore_get_partitions_ps_with_auth_result&);
-  ThriftHiveMetastore_get_partitions_ps_with_auth_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_ps_with_auth_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_ps_with_auth_result() noexcept;
   std::vector<Partition>  success;
@@ -13808,16 +11930,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_ps_with_auth_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13861,8 +11974,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_req_args {
 
   ThriftHiveMetastore_get_partitions_ps_with_auth_req_args(const ThriftHiveMetastore_get_partitions_ps_with_auth_req_args&);
   ThriftHiveMetastore_get_partitions_ps_with_auth_req_args& operator=(const ThriftHiveMetastore_get_partitions_ps_with_auth_req_args&);
-  ThriftHiveMetastore_get_partitions_ps_with_auth_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_ps_with_auth_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_ps_with_auth_req_args() noexcept;
   GetPartitionsPsWithAuthRequest req;
@@ -13871,12 +11983,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_req_args {
 
   void __set_req(const GetPartitionsPsWithAuthRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_ps_with_auth_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -13912,8 +12019,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_req_result {
 
   ThriftHiveMetastore_get_partitions_ps_with_auth_req_result(const ThriftHiveMetastore_get_partitions_ps_with_auth_req_result&);
   ThriftHiveMetastore_get_partitions_ps_with_auth_req_result& operator=(const ThriftHiveMetastore_get_partitions_ps_with_auth_req_result&);
-  ThriftHiveMetastore_get_partitions_ps_with_auth_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_ps_with_auth_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_ps_with_auth_req_result() noexcept;
   GetPartitionsPsWithAuthResponse success;
@@ -13928,16 +12034,7 @@ class ThriftHiveMetastore_get_partitions_ps_with_auth_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_ps_with_auth_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_ps_with_auth_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -13984,11 +12081,7 @@ class ThriftHiveMetastore_get_partition_names_ps_args {
 
   ThriftHiveMetastore_get_partition_names_ps_args(const ThriftHiveMetastore_get_partition_names_ps_args&);
   ThriftHiveMetastore_get_partition_names_ps_args& operator=(const ThriftHiveMetastore_get_partition_names_ps_args&);
-  ThriftHiveMetastore_get_partition_names_ps_args() noexcept
-                                                  : db_name(),
-                                                    tbl_name(),
-                                                    max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_partition_names_ps_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_ps_args() noexcept;
   std::string db_name;
@@ -14006,18 +12099,7 @@ class ThriftHiveMetastore_get_partition_names_ps_args {
 
   void __set_max_parts(const int16_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_ps_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14056,8 +12138,7 @@ class ThriftHiveMetastore_get_partition_names_ps_result {
 
   ThriftHiveMetastore_get_partition_names_ps_result(const ThriftHiveMetastore_get_partition_names_ps_result&);
   ThriftHiveMetastore_get_partition_names_ps_result& operator=(const ThriftHiveMetastore_get_partition_names_ps_result&);
-  ThriftHiveMetastore_get_partition_names_ps_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_names_ps_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_ps_result() noexcept;
   std::vector<std::string>  success;
@@ -14072,16 +12153,7 @@ class ThriftHiveMetastore_get_partition_names_ps_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_ps_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14125,8 +12197,7 @@ class ThriftHiveMetastore_get_partition_names_ps_req_args {
 
   ThriftHiveMetastore_get_partition_names_ps_req_args(const ThriftHiveMetastore_get_partition_names_ps_req_args&);
   ThriftHiveMetastore_get_partition_names_ps_req_args& operator=(const ThriftHiveMetastore_get_partition_names_ps_req_args&);
-  ThriftHiveMetastore_get_partition_names_ps_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_names_ps_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_ps_req_args() noexcept;
   GetPartitionNamesPsRequest req;
@@ -14135,12 +12206,7 @@ class ThriftHiveMetastore_get_partition_names_ps_req_args {
 
   void __set_req(const GetPartitionNamesPsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_ps_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14176,8 +12242,7 @@ class ThriftHiveMetastore_get_partition_names_ps_req_result {
 
   ThriftHiveMetastore_get_partition_names_ps_req_result(const ThriftHiveMetastore_get_partition_names_ps_req_result&);
   ThriftHiveMetastore_get_partition_names_ps_req_result& operator=(const ThriftHiveMetastore_get_partition_names_ps_req_result&);
-  ThriftHiveMetastore_get_partition_names_ps_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_names_ps_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_ps_req_result() noexcept;
   GetPartitionNamesPsResponse success;
@@ -14192,16 +12257,7 @@ class ThriftHiveMetastore_get_partition_names_ps_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_ps_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_ps_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14245,8 +12301,7 @@ class ThriftHiveMetastore_get_partition_names_req_args {
 
   ThriftHiveMetastore_get_partition_names_req_args(const ThriftHiveMetastore_get_partition_names_req_args&);
   ThriftHiveMetastore_get_partition_names_req_args& operator=(const ThriftHiveMetastore_get_partition_names_req_args&);
-  ThriftHiveMetastore_get_partition_names_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_names_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_req_args() noexcept;
   PartitionsByExprRequest req;
@@ -14255,12 +12310,7 @@ class ThriftHiveMetastore_get_partition_names_req_args {
 
   void __set_req(const PartitionsByExprRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14296,8 +12346,7 @@ class ThriftHiveMetastore_get_partition_names_req_result {
 
   ThriftHiveMetastore_get_partition_names_req_result(const ThriftHiveMetastore_get_partition_names_req_result&);
   ThriftHiveMetastore_get_partition_names_req_result& operator=(const ThriftHiveMetastore_get_partition_names_req_result&);
-  ThriftHiveMetastore_get_partition_names_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_names_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_names_req_result() noexcept;
   std::vector<std::string>  success;
@@ -14312,16 +12361,7 @@ class ThriftHiveMetastore_get_partition_names_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_names_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_names_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_names_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14368,12 +12408,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_args {
 
   ThriftHiveMetastore_get_partitions_by_filter_args(const ThriftHiveMetastore_get_partitions_by_filter_args&);
   ThriftHiveMetastore_get_partitions_by_filter_args& operator=(const ThriftHiveMetastore_get_partitions_by_filter_args&);
-  ThriftHiveMetastore_get_partitions_by_filter_args() noexcept
-                                                    : db_name(),
-                                                      tbl_name(),
-                                                      filter(),
-                                                      max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_partitions_by_filter_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_filter_args() noexcept;
   std::string db_name;
@@ -14391,18 +12426,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_args {
 
   void __set_max_parts(const int16_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(filter == rhs.filter))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_filter_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14441,8 +12465,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_result {
 
   ThriftHiveMetastore_get_partitions_by_filter_result(const ThriftHiveMetastore_get_partitions_by_filter_result&);
   ThriftHiveMetastore_get_partitions_by_filter_result& operator=(const ThriftHiveMetastore_get_partitions_by_filter_result&);
-  ThriftHiveMetastore_get_partitions_by_filter_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_filter_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_filter_result() noexcept;
   std::vector<Partition>  success;
@@ -14457,16 +12480,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_filter_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14510,8 +12524,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_req_args {
 
   ThriftHiveMetastore_get_partitions_by_filter_req_args(const ThriftHiveMetastore_get_partitions_by_filter_req_args&);
   ThriftHiveMetastore_get_partitions_by_filter_req_args& operator=(const ThriftHiveMetastore_get_partitions_by_filter_req_args&);
-  ThriftHiveMetastore_get_partitions_by_filter_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_filter_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_filter_req_args() noexcept;
   GetPartitionsByFilterRequest req;
@@ -14520,12 +12533,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_req_args {
 
   void __set_req(const GetPartitionsByFilterRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_filter_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14561,8 +12569,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_req_result {
 
   ThriftHiveMetastore_get_partitions_by_filter_req_result(const ThriftHiveMetastore_get_partitions_by_filter_req_result&);
   ThriftHiveMetastore_get_partitions_by_filter_req_result& operator=(const ThriftHiveMetastore_get_partitions_by_filter_req_result&);
-  ThriftHiveMetastore_get_partitions_by_filter_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_filter_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_filter_req_result() noexcept;
   std::vector<Partition>  success;
@@ -14577,16 +12584,7 @@ class ThriftHiveMetastore_get_partitions_by_filter_req_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_filter_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_filter_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14633,12 +12631,7 @@ class ThriftHiveMetastore_get_part_specs_by_filter_args {
 
   ThriftHiveMetastore_get_part_specs_by_filter_args(const ThriftHiveMetastore_get_part_specs_by_filter_args&);
   ThriftHiveMetastore_get_part_specs_by_filter_args& operator=(const ThriftHiveMetastore_get_part_specs_by_filter_args&);
-  ThriftHiveMetastore_get_part_specs_by_filter_args() noexcept
-                                                    : db_name(),
-                                                      tbl_name(),
-                                                      filter(),
-                                                      max_parts(-1) {
-  }
+  ThriftHiveMetastore_get_part_specs_by_filter_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_part_specs_by_filter_args() noexcept;
   std::string db_name;
@@ -14656,18 +12649,7 @@ class ThriftHiveMetastore_get_part_specs_by_filter_args {
 
   void __set_max_parts(const int32_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_part_specs_by_filter_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(filter == rhs.filter))
-      return false;
-    if (!(max_parts == rhs.max_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_part_specs_by_filter_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_part_specs_by_filter_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14706,8 +12688,7 @@ class ThriftHiveMetastore_get_part_specs_by_filter_result {
 
   ThriftHiveMetastore_get_part_specs_by_filter_result(const ThriftHiveMetastore_get_part_specs_by_filter_result&);
   ThriftHiveMetastore_get_part_specs_by_filter_result& operator=(const ThriftHiveMetastore_get_part_specs_by_filter_result&);
-  ThriftHiveMetastore_get_part_specs_by_filter_result() noexcept {
-  }
+  ThriftHiveMetastore_get_part_specs_by_filter_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_part_specs_by_filter_result() noexcept;
   std::vector<PartitionSpec>  success;
@@ -14722,16 +12703,7 @@ class ThriftHiveMetastore_get_part_specs_by_filter_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_part_specs_by_filter_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_part_specs_by_filter_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_part_specs_by_filter_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14775,8 +12747,7 @@ class ThriftHiveMetastore_get_partitions_by_expr_args {
 
   ThriftHiveMetastore_get_partitions_by_expr_args(const ThriftHiveMetastore_get_partitions_by_expr_args&);
   ThriftHiveMetastore_get_partitions_by_expr_args& operator=(const ThriftHiveMetastore_get_partitions_by_expr_args&);
-  ThriftHiveMetastore_get_partitions_by_expr_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_expr_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_expr_args() noexcept;
   PartitionsByExprRequest req;
@@ -14785,12 +12756,7 @@ class ThriftHiveMetastore_get_partitions_by_expr_args {
 
   void __set_req(const PartitionsByExprRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_expr_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_expr_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_expr_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14826,8 +12792,7 @@ class ThriftHiveMetastore_get_partitions_by_expr_result {
 
   ThriftHiveMetastore_get_partitions_by_expr_result(const ThriftHiveMetastore_get_partitions_by_expr_result&);
   ThriftHiveMetastore_get_partitions_by_expr_result& operator=(const ThriftHiveMetastore_get_partitions_by_expr_result&);
-  ThriftHiveMetastore_get_partitions_by_expr_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_expr_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_expr_result() noexcept;
   PartitionsByExprResult success;
@@ -14842,16 +12807,7 @@ class ThriftHiveMetastore_get_partitions_by_expr_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_expr_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_expr_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_expr_result &rhs) const {
     return !(*this == rhs);
   }
@@ -14895,8 +12851,7 @@ class ThriftHiveMetastore_get_partitions_spec_by_expr_args {
 
   ThriftHiveMetastore_get_partitions_spec_by_expr_args(const ThriftHiveMetastore_get_partitions_spec_by_expr_args&);
   ThriftHiveMetastore_get_partitions_spec_by_expr_args& operator=(const ThriftHiveMetastore_get_partitions_spec_by_expr_args&);
-  ThriftHiveMetastore_get_partitions_spec_by_expr_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_spec_by_expr_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_spec_by_expr_args() noexcept;
   PartitionsByExprRequest req;
@@ -14905,12 +12860,7 @@ class ThriftHiveMetastore_get_partitions_spec_by_expr_args {
 
   void __set_req(const PartitionsByExprRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_spec_by_expr_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_spec_by_expr_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_spec_by_expr_args &rhs) const {
     return !(*this == rhs);
   }
@@ -14946,8 +12896,7 @@ class ThriftHiveMetastore_get_partitions_spec_by_expr_result {
 
   ThriftHiveMetastore_get_partitions_spec_by_expr_result(const ThriftHiveMetastore_get_partitions_spec_by_expr_result&);
   ThriftHiveMetastore_get_partitions_spec_by_expr_result& operator=(const ThriftHiveMetastore_get_partitions_spec_by_expr_result&);
-  ThriftHiveMetastore_get_partitions_spec_by_expr_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_spec_by_expr_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_spec_by_expr_result() noexcept;
   PartitionsSpecByExprResult success;
@@ -14962,16 +12911,7 @@ class ThriftHiveMetastore_get_partitions_spec_by_expr_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_spec_by_expr_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_spec_by_expr_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_spec_by_expr_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15017,11 +12957,7 @@ class ThriftHiveMetastore_get_num_partitions_by_filter_args {
 
   ThriftHiveMetastore_get_num_partitions_by_filter_args(const ThriftHiveMetastore_get_num_partitions_by_filter_args&);
   ThriftHiveMetastore_get_num_partitions_by_filter_args& operator=(const ThriftHiveMetastore_get_num_partitions_by_filter_args&);
-  ThriftHiveMetastore_get_num_partitions_by_filter_args() noexcept
-                                                        : db_name(),
-                                                          tbl_name(),
-                                                          filter() {
-  }
+  ThriftHiveMetastore_get_num_partitions_by_filter_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_num_partitions_by_filter_args() noexcept;
   std::string db_name;
@@ -15036,16 +12972,7 @@ class ThriftHiveMetastore_get_num_partitions_by_filter_args {
 
   void __set_filter(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_num_partitions_by_filter_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(filter == rhs.filter))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_num_partitions_by_filter_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_num_partitions_by_filter_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15083,9 +13010,7 @@ class ThriftHiveMetastore_get_num_partitions_by_filter_result {
 
   ThriftHiveMetastore_get_num_partitions_by_filter_result(const ThriftHiveMetastore_get_num_partitions_by_filter_result&);
   ThriftHiveMetastore_get_num_partitions_by_filter_result& operator=(const ThriftHiveMetastore_get_num_partitions_by_filter_result&);
-  ThriftHiveMetastore_get_num_partitions_by_filter_result() noexcept
-                                                          : success(0) {
-  }
+  ThriftHiveMetastore_get_num_partitions_by_filter_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_num_partitions_by_filter_result() noexcept;
   int32_t success;
@@ -15100,16 +13025,7 @@ class ThriftHiveMetastore_get_num_partitions_by_filter_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_num_partitions_by_filter_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_num_partitions_by_filter_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_num_partitions_by_filter_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15155,10 +13071,7 @@ class ThriftHiveMetastore_get_partitions_by_names_args {
 
   ThriftHiveMetastore_get_partitions_by_names_args(const ThriftHiveMetastore_get_partitions_by_names_args&);
   ThriftHiveMetastore_get_partitions_by_names_args& operator=(const ThriftHiveMetastore_get_partitions_by_names_args&);
-  ThriftHiveMetastore_get_partitions_by_names_args() noexcept
-                                                   : db_name(),
-                                                     tbl_name() {
-  }
+  ThriftHiveMetastore_get_partitions_by_names_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_names_args() noexcept;
   std::string db_name;
@@ -15173,16 +13086,7 @@ class ThriftHiveMetastore_get_partitions_by_names_args {
 
   void __set_names(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(names == rhs.names))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_names_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15221,8 +13125,7 @@ class ThriftHiveMetastore_get_partitions_by_names_result {
 
   ThriftHiveMetastore_get_partitions_by_names_result(const ThriftHiveMetastore_get_partitions_by_names_result&);
   ThriftHiveMetastore_get_partitions_by_names_result& operator=(const ThriftHiveMetastore_get_partitions_by_names_result&);
-  ThriftHiveMetastore_get_partitions_by_names_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_names_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_names_result() noexcept;
   std::vector<Partition>  success;
@@ -15240,18 +13143,7 @@ class ThriftHiveMetastore_get_partitions_by_names_result {
 
   void __set_o3(const InvalidObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_names_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15297,8 +13189,7 @@ class ThriftHiveMetastore_get_partitions_by_names_req_args {
 
   ThriftHiveMetastore_get_partitions_by_names_req_args(const ThriftHiveMetastore_get_partitions_by_names_req_args&);
   ThriftHiveMetastore_get_partitions_by_names_req_args& operator=(const ThriftHiveMetastore_get_partitions_by_names_req_args&);
-  ThriftHiveMetastore_get_partitions_by_names_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_names_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_names_req_args() noexcept;
   GetPartitionsByNamesRequest req;
@@ -15307,12 +13198,7 @@ class ThriftHiveMetastore_get_partitions_by_names_req_args {
 
   void __set_req(const GetPartitionsByNamesRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_names_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15349,8 +13235,7 @@ class ThriftHiveMetastore_get_partitions_by_names_req_result {
 
   ThriftHiveMetastore_get_partitions_by_names_req_result(const ThriftHiveMetastore_get_partitions_by_names_req_result&);
   ThriftHiveMetastore_get_partitions_by_names_req_result& operator=(const ThriftHiveMetastore_get_partitions_by_names_req_result&);
-  ThriftHiveMetastore_get_partitions_by_names_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_by_names_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_by_names_req_result() noexcept;
   GetPartitionsByNamesResult success;
@@ -15368,18 +13253,7 @@ class ThriftHiveMetastore_get_partitions_by_names_req_result {
 
   void __set_o3(const InvalidObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_by_names_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_by_names_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15425,8 +13299,7 @@ class ThriftHiveMetastore_get_properties_args {
 
   ThriftHiveMetastore_get_properties_args(const ThriftHiveMetastore_get_properties_args&);
   ThriftHiveMetastore_get_properties_args& operator=(const ThriftHiveMetastore_get_properties_args&);
-  ThriftHiveMetastore_get_properties_args() noexcept {
-  }
+  ThriftHiveMetastore_get_properties_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_properties_args() noexcept;
   PropertyGetRequest req;
@@ -15435,12 +13308,7 @@ class ThriftHiveMetastore_get_properties_args {
 
   void __set_req(const PropertyGetRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_properties_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_properties_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_properties_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15476,8 +13344,7 @@ class ThriftHiveMetastore_get_properties_result {
 
   ThriftHiveMetastore_get_properties_result(const ThriftHiveMetastore_get_properties_result&);
   ThriftHiveMetastore_get_properties_result& operator=(const ThriftHiveMetastore_get_properties_result&);
-  ThriftHiveMetastore_get_properties_result() noexcept {
-  }
+  ThriftHiveMetastore_get_properties_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_properties_result() noexcept;
   PropertyGetResponse success;
@@ -15492,16 +13359,7 @@ class ThriftHiveMetastore_get_properties_result {
 
   void __set_e2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_properties_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(e1 == rhs.e1))
-      return false;
-    if (!(e2 == rhs.e2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_properties_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_properties_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15545,8 +13403,7 @@ class ThriftHiveMetastore_set_properties_args {
 
   ThriftHiveMetastore_set_properties_args(const ThriftHiveMetastore_set_properties_args&);
   ThriftHiveMetastore_set_properties_args& operator=(const ThriftHiveMetastore_set_properties_args&);
-  ThriftHiveMetastore_set_properties_args() noexcept {
-  }
+  ThriftHiveMetastore_set_properties_args() noexcept;
 
   virtual ~ThriftHiveMetastore_set_properties_args() noexcept;
   PropertySetRequest req;
@@ -15555,12 +13412,7 @@ class ThriftHiveMetastore_set_properties_args {
 
   void __set_req(const PropertySetRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_set_properties_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_properties_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_properties_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15596,9 +13448,7 @@ class ThriftHiveMetastore_set_properties_result {
 
   ThriftHiveMetastore_set_properties_result(const ThriftHiveMetastore_set_properties_result&);
   ThriftHiveMetastore_set_properties_result& operator=(const ThriftHiveMetastore_set_properties_result&);
-  ThriftHiveMetastore_set_properties_result() noexcept
-                                            : success(0) {
-  }
+  ThriftHiveMetastore_set_properties_result() noexcept;
 
   virtual ~ThriftHiveMetastore_set_properties_result() noexcept;
   bool success;
@@ -15613,16 +13463,7 @@ class ThriftHiveMetastore_set_properties_result {
 
   void __set_e2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_set_properties_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(e1 == rhs.e1))
-      return false;
-    if (!(e2 == rhs.e2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_properties_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_properties_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15668,10 +13509,7 @@ class ThriftHiveMetastore_alter_partition_args {
 
   ThriftHiveMetastore_alter_partition_args(const ThriftHiveMetastore_alter_partition_args&);
   ThriftHiveMetastore_alter_partition_args& operator=(const ThriftHiveMetastore_alter_partition_args&);
-  ThriftHiveMetastore_alter_partition_args() noexcept
-                                           : db_name(),
-                                             tbl_name() {
-  }
+  ThriftHiveMetastore_alter_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partition_args() noexcept;
   std::string db_name;
@@ -15686,16 +13524,7 @@ class ThriftHiveMetastore_alter_partition_args {
 
   void __set_new_part(const Partition& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partition_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_part == rhs.new_part))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15732,8 +13561,7 @@ class ThriftHiveMetastore_alter_partition_result {
 
   ThriftHiveMetastore_alter_partition_result(const ThriftHiveMetastore_alter_partition_result&);
   ThriftHiveMetastore_alter_partition_result& operator=(const ThriftHiveMetastore_alter_partition_result&);
-  ThriftHiveMetastore_alter_partition_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partition_result() noexcept;
   InvalidOperationException o1;
@@ -15745,14 +13573,7 @@ class ThriftHiveMetastore_alter_partition_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partition_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15796,10 +13617,7 @@ class ThriftHiveMetastore_alter_partitions_args {
 
   ThriftHiveMetastore_alter_partitions_args(const ThriftHiveMetastore_alter_partitions_args&);
   ThriftHiveMetastore_alter_partitions_args& operator=(const ThriftHiveMetastore_alter_partitions_args&);
-  ThriftHiveMetastore_alter_partitions_args() noexcept
-                                            : db_name(),
-                                              tbl_name() {
-  }
+  ThriftHiveMetastore_alter_partitions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partitions_args() noexcept;
   std::string db_name;
@@ -15814,16 +13632,7 @@ class ThriftHiveMetastore_alter_partitions_args {
 
   void __set_new_parts(const std::vector<Partition> & val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partitions_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_parts == rhs.new_parts))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partitions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partitions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15860,8 +13669,7 @@ class ThriftHiveMetastore_alter_partitions_result {
 
   ThriftHiveMetastore_alter_partitions_result(const ThriftHiveMetastore_alter_partitions_result&);
   ThriftHiveMetastore_alter_partitions_result& operator=(const ThriftHiveMetastore_alter_partitions_result&);
-  ThriftHiveMetastore_alter_partitions_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_partitions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partitions_result() noexcept;
   InvalidOperationException o1;
@@ -15873,14 +13681,7 @@ class ThriftHiveMetastore_alter_partitions_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partitions_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partitions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partitions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -15925,10 +13726,7 @@ class ThriftHiveMetastore_alter_partitions_with_environment_context_args {
 
   ThriftHiveMetastore_alter_partitions_with_environment_context_args(const ThriftHiveMetastore_alter_partitions_with_environment_context_args&);
   ThriftHiveMetastore_alter_partitions_with_environment_context_args& operator=(const ThriftHiveMetastore_alter_partitions_with_environment_context_args&);
-  ThriftHiveMetastore_alter_partitions_with_environment_context_args() noexcept
-                                                                     : db_name(),
-                                                                       tbl_name() {
-  }
+  ThriftHiveMetastore_alter_partitions_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partitions_with_environment_context_args() noexcept;
   std::string db_name;
@@ -15946,18 +13744,7 @@ class ThriftHiveMetastore_alter_partitions_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partitions_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_parts == rhs.new_parts))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partitions_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partitions_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -15995,8 +13782,7 @@ class ThriftHiveMetastore_alter_partitions_with_environment_context_result {
 
   ThriftHiveMetastore_alter_partitions_with_environment_context_result(const ThriftHiveMetastore_alter_partitions_with_environment_context_result&);
   ThriftHiveMetastore_alter_partitions_with_environment_context_result& operator=(const ThriftHiveMetastore_alter_partitions_with_environment_context_result&);
-  ThriftHiveMetastore_alter_partitions_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_partitions_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partitions_with_environment_context_result() noexcept;
   InvalidOperationException o1;
@@ -16008,14 +13794,7 @@ class ThriftHiveMetastore_alter_partitions_with_environment_context_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partitions_with_environment_context_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partitions_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partitions_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16057,8 +13836,7 @@ class ThriftHiveMetastore_alter_partitions_req_args {
 
   ThriftHiveMetastore_alter_partitions_req_args(const ThriftHiveMetastore_alter_partitions_req_args&);
   ThriftHiveMetastore_alter_partitions_req_args& operator=(const ThriftHiveMetastore_alter_partitions_req_args&);
-  ThriftHiveMetastore_alter_partitions_req_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_partitions_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partitions_req_args() noexcept;
   AlterPartitionsRequest req;
@@ -16067,12 +13845,7 @@ class ThriftHiveMetastore_alter_partitions_req_args {
 
   void __set_req(const AlterPartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partitions_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partitions_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partitions_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16108,8 +13881,7 @@ class ThriftHiveMetastore_alter_partitions_req_result {
 
   ThriftHiveMetastore_alter_partitions_req_result(const ThriftHiveMetastore_alter_partitions_req_result&);
   ThriftHiveMetastore_alter_partitions_req_result& operator=(const ThriftHiveMetastore_alter_partitions_req_result&);
-  ThriftHiveMetastore_alter_partitions_req_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_partitions_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partitions_req_result() noexcept;
   AlterPartitionsResponse success;
@@ -16124,16 +13896,7 @@ class ThriftHiveMetastore_alter_partitions_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partitions_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partitions_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partitions_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16180,10 +13943,7 @@ class ThriftHiveMetastore_alter_partition_with_environment_context_args {
 
   ThriftHiveMetastore_alter_partition_with_environment_context_args(const ThriftHiveMetastore_alter_partition_with_environment_context_args&);
   ThriftHiveMetastore_alter_partition_with_environment_context_args& operator=(const ThriftHiveMetastore_alter_partition_with_environment_context_args&);
-  ThriftHiveMetastore_alter_partition_with_environment_context_args() noexcept
-                                                                    : db_name(),
-                                                                      tbl_name() {
-  }
+  ThriftHiveMetastore_alter_partition_with_environment_context_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partition_with_environment_context_args() noexcept;
   std::string db_name;
@@ -16201,18 +13961,7 @@ class ThriftHiveMetastore_alter_partition_with_environment_context_args {
 
   void __set_environment_context(const EnvironmentContext& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partition_with_environment_context_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(new_part == rhs.new_part))
-      return false;
-    if (!(environment_context == rhs.environment_context))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partition_with_environment_context_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partition_with_environment_context_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16250,8 +13999,7 @@ class ThriftHiveMetastore_alter_partition_with_environment_context_result {
 
   ThriftHiveMetastore_alter_partition_with_environment_context_result(const ThriftHiveMetastore_alter_partition_with_environment_context_result&);
   ThriftHiveMetastore_alter_partition_with_environment_context_result& operator=(const ThriftHiveMetastore_alter_partition_with_environment_context_result&);
-  ThriftHiveMetastore_alter_partition_with_environment_context_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_partition_with_environment_context_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_partition_with_environment_context_result() noexcept;
   InvalidOperationException o1;
@@ -16263,14 +14011,7 @@ class ThriftHiveMetastore_alter_partition_with_environment_context_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_partition_with_environment_context_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_partition_with_environment_context_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_partition_with_environment_context_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16315,10 +14056,7 @@ class ThriftHiveMetastore_rename_partition_args {
 
   ThriftHiveMetastore_rename_partition_args(const ThriftHiveMetastore_rename_partition_args&);
   ThriftHiveMetastore_rename_partition_args& operator=(const ThriftHiveMetastore_rename_partition_args&);
-  ThriftHiveMetastore_rename_partition_args() noexcept
-                                            : db_name(),
-                                              tbl_name() {
-  }
+  ThriftHiveMetastore_rename_partition_args() noexcept;
 
   virtual ~ThriftHiveMetastore_rename_partition_args() noexcept;
   std::string db_name;
@@ -16336,18 +14074,7 @@ class ThriftHiveMetastore_rename_partition_args {
 
   void __set_new_part(const Partition& val);
 
-  bool operator == (const ThriftHiveMetastore_rename_partition_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(new_part == rhs.new_part))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_rename_partition_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_rename_partition_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16385,8 +14112,7 @@ class ThriftHiveMetastore_rename_partition_result {
 
   ThriftHiveMetastore_rename_partition_result(const ThriftHiveMetastore_rename_partition_result&);
   ThriftHiveMetastore_rename_partition_result& operator=(const ThriftHiveMetastore_rename_partition_result&);
-  ThriftHiveMetastore_rename_partition_result() noexcept {
-  }
+  ThriftHiveMetastore_rename_partition_result() noexcept;
 
   virtual ~ThriftHiveMetastore_rename_partition_result() noexcept;
   InvalidOperationException o1;
@@ -16398,14 +14124,7 @@ class ThriftHiveMetastore_rename_partition_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_rename_partition_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_rename_partition_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_rename_partition_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16447,8 +14166,7 @@ class ThriftHiveMetastore_rename_partition_req_args {
 
   ThriftHiveMetastore_rename_partition_req_args(const ThriftHiveMetastore_rename_partition_req_args&);
   ThriftHiveMetastore_rename_partition_req_args& operator=(const ThriftHiveMetastore_rename_partition_req_args&);
-  ThriftHiveMetastore_rename_partition_req_args() noexcept {
-  }
+  ThriftHiveMetastore_rename_partition_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_rename_partition_req_args() noexcept;
   RenamePartitionRequest req;
@@ -16457,12 +14175,7 @@ class ThriftHiveMetastore_rename_partition_req_args {
 
   void __set_req(const RenamePartitionRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_rename_partition_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_rename_partition_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_rename_partition_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16498,8 +14211,7 @@ class ThriftHiveMetastore_rename_partition_req_result {
 
   ThriftHiveMetastore_rename_partition_req_result(const ThriftHiveMetastore_rename_partition_req_result&);
   ThriftHiveMetastore_rename_partition_req_result& operator=(const ThriftHiveMetastore_rename_partition_req_result&);
-  ThriftHiveMetastore_rename_partition_req_result() noexcept {
-  }
+  ThriftHiveMetastore_rename_partition_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_rename_partition_req_result() noexcept;
   RenamePartitionResponse success;
@@ -16514,16 +14226,7 @@ class ThriftHiveMetastore_rename_partition_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_rename_partition_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_rename_partition_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_rename_partition_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16568,9 +14271,7 @@ class ThriftHiveMetastore_partition_name_has_valid_characters_args {
 
   ThriftHiveMetastore_partition_name_has_valid_characters_args(const ThriftHiveMetastore_partition_name_has_valid_characters_args&);
   ThriftHiveMetastore_partition_name_has_valid_characters_args& operator=(const ThriftHiveMetastore_partition_name_has_valid_characters_args&);
-  ThriftHiveMetastore_partition_name_has_valid_characters_args() noexcept
-                                                               : throw_exception(0) {
-  }
+  ThriftHiveMetastore_partition_name_has_valid_characters_args() noexcept;
 
   virtual ~ThriftHiveMetastore_partition_name_has_valid_characters_args() noexcept;
   std::vector<std::string>  part_vals;
@@ -16582,14 +14283,7 @@ class ThriftHiveMetastore_partition_name_has_valid_characters_args {
 
   void __set_throw_exception(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_partition_name_has_valid_characters_args & rhs) const
-  {
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(throw_exception == rhs.throw_exception))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_partition_name_has_valid_characters_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_partition_name_has_valid_characters_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16625,9 +14319,7 @@ class ThriftHiveMetastore_partition_name_has_valid_characters_result {
 
   ThriftHiveMetastore_partition_name_has_valid_characters_result(const ThriftHiveMetastore_partition_name_has_valid_characters_result&);
   ThriftHiveMetastore_partition_name_has_valid_characters_result& operator=(const ThriftHiveMetastore_partition_name_has_valid_characters_result&);
-  ThriftHiveMetastore_partition_name_has_valid_characters_result() noexcept
-                                                                 : success(0) {
-  }
+  ThriftHiveMetastore_partition_name_has_valid_characters_result() noexcept;
 
   virtual ~ThriftHiveMetastore_partition_name_has_valid_characters_result() noexcept;
   bool success;
@@ -16639,14 +14331,7 @@ class ThriftHiveMetastore_partition_name_has_valid_characters_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_partition_name_has_valid_characters_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_partition_name_has_valid_characters_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_partition_name_has_valid_characters_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16689,10 +14374,7 @@ class ThriftHiveMetastore_get_config_value_args {
 
   ThriftHiveMetastore_get_config_value_args(const ThriftHiveMetastore_get_config_value_args&);
   ThriftHiveMetastore_get_config_value_args& operator=(const ThriftHiveMetastore_get_config_value_args&);
-  ThriftHiveMetastore_get_config_value_args() noexcept
-                                            : name(),
-                                              defaultValue() {
-  }
+  ThriftHiveMetastore_get_config_value_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_config_value_args() noexcept;
   std::string name;
@@ -16704,14 +14386,7 @@ class ThriftHiveMetastore_get_config_value_args {
 
   void __set_defaultValue(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_config_value_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(defaultValue == rhs.defaultValue))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_config_value_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_config_value_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16747,9 +14422,7 @@ class ThriftHiveMetastore_get_config_value_result {
 
   ThriftHiveMetastore_get_config_value_result(const ThriftHiveMetastore_get_config_value_result&);
   ThriftHiveMetastore_get_config_value_result& operator=(const ThriftHiveMetastore_get_config_value_result&);
-  ThriftHiveMetastore_get_config_value_result() noexcept
-                                              : success() {
-  }
+  ThriftHiveMetastore_get_config_value_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_config_value_result() noexcept;
   std::string success;
@@ -16761,14 +14434,7 @@ class ThriftHiveMetastore_get_config_value_result {
 
   void __set_o1(const ConfigValSecurityException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_config_value_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_config_value_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_config_value_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16810,9 +14476,7 @@ class ThriftHiveMetastore_partition_name_to_vals_args {
 
   ThriftHiveMetastore_partition_name_to_vals_args(const ThriftHiveMetastore_partition_name_to_vals_args&);
   ThriftHiveMetastore_partition_name_to_vals_args& operator=(const ThriftHiveMetastore_partition_name_to_vals_args&);
-  ThriftHiveMetastore_partition_name_to_vals_args() noexcept
-                                                  : part_name() {
-  }
+  ThriftHiveMetastore_partition_name_to_vals_args() noexcept;
 
   virtual ~ThriftHiveMetastore_partition_name_to_vals_args() noexcept;
   std::string part_name;
@@ -16821,12 +14485,7 @@ class ThriftHiveMetastore_partition_name_to_vals_args {
 
   void __set_part_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_partition_name_to_vals_args & rhs) const
-  {
-    if (!(part_name == rhs.part_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_partition_name_to_vals_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_partition_name_to_vals_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16861,8 +14520,7 @@ class ThriftHiveMetastore_partition_name_to_vals_result {
 
   ThriftHiveMetastore_partition_name_to_vals_result(const ThriftHiveMetastore_partition_name_to_vals_result&);
   ThriftHiveMetastore_partition_name_to_vals_result& operator=(const ThriftHiveMetastore_partition_name_to_vals_result&);
-  ThriftHiveMetastore_partition_name_to_vals_result() noexcept {
-  }
+  ThriftHiveMetastore_partition_name_to_vals_result() noexcept;
 
   virtual ~ThriftHiveMetastore_partition_name_to_vals_result() noexcept;
   std::vector<std::string>  success;
@@ -16874,14 +14532,7 @@ class ThriftHiveMetastore_partition_name_to_vals_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_partition_name_to_vals_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_partition_name_to_vals_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_partition_name_to_vals_result &rhs) const {
     return !(*this == rhs);
   }
@@ -16923,9 +14574,7 @@ class ThriftHiveMetastore_partition_name_to_spec_args {
 
   ThriftHiveMetastore_partition_name_to_spec_args(const ThriftHiveMetastore_partition_name_to_spec_args&);
   ThriftHiveMetastore_partition_name_to_spec_args& operator=(const ThriftHiveMetastore_partition_name_to_spec_args&);
-  ThriftHiveMetastore_partition_name_to_spec_args() noexcept
-                                                  : part_name() {
-  }
+  ThriftHiveMetastore_partition_name_to_spec_args() noexcept;
 
   virtual ~ThriftHiveMetastore_partition_name_to_spec_args() noexcept;
   std::string part_name;
@@ -16934,12 +14583,7 @@ class ThriftHiveMetastore_partition_name_to_spec_args {
 
   void __set_part_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_partition_name_to_spec_args & rhs) const
-  {
-    if (!(part_name == rhs.part_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_partition_name_to_spec_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_partition_name_to_spec_args &rhs) const {
     return !(*this == rhs);
   }
@@ -16974,8 +14618,7 @@ class ThriftHiveMetastore_partition_name_to_spec_result {
 
   ThriftHiveMetastore_partition_name_to_spec_result(const ThriftHiveMetastore_partition_name_to_spec_result&);
   ThriftHiveMetastore_partition_name_to_spec_result& operator=(const ThriftHiveMetastore_partition_name_to_spec_result&);
-  ThriftHiveMetastore_partition_name_to_spec_result() noexcept {
-  }
+  ThriftHiveMetastore_partition_name_to_spec_result() noexcept;
 
   virtual ~ThriftHiveMetastore_partition_name_to_spec_result() noexcept;
   std::map<std::string, std::string>  success;
@@ -16987,14 +14630,7 @@ class ThriftHiveMetastore_partition_name_to_spec_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_partition_name_to_spec_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_partition_name_to_spec_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_partition_name_to_spec_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17039,11 +14675,7 @@ class ThriftHiveMetastore_markPartitionForEvent_args {
 
   ThriftHiveMetastore_markPartitionForEvent_args(const ThriftHiveMetastore_markPartitionForEvent_args&);
   ThriftHiveMetastore_markPartitionForEvent_args& operator=(const ThriftHiveMetastore_markPartitionForEvent_args&);
-  ThriftHiveMetastore_markPartitionForEvent_args() noexcept
-                                                 : db_name(),
-                                                   tbl_name(),
-                                                   eventType(static_cast<PartitionEventType::type>(0)) {
-  }
+  ThriftHiveMetastore_markPartitionForEvent_args() noexcept;
 
   virtual ~ThriftHiveMetastore_markPartitionForEvent_args() noexcept;
   std::string db_name;
@@ -17065,18 +14697,7 @@ class ThriftHiveMetastore_markPartitionForEvent_args {
 
   void __set_eventType(const PartitionEventType::type val);
 
-  bool operator == (const ThriftHiveMetastore_markPartitionForEvent_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(eventType == rhs.eventType))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_markPartitionForEvent_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_markPartitionForEvent_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17122,8 +14743,7 @@ class ThriftHiveMetastore_markPartitionForEvent_result {
 
   ThriftHiveMetastore_markPartitionForEvent_result(const ThriftHiveMetastore_markPartitionForEvent_result&);
   ThriftHiveMetastore_markPartitionForEvent_result& operator=(const ThriftHiveMetastore_markPartitionForEvent_result&);
-  ThriftHiveMetastore_markPartitionForEvent_result() noexcept {
-  }
+  ThriftHiveMetastore_markPartitionForEvent_result() noexcept;
 
   virtual ~ThriftHiveMetastore_markPartitionForEvent_result() noexcept;
   MetaException o1;
@@ -17147,22 +14767,7 @@ class ThriftHiveMetastore_markPartitionForEvent_result {
 
   void __set_o6(const InvalidPartitionException& val);
 
-  bool operator == (const ThriftHiveMetastore_markPartitionForEvent_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    if (!(o5 == rhs.o5))
-      return false;
-    if (!(o6 == rhs.o6))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_markPartitionForEvent_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_markPartitionForEvent_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17215,11 +14820,7 @@ class ThriftHiveMetastore_isPartitionMarkedForEvent_args {
 
   ThriftHiveMetastore_isPartitionMarkedForEvent_args(const ThriftHiveMetastore_isPartitionMarkedForEvent_args&);
   ThriftHiveMetastore_isPartitionMarkedForEvent_args& operator=(const ThriftHiveMetastore_isPartitionMarkedForEvent_args&);
-  ThriftHiveMetastore_isPartitionMarkedForEvent_args() noexcept
-                                                     : db_name(),
-                                                       tbl_name(),
-                                                       eventType(static_cast<PartitionEventType::type>(0)) {
-  }
+  ThriftHiveMetastore_isPartitionMarkedForEvent_args() noexcept;
 
   virtual ~ThriftHiveMetastore_isPartitionMarkedForEvent_args() noexcept;
   std::string db_name;
@@ -17241,18 +14842,7 @@ class ThriftHiveMetastore_isPartitionMarkedForEvent_args {
 
   void __set_eventType(const PartitionEventType::type val);
 
-  bool operator == (const ThriftHiveMetastore_isPartitionMarkedForEvent_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_vals == rhs.part_vals))
-      return false;
-    if (!(eventType == rhs.eventType))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_isPartitionMarkedForEvent_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_isPartitionMarkedForEvent_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17299,9 +14889,7 @@ class ThriftHiveMetastore_isPartitionMarkedForEvent_result {
 
   ThriftHiveMetastore_isPartitionMarkedForEvent_result(const ThriftHiveMetastore_isPartitionMarkedForEvent_result&);
   ThriftHiveMetastore_isPartitionMarkedForEvent_result& operator=(const ThriftHiveMetastore_isPartitionMarkedForEvent_result&);
-  ThriftHiveMetastore_isPartitionMarkedForEvent_result() noexcept
-                                                       : success(0) {
-  }
+  ThriftHiveMetastore_isPartitionMarkedForEvent_result() noexcept;
 
   virtual ~ThriftHiveMetastore_isPartitionMarkedForEvent_result() noexcept;
   bool success;
@@ -17328,24 +14916,7 @@ class ThriftHiveMetastore_isPartitionMarkedForEvent_result {
 
   void __set_o6(const InvalidPartitionException& val);
 
-  bool operator == (const ThriftHiveMetastore_isPartitionMarkedForEvent_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    if (!(o5 == rhs.o5))
-      return false;
-    if (!(o6 == rhs.o6))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_isPartitionMarkedForEvent_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_isPartitionMarkedForEvent_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17397,8 +14968,7 @@ class ThriftHiveMetastore_get_primary_keys_args {
 
   ThriftHiveMetastore_get_primary_keys_args(const ThriftHiveMetastore_get_primary_keys_args&);
   ThriftHiveMetastore_get_primary_keys_args& operator=(const ThriftHiveMetastore_get_primary_keys_args&);
-  ThriftHiveMetastore_get_primary_keys_args() noexcept {
-  }
+  ThriftHiveMetastore_get_primary_keys_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_primary_keys_args() noexcept;
   PrimaryKeysRequest request;
@@ -17407,12 +14977,7 @@ class ThriftHiveMetastore_get_primary_keys_args {
 
   void __set_request(const PrimaryKeysRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_primary_keys_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_primary_keys_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_primary_keys_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17448,8 +15013,7 @@ class ThriftHiveMetastore_get_primary_keys_result {
 
   ThriftHiveMetastore_get_primary_keys_result(const ThriftHiveMetastore_get_primary_keys_result&);
   ThriftHiveMetastore_get_primary_keys_result& operator=(const ThriftHiveMetastore_get_primary_keys_result&);
-  ThriftHiveMetastore_get_primary_keys_result() noexcept {
-  }
+  ThriftHiveMetastore_get_primary_keys_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_primary_keys_result() noexcept;
   PrimaryKeysResponse success;
@@ -17464,16 +15028,7 @@ class ThriftHiveMetastore_get_primary_keys_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_primary_keys_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_primary_keys_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_primary_keys_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17517,8 +15072,7 @@ class ThriftHiveMetastore_get_foreign_keys_args {
 
   ThriftHiveMetastore_get_foreign_keys_args(const ThriftHiveMetastore_get_foreign_keys_args&);
   ThriftHiveMetastore_get_foreign_keys_args& operator=(const ThriftHiveMetastore_get_foreign_keys_args&);
-  ThriftHiveMetastore_get_foreign_keys_args() noexcept {
-  }
+  ThriftHiveMetastore_get_foreign_keys_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_foreign_keys_args() noexcept;
   ForeignKeysRequest request;
@@ -17527,12 +15081,7 @@ class ThriftHiveMetastore_get_foreign_keys_args {
 
   void __set_request(const ForeignKeysRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_foreign_keys_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_foreign_keys_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_foreign_keys_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17568,8 +15117,7 @@ class ThriftHiveMetastore_get_foreign_keys_result {
 
   ThriftHiveMetastore_get_foreign_keys_result(const ThriftHiveMetastore_get_foreign_keys_result&);
   ThriftHiveMetastore_get_foreign_keys_result& operator=(const ThriftHiveMetastore_get_foreign_keys_result&);
-  ThriftHiveMetastore_get_foreign_keys_result() noexcept {
-  }
+  ThriftHiveMetastore_get_foreign_keys_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_foreign_keys_result() noexcept;
   ForeignKeysResponse success;
@@ -17584,16 +15132,7 @@ class ThriftHiveMetastore_get_foreign_keys_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_foreign_keys_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_foreign_keys_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_foreign_keys_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17637,8 +15176,7 @@ class ThriftHiveMetastore_get_unique_constraints_args {
 
   ThriftHiveMetastore_get_unique_constraints_args(const ThriftHiveMetastore_get_unique_constraints_args&);
   ThriftHiveMetastore_get_unique_constraints_args& operator=(const ThriftHiveMetastore_get_unique_constraints_args&);
-  ThriftHiveMetastore_get_unique_constraints_args() noexcept {
-  }
+  ThriftHiveMetastore_get_unique_constraints_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_unique_constraints_args() noexcept;
   UniqueConstraintsRequest request;
@@ -17647,12 +15185,7 @@ class ThriftHiveMetastore_get_unique_constraints_args {
 
   void __set_request(const UniqueConstraintsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_unique_constraints_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_unique_constraints_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_unique_constraints_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17688,8 +15221,7 @@ class ThriftHiveMetastore_get_unique_constraints_result {
 
   ThriftHiveMetastore_get_unique_constraints_result(const ThriftHiveMetastore_get_unique_constraints_result&);
   ThriftHiveMetastore_get_unique_constraints_result& operator=(const ThriftHiveMetastore_get_unique_constraints_result&);
-  ThriftHiveMetastore_get_unique_constraints_result() noexcept {
-  }
+  ThriftHiveMetastore_get_unique_constraints_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_unique_constraints_result() noexcept;
   UniqueConstraintsResponse success;
@@ -17704,16 +15236,7 @@ class ThriftHiveMetastore_get_unique_constraints_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_unique_constraints_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_unique_constraints_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_unique_constraints_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17757,8 +15280,7 @@ class ThriftHiveMetastore_get_not_null_constraints_args {
 
   ThriftHiveMetastore_get_not_null_constraints_args(const ThriftHiveMetastore_get_not_null_constraints_args&);
   ThriftHiveMetastore_get_not_null_constraints_args& operator=(const ThriftHiveMetastore_get_not_null_constraints_args&);
-  ThriftHiveMetastore_get_not_null_constraints_args() noexcept {
-  }
+  ThriftHiveMetastore_get_not_null_constraints_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_not_null_constraints_args() noexcept;
   NotNullConstraintsRequest request;
@@ -17767,12 +15289,7 @@ class ThriftHiveMetastore_get_not_null_constraints_args {
 
   void __set_request(const NotNullConstraintsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_not_null_constraints_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_not_null_constraints_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_not_null_constraints_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17808,8 +15325,7 @@ class ThriftHiveMetastore_get_not_null_constraints_result {
 
   ThriftHiveMetastore_get_not_null_constraints_result(const ThriftHiveMetastore_get_not_null_constraints_result&);
   ThriftHiveMetastore_get_not_null_constraints_result& operator=(const ThriftHiveMetastore_get_not_null_constraints_result&);
-  ThriftHiveMetastore_get_not_null_constraints_result() noexcept {
-  }
+  ThriftHiveMetastore_get_not_null_constraints_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_not_null_constraints_result() noexcept;
   NotNullConstraintsResponse success;
@@ -17824,16 +15340,7 @@ class ThriftHiveMetastore_get_not_null_constraints_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_not_null_constraints_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_not_null_constraints_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_not_null_constraints_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17877,8 +15384,7 @@ class ThriftHiveMetastore_get_default_constraints_args {
 
   ThriftHiveMetastore_get_default_constraints_args(const ThriftHiveMetastore_get_default_constraints_args&);
   ThriftHiveMetastore_get_default_constraints_args& operator=(const ThriftHiveMetastore_get_default_constraints_args&);
-  ThriftHiveMetastore_get_default_constraints_args() noexcept {
-  }
+  ThriftHiveMetastore_get_default_constraints_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_default_constraints_args() noexcept;
   DefaultConstraintsRequest request;
@@ -17887,12 +15393,7 @@ class ThriftHiveMetastore_get_default_constraints_args {
 
   void __set_request(const DefaultConstraintsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_default_constraints_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_default_constraints_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_default_constraints_args &rhs) const {
     return !(*this == rhs);
   }
@@ -17928,8 +15429,7 @@ class ThriftHiveMetastore_get_default_constraints_result {
 
   ThriftHiveMetastore_get_default_constraints_result(const ThriftHiveMetastore_get_default_constraints_result&);
   ThriftHiveMetastore_get_default_constraints_result& operator=(const ThriftHiveMetastore_get_default_constraints_result&);
-  ThriftHiveMetastore_get_default_constraints_result() noexcept {
-  }
+  ThriftHiveMetastore_get_default_constraints_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_default_constraints_result() noexcept;
   DefaultConstraintsResponse success;
@@ -17944,16 +15444,7 @@ class ThriftHiveMetastore_get_default_constraints_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_default_constraints_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_default_constraints_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_default_constraints_result &rhs) const {
     return !(*this == rhs);
   }
@@ -17997,8 +15488,7 @@ class ThriftHiveMetastore_get_check_constraints_args {
 
   ThriftHiveMetastore_get_check_constraints_args(const ThriftHiveMetastore_get_check_constraints_args&);
   ThriftHiveMetastore_get_check_constraints_args& operator=(const ThriftHiveMetastore_get_check_constraints_args&);
-  ThriftHiveMetastore_get_check_constraints_args() noexcept {
-  }
+  ThriftHiveMetastore_get_check_constraints_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_check_constraints_args() noexcept;
   CheckConstraintsRequest request;
@@ -18007,12 +15497,7 @@ class ThriftHiveMetastore_get_check_constraints_args {
 
   void __set_request(const CheckConstraintsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_check_constraints_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_check_constraints_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_check_constraints_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18048,8 +15533,7 @@ class ThriftHiveMetastore_get_check_constraints_result {
 
   ThriftHiveMetastore_get_check_constraints_result(const ThriftHiveMetastore_get_check_constraints_result&);
   ThriftHiveMetastore_get_check_constraints_result& operator=(const ThriftHiveMetastore_get_check_constraints_result&);
-  ThriftHiveMetastore_get_check_constraints_result() noexcept {
-  }
+  ThriftHiveMetastore_get_check_constraints_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_check_constraints_result() noexcept;
   CheckConstraintsResponse success;
@@ -18064,16 +15548,7 @@ class ThriftHiveMetastore_get_check_constraints_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_check_constraints_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_check_constraints_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_check_constraints_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18117,8 +15592,7 @@ class ThriftHiveMetastore_get_all_table_constraints_args {
 
   ThriftHiveMetastore_get_all_table_constraints_args(const ThriftHiveMetastore_get_all_table_constraints_args&);
   ThriftHiveMetastore_get_all_table_constraints_args& operator=(const ThriftHiveMetastore_get_all_table_constraints_args&);
-  ThriftHiveMetastore_get_all_table_constraints_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_table_constraints_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_table_constraints_args() noexcept;
   AllTableConstraintsRequest request;
@@ -18127,12 +15601,7 @@ class ThriftHiveMetastore_get_all_table_constraints_args {
 
   void __set_request(const AllTableConstraintsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_table_constraints_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_table_constraints_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_table_constraints_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18168,8 +15637,7 @@ class ThriftHiveMetastore_get_all_table_constraints_result {
 
   ThriftHiveMetastore_get_all_table_constraints_result(const ThriftHiveMetastore_get_all_table_constraints_result&);
   ThriftHiveMetastore_get_all_table_constraints_result& operator=(const ThriftHiveMetastore_get_all_table_constraints_result&);
-  ThriftHiveMetastore_get_all_table_constraints_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_table_constraints_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_table_constraints_result() noexcept;
   AllTableConstraintsResponse success;
@@ -18184,16 +15652,7 @@ class ThriftHiveMetastore_get_all_table_constraints_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_table_constraints_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_table_constraints_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_table_constraints_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18237,8 +15696,7 @@ class ThriftHiveMetastore_update_table_column_statistics_args {
 
   ThriftHiveMetastore_update_table_column_statistics_args(const ThriftHiveMetastore_update_table_column_statistics_args&);
   ThriftHiveMetastore_update_table_column_statistics_args& operator=(const ThriftHiveMetastore_update_table_column_statistics_args&);
-  ThriftHiveMetastore_update_table_column_statistics_args() noexcept {
-  }
+  ThriftHiveMetastore_update_table_column_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_table_column_statistics_args() noexcept;
   ColumnStatistics stats_obj;
@@ -18247,12 +15705,7 @@ class ThriftHiveMetastore_update_table_column_statistics_args {
 
   void __set_stats_obj(const ColumnStatistics& val);
 
-  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_args & rhs) const
-  {
-    if (!(stats_obj == rhs.stats_obj))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_table_column_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18290,9 +15743,7 @@ class ThriftHiveMetastore_update_table_column_statistics_result {
 
   ThriftHiveMetastore_update_table_column_statistics_result(const ThriftHiveMetastore_update_table_column_statistics_result&);
   ThriftHiveMetastore_update_table_column_statistics_result& operator=(const ThriftHiveMetastore_update_table_column_statistics_result&);
-  ThriftHiveMetastore_update_table_column_statistics_result() noexcept
-                                                            : success(0) {
-  }
+  ThriftHiveMetastore_update_table_column_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_table_column_statistics_result() noexcept;
   bool success;
@@ -18313,20 +15764,7 @@ class ThriftHiveMetastore_update_table_column_statistics_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_table_column_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18374,8 +15812,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_args {
 
   ThriftHiveMetastore_update_partition_column_statistics_args(const ThriftHiveMetastore_update_partition_column_statistics_args&);
   ThriftHiveMetastore_update_partition_column_statistics_args& operator=(const ThriftHiveMetastore_update_partition_column_statistics_args&);
-  ThriftHiveMetastore_update_partition_column_statistics_args() noexcept {
-  }
+  ThriftHiveMetastore_update_partition_column_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_partition_column_statistics_args() noexcept;
   ColumnStatistics stats_obj;
@@ -18384,12 +15821,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_args {
 
   void __set_stats_obj(const ColumnStatistics& val);
 
-  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_args & rhs) const
-  {
-    if (!(stats_obj == rhs.stats_obj))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_partition_column_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18427,9 +15859,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_result {
 
   ThriftHiveMetastore_update_partition_column_statistics_result(const ThriftHiveMetastore_update_partition_column_statistics_result&);
   ThriftHiveMetastore_update_partition_column_statistics_result& operator=(const ThriftHiveMetastore_update_partition_column_statistics_result&);
-  ThriftHiveMetastore_update_partition_column_statistics_result() noexcept
-                                                                : success(0) {
-  }
+  ThriftHiveMetastore_update_partition_column_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_partition_column_statistics_result() noexcept;
   bool success;
@@ -18450,20 +15880,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_partition_column_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18511,8 +15928,7 @@ class ThriftHiveMetastore_update_table_column_statistics_req_args {
 
   ThriftHiveMetastore_update_table_column_statistics_req_args(const ThriftHiveMetastore_update_table_column_statistics_req_args&);
   ThriftHiveMetastore_update_table_column_statistics_req_args& operator=(const ThriftHiveMetastore_update_table_column_statistics_req_args&);
-  ThriftHiveMetastore_update_table_column_statistics_req_args() noexcept {
-  }
+  ThriftHiveMetastore_update_table_column_statistics_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_table_column_statistics_req_args() noexcept;
   SetPartitionsStatsRequest req;
@@ -18521,12 +15937,7 @@ class ThriftHiveMetastore_update_table_column_statistics_req_args {
 
   void __set_req(const SetPartitionsStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_table_column_statistics_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18564,8 +15975,7 @@ class ThriftHiveMetastore_update_table_column_statistics_req_result {
 
   ThriftHiveMetastore_update_table_column_statistics_req_result(const ThriftHiveMetastore_update_table_column_statistics_req_result&);
   ThriftHiveMetastore_update_table_column_statistics_req_result& operator=(const ThriftHiveMetastore_update_table_column_statistics_req_result&);
-  ThriftHiveMetastore_update_table_column_statistics_req_result() noexcept {
-  }
+  ThriftHiveMetastore_update_table_column_statistics_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_table_column_statistics_req_result() noexcept;
   SetPartitionsStatsResponse success;
@@ -18586,20 +15996,7 @@ class ThriftHiveMetastore_update_table_column_statistics_req_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_table_column_statistics_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_table_column_statistics_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18647,8 +16044,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_req_args {
 
   ThriftHiveMetastore_update_partition_column_statistics_req_args(const ThriftHiveMetastore_update_partition_column_statistics_req_args&);
   ThriftHiveMetastore_update_partition_column_statistics_req_args& operator=(const ThriftHiveMetastore_update_partition_column_statistics_req_args&);
-  ThriftHiveMetastore_update_partition_column_statistics_req_args() noexcept {
-  }
+  ThriftHiveMetastore_update_partition_column_statistics_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_partition_column_statistics_req_args() noexcept;
   SetPartitionsStatsRequest req;
@@ -18657,12 +16053,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_req_args {
 
   void __set_req(const SetPartitionsStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_partition_column_statistics_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18700,8 +16091,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_req_result {
 
   ThriftHiveMetastore_update_partition_column_statistics_req_result(const ThriftHiveMetastore_update_partition_column_statistics_req_result&);
   ThriftHiveMetastore_update_partition_column_statistics_req_result& operator=(const ThriftHiveMetastore_update_partition_column_statistics_req_result&);
-  ThriftHiveMetastore_update_partition_column_statistics_req_result() noexcept {
-  }
+  ThriftHiveMetastore_update_partition_column_statistics_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_partition_column_statistics_req_result() noexcept;
   SetPartitionsStatsResponse success;
@@ -18722,20 +16112,7 @@ class ThriftHiveMetastore_update_partition_column_statistics_req_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_partition_column_statistics_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_partition_column_statistics_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18783,8 +16160,7 @@ class ThriftHiveMetastore_update_transaction_statistics_args {
 
   ThriftHiveMetastore_update_transaction_statistics_args(const ThriftHiveMetastore_update_transaction_statistics_args&) noexcept;
   ThriftHiveMetastore_update_transaction_statistics_args& operator=(const ThriftHiveMetastore_update_transaction_statistics_args&) noexcept;
-  ThriftHiveMetastore_update_transaction_statistics_args() noexcept {
-  }
+  ThriftHiveMetastore_update_transaction_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_transaction_statistics_args() noexcept;
   UpdateTransactionalStatsRequest req;
@@ -18793,12 +16169,7 @@ class ThriftHiveMetastore_update_transaction_statistics_args {
 
   void __set_req(const UpdateTransactionalStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_update_transaction_statistics_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_transaction_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_transaction_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18832,8 +16203,7 @@ class ThriftHiveMetastore_update_transaction_statistics_result {
 
   ThriftHiveMetastore_update_transaction_statistics_result(const ThriftHiveMetastore_update_transaction_statistics_result&);
   ThriftHiveMetastore_update_transaction_statistics_result& operator=(const ThriftHiveMetastore_update_transaction_statistics_result&);
-  ThriftHiveMetastore_update_transaction_statistics_result() noexcept {
-  }
+  ThriftHiveMetastore_update_transaction_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_transaction_statistics_result() noexcept;
   MetaException o1;
@@ -18842,12 +16212,7 @@ class ThriftHiveMetastore_update_transaction_statistics_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_transaction_statistics_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_transaction_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_transaction_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -18889,11 +16254,7 @@ class ThriftHiveMetastore_get_table_column_statistics_args {
 
   ThriftHiveMetastore_get_table_column_statistics_args(const ThriftHiveMetastore_get_table_column_statistics_args&);
   ThriftHiveMetastore_get_table_column_statistics_args& operator=(const ThriftHiveMetastore_get_table_column_statistics_args&);
-  ThriftHiveMetastore_get_table_column_statistics_args() noexcept
-                                                       : db_name(),
-                                                         tbl_name(),
-                                                         col_name() {
-  }
+  ThriftHiveMetastore_get_table_column_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_column_statistics_args() noexcept;
   std::string db_name;
@@ -18908,16 +16269,7 @@ class ThriftHiveMetastore_get_table_column_statistics_args {
 
   void __set_col_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_column_statistics_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(col_name == rhs.col_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_column_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_column_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -18957,8 +16309,7 @@ class ThriftHiveMetastore_get_table_column_statistics_result {
 
   ThriftHiveMetastore_get_table_column_statistics_result(const ThriftHiveMetastore_get_table_column_statistics_result&);
   ThriftHiveMetastore_get_table_column_statistics_result& operator=(const ThriftHiveMetastore_get_table_column_statistics_result&);
-  ThriftHiveMetastore_get_table_column_statistics_result() noexcept {
-  }
+  ThriftHiveMetastore_get_table_column_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_column_statistics_result() noexcept;
   ColumnStatistics success;
@@ -18979,20 +16330,7 @@ class ThriftHiveMetastore_get_table_column_statistics_result {
 
   void __set_o4(const InvalidObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_column_statistics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_column_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_column_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19043,12 +16381,7 @@ class ThriftHiveMetastore_get_partition_column_statistics_args {
 
   ThriftHiveMetastore_get_partition_column_statistics_args(const ThriftHiveMetastore_get_partition_column_statistics_args&);
   ThriftHiveMetastore_get_partition_column_statistics_args& operator=(const ThriftHiveMetastore_get_partition_column_statistics_args&);
-  ThriftHiveMetastore_get_partition_column_statistics_args() noexcept
-                                                           : db_name(),
-                                                             tbl_name(),
-                                                             part_name(),
-                                                             col_name() {
-  }
+  ThriftHiveMetastore_get_partition_column_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_column_statistics_args() noexcept;
   std::string db_name;
@@ -19066,18 +16399,7 @@ class ThriftHiveMetastore_get_partition_column_statistics_args {
 
   void __set_col_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_column_statistics_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    if (!(col_name == rhs.col_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_column_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_column_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19118,8 +16440,7 @@ class ThriftHiveMetastore_get_partition_column_statistics_result {
 
   ThriftHiveMetastore_get_partition_column_statistics_result(const ThriftHiveMetastore_get_partition_column_statistics_result&);
   ThriftHiveMetastore_get_partition_column_statistics_result& operator=(const ThriftHiveMetastore_get_partition_column_statistics_result&);
-  ThriftHiveMetastore_get_partition_column_statistics_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partition_column_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partition_column_statistics_result() noexcept;
   ColumnStatistics success;
@@ -19140,20 +16461,7 @@ class ThriftHiveMetastore_get_partition_column_statistics_result {
 
   void __set_o4(const InvalidObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partition_column_statistics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partition_column_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partition_column_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19201,8 +16509,7 @@ class ThriftHiveMetastore_get_table_statistics_req_args {
 
   ThriftHiveMetastore_get_table_statistics_req_args(const ThriftHiveMetastore_get_table_statistics_req_args&);
   ThriftHiveMetastore_get_table_statistics_req_args& operator=(const ThriftHiveMetastore_get_table_statistics_req_args&);
-  ThriftHiveMetastore_get_table_statistics_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_table_statistics_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_statistics_req_args() noexcept;
   TableStatsRequest request;
@@ -19211,12 +16518,7 @@ class ThriftHiveMetastore_get_table_statistics_req_args {
 
   void __set_request(const TableStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_statistics_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_statistics_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_statistics_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19252,8 +16554,7 @@ class ThriftHiveMetastore_get_table_statistics_req_result {
 
   ThriftHiveMetastore_get_table_statistics_req_result(const ThriftHiveMetastore_get_table_statistics_req_result&);
   ThriftHiveMetastore_get_table_statistics_req_result& operator=(const ThriftHiveMetastore_get_table_statistics_req_result&);
-  ThriftHiveMetastore_get_table_statistics_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_table_statistics_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_table_statistics_req_result() noexcept;
   TableStatsResult success;
@@ -19268,16 +16569,7 @@ class ThriftHiveMetastore_get_table_statistics_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_table_statistics_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_table_statistics_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_table_statistics_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19321,8 +16613,7 @@ class ThriftHiveMetastore_get_partitions_statistics_req_args {
 
   ThriftHiveMetastore_get_partitions_statistics_req_args(const ThriftHiveMetastore_get_partitions_statistics_req_args&);
   ThriftHiveMetastore_get_partitions_statistics_req_args& operator=(const ThriftHiveMetastore_get_partitions_statistics_req_args&);
-  ThriftHiveMetastore_get_partitions_statistics_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_statistics_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_statistics_req_args() noexcept;
   PartitionsStatsRequest request;
@@ -19331,12 +16622,7 @@ class ThriftHiveMetastore_get_partitions_statistics_req_args {
 
   void __set_request(const PartitionsStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_statistics_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_statistics_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_statistics_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19372,8 +16658,7 @@ class ThriftHiveMetastore_get_partitions_statistics_req_result {
 
   ThriftHiveMetastore_get_partitions_statistics_req_result(const ThriftHiveMetastore_get_partitions_statistics_req_result&);
   ThriftHiveMetastore_get_partitions_statistics_req_result& operator=(const ThriftHiveMetastore_get_partitions_statistics_req_result&);
-  ThriftHiveMetastore_get_partitions_statistics_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_statistics_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_statistics_req_result() noexcept;
   PartitionsStatsResult success;
@@ -19388,16 +16673,7 @@ class ThriftHiveMetastore_get_partitions_statistics_req_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_statistics_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_statistics_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_statistics_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19441,8 +16717,7 @@ class ThriftHiveMetastore_get_aggr_stats_for_args {
 
   ThriftHiveMetastore_get_aggr_stats_for_args(const ThriftHiveMetastore_get_aggr_stats_for_args&);
   ThriftHiveMetastore_get_aggr_stats_for_args& operator=(const ThriftHiveMetastore_get_aggr_stats_for_args&);
-  ThriftHiveMetastore_get_aggr_stats_for_args() noexcept {
-  }
+  ThriftHiveMetastore_get_aggr_stats_for_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_aggr_stats_for_args() noexcept;
   PartitionsStatsRequest request;
@@ -19451,12 +16726,7 @@ class ThriftHiveMetastore_get_aggr_stats_for_args {
 
   void __set_request(const PartitionsStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_aggr_stats_for_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_aggr_stats_for_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_aggr_stats_for_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19492,8 +16762,7 @@ class ThriftHiveMetastore_get_aggr_stats_for_result {
 
   ThriftHiveMetastore_get_aggr_stats_for_result(const ThriftHiveMetastore_get_aggr_stats_for_result&);
   ThriftHiveMetastore_get_aggr_stats_for_result& operator=(const ThriftHiveMetastore_get_aggr_stats_for_result&);
-  ThriftHiveMetastore_get_aggr_stats_for_result() noexcept {
-  }
+  ThriftHiveMetastore_get_aggr_stats_for_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_aggr_stats_for_result() noexcept;
   AggrStats success;
@@ -19508,16 +16777,7 @@ class ThriftHiveMetastore_get_aggr_stats_for_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_aggr_stats_for_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_aggr_stats_for_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_aggr_stats_for_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19561,8 +16821,7 @@ class ThriftHiveMetastore_set_aggr_stats_for_args {
 
   ThriftHiveMetastore_set_aggr_stats_for_args(const ThriftHiveMetastore_set_aggr_stats_for_args&);
   ThriftHiveMetastore_set_aggr_stats_for_args& operator=(const ThriftHiveMetastore_set_aggr_stats_for_args&);
-  ThriftHiveMetastore_set_aggr_stats_for_args() noexcept {
-  }
+  ThriftHiveMetastore_set_aggr_stats_for_args() noexcept;
 
   virtual ~ThriftHiveMetastore_set_aggr_stats_for_args() noexcept;
   SetPartitionsStatsRequest request;
@@ -19571,12 +16830,7 @@ class ThriftHiveMetastore_set_aggr_stats_for_args {
 
   void __set_request(const SetPartitionsStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_set_aggr_stats_for_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_aggr_stats_for_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_aggr_stats_for_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19614,9 +16868,7 @@ class ThriftHiveMetastore_set_aggr_stats_for_result {
 
   ThriftHiveMetastore_set_aggr_stats_for_result(const ThriftHiveMetastore_set_aggr_stats_for_result&);
   ThriftHiveMetastore_set_aggr_stats_for_result& operator=(const ThriftHiveMetastore_set_aggr_stats_for_result&);
-  ThriftHiveMetastore_set_aggr_stats_for_result() noexcept
-                                                : success(0) {
-  }
+  ThriftHiveMetastore_set_aggr_stats_for_result() noexcept;
 
   virtual ~ThriftHiveMetastore_set_aggr_stats_for_result() noexcept;
   bool success;
@@ -19637,20 +16889,7 @@ class ThriftHiveMetastore_set_aggr_stats_for_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_set_aggr_stats_for_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_aggr_stats_for_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_aggr_stats_for_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19702,13 +16941,7 @@ class ThriftHiveMetastore_delete_partition_column_statistics_args {
 
   ThriftHiveMetastore_delete_partition_column_statistics_args(const ThriftHiveMetastore_delete_partition_column_statistics_args&);
   ThriftHiveMetastore_delete_partition_column_statistics_args& operator=(const ThriftHiveMetastore_delete_partition_column_statistics_args&);
-  ThriftHiveMetastore_delete_partition_column_statistics_args() noexcept
-                                                              : db_name(),
-                                                                tbl_name(),
-                                                                part_name(),
-                                                                col_name(),
-                                                                engine() {
-  }
+  ThriftHiveMetastore_delete_partition_column_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_delete_partition_column_statistics_args() noexcept;
   std::string db_name;
@@ -19729,20 +16962,7 @@ class ThriftHiveMetastore_delete_partition_column_statistics_args {
 
   void __set_engine(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_delete_partition_column_statistics_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(part_name == rhs.part_name))
-      return false;
-    if (!(col_name == rhs.col_name))
-      return false;
-    if (!(engine == rhs.engine))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_delete_partition_column_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_delete_partition_column_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19784,9 +17004,7 @@ class ThriftHiveMetastore_delete_partition_column_statistics_result {
 
   ThriftHiveMetastore_delete_partition_column_statistics_result(const ThriftHiveMetastore_delete_partition_column_statistics_result&);
   ThriftHiveMetastore_delete_partition_column_statistics_result& operator=(const ThriftHiveMetastore_delete_partition_column_statistics_result&);
-  ThriftHiveMetastore_delete_partition_column_statistics_result() noexcept
-                                                                : success(0) {
-  }
+  ThriftHiveMetastore_delete_partition_column_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_delete_partition_column_statistics_result() noexcept;
   bool success;
@@ -19807,20 +17025,7 @@ class ThriftHiveMetastore_delete_partition_column_statistics_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_delete_partition_column_statistics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_delete_partition_column_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_delete_partition_column_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -19871,12 +17076,7 @@ class ThriftHiveMetastore_delete_table_column_statistics_args {
 
   ThriftHiveMetastore_delete_table_column_statistics_args(const ThriftHiveMetastore_delete_table_column_statistics_args&);
   ThriftHiveMetastore_delete_table_column_statistics_args& operator=(const ThriftHiveMetastore_delete_table_column_statistics_args&);
-  ThriftHiveMetastore_delete_table_column_statistics_args() noexcept
-                                                          : db_name(),
-                                                            tbl_name(),
-                                                            col_name(),
-                                                            engine() {
-  }
+  ThriftHiveMetastore_delete_table_column_statistics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_delete_table_column_statistics_args() noexcept;
   std::string db_name;
@@ -19894,18 +17094,7 @@ class ThriftHiveMetastore_delete_table_column_statistics_args {
 
   void __set_engine(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_delete_table_column_statistics_args & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (!(col_name == rhs.col_name))
-      return false;
-    if (!(engine == rhs.engine))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_delete_table_column_statistics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_delete_table_column_statistics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -19946,9 +17135,7 @@ class ThriftHiveMetastore_delete_table_column_statistics_result {
 
   ThriftHiveMetastore_delete_table_column_statistics_result(const ThriftHiveMetastore_delete_table_column_statistics_result&);
   ThriftHiveMetastore_delete_table_column_statistics_result& operator=(const ThriftHiveMetastore_delete_table_column_statistics_result&);
-  ThriftHiveMetastore_delete_table_column_statistics_result() noexcept
-                                                            : success(0) {
-  }
+  ThriftHiveMetastore_delete_table_column_statistics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_delete_table_column_statistics_result() noexcept;
   bool success;
@@ -19969,20 +17156,7 @@ class ThriftHiveMetastore_delete_table_column_statistics_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_delete_table_column_statistics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_delete_table_column_statistics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_delete_table_column_statistics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20030,8 +17204,7 @@ class ThriftHiveMetastore_delete_column_statistics_req_args {
 
   ThriftHiveMetastore_delete_column_statistics_req_args(const ThriftHiveMetastore_delete_column_statistics_req_args&);
   ThriftHiveMetastore_delete_column_statistics_req_args& operator=(const ThriftHiveMetastore_delete_column_statistics_req_args&);
-  ThriftHiveMetastore_delete_column_statistics_req_args() noexcept {
-  }
+  ThriftHiveMetastore_delete_column_statistics_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_delete_column_statistics_req_args() noexcept;
   DeleteColumnStatisticsRequest req;
@@ -20040,12 +17213,7 @@ class ThriftHiveMetastore_delete_column_statistics_req_args {
 
   void __set_req(const DeleteColumnStatisticsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_delete_column_statistics_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_delete_column_statistics_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_delete_column_statistics_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20083,9 +17251,7 @@ class ThriftHiveMetastore_delete_column_statistics_req_result {
 
   ThriftHiveMetastore_delete_column_statistics_req_result(const ThriftHiveMetastore_delete_column_statistics_req_result&);
   ThriftHiveMetastore_delete_column_statistics_req_result& operator=(const ThriftHiveMetastore_delete_column_statistics_req_result&);
-  ThriftHiveMetastore_delete_column_statistics_req_result() noexcept
-                                                          : success(0) {
-  }
+  ThriftHiveMetastore_delete_column_statistics_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_delete_column_statistics_req_result() noexcept;
   bool success;
@@ -20106,20 +17272,7 @@ class ThriftHiveMetastore_delete_column_statistics_req_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_delete_column_statistics_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_delete_column_statistics_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_delete_column_statistics_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20167,8 +17320,7 @@ class ThriftHiveMetastore_create_function_args {
 
   ThriftHiveMetastore_create_function_args(const ThriftHiveMetastore_create_function_args&);
   ThriftHiveMetastore_create_function_args& operator=(const ThriftHiveMetastore_create_function_args&);
-  ThriftHiveMetastore_create_function_args() noexcept {
-  }
+  ThriftHiveMetastore_create_function_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_function_args() noexcept;
   Function func;
@@ -20177,12 +17329,7 @@ class ThriftHiveMetastore_create_function_args {
 
   void __set_func(const Function& val);
 
-  bool operator == (const ThriftHiveMetastore_create_function_args & rhs) const
-  {
-    if (!(func == rhs.func))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_function_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_function_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20219,8 +17366,7 @@ class ThriftHiveMetastore_create_function_result {
 
   ThriftHiveMetastore_create_function_result(const ThriftHiveMetastore_create_function_result&);
   ThriftHiveMetastore_create_function_result& operator=(const ThriftHiveMetastore_create_function_result&);
-  ThriftHiveMetastore_create_function_result() noexcept {
-  }
+  ThriftHiveMetastore_create_function_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_function_result() noexcept;
   AlreadyExistsException o1;
@@ -20238,18 +17384,7 @@ class ThriftHiveMetastore_create_function_result {
 
   void __set_o4(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_function_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_function_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_function_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20296,10 +17431,7 @@ class ThriftHiveMetastore_drop_function_args {
 
   ThriftHiveMetastore_drop_function_args(const ThriftHiveMetastore_drop_function_args&);
   ThriftHiveMetastore_drop_function_args& operator=(const ThriftHiveMetastore_drop_function_args&);
-  ThriftHiveMetastore_drop_function_args() noexcept
-                                         : dbName(),
-                                           funcName() {
-  }
+  ThriftHiveMetastore_drop_function_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_function_args() noexcept;
   std::string dbName;
@@ -20311,14 +17443,7 @@ class ThriftHiveMetastore_drop_function_args {
 
   void __set_funcName(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_function_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(funcName == rhs.funcName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_function_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_function_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20354,8 +17479,7 @@ class ThriftHiveMetastore_drop_function_result {
 
   ThriftHiveMetastore_drop_function_result(const ThriftHiveMetastore_drop_function_result&);
   ThriftHiveMetastore_drop_function_result& operator=(const ThriftHiveMetastore_drop_function_result&);
-  ThriftHiveMetastore_drop_function_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_function_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_function_result() noexcept;
   NoSuchObjectException o1;
@@ -20367,14 +17491,7 @@ class ThriftHiveMetastore_drop_function_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_function_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_function_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_function_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20418,10 +17535,7 @@ class ThriftHiveMetastore_alter_function_args {
 
   ThriftHiveMetastore_alter_function_args(const ThriftHiveMetastore_alter_function_args&);
   ThriftHiveMetastore_alter_function_args& operator=(const ThriftHiveMetastore_alter_function_args&);
-  ThriftHiveMetastore_alter_function_args() noexcept
-                                          : dbName(),
-                                            funcName() {
-  }
+  ThriftHiveMetastore_alter_function_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_function_args() noexcept;
   std::string dbName;
@@ -20436,16 +17550,7 @@ class ThriftHiveMetastore_alter_function_args {
 
   void __set_newFunc(const Function& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_function_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(funcName == rhs.funcName))
-      return false;
-    if (!(newFunc == rhs.newFunc))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_function_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_function_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20482,8 +17587,7 @@ class ThriftHiveMetastore_alter_function_result {
 
   ThriftHiveMetastore_alter_function_result(const ThriftHiveMetastore_alter_function_result&);
   ThriftHiveMetastore_alter_function_result& operator=(const ThriftHiveMetastore_alter_function_result&);
-  ThriftHiveMetastore_alter_function_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_function_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_function_result() noexcept;
   InvalidOperationException o1;
@@ -20495,14 +17599,7 @@ class ThriftHiveMetastore_alter_function_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_function_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_function_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_function_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20545,10 +17642,7 @@ class ThriftHiveMetastore_get_functions_args {
 
   ThriftHiveMetastore_get_functions_args(const ThriftHiveMetastore_get_functions_args&);
   ThriftHiveMetastore_get_functions_args& operator=(const ThriftHiveMetastore_get_functions_args&);
-  ThriftHiveMetastore_get_functions_args() noexcept
-                                         : dbName(),
-                                           pattern() {
-  }
+  ThriftHiveMetastore_get_functions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_functions_args() noexcept;
   std::string dbName;
@@ -20560,14 +17654,7 @@ class ThriftHiveMetastore_get_functions_args {
 
   void __set_pattern(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_functions_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(pattern == rhs.pattern))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_functions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_functions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20603,8 +17690,7 @@ class ThriftHiveMetastore_get_functions_result {
 
   ThriftHiveMetastore_get_functions_result(const ThriftHiveMetastore_get_functions_result&);
   ThriftHiveMetastore_get_functions_result& operator=(const ThriftHiveMetastore_get_functions_result&);
-  ThriftHiveMetastore_get_functions_result() noexcept {
-  }
+  ThriftHiveMetastore_get_functions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_functions_result() noexcept;
   std::vector<std::string>  success;
@@ -20616,14 +17702,7 @@ class ThriftHiveMetastore_get_functions_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_functions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_functions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_functions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20665,8 +17744,7 @@ class ThriftHiveMetastore_get_functions_req_args {
 
   ThriftHiveMetastore_get_functions_req_args(const ThriftHiveMetastore_get_functions_req_args&);
   ThriftHiveMetastore_get_functions_req_args& operator=(const ThriftHiveMetastore_get_functions_req_args&);
-  ThriftHiveMetastore_get_functions_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_functions_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_functions_req_args() noexcept;
   GetFunctionsRequest request;
@@ -20675,12 +17753,7 @@ class ThriftHiveMetastore_get_functions_req_args {
 
   void __set_request(const GetFunctionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_functions_req_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_functions_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_functions_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20715,8 +17788,7 @@ class ThriftHiveMetastore_get_functions_req_result {
 
   ThriftHiveMetastore_get_functions_req_result(const ThriftHiveMetastore_get_functions_req_result&);
   ThriftHiveMetastore_get_functions_req_result& operator=(const ThriftHiveMetastore_get_functions_req_result&);
-  ThriftHiveMetastore_get_functions_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_functions_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_functions_req_result() noexcept;
   GetFunctionsResponse success;
@@ -20728,14 +17800,7 @@ class ThriftHiveMetastore_get_functions_req_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_functions_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_functions_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_functions_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20778,10 +17843,7 @@ class ThriftHiveMetastore_get_function_args {
 
   ThriftHiveMetastore_get_function_args(const ThriftHiveMetastore_get_function_args&);
   ThriftHiveMetastore_get_function_args& operator=(const ThriftHiveMetastore_get_function_args&);
-  ThriftHiveMetastore_get_function_args() noexcept
-                                        : dbName(),
-                                          funcName() {
-  }
+  ThriftHiveMetastore_get_function_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_function_args() noexcept;
   std::string dbName;
@@ -20793,14 +17855,7 @@ class ThriftHiveMetastore_get_function_args {
 
   void __set_funcName(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_function_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(funcName == rhs.funcName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_function_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_function_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20837,8 +17892,7 @@ class ThriftHiveMetastore_get_function_result {
 
   ThriftHiveMetastore_get_function_result(const ThriftHiveMetastore_get_function_result&);
   ThriftHiveMetastore_get_function_result& operator=(const ThriftHiveMetastore_get_function_result&);
-  ThriftHiveMetastore_get_function_result() noexcept {
-  }
+  ThriftHiveMetastore_get_function_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_function_result() noexcept;
   Function success;
@@ -20853,16 +17907,7 @@ class ThriftHiveMetastore_get_function_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_function_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_function_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_function_result &rhs) const {
     return !(*this == rhs);
   }
@@ -20902,15 +17947,11 @@ class ThriftHiveMetastore_get_all_functions_args {
 
   ThriftHiveMetastore_get_all_functions_args(const ThriftHiveMetastore_get_all_functions_args&) noexcept;
   ThriftHiveMetastore_get_all_functions_args& operator=(const ThriftHiveMetastore_get_all_functions_args&) noexcept;
-  ThriftHiveMetastore_get_all_functions_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_functions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_functions_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_all_functions_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_functions_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_all_functions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -20944,8 +17985,7 @@ class ThriftHiveMetastore_get_all_functions_result {
 
   ThriftHiveMetastore_get_all_functions_result(const ThriftHiveMetastore_get_all_functions_result&);
   ThriftHiveMetastore_get_all_functions_result& operator=(const ThriftHiveMetastore_get_all_functions_result&);
-  ThriftHiveMetastore_get_all_functions_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_functions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_functions_result() noexcept;
   GetAllFunctionsResponse success;
@@ -20957,14 +17997,7 @@ class ThriftHiveMetastore_get_all_functions_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_functions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_functions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_functions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21006,8 +18039,7 @@ class ThriftHiveMetastore_create_role_args {
 
   ThriftHiveMetastore_create_role_args(const ThriftHiveMetastore_create_role_args&);
   ThriftHiveMetastore_create_role_args& operator=(const ThriftHiveMetastore_create_role_args&);
-  ThriftHiveMetastore_create_role_args() noexcept {
-  }
+  ThriftHiveMetastore_create_role_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_role_args() noexcept;
   Role role;
@@ -21016,12 +18048,7 @@ class ThriftHiveMetastore_create_role_args {
 
   void __set_role(const Role& val);
 
-  bool operator == (const ThriftHiveMetastore_create_role_args & rhs) const
-  {
-    if (!(role == rhs.role))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_role_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_role_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21056,9 +18083,7 @@ class ThriftHiveMetastore_create_role_result {
 
   ThriftHiveMetastore_create_role_result(const ThriftHiveMetastore_create_role_result&);
   ThriftHiveMetastore_create_role_result& operator=(const ThriftHiveMetastore_create_role_result&);
-  ThriftHiveMetastore_create_role_result() noexcept
-                                         : success(0) {
-  }
+  ThriftHiveMetastore_create_role_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_role_result() noexcept;
   bool success;
@@ -21070,14 +18095,7 @@ class ThriftHiveMetastore_create_role_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_role_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_role_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_role_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21119,9 +18137,7 @@ class ThriftHiveMetastore_drop_role_args {
 
   ThriftHiveMetastore_drop_role_args(const ThriftHiveMetastore_drop_role_args&);
   ThriftHiveMetastore_drop_role_args& operator=(const ThriftHiveMetastore_drop_role_args&);
-  ThriftHiveMetastore_drop_role_args() noexcept
-                                     : role_name() {
-  }
+  ThriftHiveMetastore_drop_role_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_role_args() noexcept;
   std::string role_name;
@@ -21130,12 +18146,7 @@ class ThriftHiveMetastore_drop_role_args {
 
   void __set_role_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_role_args & rhs) const
-  {
-    if (!(role_name == rhs.role_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_role_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_role_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21170,9 +18181,7 @@ class ThriftHiveMetastore_drop_role_result {
 
   ThriftHiveMetastore_drop_role_result(const ThriftHiveMetastore_drop_role_result&);
   ThriftHiveMetastore_drop_role_result& operator=(const ThriftHiveMetastore_drop_role_result&);
-  ThriftHiveMetastore_drop_role_result() noexcept
-                                       : success(0) {
-  }
+  ThriftHiveMetastore_drop_role_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_role_result() noexcept;
   bool success;
@@ -21184,14 +18193,7 @@ class ThriftHiveMetastore_drop_role_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_role_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_role_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_role_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21229,15 +18231,11 @@ class ThriftHiveMetastore_get_role_names_args {
 
   ThriftHiveMetastore_get_role_names_args(const ThriftHiveMetastore_get_role_names_args&) noexcept;
   ThriftHiveMetastore_get_role_names_args& operator=(const ThriftHiveMetastore_get_role_names_args&) noexcept;
-  ThriftHiveMetastore_get_role_names_args() noexcept {
-  }
+  ThriftHiveMetastore_get_role_names_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_role_names_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_role_names_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_role_names_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_role_names_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21271,8 +18269,7 @@ class ThriftHiveMetastore_get_role_names_result {
 
   ThriftHiveMetastore_get_role_names_result(const ThriftHiveMetastore_get_role_names_result&);
   ThriftHiveMetastore_get_role_names_result& operator=(const ThriftHiveMetastore_get_role_names_result&);
-  ThriftHiveMetastore_get_role_names_result() noexcept {
-  }
+  ThriftHiveMetastore_get_role_names_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_role_names_result() noexcept;
   std::vector<std::string>  success;
@@ -21284,14 +18281,7 @@ class ThriftHiveMetastore_get_role_names_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_role_names_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_role_names_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_role_names_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21338,14 +18328,7 @@ class ThriftHiveMetastore_grant_role_args {
 
   ThriftHiveMetastore_grant_role_args(const ThriftHiveMetastore_grant_role_args&);
   ThriftHiveMetastore_grant_role_args& operator=(const ThriftHiveMetastore_grant_role_args&);
-  ThriftHiveMetastore_grant_role_args() noexcept
-                                      : role_name(),
-                                        principal_name(),
-                                        principal_type(static_cast<PrincipalType::type>(0)),
-                                        grantor(),
-                                        grantorType(static_cast<PrincipalType::type>(0)),
-                                        grant_option(0) {
-  }
+  ThriftHiveMetastore_grant_role_args() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_role_args() noexcept;
   std::string role_name;
@@ -21377,22 +18360,7 @@ class ThriftHiveMetastore_grant_role_args {
 
   void __set_grant_option(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_grant_role_args & rhs) const
-  {
-    if (!(role_name == rhs.role_name))
-      return false;
-    if (!(principal_name == rhs.principal_name))
-      return false;
-    if (!(principal_type == rhs.principal_type))
-      return false;
-    if (!(grantor == rhs.grantor))
-      return false;
-    if (!(grantorType == rhs.grantorType))
-      return false;
-    if (!(grant_option == rhs.grant_option))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_role_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_role_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21440,9 +18408,7 @@ class ThriftHiveMetastore_grant_role_result {
 
   ThriftHiveMetastore_grant_role_result(const ThriftHiveMetastore_grant_role_result&);
   ThriftHiveMetastore_grant_role_result& operator=(const ThriftHiveMetastore_grant_role_result&);
-  ThriftHiveMetastore_grant_role_result() noexcept
-                                        : success(0) {
-  }
+  ThriftHiveMetastore_grant_role_result() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_role_result() noexcept;
   bool success;
@@ -21454,14 +18420,7 @@ class ThriftHiveMetastore_grant_role_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_role_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_role_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_role_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21505,11 +18464,7 @@ class ThriftHiveMetastore_revoke_role_args {
 
   ThriftHiveMetastore_revoke_role_args(const ThriftHiveMetastore_revoke_role_args&);
   ThriftHiveMetastore_revoke_role_args& operator=(const ThriftHiveMetastore_revoke_role_args&);
-  ThriftHiveMetastore_revoke_role_args() noexcept
-                                       : role_name(),
-                                         principal_name(),
-                                         principal_type(static_cast<PrincipalType::type>(0)) {
-  }
+  ThriftHiveMetastore_revoke_role_args() noexcept;
 
   virtual ~ThriftHiveMetastore_revoke_role_args() noexcept;
   std::string role_name;
@@ -21528,16 +18483,7 @@ class ThriftHiveMetastore_revoke_role_args {
 
   void __set_principal_type(const PrincipalType::type val);
 
-  bool operator == (const ThriftHiveMetastore_revoke_role_args & rhs) const
-  {
-    if (!(role_name == rhs.role_name))
-      return false;
-    if (!(principal_name == rhs.principal_name))
-      return false;
-    if (!(principal_type == rhs.principal_type))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_revoke_role_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_revoke_role_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21578,9 +18524,7 @@ class ThriftHiveMetastore_revoke_role_result {
 
   ThriftHiveMetastore_revoke_role_result(const ThriftHiveMetastore_revoke_role_result&);
   ThriftHiveMetastore_revoke_role_result& operator=(const ThriftHiveMetastore_revoke_role_result&);
-  ThriftHiveMetastore_revoke_role_result() noexcept
-                                         : success(0) {
-  }
+  ThriftHiveMetastore_revoke_role_result() noexcept;
 
   virtual ~ThriftHiveMetastore_revoke_role_result() noexcept;
   bool success;
@@ -21592,14 +18536,7 @@ class ThriftHiveMetastore_revoke_role_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_revoke_role_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_revoke_role_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_revoke_role_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21642,10 +18579,7 @@ class ThriftHiveMetastore_list_roles_args {
 
   ThriftHiveMetastore_list_roles_args(const ThriftHiveMetastore_list_roles_args&);
   ThriftHiveMetastore_list_roles_args& operator=(const ThriftHiveMetastore_list_roles_args&);
-  ThriftHiveMetastore_list_roles_args() noexcept
-                                      : principal_name(),
-                                        principal_type(static_cast<PrincipalType::type>(0)) {
-  }
+  ThriftHiveMetastore_list_roles_args() noexcept;
 
   virtual ~ThriftHiveMetastore_list_roles_args() noexcept;
   std::string principal_name;
@@ -21661,14 +18595,7 @@ class ThriftHiveMetastore_list_roles_args {
 
   void __set_principal_type(const PrincipalType::type val);
 
-  bool operator == (const ThriftHiveMetastore_list_roles_args & rhs) const
-  {
-    if (!(principal_name == rhs.principal_name))
-      return false;
-    if (!(principal_type == rhs.principal_type))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_list_roles_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_list_roles_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21708,8 +18635,7 @@ class ThriftHiveMetastore_list_roles_result {
 
   ThriftHiveMetastore_list_roles_result(const ThriftHiveMetastore_list_roles_result&);
   ThriftHiveMetastore_list_roles_result& operator=(const ThriftHiveMetastore_list_roles_result&);
-  ThriftHiveMetastore_list_roles_result() noexcept {
-  }
+  ThriftHiveMetastore_list_roles_result() noexcept;
 
   virtual ~ThriftHiveMetastore_list_roles_result() noexcept;
   std::vector<Role>  success;
@@ -21721,14 +18647,7 @@ class ThriftHiveMetastore_list_roles_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_list_roles_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_list_roles_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_list_roles_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21770,8 +18689,7 @@ class ThriftHiveMetastore_grant_revoke_role_args {
 
   ThriftHiveMetastore_grant_revoke_role_args(const ThriftHiveMetastore_grant_revoke_role_args&);
   ThriftHiveMetastore_grant_revoke_role_args& operator=(const ThriftHiveMetastore_grant_revoke_role_args&);
-  ThriftHiveMetastore_grant_revoke_role_args() noexcept {
-  }
+  ThriftHiveMetastore_grant_revoke_role_args() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_revoke_role_args() noexcept;
   GrantRevokeRoleRequest request;
@@ -21780,12 +18698,7 @@ class ThriftHiveMetastore_grant_revoke_role_args {
 
   void __set_request(const GrantRevokeRoleRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_revoke_role_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_revoke_role_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_revoke_role_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21820,8 +18733,7 @@ class ThriftHiveMetastore_grant_revoke_role_result {
 
   ThriftHiveMetastore_grant_revoke_role_result(const ThriftHiveMetastore_grant_revoke_role_result&);
   ThriftHiveMetastore_grant_revoke_role_result& operator=(const ThriftHiveMetastore_grant_revoke_role_result&);
-  ThriftHiveMetastore_grant_revoke_role_result() noexcept {
-  }
+  ThriftHiveMetastore_grant_revoke_role_result() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_revoke_role_result() noexcept;
   GrantRevokeRoleResponse success;
@@ -21833,14 +18745,7 @@ class ThriftHiveMetastore_grant_revoke_role_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_revoke_role_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_revoke_role_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_revoke_role_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21882,8 +18787,7 @@ class ThriftHiveMetastore_get_principals_in_role_args {
 
   ThriftHiveMetastore_get_principals_in_role_args(const ThriftHiveMetastore_get_principals_in_role_args&);
   ThriftHiveMetastore_get_principals_in_role_args& operator=(const ThriftHiveMetastore_get_principals_in_role_args&);
-  ThriftHiveMetastore_get_principals_in_role_args() noexcept {
-  }
+  ThriftHiveMetastore_get_principals_in_role_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_principals_in_role_args() noexcept;
   GetPrincipalsInRoleRequest request;
@@ -21892,12 +18796,7 @@ class ThriftHiveMetastore_get_principals_in_role_args {
 
   void __set_request(const GetPrincipalsInRoleRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_principals_in_role_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_principals_in_role_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_principals_in_role_args &rhs) const {
     return !(*this == rhs);
   }
@@ -21932,8 +18831,7 @@ class ThriftHiveMetastore_get_principals_in_role_result {
 
   ThriftHiveMetastore_get_principals_in_role_result(const ThriftHiveMetastore_get_principals_in_role_result&);
   ThriftHiveMetastore_get_principals_in_role_result& operator=(const ThriftHiveMetastore_get_principals_in_role_result&);
-  ThriftHiveMetastore_get_principals_in_role_result() noexcept {
-  }
+  ThriftHiveMetastore_get_principals_in_role_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_principals_in_role_result() noexcept;
   GetPrincipalsInRoleResponse success;
@@ -21945,14 +18843,7 @@ class ThriftHiveMetastore_get_principals_in_role_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_principals_in_role_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_principals_in_role_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_principals_in_role_result &rhs) const {
     return !(*this == rhs);
   }
@@ -21994,8 +18885,7 @@ class ThriftHiveMetastore_get_role_grants_for_principal_args {
 
   ThriftHiveMetastore_get_role_grants_for_principal_args(const ThriftHiveMetastore_get_role_grants_for_principal_args&);
   ThriftHiveMetastore_get_role_grants_for_principal_args& operator=(const ThriftHiveMetastore_get_role_grants_for_principal_args&);
-  ThriftHiveMetastore_get_role_grants_for_principal_args() noexcept {
-  }
+  ThriftHiveMetastore_get_role_grants_for_principal_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_role_grants_for_principal_args() noexcept;
   GetRoleGrantsForPrincipalRequest request;
@@ -22004,12 +18894,7 @@ class ThriftHiveMetastore_get_role_grants_for_principal_args {
 
   void __set_request(const GetRoleGrantsForPrincipalRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_role_grants_for_principal_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_role_grants_for_principal_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_role_grants_for_principal_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22044,8 +18929,7 @@ class ThriftHiveMetastore_get_role_grants_for_principal_result {
 
   ThriftHiveMetastore_get_role_grants_for_principal_result(const ThriftHiveMetastore_get_role_grants_for_principal_result&);
   ThriftHiveMetastore_get_role_grants_for_principal_result& operator=(const ThriftHiveMetastore_get_role_grants_for_principal_result&);
-  ThriftHiveMetastore_get_role_grants_for_principal_result() noexcept {
-  }
+  ThriftHiveMetastore_get_role_grants_for_principal_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_role_grants_for_principal_result() noexcept;
   GetRoleGrantsForPrincipalResponse success;
@@ -22057,14 +18941,7 @@ class ThriftHiveMetastore_get_role_grants_for_principal_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_role_grants_for_principal_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_role_grants_for_principal_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_role_grants_for_principal_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22108,9 +18985,7 @@ class ThriftHiveMetastore_get_privilege_set_args {
 
   ThriftHiveMetastore_get_privilege_set_args(const ThriftHiveMetastore_get_privilege_set_args&);
   ThriftHiveMetastore_get_privilege_set_args& operator=(const ThriftHiveMetastore_get_privilege_set_args&);
-  ThriftHiveMetastore_get_privilege_set_args() noexcept
-                                             : user_name() {
-  }
+  ThriftHiveMetastore_get_privilege_set_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_privilege_set_args() noexcept;
   HiveObjectRef hiveObject;
@@ -22125,16 +19000,7 @@ class ThriftHiveMetastore_get_privilege_set_args {
 
   void __set_group_names(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_privilege_set_args & rhs) const
-  {
-    if (!(hiveObject == rhs.hiveObject))
-      return false;
-    if (!(user_name == rhs.user_name))
-      return false;
-    if (!(group_names == rhs.group_names))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_privilege_set_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_privilege_set_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22171,8 +19037,7 @@ class ThriftHiveMetastore_get_privilege_set_result {
 
   ThriftHiveMetastore_get_privilege_set_result(const ThriftHiveMetastore_get_privilege_set_result&);
   ThriftHiveMetastore_get_privilege_set_result& operator=(const ThriftHiveMetastore_get_privilege_set_result&);
-  ThriftHiveMetastore_get_privilege_set_result() noexcept {
-  }
+  ThriftHiveMetastore_get_privilege_set_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_privilege_set_result() noexcept;
   PrincipalPrivilegeSet success;
@@ -22184,14 +19049,7 @@ class ThriftHiveMetastore_get_privilege_set_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_privilege_set_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_privilege_set_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_privilege_set_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22235,10 +19093,7 @@ class ThriftHiveMetastore_list_privileges_args {
 
   ThriftHiveMetastore_list_privileges_args(const ThriftHiveMetastore_list_privileges_args&);
   ThriftHiveMetastore_list_privileges_args& operator=(const ThriftHiveMetastore_list_privileges_args&);
-  ThriftHiveMetastore_list_privileges_args() noexcept
-                                           : principal_name(),
-                                             principal_type(static_cast<PrincipalType::type>(0)) {
-  }
+  ThriftHiveMetastore_list_privileges_args() noexcept;
 
   virtual ~ThriftHiveMetastore_list_privileges_args() noexcept;
   std::string principal_name;
@@ -22257,16 +19112,7 @@ class ThriftHiveMetastore_list_privileges_args {
 
   void __set_hiveObject(const HiveObjectRef& val);
 
-  bool operator == (const ThriftHiveMetastore_list_privileges_args & rhs) const
-  {
-    if (!(principal_name == rhs.principal_name))
-      return false;
-    if (!(principal_type == rhs.principal_type))
-      return false;
-    if (!(hiveObject == rhs.hiveObject))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_list_privileges_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_list_privileges_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22307,8 +19153,7 @@ class ThriftHiveMetastore_list_privileges_result {
 
   ThriftHiveMetastore_list_privileges_result(const ThriftHiveMetastore_list_privileges_result&);
   ThriftHiveMetastore_list_privileges_result& operator=(const ThriftHiveMetastore_list_privileges_result&);
-  ThriftHiveMetastore_list_privileges_result() noexcept {
-  }
+  ThriftHiveMetastore_list_privileges_result() noexcept;
 
   virtual ~ThriftHiveMetastore_list_privileges_result() noexcept;
   std::vector<HiveObjectPrivilege>  success;
@@ -22320,14 +19165,7 @@ class ThriftHiveMetastore_list_privileges_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_list_privileges_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_list_privileges_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_list_privileges_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22369,8 +19207,7 @@ class ThriftHiveMetastore_grant_privileges_args {
 
   ThriftHiveMetastore_grant_privileges_args(const ThriftHiveMetastore_grant_privileges_args&);
   ThriftHiveMetastore_grant_privileges_args& operator=(const ThriftHiveMetastore_grant_privileges_args&);
-  ThriftHiveMetastore_grant_privileges_args() noexcept {
-  }
+  ThriftHiveMetastore_grant_privileges_args() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_privileges_args() noexcept;
   PrivilegeBag privileges;
@@ -22379,12 +19216,7 @@ class ThriftHiveMetastore_grant_privileges_args {
 
   void __set_privileges(const PrivilegeBag& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_privileges_args & rhs) const
-  {
-    if (!(privileges == rhs.privileges))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_privileges_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_privileges_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22419,9 +19251,7 @@ class ThriftHiveMetastore_grant_privileges_result {
 
   ThriftHiveMetastore_grant_privileges_result(const ThriftHiveMetastore_grant_privileges_result&);
   ThriftHiveMetastore_grant_privileges_result& operator=(const ThriftHiveMetastore_grant_privileges_result&);
-  ThriftHiveMetastore_grant_privileges_result() noexcept
-                                              : success(0) {
-  }
+  ThriftHiveMetastore_grant_privileges_result() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_privileges_result() noexcept;
   bool success;
@@ -22433,14 +19263,7 @@ class ThriftHiveMetastore_grant_privileges_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_privileges_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_privileges_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_privileges_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22482,8 +19305,7 @@ class ThriftHiveMetastore_revoke_privileges_args {
 
   ThriftHiveMetastore_revoke_privileges_args(const ThriftHiveMetastore_revoke_privileges_args&);
   ThriftHiveMetastore_revoke_privileges_args& operator=(const ThriftHiveMetastore_revoke_privileges_args&);
-  ThriftHiveMetastore_revoke_privileges_args() noexcept {
-  }
+  ThriftHiveMetastore_revoke_privileges_args() noexcept;
 
   virtual ~ThriftHiveMetastore_revoke_privileges_args() noexcept;
   PrivilegeBag privileges;
@@ -22492,12 +19314,7 @@ class ThriftHiveMetastore_revoke_privileges_args {
 
   void __set_privileges(const PrivilegeBag& val);
 
-  bool operator == (const ThriftHiveMetastore_revoke_privileges_args & rhs) const
-  {
-    if (!(privileges == rhs.privileges))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_revoke_privileges_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_revoke_privileges_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22532,9 +19349,7 @@ class ThriftHiveMetastore_revoke_privileges_result {
 
   ThriftHiveMetastore_revoke_privileges_result(const ThriftHiveMetastore_revoke_privileges_result&);
   ThriftHiveMetastore_revoke_privileges_result& operator=(const ThriftHiveMetastore_revoke_privileges_result&);
-  ThriftHiveMetastore_revoke_privileges_result() noexcept
-                                               : success(0) {
-  }
+  ThriftHiveMetastore_revoke_privileges_result() noexcept;
 
   virtual ~ThriftHiveMetastore_revoke_privileges_result() noexcept;
   bool success;
@@ -22546,14 +19361,7 @@ class ThriftHiveMetastore_revoke_privileges_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_revoke_privileges_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_revoke_privileges_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_revoke_privileges_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22595,8 +19403,7 @@ class ThriftHiveMetastore_grant_revoke_privileges_args {
 
   ThriftHiveMetastore_grant_revoke_privileges_args(const ThriftHiveMetastore_grant_revoke_privileges_args&);
   ThriftHiveMetastore_grant_revoke_privileges_args& operator=(const ThriftHiveMetastore_grant_revoke_privileges_args&);
-  ThriftHiveMetastore_grant_revoke_privileges_args() noexcept {
-  }
+  ThriftHiveMetastore_grant_revoke_privileges_args() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_revoke_privileges_args() noexcept;
   GrantRevokePrivilegeRequest request;
@@ -22605,12 +19412,7 @@ class ThriftHiveMetastore_grant_revoke_privileges_args {
 
   void __set_request(const GrantRevokePrivilegeRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_revoke_privileges_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_revoke_privileges_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_revoke_privileges_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22645,8 +19447,7 @@ class ThriftHiveMetastore_grant_revoke_privileges_result {
 
   ThriftHiveMetastore_grant_revoke_privileges_result(const ThriftHiveMetastore_grant_revoke_privileges_result&);
   ThriftHiveMetastore_grant_revoke_privileges_result& operator=(const ThriftHiveMetastore_grant_revoke_privileges_result&);
-  ThriftHiveMetastore_grant_revoke_privileges_result() noexcept {
-  }
+  ThriftHiveMetastore_grant_revoke_privileges_result() noexcept;
 
   virtual ~ThriftHiveMetastore_grant_revoke_privileges_result() noexcept;
   GrantRevokePrivilegeResponse success;
@@ -22658,14 +19459,7 @@ class ThriftHiveMetastore_grant_revoke_privileges_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_grant_revoke_privileges_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_grant_revoke_privileges_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_grant_revoke_privileges_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22709,9 +19503,7 @@ class ThriftHiveMetastore_refresh_privileges_args {
 
   ThriftHiveMetastore_refresh_privileges_args(const ThriftHiveMetastore_refresh_privileges_args&);
   ThriftHiveMetastore_refresh_privileges_args& operator=(const ThriftHiveMetastore_refresh_privileges_args&);
-  ThriftHiveMetastore_refresh_privileges_args() noexcept
-                                              : authorizer() {
-  }
+  ThriftHiveMetastore_refresh_privileges_args() noexcept;
 
   virtual ~ThriftHiveMetastore_refresh_privileges_args() noexcept;
   HiveObjectRef objToRefresh;
@@ -22726,16 +19518,7 @@ class ThriftHiveMetastore_refresh_privileges_args {
 
   void __set_grantRequest(const GrantRevokePrivilegeRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_refresh_privileges_args & rhs) const
-  {
-    if (!(objToRefresh == rhs.objToRefresh))
-      return false;
-    if (!(authorizer == rhs.authorizer))
-      return false;
-    if (!(grantRequest == rhs.grantRequest))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_refresh_privileges_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_refresh_privileges_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22772,8 +19555,7 @@ class ThriftHiveMetastore_refresh_privileges_result {
 
   ThriftHiveMetastore_refresh_privileges_result(const ThriftHiveMetastore_refresh_privileges_result&);
   ThriftHiveMetastore_refresh_privileges_result& operator=(const ThriftHiveMetastore_refresh_privileges_result&);
-  ThriftHiveMetastore_refresh_privileges_result() noexcept {
-  }
+  ThriftHiveMetastore_refresh_privileges_result() noexcept;
 
   virtual ~ThriftHiveMetastore_refresh_privileges_result() noexcept;
   GrantRevokePrivilegeResponse success;
@@ -22785,14 +19567,7 @@ class ThriftHiveMetastore_refresh_privileges_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_refresh_privileges_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_refresh_privileges_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_refresh_privileges_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22835,9 +19610,7 @@ class ThriftHiveMetastore_set_ugi_args {
 
   ThriftHiveMetastore_set_ugi_args(const ThriftHiveMetastore_set_ugi_args&);
   ThriftHiveMetastore_set_ugi_args& operator=(const ThriftHiveMetastore_set_ugi_args&);
-  ThriftHiveMetastore_set_ugi_args() noexcept
-                                   : user_name() {
-  }
+  ThriftHiveMetastore_set_ugi_args() noexcept;
 
   virtual ~ThriftHiveMetastore_set_ugi_args() noexcept;
   std::string user_name;
@@ -22849,14 +19622,7 @@ class ThriftHiveMetastore_set_ugi_args {
 
   void __set_group_names(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_set_ugi_args & rhs) const
-  {
-    if (!(user_name == rhs.user_name))
-      return false;
-    if (!(group_names == rhs.group_names))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_ugi_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_ugi_args &rhs) const {
     return !(*this == rhs);
   }
@@ -22892,8 +19658,7 @@ class ThriftHiveMetastore_set_ugi_result {
 
   ThriftHiveMetastore_set_ugi_result(const ThriftHiveMetastore_set_ugi_result&);
   ThriftHiveMetastore_set_ugi_result& operator=(const ThriftHiveMetastore_set_ugi_result&);
-  ThriftHiveMetastore_set_ugi_result() noexcept {
-  }
+  ThriftHiveMetastore_set_ugi_result() noexcept;
 
   virtual ~ThriftHiveMetastore_set_ugi_result() noexcept;
   std::vector<std::string>  success;
@@ -22905,14 +19670,7 @@ class ThriftHiveMetastore_set_ugi_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_set_ugi_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_ugi_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_ugi_result &rhs) const {
     return !(*this == rhs);
   }
@@ -22955,10 +19713,7 @@ class ThriftHiveMetastore_get_delegation_token_args {
 
   ThriftHiveMetastore_get_delegation_token_args(const ThriftHiveMetastore_get_delegation_token_args&);
   ThriftHiveMetastore_get_delegation_token_args& operator=(const ThriftHiveMetastore_get_delegation_token_args&);
-  ThriftHiveMetastore_get_delegation_token_args() noexcept
-                                                : token_owner(),
-                                                  renewer_kerberos_principal_name() {
-  }
+  ThriftHiveMetastore_get_delegation_token_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_delegation_token_args() noexcept;
   std::string token_owner;
@@ -22970,14 +19725,7 @@ class ThriftHiveMetastore_get_delegation_token_args {
 
   void __set_renewer_kerberos_principal_name(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_delegation_token_args & rhs) const
-  {
-    if (!(token_owner == rhs.token_owner))
-      return false;
-    if (!(renewer_kerberos_principal_name == rhs.renewer_kerberos_principal_name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_delegation_token_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_delegation_token_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23013,9 +19761,7 @@ class ThriftHiveMetastore_get_delegation_token_result {
 
   ThriftHiveMetastore_get_delegation_token_result(const ThriftHiveMetastore_get_delegation_token_result&);
   ThriftHiveMetastore_get_delegation_token_result& operator=(const ThriftHiveMetastore_get_delegation_token_result&);
-  ThriftHiveMetastore_get_delegation_token_result() noexcept
-                                                  : success() {
-  }
+  ThriftHiveMetastore_get_delegation_token_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_delegation_token_result() noexcept;
   std::string success;
@@ -23027,14 +19773,7 @@ class ThriftHiveMetastore_get_delegation_token_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_delegation_token_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_delegation_token_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_delegation_token_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23076,9 +19815,7 @@ class ThriftHiveMetastore_renew_delegation_token_args {
 
   ThriftHiveMetastore_renew_delegation_token_args(const ThriftHiveMetastore_renew_delegation_token_args&);
   ThriftHiveMetastore_renew_delegation_token_args& operator=(const ThriftHiveMetastore_renew_delegation_token_args&);
-  ThriftHiveMetastore_renew_delegation_token_args() noexcept
-                                                  : token_str_form() {
-  }
+  ThriftHiveMetastore_renew_delegation_token_args() noexcept;
 
   virtual ~ThriftHiveMetastore_renew_delegation_token_args() noexcept;
   std::string token_str_form;
@@ -23087,12 +19824,7 @@ class ThriftHiveMetastore_renew_delegation_token_args {
 
   void __set_token_str_form(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_renew_delegation_token_args & rhs) const
-  {
-    if (!(token_str_form == rhs.token_str_form))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_renew_delegation_token_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_renew_delegation_token_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23127,9 +19859,7 @@ class ThriftHiveMetastore_renew_delegation_token_result {
 
   ThriftHiveMetastore_renew_delegation_token_result(const ThriftHiveMetastore_renew_delegation_token_result&);
   ThriftHiveMetastore_renew_delegation_token_result& operator=(const ThriftHiveMetastore_renew_delegation_token_result&);
-  ThriftHiveMetastore_renew_delegation_token_result() noexcept
-                                                    : success(0) {
-  }
+  ThriftHiveMetastore_renew_delegation_token_result() noexcept;
 
   virtual ~ThriftHiveMetastore_renew_delegation_token_result() noexcept;
   int64_t success;
@@ -23141,14 +19871,7 @@ class ThriftHiveMetastore_renew_delegation_token_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_renew_delegation_token_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_renew_delegation_token_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_renew_delegation_token_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23190,9 +19913,7 @@ class ThriftHiveMetastore_cancel_delegation_token_args {
 
   ThriftHiveMetastore_cancel_delegation_token_args(const ThriftHiveMetastore_cancel_delegation_token_args&);
   ThriftHiveMetastore_cancel_delegation_token_args& operator=(const ThriftHiveMetastore_cancel_delegation_token_args&);
-  ThriftHiveMetastore_cancel_delegation_token_args() noexcept
-                                                   : token_str_form() {
-  }
+  ThriftHiveMetastore_cancel_delegation_token_args() noexcept;
 
   virtual ~ThriftHiveMetastore_cancel_delegation_token_args() noexcept;
   std::string token_str_form;
@@ -23201,12 +19922,7 @@ class ThriftHiveMetastore_cancel_delegation_token_args {
 
   void __set_token_str_form(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_cancel_delegation_token_args & rhs) const
-  {
-    if (!(token_str_form == rhs.token_str_form))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_cancel_delegation_token_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_cancel_delegation_token_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23240,8 +19956,7 @@ class ThriftHiveMetastore_cancel_delegation_token_result {
 
   ThriftHiveMetastore_cancel_delegation_token_result(const ThriftHiveMetastore_cancel_delegation_token_result&);
   ThriftHiveMetastore_cancel_delegation_token_result& operator=(const ThriftHiveMetastore_cancel_delegation_token_result&);
-  ThriftHiveMetastore_cancel_delegation_token_result() noexcept {
-  }
+  ThriftHiveMetastore_cancel_delegation_token_result() noexcept;
 
   virtual ~ThriftHiveMetastore_cancel_delegation_token_result() noexcept;
   MetaException o1;
@@ -23250,12 +19965,7 @@ class ThriftHiveMetastore_cancel_delegation_token_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_cancel_delegation_token_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_cancel_delegation_token_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_cancel_delegation_token_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23296,10 +20006,7 @@ class ThriftHiveMetastore_add_token_args {
 
   ThriftHiveMetastore_add_token_args(const ThriftHiveMetastore_add_token_args&);
   ThriftHiveMetastore_add_token_args& operator=(const ThriftHiveMetastore_add_token_args&);
-  ThriftHiveMetastore_add_token_args() noexcept
-                                     : token_identifier(),
-                                       delegation_token() {
-  }
+  ThriftHiveMetastore_add_token_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_token_args() noexcept;
   std::string token_identifier;
@@ -23311,14 +20018,7 @@ class ThriftHiveMetastore_add_token_args {
 
   void __set_delegation_token(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_add_token_args & rhs) const
-  {
-    if (!(token_identifier == rhs.token_identifier))
-      return false;
-    if (!(delegation_token == rhs.delegation_token))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_token_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_token_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23353,9 +20053,7 @@ class ThriftHiveMetastore_add_token_result {
 
   ThriftHiveMetastore_add_token_result(const ThriftHiveMetastore_add_token_result&) noexcept;
   ThriftHiveMetastore_add_token_result& operator=(const ThriftHiveMetastore_add_token_result&) noexcept;
-  ThriftHiveMetastore_add_token_result() noexcept
-                                       : success(0) {
-  }
+  ThriftHiveMetastore_add_token_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_token_result() noexcept;
   bool success;
@@ -23364,12 +20062,7 @@ class ThriftHiveMetastore_add_token_result {
 
   void __set_success(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_add_token_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_token_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_token_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23409,9 +20102,7 @@ class ThriftHiveMetastore_remove_token_args {
 
   ThriftHiveMetastore_remove_token_args(const ThriftHiveMetastore_remove_token_args&);
   ThriftHiveMetastore_remove_token_args& operator=(const ThriftHiveMetastore_remove_token_args&);
-  ThriftHiveMetastore_remove_token_args() noexcept
-                                        : token_identifier() {
-  }
+  ThriftHiveMetastore_remove_token_args() noexcept;
 
   virtual ~ThriftHiveMetastore_remove_token_args() noexcept;
   std::string token_identifier;
@@ -23420,12 +20111,7 @@ class ThriftHiveMetastore_remove_token_args {
 
   void __set_token_identifier(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_remove_token_args & rhs) const
-  {
-    if (!(token_identifier == rhs.token_identifier))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_remove_token_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_remove_token_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23459,9 +20145,7 @@ class ThriftHiveMetastore_remove_token_result {
 
   ThriftHiveMetastore_remove_token_result(const ThriftHiveMetastore_remove_token_result&) noexcept;
   ThriftHiveMetastore_remove_token_result& operator=(const ThriftHiveMetastore_remove_token_result&) noexcept;
-  ThriftHiveMetastore_remove_token_result() noexcept
-                                          : success(0) {
-  }
+  ThriftHiveMetastore_remove_token_result() noexcept;
 
   virtual ~ThriftHiveMetastore_remove_token_result() noexcept;
   bool success;
@@ -23470,12 +20154,7 @@ class ThriftHiveMetastore_remove_token_result {
 
   void __set_success(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_remove_token_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_remove_token_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_remove_token_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23515,9 +20194,7 @@ class ThriftHiveMetastore_get_token_args {
 
   ThriftHiveMetastore_get_token_args(const ThriftHiveMetastore_get_token_args&);
   ThriftHiveMetastore_get_token_args& operator=(const ThriftHiveMetastore_get_token_args&);
-  ThriftHiveMetastore_get_token_args() noexcept
-                                     : token_identifier() {
-  }
+  ThriftHiveMetastore_get_token_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_token_args() noexcept;
   std::string token_identifier;
@@ -23526,12 +20203,7 @@ class ThriftHiveMetastore_get_token_args {
 
   void __set_token_identifier(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_token_args & rhs) const
-  {
-    if (!(token_identifier == rhs.token_identifier))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_token_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_token_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23565,9 +20237,7 @@ class ThriftHiveMetastore_get_token_result {
 
   ThriftHiveMetastore_get_token_result(const ThriftHiveMetastore_get_token_result&);
   ThriftHiveMetastore_get_token_result& operator=(const ThriftHiveMetastore_get_token_result&);
-  ThriftHiveMetastore_get_token_result() noexcept
-                                       : success() {
-  }
+  ThriftHiveMetastore_get_token_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_token_result() noexcept;
   std::string success;
@@ -23576,12 +20246,7 @@ class ThriftHiveMetastore_get_token_result {
 
   void __set_success(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_token_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_token_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_token_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23617,15 +20282,11 @@ class ThriftHiveMetastore_get_all_token_identifiers_args {
 
   ThriftHiveMetastore_get_all_token_identifiers_args(const ThriftHiveMetastore_get_all_token_identifiers_args&) noexcept;
   ThriftHiveMetastore_get_all_token_identifiers_args& operator=(const ThriftHiveMetastore_get_all_token_identifiers_args&) noexcept;
-  ThriftHiveMetastore_get_all_token_identifiers_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_token_identifiers_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_token_identifiers_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_all_token_identifiers_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_token_identifiers_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_all_token_identifiers_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23658,8 +20319,7 @@ class ThriftHiveMetastore_get_all_token_identifiers_result {
 
   ThriftHiveMetastore_get_all_token_identifiers_result(const ThriftHiveMetastore_get_all_token_identifiers_result&);
   ThriftHiveMetastore_get_all_token_identifiers_result& operator=(const ThriftHiveMetastore_get_all_token_identifiers_result&);
-  ThriftHiveMetastore_get_all_token_identifiers_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_token_identifiers_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_token_identifiers_result() noexcept;
   std::vector<std::string>  success;
@@ -23668,12 +20328,7 @@ class ThriftHiveMetastore_get_all_token_identifiers_result {
 
   void __set_success(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_token_identifiers_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_token_identifiers_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_token_identifiers_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23713,9 +20368,7 @@ class ThriftHiveMetastore_add_master_key_args {
 
   ThriftHiveMetastore_add_master_key_args(const ThriftHiveMetastore_add_master_key_args&);
   ThriftHiveMetastore_add_master_key_args& operator=(const ThriftHiveMetastore_add_master_key_args&);
-  ThriftHiveMetastore_add_master_key_args() noexcept
-                                          : key() {
-  }
+  ThriftHiveMetastore_add_master_key_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_master_key_args() noexcept;
   std::string key;
@@ -23724,12 +20377,7 @@ class ThriftHiveMetastore_add_master_key_args {
 
   void __set_key(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_add_master_key_args & rhs) const
-  {
-    if (!(key == rhs.key))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_master_key_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_master_key_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23764,9 +20412,7 @@ class ThriftHiveMetastore_add_master_key_result {
 
   ThriftHiveMetastore_add_master_key_result(const ThriftHiveMetastore_add_master_key_result&);
   ThriftHiveMetastore_add_master_key_result& operator=(const ThriftHiveMetastore_add_master_key_result&);
-  ThriftHiveMetastore_add_master_key_result() noexcept
-                                            : success(0) {
-  }
+  ThriftHiveMetastore_add_master_key_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_master_key_result() noexcept;
   int32_t success;
@@ -23778,14 +20424,7 @@ class ThriftHiveMetastore_add_master_key_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_master_key_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_master_key_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_master_key_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23828,10 +20467,7 @@ class ThriftHiveMetastore_update_master_key_args {
 
   ThriftHiveMetastore_update_master_key_args(const ThriftHiveMetastore_update_master_key_args&);
   ThriftHiveMetastore_update_master_key_args& operator=(const ThriftHiveMetastore_update_master_key_args&);
-  ThriftHiveMetastore_update_master_key_args() noexcept
-                                             : seq_number(0),
-                                               key() {
-  }
+  ThriftHiveMetastore_update_master_key_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_master_key_args() noexcept;
   int32_t seq_number;
@@ -23843,14 +20479,7 @@ class ThriftHiveMetastore_update_master_key_args {
 
   void __set_key(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_update_master_key_args & rhs) const
-  {
-    if (!(seq_number == rhs.seq_number))
-      return false;
-    if (!(key == rhs.key))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_master_key_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_master_key_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23886,8 +20515,7 @@ class ThriftHiveMetastore_update_master_key_result {
 
   ThriftHiveMetastore_update_master_key_result(const ThriftHiveMetastore_update_master_key_result&);
   ThriftHiveMetastore_update_master_key_result& operator=(const ThriftHiveMetastore_update_master_key_result&);
-  ThriftHiveMetastore_update_master_key_result() noexcept {
-  }
+  ThriftHiveMetastore_update_master_key_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_master_key_result() noexcept;
   NoSuchObjectException o1;
@@ -23899,14 +20527,7 @@ class ThriftHiveMetastore_update_master_key_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_master_key_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_master_key_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_master_key_result &rhs) const {
     return !(*this == rhs);
   }
@@ -23948,9 +20569,7 @@ class ThriftHiveMetastore_remove_master_key_args {
 
   ThriftHiveMetastore_remove_master_key_args(const ThriftHiveMetastore_remove_master_key_args&) noexcept;
   ThriftHiveMetastore_remove_master_key_args& operator=(const ThriftHiveMetastore_remove_master_key_args&) noexcept;
-  ThriftHiveMetastore_remove_master_key_args() noexcept
-                                             : key_seq(0) {
-  }
+  ThriftHiveMetastore_remove_master_key_args() noexcept;
 
   virtual ~ThriftHiveMetastore_remove_master_key_args() noexcept;
   int32_t key_seq;
@@ -23959,12 +20578,7 @@ class ThriftHiveMetastore_remove_master_key_args {
 
   void __set_key_seq(const int32_t val);
 
-  bool operator == (const ThriftHiveMetastore_remove_master_key_args & rhs) const
-  {
-    if (!(key_seq == rhs.key_seq))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_remove_master_key_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_remove_master_key_args &rhs) const {
     return !(*this == rhs);
   }
@@ -23998,9 +20612,7 @@ class ThriftHiveMetastore_remove_master_key_result {
 
   ThriftHiveMetastore_remove_master_key_result(const ThriftHiveMetastore_remove_master_key_result&) noexcept;
   ThriftHiveMetastore_remove_master_key_result& operator=(const ThriftHiveMetastore_remove_master_key_result&) noexcept;
-  ThriftHiveMetastore_remove_master_key_result() noexcept
-                                               : success(0) {
-  }
+  ThriftHiveMetastore_remove_master_key_result() noexcept;
 
   virtual ~ThriftHiveMetastore_remove_master_key_result() noexcept;
   bool success;
@@ -24009,12 +20621,7 @@ class ThriftHiveMetastore_remove_master_key_result {
 
   void __set_success(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_remove_master_key_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_remove_master_key_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_remove_master_key_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24050,15 +20657,11 @@ class ThriftHiveMetastore_get_master_keys_args {
 
   ThriftHiveMetastore_get_master_keys_args(const ThriftHiveMetastore_get_master_keys_args&) noexcept;
   ThriftHiveMetastore_get_master_keys_args& operator=(const ThriftHiveMetastore_get_master_keys_args&) noexcept;
-  ThriftHiveMetastore_get_master_keys_args() noexcept {
-  }
+  ThriftHiveMetastore_get_master_keys_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_master_keys_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_master_keys_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_master_keys_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_master_keys_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24091,8 +20694,7 @@ class ThriftHiveMetastore_get_master_keys_result {
 
   ThriftHiveMetastore_get_master_keys_result(const ThriftHiveMetastore_get_master_keys_result&);
   ThriftHiveMetastore_get_master_keys_result& operator=(const ThriftHiveMetastore_get_master_keys_result&);
-  ThriftHiveMetastore_get_master_keys_result() noexcept {
-  }
+  ThriftHiveMetastore_get_master_keys_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_master_keys_result() noexcept;
   std::vector<std::string>  success;
@@ -24101,12 +20703,7 @@ class ThriftHiveMetastore_get_master_keys_result {
 
   void __set_success(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_get_master_keys_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_master_keys_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_master_keys_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24142,15 +20739,11 @@ class ThriftHiveMetastore_get_open_txns_args {
 
   ThriftHiveMetastore_get_open_txns_args(const ThriftHiveMetastore_get_open_txns_args&) noexcept;
   ThriftHiveMetastore_get_open_txns_args& operator=(const ThriftHiveMetastore_get_open_txns_args&) noexcept;
-  ThriftHiveMetastore_get_open_txns_args() noexcept {
-  }
+  ThriftHiveMetastore_get_open_txns_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_open_txns_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_open_txns_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_open_txns_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_open_txns_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24183,8 +20776,7 @@ class ThriftHiveMetastore_get_open_txns_result {
 
   ThriftHiveMetastore_get_open_txns_result(const ThriftHiveMetastore_get_open_txns_result&);
   ThriftHiveMetastore_get_open_txns_result& operator=(const ThriftHiveMetastore_get_open_txns_result&);
-  ThriftHiveMetastore_get_open_txns_result() noexcept {
-  }
+  ThriftHiveMetastore_get_open_txns_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_open_txns_result() noexcept;
   GetOpenTxnsResponse success;
@@ -24193,12 +20785,7 @@ class ThriftHiveMetastore_get_open_txns_result {
 
   void __set_success(const GetOpenTxnsResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_open_txns_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_open_txns_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_open_txns_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24234,15 +20821,11 @@ class ThriftHiveMetastore_get_open_txns_info_args {
 
   ThriftHiveMetastore_get_open_txns_info_args(const ThriftHiveMetastore_get_open_txns_info_args&) noexcept;
   ThriftHiveMetastore_get_open_txns_info_args& operator=(const ThriftHiveMetastore_get_open_txns_info_args&) noexcept;
-  ThriftHiveMetastore_get_open_txns_info_args() noexcept {
-  }
+  ThriftHiveMetastore_get_open_txns_info_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_open_txns_info_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_open_txns_info_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_open_txns_info_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_open_txns_info_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24275,8 +20858,7 @@ class ThriftHiveMetastore_get_open_txns_info_result {
 
   ThriftHiveMetastore_get_open_txns_info_result(const ThriftHiveMetastore_get_open_txns_info_result&);
   ThriftHiveMetastore_get_open_txns_info_result& operator=(const ThriftHiveMetastore_get_open_txns_info_result&);
-  ThriftHiveMetastore_get_open_txns_info_result() noexcept {
-  }
+  ThriftHiveMetastore_get_open_txns_info_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_open_txns_info_result() noexcept;
   GetOpenTxnsInfoResponse success;
@@ -24285,12 +20867,7 @@ class ThriftHiveMetastore_get_open_txns_info_result {
 
   void __set_success(const GetOpenTxnsInfoResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_open_txns_info_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_open_txns_info_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_open_txns_info_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24330,8 +20907,7 @@ class ThriftHiveMetastore_open_txns_args {
 
   ThriftHiveMetastore_open_txns_args(const ThriftHiveMetastore_open_txns_args&);
   ThriftHiveMetastore_open_txns_args& operator=(const ThriftHiveMetastore_open_txns_args&);
-  ThriftHiveMetastore_open_txns_args() noexcept {
-  }
+  ThriftHiveMetastore_open_txns_args() noexcept;
 
   virtual ~ThriftHiveMetastore_open_txns_args() noexcept;
   OpenTxnRequest rqst;
@@ -24340,12 +20916,7 @@ class ThriftHiveMetastore_open_txns_args {
 
   void __set_rqst(const OpenTxnRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_open_txns_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_open_txns_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_open_txns_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24379,8 +20950,7 @@ class ThriftHiveMetastore_open_txns_result {
 
   ThriftHiveMetastore_open_txns_result(const ThriftHiveMetastore_open_txns_result&);
   ThriftHiveMetastore_open_txns_result& operator=(const ThriftHiveMetastore_open_txns_result&);
-  ThriftHiveMetastore_open_txns_result() noexcept {
-  }
+  ThriftHiveMetastore_open_txns_result() noexcept;
 
   virtual ~ThriftHiveMetastore_open_txns_result() noexcept;
   OpenTxnsResponse success;
@@ -24389,12 +20959,7 @@ class ThriftHiveMetastore_open_txns_result {
 
   void __set_success(const OpenTxnsResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_open_txns_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_open_txns_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_open_txns_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24434,8 +20999,7 @@ class ThriftHiveMetastore_abort_txn_args {
 
   ThriftHiveMetastore_abort_txn_args(const ThriftHiveMetastore_abort_txn_args&);
   ThriftHiveMetastore_abort_txn_args& operator=(const ThriftHiveMetastore_abort_txn_args&);
-  ThriftHiveMetastore_abort_txn_args() noexcept {
-  }
+  ThriftHiveMetastore_abort_txn_args() noexcept;
 
   virtual ~ThriftHiveMetastore_abort_txn_args() noexcept;
   AbortTxnRequest rqst;
@@ -24444,12 +21008,7 @@ class ThriftHiveMetastore_abort_txn_args {
 
   void __set_rqst(const AbortTxnRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_abort_txn_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_abort_txn_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_abort_txn_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24483,8 +21042,7 @@ class ThriftHiveMetastore_abort_txn_result {
 
   ThriftHiveMetastore_abort_txn_result(const ThriftHiveMetastore_abort_txn_result&);
   ThriftHiveMetastore_abort_txn_result& operator=(const ThriftHiveMetastore_abort_txn_result&);
-  ThriftHiveMetastore_abort_txn_result() noexcept {
-  }
+  ThriftHiveMetastore_abort_txn_result() noexcept;
 
   virtual ~ThriftHiveMetastore_abort_txn_result() noexcept;
   NoSuchTxnException o1;
@@ -24493,12 +21051,7 @@ class ThriftHiveMetastore_abort_txn_result {
 
   void __set_o1(const NoSuchTxnException& val);
 
-  bool operator == (const ThriftHiveMetastore_abort_txn_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_abort_txn_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_abort_txn_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24538,8 +21091,7 @@ class ThriftHiveMetastore_abort_txns_args {
 
   ThriftHiveMetastore_abort_txns_args(const ThriftHiveMetastore_abort_txns_args&);
   ThriftHiveMetastore_abort_txns_args& operator=(const ThriftHiveMetastore_abort_txns_args&);
-  ThriftHiveMetastore_abort_txns_args() noexcept {
-  }
+  ThriftHiveMetastore_abort_txns_args() noexcept;
 
   virtual ~ThriftHiveMetastore_abort_txns_args() noexcept;
   AbortTxnsRequest rqst;
@@ -24548,12 +21100,7 @@ class ThriftHiveMetastore_abort_txns_args {
 
   void __set_rqst(const AbortTxnsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_abort_txns_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_abort_txns_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_abort_txns_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24587,8 +21134,7 @@ class ThriftHiveMetastore_abort_txns_result {
 
   ThriftHiveMetastore_abort_txns_result(const ThriftHiveMetastore_abort_txns_result&);
   ThriftHiveMetastore_abort_txns_result& operator=(const ThriftHiveMetastore_abort_txns_result&);
-  ThriftHiveMetastore_abort_txns_result() noexcept {
-  }
+  ThriftHiveMetastore_abort_txns_result() noexcept;
 
   virtual ~ThriftHiveMetastore_abort_txns_result() noexcept;
   NoSuchTxnException o1;
@@ -24597,12 +21143,7 @@ class ThriftHiveMetastore_abort_txns_result {
 
   void __set_o1(const NoSuchTxnException& val);
 
-  bool operator == (const ThriftHiveMetastore_abort_txns_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_abort_txns_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_abort_txns_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24642,8 +21183,7 @@ class ThriftHiveMetastore_commit_txn_args {
 
   ThriftHiveMetastore_commit_txn_args(const ThriftHiveMetastore_commit_txn_args&);
   ThriftHiveMetastore_commit_txn_args& operator=(const ThriftHiveMetastore_commit_txn_args&);
-  ThriftHiveMetastore_commit_txn_args() noexcept {
-  }
+  ThriftHiveMetastore_commit_txn_args() noexcept;
 
   virtual ~ThriftHiveMetastore_commit_txn_args() noexcept;
   CommitTxnRequest rqst;
@@ -24652,12 +21192,7 @@ class ThriftHiveMetastore_commit_txn_args {
 
   void __set_rqst(const CommitTxnRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_commit_txn_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_commit_txn_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_commit_txn_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24692,8 +21227,7 @@ class ThriftHiveMetastore_commit_txn_result {
 
   ThriftHiveMetastore_commit_txn_result(const ThriftHiveMetastore_commit_txn_result&);
   ThriftHiveMetastore_commit_txn_result& operator=(const ThriftHiveMetastore_commit_txn_result&);
-  ThriftHiveMetastore_commit_txn_result() noexcept {
-  }
+  ThriftHiveMetastore_commit_txn_result() noexcept;
 
   virtual ~ThriftHiveMetastore_commit_txn_result() noexcept;
   NoSuchTxnException o1;
@@ -24705,14 +21239,7 @@ class ThriftHiveMetastore_commit_txn_result {
 
   void __set_o2(const TxnAbortedException& val);
 
-  bool operator == (const ThriftHiveMetastore_commit_txn_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_commit_txn_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_commit_txn_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24754,9 +21281,7 @@ class ThriftHiveMetastore_get_latest_txnid_in_conflict_args {
 
   ThriftHiveMetastore_get_latest_txnid_in_conflict_args(const ThriftHiveMetastore_get_latest_txnid_in_conflict_args&) noexcept;
   ThriftHiveMetastore_get_latest_txnid_in_conflict_args& operator=(const ThriftHiveMetastore_get_latest_txnid_in_conflict_args&) noexcept;
-  ThriftHiveMetastore_get_latest_txnid_in_conflict_args() noexcept
-                                                        : txnId(0) {
-  }
+  ThriftHiveMetastore_get_latest_txnid_in_conflict_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_latest_txnid_in_conflict_args() noexcept;
   int64_t txnId;
@@ -24765,12 +21290,7 @@ class ThriftHiveMetastore_get_latest_txnid_in_conflict_args {
 
   void __set_txnId(const int64_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_latest_txnid_in_conflict_args & rhs) const
-  {
-    if (!(txnId == rhs.txnId))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_latest_txnid_in_conflict_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_latest_txnid_in_conflict_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24805,9 +21325,7 @@ class ThriftHiveMetastore_get_latest_txnid_in_conflict_result {
 
   ThriftHiveMetastore_get_latest_txnid_in_conflict_result(const ThriftHiveMetastore_get_latest_txnid_in_conflict_result&);
   ThriftHiveMetastore_get_latest_txnid_in_conflict_result& operator=(const ThriftHiveMetastore_get_latest_txnid_in_conflict_result&);
-  ThriftHiveMetastore_get_latest_txnid_in_conflict_result() noexcept
-                                                          : success(0) {
-  }
+  ThriftHiveMetastore_get_latest_txnid_in_conflict_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_latest_txnid_in_conflict_result() noexcept;
   int64_t success;
@@ -24819,14 +21337,7 @@ class ThriftHiveMetastore_get_latest_txnid_in_conflict_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_latest_txnid_in_conflict_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_latest_txnid_in_conflict_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_latest_txnid_in_conflict_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24868,8 +21379,7 @@ class ThriftHiveMetastore_repl_tbl_writeid_state_args {
 
   ThriftHiveMetastore_repl_tbl_writeid_state_args(const ThriftHiveMetastore_repl_tbl_writeid_state_args&);
   ThriftHiveMetastore_repl_tbl_writeid_state_args& operator=(const ThriftHiveMetastore_repl_tbl_writeid_state_args&);
-  ThriftHiveMetastore_repl_tbl_writeid_state_args() noexcept {
-  }
+  ThriftHiveMetastore_repl_tbl_writeid_state_args() noexcept;
 
   virtual ~ThriftHiveMetastore_repl_tbl_writeid_state_args() noexcept;
   ReplTblWriteIdStateRequest rqst;
@@ -24878,12 +21388,7 @@ class ThriftHiveMetastore_repl_tbl_writeid_state_args {
 
   void __set_rqst(const ReplTblWriteIdStateRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_repl_tbl_writeid_state_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_repl_tbl_writeid_state_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_repl_tbl_writeid_state_args &rhs) const {
     return !(*this == rhs);
   }
@@ -24913,15 +21418,11 @@ class ThriftHiveMetastore_repl_tbl_writeid_state_result {
 
   ThriftHiveMetastore_repl_tbl_writeid_state_result(const ThriftHiveMetastore_repl_tbl_writeid_state_result&) noexcept;
   ThriftHiveMetastore_repl_tbl_writeid_state_result& operator=(const ThriftHiveMetastore_repl_tbl_writeid_state_result&) noexcept;
-  ThriftHiveMetastore_repl_tbl_writeid_state_result() noexcept {
-  }
+  ThriftHiveMetastore_repl_tbl_writeid_state_result() noexcept;
 
   virtual ~ThriftHiveMetastore_repl_tbl_writeid_state_result() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_repl_tbl_writeid_state_result & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_repl_tbl_writeid_state_result & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_repl_tbl_writeid_state_result &rhs) const {
     return !(*this == rhs);
   }
@@ -24954,8 +21455,7 @@ class ThriftHiveMetastore_get_valid_write_ids_args {
 
   ThriftHiveMetastore_get_valid_write_ids_args(const ThriftHiveMetastore_get_valid_write_ids_args&);
   ThriftHiveMetastore_get_valid_write_ids_args& operator=(const ThriftHiveMetastore_get_valid_write_ids_args&);
-  ThriftHiveMetastore_get_valid_write_ids_args() noexcept {
-  }
+  ThriftHiveMetastore_get_valid_write_ids_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_valid_write_ids_args() noexcept;
   GetValidWriteIdsRequest rqst;
@@ -24964,12 +21464,7 @@ class ThriftHiveMetastore_get_valid_write_ids_args {
 
   void __set_rqst(const GetValidWriteIdsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_valid_write_ids_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_valid_write_ids_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_valid_write_ids_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25005,8 +21500,7 @@ class ThriftHiveMetastore_get_valid_write_ids_result {
 
   ThriftHiveMetastore_get_valid_write_ids_result(const ThriftHiveMetastore_get_valid_write_ids_result&);
   ThriftHiveMetastore_get_valid_write_ids_result& operator=(const ThriftHiveMetastore_get_valid_write_ids_result&);
-  ThriftHiveMetastore_get_valid_write_ids_result() noexcept {
-  }
+  ThriftHiveMetastore_get_valid_write_ids_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_valid_write_ids_result() noexcept;
   GetValidWriteIdsResponse success;
@@ -25021,16 +21515,7 @@ class ThriftHiveMetastore_get_valid_write_ids_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_valid_write_ids_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_valid_write_ids_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_valid_write_ids_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25075,9 +21560,7 @@ class ThriftHiveMetastore_add_write_ids_to_min_history_args {
 
   ThriftHiveMetastore_add_write_ids_to_min_history_args(const ThriftHiveMetastore_add_write_ids_to_min_history_args&);
   ThriftHiveMetastore_add_write_ids_to_min_history_args& operator=(const ThriftHiveMetastore_add_write_ids_to_min_history_args&);
-  ThriftHiveMetastore_add_write_ids_to_min_history_args() noexcept
-                                                        : txnId(0) {
-  }
+  ThriftHiveMetastore_add_write_ids_to_min_history_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_write_ids_to_min_history_args() noexcept;
   int64_t txnId;
@@ -25089,14 +21572,7 @@ class ThriftHiveMetastore_add_write_ids_to_min_history_args {
 
   void __set_writeIds(const std::map<std::string, int64_t> & val);
 
-  bool operator == (const ThriftHiveMetastore_add_write_ids_to_min_history_args & rhs) const
-  {
-    if (!(txnId == rhs.txnId))
-      return false;
-    if (!(writeIds == rhs.writeIds))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_write_ids_to_min_history_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_write_ids_to_min_history_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25131,8 +21607,7 @@ class ThriftHiveMetastore_add_write_ids_to_min_history_result {
 
   ThriftHiveMetastore_add_write_ids_to_min_history_result(const ThriftHiveMetastore_add_write_ids_to_min_history_result&);
   ThriftHiveMetastore_add_write_ids_to_min_history_result& operator=(const ThriftHiveMetastore_add_write_ids_to_min_history_result&);
-  ThriftHiveMetastore_add_write_ids_to_min_history_result() noexcept {
-  }
+  ThriftHiveMetastore_add_write_ids_to_min_history_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_write_ids_to_min_history_result() noexcept;
   MetaException o2;
@@ -25141,12 +21616,7 @@ class ThriftHiveMetastore_add_write_ids_to_min_history_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_write_ids_to_min_history_result & rhs) const
-  {
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_write_ids_to_min_history_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_write_ids_to_min_history_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25186,8 +21656,7 @@ class ThriftHiveMetastore_allocate_table_write_ids_args {
 
   ThriftHiveMetastore_allocate_table_write_ids_args(const ThriftHiveMetastore_allocate_table_write_ids_args&);
   ThriftHiveMetastore_allocate_table_write_ids_args& operator=(const ThriftHiveMetastore_allocate_table_write_ids_args&);
-  ThriftHiveMetastore_allocate_table_write_ids_args() noexcept {
-  }
+  ThriftHiveMetastore_allocate_table_write_ids_args() noexcept;
 
   virtual ~ThriftHiveMetastore_allocate_table_write_ids_args() noexcept;
   AllocateTableWriteIdsRequest rqst;
@@ -25196,12 +21665,7 @@ class ThriftHiveMetastore_allocate_table_write_ids_args {
 
   void __set_rqst(const AllocateTableWriteIdsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_allocate_table_write_ids_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_allocate_table_write_ids_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_allocate_table_write_ids_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25238,8 +21702,7 @@ class ThriftHiveMetastore_allocate_table_write_ids_result {
 
   ThriftHiveMetastore_allocate_table_write_ids_result(const ThriftHiveMetastore_allocate_table_write_ids_result&);
   ThriftHiveMetastore_allocate_table_write_ids_result& operator=(const ThriftHiveMetastore_allocate_table_write_ids_result&);
-  ThriftHiveMetastore_allocate_table_write_ids_result() noexcept {
-  }
+  ThriftHiveMetastore_allocate_table_write_ids_result() noexcept;
 
   virtual ~ThriftHiveMetastore_allocate_table_write_ids_result() noexcept;
   AllocateTableWriteIdsResponse success;
@@ -25257,18 +21720,7 @@ class ThriftHiveMetastore_allocate_table_write_ids_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_allocate_table_write_ids_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_allocate_table_write_ids_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_allocate_table_write_ids_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25314,8 +21766,7 @@ class ThriftHiveMetastore_get_max_allocated_table_write_id_args {
 
   ThriftHiveMetastore_get_max_allocated_table_write_id_args(const ThriftHiveMetastore_get_max_allocated_table_write_id_args&);
   ThriftHiveMetastore_get_max_allocated_table_write_id_args& operator=(const ThriftHiveMetastore_get_max_allocated_table_write_id_args&);
-  ThriftHiveMetastore_get_max_allocated_table_write_id_args() noexcept {
-  }
+  ThriftHiveMetastore_get_max_allocated_table_write_id_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_max_allocated_table_write_id_args() noexcept;
   MaxAllocatedTableWriteIdRequest rqst;
@@ -25324,12 +21775,7 @@ class ThriftHiveMetastore_get_max_allocated_table_write_id_args {
 
   void __set_rqst(const MaxAllocatedTableWriteIdRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_max_allocated_table_write_id_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_max_allocated_table_write_id_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_max_allocated_table_write_id_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25364,8 +21810,7 @@ class ThriftHiveMetastore_get_max_allocated_table_write_id_result {
 
   ThriftHiveMetastore_get_max_allocated_table_write_id_result(const ThriftHiveMetastore_get_max_allocated_table_write_id_result&);
   ThriftHiveMetastore_get_max_allocated_table_write_id_result& operator=(const ThriftHiveMetastore_get_max_allocated_table_write_id_result&);
-  ThriftHiveMetastore_get_max_allocated_table_write_id_result() noexcept {
-  }
+  ThriftHiveMetastore_get_max_allocated_table_write_id_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_max_allocated_table_write_id_result() noexcept;
   MaxAllocatedTableWriteIdResponse success;
@@ -25377,14 +21822,7 @@ class ThriftHiveMetastore_get_max_allocated_table_write_id_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_max_allocated_table_write_id_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_max_allocated_table_write_id_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_max_allocated_table_write_id_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25426,8 +21864,7 @@ class ThriftHiveMetastore_seed_write_id_args {
 
   ThriftHiveMetastore_seed_write_id_args(const ThriftHiveMetastore_seed_write_id_args&);
   ThriftHiveMetastore_seed_write_id_args& operator=(const ThriftHiveMetastore_seed_write_id_args&);
-  ThriftHiveMetastore_seed_write_id_args() noexcept {
-  }
+  ThriftHiveMetastore_seed_write_id_args() noexcept;
 
   virtual ~ThriftHiveMetastore_seed_write_id_args() noexcept;
   SeedTableWriteIdsRequest rqst;
@@ -25436,12 +21873,7 @@ class ThriftHiveMetastore_seed_write_id_args {
 
   void __set_rqst(const SeedTableWriteIdsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_seed_write_id_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_seed_write_id_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_seed_write_id_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25475,8 +21907,7 @@ class ThriftHiveMetastore_seed_write_id_result {
 
   ThriftHiveMetastore_seed_write_id_result(const ThriftHiveMetastore_seed_write_id_result&);
   ThriftHiveMetastore_seed_write_id_result& operator=(const ThriftHiveMetastore_seed_write_id_result&);
-  ThriftHiveMetastore_seed_write_id_result() noexcept {
-  }
+  ThriftHiveMetastore_seed_write_id_result() noexcept;
 
   virtual ~ThriftHiveMetastore_seed_write_id_result() noexcept;
   MetaException o1;
@@ -25485,12 +21916,7 @@ class ThriftHiveMetastore_seed_write_id_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_seed_write_id_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_seed_write_id_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_seed_write_id_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25530,8 +21956,7 @@ class ThriftHiveMetastore_seed_txn_id_args {
 
   ThriftHiveMetastore_seed_txn_id_args(const ThriftHiveMetastore_seed_txn_id_args&) noexcept;
   ThriftHiveMetastore_seed_txn_id_args& operator=(const ThriftHiveMetastore_seed_txn_id_args&) noexcept;
-  ThriftHiveMetastore_seed_txn_id_args() noexcept {
-  }
+  ThriftHiveMetastore_seed_txn_id_args() noexcept;
 
   virtual ~ThriftHiveMetastore_seed_txn_id_args() noexcept;
   SeedTxnIdRequest rqst;
@@ -25540,12 +21965,7 @@ class ThriftHiveMetastore_seed_txn_id_args {
 
   void __set_rqst(const SeedTxnIdRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_seed_txn_id_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_seed_txn_id_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_seed_txn_id_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25579,8 +21999,7 @@ class ThriftHiveMetastore_seed_txn_id_result {
 
   ThriftHiveMetastore_seed_txn_id_result(const ThriftHiveMetastore_seed_txn_id_result&);
   ThriftHiveMetastore_seed_txn_id_result& operator=(const ThriftHiveMetastore_seed_txn_id_result&);
-  ThriftHiveMetastore_seed_txn_id_result() noexcept {
-  }
+  ThriftHiveMetastore_seed_txn_id_result() noexcept;
 
   virtual ~ThriftHiveMetastore_seed_txn_id_result() noexcept;
   MetaException o1;
@@ -25589,12 +22008,7 @@ class ThriftHiveMetastore_seed_txn_id_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_seed_txn_id_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_seed_txn_id_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_seed_txn_id_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25634,8 +22048,7 @@ class ThriftHiveMetastore_lock_args {
 
   ThriftHiveMetastore_lock_args(const ThriftHiveMetastore_lock_args&);
   ThriftHiveMetastore_lock_args& operator=(const ThriftHiveMetastore_lock_args&);
-  ThriftHiveMetastore_lock_args() noexcept {
-  }
+  ThriftHiveMetastore_lock_args() noexcept;
 
   virtual ~ThriftHiveMetastore_lock_args() noexcept;
   LockRequest rqst;
@@ -25644,12 +22057,7 @@ class ThriftHiveMetastore_lock_args {
 
   void __set_rqst(const LockRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_lock_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_lock_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_lock_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25685,8 +22093,7 @@ class ThriftHiveMetastore_lock_result {
 
   ThriftHiveMetastore_lock_result(const ThriftHiveMetastore_lock_result&);
   ThriftHiveMetastore_lock_result& operator=(const ThriftHiveMetastore_lock_result&);
-  ThriftHiveMetastore_lock_result() noexcept {
-  }
+  ThriftHiveMetastore_lock_result() noexcept;
 
   virtual ~ThriftHiveMetastore_lock_result() noexcept;
   LockResponse success;
@@ -25701,16 +22108,7 @@ class ThriftHiveMetastore_lock_result {
 
   void __set_o2(const TxnAbortedException& val);
 
-  bool operator == (const ThriftHiveMetastore_lock_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_lock_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_lock_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25754,8 +22152,7 @@ class ThriftHiveMetastore_check_lock_args {
 
   ThriftHiveMetastore_check_lock_args(const ThriftHiveMetastore_check_lock_args&) noexcept;
   ThriftHiveMetastore_check_lock_args& operator=(const ThriftHiveMetastore_check_lock_args&) noexcept;
-  ThriftHiveMetastore_check_lock_args() noexcept {
-  }
+  ThriftHiveMetastore_check_lock_args() noexcept;
 
   virtual ~ThriftHiveMetastore_check_lock_args() noexcept;
   CheckLockRequest rqst;
@@ -25764,12 +22161,7 @@ class ThriftHiveMetastore_check_lock_args {
 
   void __set_rqst(const CheckLockRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_check_lock_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_check_lock_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_check_lock_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25806,8 +22198,7 @@ class ThriftHiveMetastore_check_lock_result {
 
   ThriftHiveMetastore_check_lock_result(const ThriftHiveMetastore_check_lock_result&);
   ThriftHiveMetastore_check_lock_result& operator=(const ThriftHiveMetastore_check_lock_result&);
-  ThriftHiveMetastore_check_lock_result() noexcept {
-  }
+  ThriftHiveMetastore_check_lock_result() noexcept;
 
   virtual ~ThriftHiveMetastore_check_lock_result() noexcept;
   LockResponse success;
@@ -25825,18 +22216,7 @@ class ThriftHiveMetastore_check_lock_result {
 
   void __set_o3(const NoSuchLockException& val);
 
-  bool operator == (const ThriftHiveMetastore_check_lock_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_check_lock_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_check_lock_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25882,8 +22262,7 @@ class ThriftHiveMetastore_unlock_args {
 
   ThriftHiveMetastore_unlock_args(const ThriftHiveMetastore_unlock_args&) noexcept;
   ThriftHiveMetastore_unlock_args& operator=(const ThriftHiveMetastore_unlock_args&) noexcept;
-  ThriftHiveMetastore_unlock_args() noexcept {
-  }
+  ThriftHiveMetastore_unlock_args() noexcept;
 
   virtual ~ThriftHiveMetastore_unlock_args() noexcept;
   UnlockRequest rqst;
@@ -25892,12 +22271,7 @@ class ThriftHiveMetastore_unlock_args {
 
   void __set_rqst(const UnlockRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_unlock_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_unlock_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_unlock_args &rhs) const {
     return !(*this == rhs);
   }
@@ -25932,8 +22306,7 @@ class ThriftHiveMetastore_unlock_result {
 
   ThriftHiveMetastore_unlock_result(const ThriftHiveMetastore_unlock_result&);
   ThriftHiveMetastore_unlock_result& operator=(const ThriftHiveMetastore_unlock_result&);
-  ThriftHiveMetastore_unlock_result() noexcept {
-  }
+  ThriftHiveMetastore_unlock_result() noexcept;
 
   virtual ~ThriftHiveMetastore_unlock_result() noexcept;
   NoSuchLockException o1;
@@ -25945,14 +22318,7 @@ class ThriftHiveMetastore_unlock_result {
 
   void __set_o2(const TxnOpenException& val);
 
-  bool operator == (const ThriftHiveMetastore_unlock_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_unlock_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_unlock_result &rhs) const {
     return !(*this == rhs);
   }
@@ -25994,8 +22360,7 @@ class ThriftHiveMetastore_show_locks_args {
 
   ThriftHiveMetastore_show_locks_args(const ThriftHiveMetastore_show_locks_args&);
   ThriftHiveMetastore_show_locks_args& operator=(const ThriftHiveMetastore_show_locks_args&);
-  ThriftHiveMetastore_show_locks_args() noexcept {
-  }
+  ThriftHiveMetastore_show_locks_args() noexcept;
 
   virtual ~ThriftHiveMetastore_show_locks_args() noexcept;
   ShowLocksRequest rqst;
@@ -26004,12 +22369,7 @@ class ThriftHiveMetastore_show_locks_args {
 
   void __set_rqst(const ShowLocksRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_show_locks_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_show_locks_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_show_locks_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26043,8 +22403,7 @@ class ThriftHiveMetastore_show_locks_result {
 
   ThriftHiveMetastore_show_locks_result(const ThriftHiveMetastore_show_locks_result&);
   ThriftHiveMetastore_show_locks_result& operator=(const ThriftHiveMetastore_show_locks_result&);
-  ThriftHiveMetastore_show_locks_result() noexcept {
-  }
+  ThriftHiveMetastore_show_locks_result() noexcept;
 
   virtual ~ThriftHiveMetastore_show_locks_result() noexcept;
   ShowLocksResponse success;
@@ -26053,12 +22412,7 @@ class ThriftHiveMetastore_show_locks_result {
 
   void __set_success(const ShowLocksResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_show_locks_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_show_locks_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_show_locks_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26098,8 +22452,7 @@ class ThriftHiveMetastore_heartbeat_args {
 
   ThriftHiveMetastore_heartbeat_args(const ThriftHiveMetastore_heartbeat_args&) noexcept;
   ThriftHiveMetastore_heartbeat_args& operator=(const ThriftHiveMetastore_heartbeat_args&) noexcept;
-  ThriftHiveMetastore_heartbeat_args() noexcept {
-  }
+  ThriftHiveMetastore_heartbeat_args() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_args() noexcept;
   HeartbeatRequest ids;
@@ -26108,12 +22461,7 @@ class ThriftHiveMetastore_heartbeat_args {
 
   void __set_ids(const HeartbeatRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_args & rhs) const
-  {
-    if (!(ids == rhs.ids))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26149,8 +22497,7 @@ class ThriftHiveMetastore_heartbeat_result {
 
   ThriftHiveMetastore_heartbeat_result(const ThriftHiveMetastore_heartbeat_result&);
   ThriftHiveMetastore_heartbeat_result& operator=(const ThriftHiveMetastore_heartbeat_result&);
-  ThriftHiveMetastore_heartbeat_result() noexcept {
-  }
+  ThriftHiveMetastore_heartbeat_result() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_result() noexcept;
   NoSuchLockException o1;
@@ -26165,16 +22512,7 @@ class ThriftHiveMetastore_heartbeat_result {
 
   void __set_o3(const TxnAbortedException& val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26218,8 +22556,7 @@ class ThriftHiveMetastore_heartbeat_txn_range_args {
 
   ThriftHiveMetastore_heartbeat_txn_range_args(const ThriftHiveMetastore_heartbeat_txn_range_args&) noexcept;
   ThriftHiveMetastore_heartbeat_txn_range_args& operator=(const ThriftHiveMetastore_heartbeat_txn_range_args&) noexcept;
-  ThriftHiveMetastore_heartbeat_txn_range_args() noexcept {
-  }
+  ThriftHiveMetastore_heartbeat_txn_range_args() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_txn_range_args() noexcept;
   HeartbeatTxnRangeRequest txns;
@@ -26228,12 +22565,7 @@ class ThriftHiveMetastore_heartbeat_txn_range_args {
 
   void __set_txns(const HeartbeatTxnRangeRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_txn_range_args & rhs) const
-  {
-    if (!(txns == rhs.txns))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_txn_range_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_txn_range_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26267,8 +22599,7 @@ class ThriftHiveMetastore_heartbeat_txn_range_result {
 
   ThriftHiveMetastore_heartbeat_txn_range_result(const ThriftHiveMetastore_heartbeat_txn_range_result&);
   ThriftHiveMetastore_heartbeat_txn_range_result& operator=(const ThriftHiveMetastore_heartbeat_txn_range_result&);
-  ThriftHiveMetastore_heartbeat_txn_range_result() noexcept {
-  }
+  ThriftHiveMetastore_heartbeat_txn_range_result() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_txn_range_result() noexcept;
   HeartbeatTxnRangeResponse success;
@@ -26277,12 +22608,7 @@ class ThriftHiveMetastore_heartbeat_txn_range_result {
 
   void __set_success(const HeartbeatTxnRangeResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_txn_range_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_txn_range_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_txn_range_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26322,8 +22648,7 @@ class ThriftHiveMetastore_compact_args {
 
   ThriftHiveMetastore_compact_args(const ThriftHiveMetastore_compact_args&);
   ThriftHiveMetastore_compact_args& operator=(const ThriftHiveMetastore_compact_args&);
-  ThriftHiveMetastore_compact_args() noexcept {
-  }
+  ThriftHiveMetastore_compact_args() noexcept;
 
   virtual ~ThriftHiveMetastore_compact_args() noexcept;
   CompactionRequest rqst;
@@ -26332,12 +22657,7 @@ class ThriftHiveMetastore_compact_args {
 
   void __set_rqst(const CompactionRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_compact_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_compact_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_compact_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26367,15 +22687,11 @@ class ThriftHiveMetastore_compact_result {
 
   ThriftHiveMetastore_compact_result(const ThriftHiveMetastore_compact_result&) noexcept;
   ThriftHiveMetastore_compact_result& operator=(const ThriftHiveMetastore_compact_result&) noexcept;
-  ThriftHiveMetastore_compact_result() noexcept {
-  }
+  ThriftHiveMetastore_compact_result() noexcept;
 
   virtual ~ThriftHiveMetastore_compact_result() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_compact_result & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_compact_result & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_compact_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26408,8 +22724,7 @@ class ThriftHiveMetastore_compact2_args {
 
   ThriftHiveMetastore_compact2_args(const ThriftHiveMetastore_compact2_args&);
   ThriftHiveMetastore_compact2_args& operator=(const ThriftHiveMetastore_compact2_args&);
-  ThriftHiveMetastore_compact2_args() noexcept {
-  }
+  ThriftHiveMetastore_compact2_args() noexcept;
 
   virtual ~ThriftHiveMetastore_compact2_args() noexcept;
   CompactionRequest rqst;
@@ -26418,12 +22733,7 @@ class ThriftHiveMetastore_compact2_args {
 
   void __set_rqst(const CompactionRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_compact2_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_compact2_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_compact2_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26457,8 +22767,7 @@ class ThriftHiveMetastore_compact2_result {
 
   ThriftHiveMetastore_compact2_result(const ThriftHiveMetastore_compact2_result&);
   ThriftHiveMetastore_compact2_result& operator=(const ThriftHiveMetastore_compact2_result&);
-  ThriftHiveMetastore_compact2_result() noexcept {
-  }
+  ThriftHiveMetastore_compact2_result() noexcept;
 
   virtual ~ThriftHiveMetastore_compact2_result() noexcept;
   CompactionResponse success;
@@ -26467,12 +22776,7 @@ class ThriftHiveMetastore_compact2_result {
 
   void __set_success(const CompactionResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_compact2_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_compact2_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_compact2_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26512,8 +22816,7 @@ class ThriftHiveMetastore_show_compact_args {
 
   ThriftHiveMetastore_show_compact_args(const ThriftHiveMetastore_show_compact_args&);
   ThriftHiveMetastore_show_compact_args& operator=(const ThriftHiveMetastore_show_compact_args&);
-  ThriftHiveMetastore_show_compact_args() noexcept {
-  }
+  ThriftHiveMetastore_show_compact_args() noexcept;
 
   virtual ~ThriftHiveMetastore_show_compact_args() noexcept;
   ShowCompactRequest rqst;
@@ -26522,12 +22825,7 @@ class ThriftHiveMetastore_show_compact_args {
 
   void __set_rqst(const ShowCompactRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_show_compact_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_show_compact_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_show_compact_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26561,8 +22859,7 @@ class ThriftHiveMetastore_show_compact_result {
 
   ThriftHiveMetastore_show_compact_result(const ThriftHiveMetastore_show_compact_result&);
   ThriftHiveMetastore_show_compact_result& operator=(const ThriftHiveMetastore_show_compact_result&);
-  ThriftHiveMetastore_show_compact_result() noexcept {
-  }
+  ThriftHiveMetastore_show_compact_result() noexcept;
 
   virtual ~ThriftHiveMetastore_show_compact_result() noexcept;
   ShowCompactResponse success;
@@ -26571,12 +22868,7 @@ class ThriftHiveMetastore_show_compact_result {
 
   void __set_success(const ShowCompactResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_show_compact_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_show_compact_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_show_compact_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26618,10 +22910,7 @@ class ThriftHiveMetastore_submit_for_cleanup_args {
 
   ThriftHiveMetastore_submit_for_cleanup_args(const ThriftHiveMetastore_submit_for_cleanup_args&);
   ThriftHiveMetastore_submit_for_cleanup_args& operator=(const ThriftHiveMetastore_submit_for_cleanup_args&);
-  ThriftHiveMetastore_submit_for_cleanup_args() noexcept
-                                              : o2(0),
-                                                o3(0) {
-  }
+  ThriftHiveMetastore_submit_for_cleanup_args() noexcept;
 
   virtual ~ThriftHiveMetastore_submit_for_cleanup_args() noexcept;
   CompactionRequest o1;
@@ -26636,16 +22925,7 @@ class ThriftHiveMetastore_submit_for_cleanup_args {
 
   void __set_o3(const int64_t val);
 
-  bool operator == (const ThriftHiveMetastore_submit_for_cleanup_args & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_submit_for_cleanup_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_submit_for_cleanup_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26682,9 +22962,7 @@ class ThriftHiveMetastore_submit_for_cleanup_result {
 
   ThriftHiveMetastore_submit_for_cleanup_result(const ThriftHiveMetastore_submit_for_cleanup_result&);
   ThriftHiveMetastore_submit_for_cleanup_result& operator=(const ThriftHiveMetastore_submit_for_cleanup_result&);
-  ThriftHiveMetastore_submit_for_cleanup_result() noexcept
-                                                : success(0) {
-  }
+  ThriftHiveMetastore_submit_for_cleanup_result() noexcept;
 
   virtual ~ThriftHiveMetastore_submit_for_cleanup_result() noexcept;
   bool success;
@@ -26696,14 +22974,7 @@ class ThriftHiveMetastore_submit_for_cleanup_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_submit_for_cleanup_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_submit_for_cleanup_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_submit_for_cleanup_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26745,8 +23016,7 @@ class ThriftHiveMetastore_add_dynamic_partitions_args {
 
   ThriftHiveMetastore_add_dynamic_partitions_args(const ThriftHiveMetastore_add_dynamic_partitions_args&);
   ThriftHiveMetastore_add_dynamic_partitions_args& operator=(const ThriftHiveMetastore_add_dynamic_partitions_args&);
-  ThriftHiveMetastore_add_dynamic_partitions_args() noexcept {
-  }
+  ThriftHiveMetastore_add_dynamic_partitions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_dynamic_partitions_args() noexcept;
   AddDynamicPartitions rqst;
@@ -26755,12 +23025,7 @@ class ThriftHiveMetastore_add_dynamic_partitions_args {
 
   void __set_rqst(const AddDynamicPartitions& val);
 
-  bool operator == (const ThriftHiveMetastore_add_dynamic_partitions_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_dynamic_partitions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_dynamic_partitions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26795,8 +23060,7 @@ class ThriftHiveMetastore_add_dynamic_partitions_result {
 
   ThriftHiveMetastore_add_dynamic_partitions_result(const ThriftHiveMetastore_add_dynamic_partitions_result&);
   ThriftHiveMetastore_add_dynamic_partitions_result& operator=(const ThriftHiveMetastore_add_dynamic_partitions_result&);
-  ThriftHiveMetastore_add_dynamic_partitions_result() noexcept {
-  }
+  ThriftHiveMetastore_add_dynamic_partitions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_dynamic_partitions_result() noexcept;
   NoSuchTxnException o1;
@@ -26808,14 +23072,7 @@ class ThriftHiveMetastore_add_dynamic_partitions_result {
 
   void __set_o2(const TxnAbortedException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_dynamic_partitions_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_dynamic_partitions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_dynamic_partitions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26857,9 +23114,7 @@ class ThriftHiveMetastore_find_next_compact_args {
 
   ThriftHiveMetastore_find_next_compact_args(const ThriftHiveMetastore_find_next_compact_args&);
   ThriftHiveMetastore_find_next_compact_args& operator=(const ThriftHiveMetastore_find_next_compact_args&);
-  ThriftHiveMetastore_find_next_compact_args() noexcept
-                                             : workerId() {
-  }
+  ThriftHiveMetastore_find_next_compact_args() noexcept;
 
   virtual ~ThriftHiveMetastore_find_next_compact_args() noexcept;
   std::string workerId;
@@ -26868,12 +23123,7 @@ class ThriftHiveMetastore_find_next_compact_args {
 
   void __set_workerId(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_find_next_compact_args & rhs) const
-  {
-    if (!(workerId == rhs.workerId))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_next_compact_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_next_compact_args &rhs) const {
     return !(*this == rhs);
   }
@@ -26908,8 +23158,7 @@ class ThriftHiveMetastore_find_next_compact_result {
 
   ThriftHiveMetastore_find_next_compact_result(const ThriftHiveMetastore_find_next_compact_result&);
   ThriftHiveMetastore_find_next_compact_result& operator=(const ThriftHiveMetastore_find_next_compact_result&);
-  ThriftHiveMetastore_find_next_compact_result() noexcept {
-  }
+  ThriftHiveMetastore_find_next_compact_result() noexcept;
 
   virtual ~ThriftHiveMetastore_find_next_compact_result() noexcept;
   OptionalCompactionInfoStruct success;
@@ -26921,14 +23170,7 @@ class ThriftHiveMetastore_find_next_compact_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_find_next_compact_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_next_compact_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_next_compact_result &rhs) const {
     return !(*this == rhs);
   }
@@ -26970,8 +23212,7 @@ class ThriftHiveMetastore_find_next_compact2_args {
 
   ThriftHiveMetastore_find_next_compact2_args(const ThriftHiveMetastore_find_next_compact2_args&);
   ThriftHiveMetastore_find_next_compact2_args& operator=(const ThriftHiveMetastore_find_next_compact2_args&);
-  ThriftHiveMetastore_find_next_compact2_args() noexcept {
-  }
+  ThriftHiveMetastore_find_next_compact2_args() noexcept;
 
   virtual ~ThriftHiveMetastore_find_next_compact2_args() noexcept;
   FindNextCompactRequest rqst;
@@ -26980,12 +23221,7 @@ class ThriftHiveMetastore_find_next_compact2_args {
 
   void __set_rqst(const FindNextCompactRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_find_next_compact2_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_next_compact2_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_next_compact2_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27020,8 +23256,7 @@ class ThriftHiveMetastore_find_next_compact2_result {
 
   ThriftHiveMetastore_find_next_compact2_result(const ThriftHiveMetastore_find_next_compact2_result&);
   ThriftHiveMetastore_find_next_compact2_result& operator=(const ThriftHiveMetastore_find_next_compact2_result&);
-  ThriftHiveMetastore_find_next_compact2_result() noexcept {
-  }
+  ThriftHiveMetastore_find_next_compact2_result() noexcept;
 
   virtual ~ThriftHiveMetastore_find_next_compact2_result() noexcept;
   OptionalCompactionInfoStruct success;
@@ -27033,14 +23268,7 @@ class ThriftHiveMetastore_find_next_compact2_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_find_next_compact2_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_next_compact2_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_next_compact2_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27083,9 +23311,7 @@ class ThriftHiveMetastore_update_compactor_state_args {
 
   ThriftHiveMetastore_update_compactor_state_args(const ThriftHiveMetastore_update_compactor_state_args&);
   ThriftHiveMetastore_update_compactor_state_args& operator=(const ThriftHiveMetastore_update_compactor_state_args&);
-  ThriftHiveMetastore_update_compactor_state_args() noexcept
-                                                  : txn_id(0) {
-  }
+  ThriftHiveMetastore_update_compactor_state_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_compactor_state_args() noexcept;
   CompactionInfoStruct cr;
@@ -27097,14 +23323,7 @@ class ThriftHiveMetastore_update_compactor_state_args {
 
   void __set_txn_id(const int64_t val);
 
-  bool operator == (const ThriftHiveMetastore_update_compactor_state_args & rhs) const
-  {
-    if (!(cr == rhs.cr))
-      return false;
-    if (!(txn_id == rhs.txn_id))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_compactor_state_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_compactor_state_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27135,15 +23354,11 @@ class ThriftHiveMetastore_update_compactor_state_result {
 
   ThriftHiveMetastore_update_compactor_state_result(const ThriftHiveMetastore_update_compactor_state_result&) noexcept;
   ThriftHiveMetastore_update_compactor_state_result& operator=(const ThriftHiveMetastore_update_compactor_state_result&) noexcept;
-  ThriftHiveMetastore_update_compactor_state_result() noexcept {
-  }
+  ThriftHiveMetastore_update_compactor_state_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_compactor_state_result() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_update_compactor_state_result & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_compactor_state_result & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_update_compactor_state_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27176,8 +23391,7 @@ class ThriftHiveMetastore_find_columns_with_stats_args {
 
   ThriftHiveMetastore_find_columns_with_stats_args(const ThriftHiveMetastore_find_columns_with_stats_args&);
   ThriftHiveMetastore_find_columns_with_stats_args& operator=(const ThriftHiveMetastore_find_columns_with_stats_args&);
-  ThriftHiveMetastore_find_columns_with_stats_args() noexcept {
-  }
+  ThriftHiveMetastore_find_columns_with_stats_args() noexcept;
 
   virtual ~ThriftHiveMetastore_find_columns_with_stats_args() noexcept;
   CompactionInfoStruct cr;
@@ -27186,12 +23400,7 @@ class ThriftHiveMetastore_find_columns_with_stats_args {
 
   void __set_cr(const CompactionInfoStruct& val);
 
-  bool operator == (const ThriftHiveMetastore_find_columns_with_stats_args & rhs) const
-  {
-    if (!(cr == rhs.cr))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_columns_with_stats_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_columns_with_stats_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27225,8 +23434,7 @@ class ThriftHiveMetastore_find_columns_with_stats_result {
 
   ThriftHiveMetastore_find_columns_with_stats_result(const ThriftHiveMetastore_find_columns_with_stats_result&);
   ThriftHiveMetastore_find_columns_with_stats_result& operator=(const ThriftHiveMetastore_find_columns_with_stats_result&);
-  ThriftHiveMetastore_find_columns_with_stats_result() noexcept {
-  }
+  ThriftHiveMetastore_find_columns_with_stats_result() noexcept;
 
   virtual ~ThriftHiveMetastore_find_columns_with_stats_result() noexcept;
   std::vector<std::string>  success;
@@ -27235,12 +23443,7 @@ class ThriftHiveMetastore_find_columns_with_stats_result {
 
   void __set_success(const std::vector<std::string> & val);
 
-  bool operator == (const ThriftHiveMetastore_find_columns_with_stats_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_columns_with_stats_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_columns_with_stats_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27280,8 +23483,7 @@ class ThriftHiveMetastore_mark_cleaned_args {
 
   ThriftHiveMetastore_mark_cleaned_args(const ThriftHiveMetastore_mark_cleaned_args&);
   ThriftHiveMetastore_mark_cleaned_args& operator=(const ThriftHiveMetastore_mark_cleaned_args&);
-  ThriftHiveMetastore_mark_cleaned_args() noexcept {
-  }
+  ThriftHiveMetastore_mark_cleaned_args() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_cleaned_args() noexcept;
   CompactionInfoStruct cr;
@@ -27290,12 +23492,7 @@ class ThriftHiveMetastore_mark_cleaned_args {
 
   void __set_cr(const CompactionInfoStruct& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_cleaned_args & rhs) const
-  {
-    if (!(cr == rhs.cr))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_cleaned_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_cleaned_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27329,8 +23526,7 @@ class ThriftHiveMetastore_mark_cleaned_result {
 
   ThriftHiveMetastore_mark_cleaned_result(const ThriftHiveMetastore_mark_cleaned_result&);
   ThriftHiveMetastore_mark_cleaned_result& operator=(const ThriftHiveMetastore_mark_cleaned_result&);
-  ThriftHiveMetastore_mark_cleaned_result() noexcept {
-  }
+  ThriftHiveMetastore_mark_cleaned_result() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_cleaned_result() noexcept;
   MetaException o1;
@@ -27339,12 +23535,7 @@ class ThriftHiveMetastore_mark_cleaned_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_cleaned_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_cleaned_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_cleaned_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27384,8 +23575,7 @@ class ThriftHiveMetastore_mark_compacted_args {
 
   ThriftHiveMetastore_mark_compacted_args(const ThriftHiveMetastore_mark_compacted_args&);
   ThriftHiveMetastore_mark_compacted_args& operator=(const ThriftHiveMetastore_mark_compacted_args&);
-  ThriftHiveMetastore_mark_compacted_args() noexcept {
-  }
+  ThriftHiveMetastore_mark_compacted_args() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_compacted_args() noexcept;
   CompactionInfoStruct cr;
@@ -27394,12 +23584,7 @@ class ThriftHiveMetastore_mark_compacted_args {
 
   void __set_cr(const CompactionInfoStruct& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_compacted_args & rhs) const
-  {
-    if (!(cr == rhs.cr))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_compacted_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_compacted_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27433,8 +23618,7 @@ class ThriftHiveMetastore_mark_compacted_result {
 
   ThriftHiveMetastore_mark_compacted_result(const ThriftHiveMetastore_mark_compacted_result&);
   ThriftHiveMetastore_mark_compacted_result& operator=(const ThriftHiveMetastore_mark_compacted_result&);
-  ThriftHiveMetastore_mark_compacted_result() noexcept {
-  }
+  ThriftHiveMetastore_mark_compacted_result() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_compacted_result() noexcept;
   MetaException o1;
@@ -27443,12 +23627,7 @@ class ThriftHiveMetastore_mark_compacted_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_compacted_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_compacted_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_compacted_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27488,8 +23667,7 @@ class ThriftHiveMetastore_mark_failed_args {
 
   ThriftHiveMetastore_mark_failed_args(const ThriftHiveMetastore_mark_failed_args&);
   ThriftHiveMetastore_mark_failed_args& operator=(const ThriftHiveMetastore_mark_failed_args&);
-  ThriftHiveMetastore_mark_failed_args() noexcept {
-  }
+  ThriftHiveMetastore_mark_failed_args() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_failed_args() noexcept;
   CompactionInfoStruct cr;
@@ -27498,12 +23676,7 @@ class ThriftHiveMetastore_mark_failed_args {
 
   void __set_cr(const CompactionInfoStruct& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_failed_args & rhs) const
-  {
-    if (!(cr == rhs.cr))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_failed_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_failed_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27537,8 +23710,7 @@ class ThriftHiveMetastore_mark_failed_result {
 
   ThriftHiveMetastore_mark_failed_result(const ThriftHiveMetastore_mark_failed_result&);
   ThriftHiveMetastore_mark_failed_result& operator=(const ThriftHiveMetastore_mark_failed_result&);
-  ThriftHiveMetastore_mark_failed_result() noexcept {
-  }
+  ThriftHiveMetastore_mark_failed_result() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_failed_result() noexcept;
   MetaException o1;
@@ -27547,12 +23719,7 @@ class ThriftHiveMetastore_mark_failed_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_failed_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_failed_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_failed_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27592,8 +23759,7 @@ class ThriftHiveMetastore_mark_refused_args {
 
   ThriftHiveMetastore_mark_refused_args(const ThriftHiveMetastore_mark_refused_args&);
   ThriftHiveMetastore_mark_refused_args& operator=(const ThriftHiveMetastore_mark_refused_args&);
-  ThriftHiveMetastore_mark_refused_args() noexcept {
-  }
+  ThriftHiveMetastore_mark_refused_args() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_refused_args() noexcept;
   CompactionInfoStruct cr;
@@ -27602,12 +23768,7 @@ class ThriftHiveMetastore_mark_refused_args {
 
   void __set_cr(const CompactionInfoStruct& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_refused_args & rhs) const
-  {
-    if (!(cr == rhs.cr))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_refused_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_refused_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27641,8 +23802,7 @@ class ThriftHiveMetastore_mark_refused_result {
 
   ThriftHiveMetastore_mark_refused_result(const ThriftHiveMetastore_mark_refused_result&);
   ThriftHiveMetastore_mark_refused_result& operator=(const ThriftHiveMetastore_mark_refused_result&);
-  ThriftHiveMetastore_mark_refused_result() noexcept {
-  }
+  ThriftHiveMetastore_mark_refused_result() noexcept;
 
   virtual ~ThriftHiveMetastore_mark_refused_result() noexcept;
   MetaException o1;
@@ -27651,12 +23811,7 @@ class ThriftHiveMetastore_mark_refused_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_mark_refused_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_mark_refused_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_mark_refused_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27696,8 +23851,7 @@ class ThriftHiveMetastore_update_compaction_metrics_data_args {
 
   ThriftHiveMetastore_update_compaction_metrics_data_args(const ThriftHiveMetastore_update_compaction_metrics_data_args&);
   ThriftHiveMetastore_update_compaction_metrics_data_args& operator=(const ThriftHiveMetastore_update_compaction_metrics_data_args&);
-  ThriftHiveMetastore_update_compaction_metrics_data_args() noexcept {
-  }
+  ThriftHiveMetastore_update_compaction_metrics_data_args() noexcept;
 
   virtual ~ThriftHiveMetastore_update_compaction_metrics_data_args() noexcept;
   CompactionMetricsDataStruct data;
@@ -27706,12 +23860,7 @@ class ThriftHiveMetastore_update_compaction_metrics_data_args {
 
   void __set_data(const CompactionMetricsDataStruct& val);
 
-  bool operator == (const ThriftHiveMetastore_update_compaction_metrics_data_args & rhs) const
-  {
-    if (!(data == rhs.data))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_compaction_metrics_data_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_compaction_metrics_data_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27746,9 +23895,7 @@ class ThriftHiveMetastore_update_compaction_metrics_data_result {
 
   ThriftHiveMetastore_update_compaction_metrics_data_result(const ThriftHiveMetastore_update_compaction_metrics_data_result&);
   ThriftHiveMetastore_update_compaction_metrics_data_result& operator=(const ThriftHiveMetastore_update_compaction_metrics_data_result&);
-  ThriftHiveMetastore_update_compaction_metrics_data_result() noexcept
-                                                            : success(0) {
-  }
+  ThriftHiveMetastore_update_compaction_metrics_data_result() noexcept;
 
   virtual ~ThriftHiveMetastore_update_compaction_metrics_data_result() noexcept;
   bool success;
@@ -27760,14 +23907,7 @@ class ThriftHiveMetastore_update_compaction_metrics_data_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_update_compaction_metrics_data_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_update_compaction_metrics_data_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_update_compaction_metrics_data_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27809,8 +23949,7 @@ class ThriftHiveMetastore_remove_compaction_metrics_data_args {
 
   ThriftHiveMetastore_remove_compaction_metrics_data_args(const ThriftHiveMetastore_remove_compaction_metrics_data_args&);
   ThriftHiveMetastore_remove_compaction_metrics_data_args& operator=(const ThriftHiveMetastore_remove_compaction_metrics_data_args&);
-  ThriftHiveMetastore_remove_compaction_metrics_data_args() noexcept {
-  }
+  ThriftHiveMetastore_remove_compaction_metrics_data_args() noexcept;
 
   virtual ~ThriftHiveMetastore_remove_compaction_metrics_data_args() noexcept;
   CompactionMetricsDataRequest request;
@@ -27819,12 +23958,7 @@ class ThriftHiveMetastore_remove_compaction_metrics_data_args {
 
   void __set_request(const CompactionMetricsDataRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_remove_compaction_metrics_data_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_remove_compaction_metrics_data_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_remove_compaction_metrics_data_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27858,8 +23992,7 @@ class ThriftHiveMetastore_remove_compaction_metrics_data_result {
 
   ThriftHiveMetastore_remove_compaction_metrics_data_result(const ThriftHiveMetastore_remove_compaction_metrics_data_result&);
   ThriftHiveMetastore_remove_compaction_metrics_data_result& operator=(const ThriftHiveMetastore_remove_compaction_metrics_data_result&);
-  ThriftHiveMetastore_remove_compaction_metrics_data_result() noexcept {
-  }
+  ThriftHiveMetastore_remove_compaction_metrics_data_result() noexcept;
 
   virtual ~ThriftHiveMetastore_remove_compaction_metrics_data_result() noexcept;
   MetaException o1;
@@ -27868,12 +24001,7 @@ class ThriftHiveMetastore_remove_compaction_metrics_data_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_remove_compaction_metrics_data_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_remove_compaction_metrics_data_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_remove_compaction_metrics_data_result &rhs) const {
     return !(*this == rhs);
   }
@@ -27914,10 +24042,7 @@ class ThriftHiveMetastore_set_hadoop_jobid_args {
 
   ThriftHiveMetastore_set_hadoop_jobid_args(const ThriftHiveMetastore_set_hadoop_jobid_args&);
   ThriftHiveMetastore_set_hadoop_jobid_args& operator=(const ThriftHiveMetastore_set_hadoop_jobid_args&);
-  ThriftHiveMetastore_set_hadoop_jobid_args() noexcept
-                                            : jobId(),
-                                              cq_id(0) {
-  }
+  ThriftHiveMetastore_set_hadoop_jobid_args() noexcept;
 
   virtual ~ThriftHiveMetastore_set_hadoop_jobid_args() noexcept;
   std::string jobId;
@@ -27929,14 +24054,7 @@ class ThriftHiveMetastore_set_hadoop_jobid_args {
 
   void __set_cq_id(const int64_t val);
 
-  bool operator == (const ThriftHiveMetastore_set_hadoop_jobid_args & rhs) const
-  {
-    if (!(jobId == rhs.jobId))
-      return false;
-    if (!(cq_id == rhs.cq_id))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_hadoop_jobid_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_hadoop_jobid_args &rhs) const {
     return !(*this == rhs);
   }
@@ -27967,15 +24085,11 @@ class ThriftHiveMetastore_set_hadoop_jobid_result {
 
   ThriftHiveMetastore_set_hadoop_jobid_result(const ThriftHiveMetastore_set_hadoop_jobid_result&) noexcept;
   ThriftHiveMetastore_set_hadoop_jobid_result& operator=(const ThriftHiveMetastore_set_hadoop_jobid_result&) noexcept;
-  ThriftHiveMetastore_set_hadoop_jobid_result() noexcept {
-  }
+  ThriftHiveMetastore_set_hadoop_jobid_result() noexcept;
 
   virtual ~ThriftHiveMetastore_set_hadoop_jobid_result() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_set_hadoop_jobid_result & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_hadoop_jobid_result & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_set_hadoop_jobid_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28008,8 +24122,7 @@ class ThriftHiveMetastore_get_latest_committed_compaction_info_args {
 
   ThriftHiveMetastore_get_latest_committed_compaction_info_args(const ThriftHiveMetastore_get_latest_committed_compaction_info_args&);
   ThriftHiveMetastore_get_latest_committed_compaction_info_args& operator=(const ThriftHiveMetastore_get_latest_committed_compaction_info_args&);
-  ThriftHiveMetastore_get_latest_committed_compaction_info_args() noexcept {
-  }
+  ThriftHiveMetastore_get_latest_committed_compaction_info_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_latest_committed_compaction_info_args() noexcept;
   GetLatestCommittedCompactionInfoRequest rqst;
@@ -28018,12 +24131,7 @@ class ThriftHiveMetastore_get_latest_committed_compaction_info_args {
 
   void __set_rqst(const GetLatestCommittedCompactionInfoRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_latest_committed_compaction_info_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_latest_committed_compaction_info_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_latest_committed_compaction_info_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28057,8 +24165,7 @@ class ThriftHiveMetastore_get_latest_committed_compaction_info_result {
 
   ThriftHiveMetastore_get_latest_committed_compaction_info_result(const ThriftHiveMetastore_get_latest_committed_compaction_info_result&);
   ThriftHiveMetastore_get_latest_committed_compaction_info_result& operator=(const ThriftHiveMetastore_get_latest_committed_compaction_info_result&);
-  ThriftHiveMetastore_get_latest_committed_compaction_info_result() noexcept {
-  }
+  ThriftHiveMetastore_get_latest_committed_compaction_info_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_latest_committed_compaction_info_result() noexcept;
   GetLatestCommittedCompactionInfoResponse success;
@@ -28067,12 +24174,7 @@ class ThriftHiveMetastore_get_latest_committed_compaction_info_result {
 
   void __set_success(const GetLatestCommittedCompactionInfoResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_latest_committed_compaction_info_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_latest_committed_compaction_info_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_latest_committed_compaction_info_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28112,8 +24214,7 @@ class ThriftHiveMetastore_get_next_notification_args {
 
   ThriftHiveMetastore_get_next_notification_args(const ThriftHiveMetastore_get_next_notification_args&);
   ThriftHiveMetastore_get_next_notification_args& operator=(const ThriftHiveMetastore_get_next_notification_args&);
-  ThriftHiveMetastore_get_next_notification_args() noexcept {
-  }
+  ThriftHiveMetastore_get_next_notification_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_next_notification_args() noexcept;
   NotificationEventRequest rqst;
@@ -28122,12 +24223,7 @@ class ThriftHiveMetastore_get_next_notification_args {
 
   void __set_rqst(const NotificationEventRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_next_notification_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_next_notification_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_next_notification_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28161,8 +24257,7 @@ class ThriftHiveMetastore_get_next_notification_result {
 
   ThriftHiveMetastore_get_next_notification_result(const ThriftHiveMetastore_get_next_notification_result&);
   ThriftHiveMetastore_get_next_notification_result& operator=(const ThriftHiveMetastore_get_next_notification_result&);
-  ThriftHiveMetastore_get_next_notification_result() noexcept {
-  }
+  ThriftHiveMetastore_get_next_notification_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_next_notification_result() noexcept;
   NotificationEventResponse success;
@@ -28171,12 +24266,7 @@ class ThriftHiveMetastore_get_next_notification_result {
 
   void __set_success(const NotificationEventResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_next_notification_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_next_notification_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_next_notification_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28212,15 +24302,11 @@ class ThriftHiveMetastore_get_current_notificationEventId_args {
 
   ThriftHiveMetastore_get_current_notificationEventId_args(const ThriftHiveMetastore_get_current_notificationEventId_args&) noexcept;
   ThriftHiveMetastore_get_current_notificationEventId_args& operator=(const ThriftHiveMetastore_get_current_notificationEventId_args&) noexcept;
-  ThriftHiveMetastore_get_current_notificationEventId_args() noexcept {
-  }
+  ThriftHiveMetastore_get_current_notificationEventId_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_current_notificationEventId_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_current_notificationEventId_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_current_notificationEventId_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_current_notificationEventId_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28253,8 +24339,7 @@ class ThriftHiveMetastore_get_current_notificationEventId_result {
 
   ThriftHiveMetastore_get_current_notificationEventId_result(const ThriftHiveMetastore_get_current_notificationEventId_result&) noexcept;
   ThriftHiveMetastore_get_current_notificationEventId_result& operator=(const ThriftHiveMetastore_get_current_notificationEventId_result&) noexcept;
-  ThriftHiveMetastore_get_current_notificationEventId_result() noexcept {
-  }
+  ThriftHiveMetastore_get_current_notificationEventId_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_current_notificationEventId_result() noexcept;
   CurrentNotificationEventId success;
@@ -28263,12 +24348,7 @@ class ThriftHiveMetastore_get_current_notificationEventId_result {
 
   void __set_success(const CurrentNotificationEventId& val);
 
-  bool operator == (const ThriftHiveMetastore_get_current_notificationEventId_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_current_notificationEventId_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_current_notificationEventId_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28308,8 +24388,7 @@ class ThriftHiveMetastore_get_notification_events_count_args {
 
   ThriftHiveMetastore_get_notification_events_count_args(const ThriftHiveMetastore_get_notification_events_count_args&);
   ThriftHiveMetastore_get_notification_events_count_args& operator=(const ThriftHiveMetastore_get_notification_events_count_args&);
-  ThriftHiveMetastore_get_notification_events_count_args() noexcept {
-  }
+  ThriftHiveMetastore_get_notification_events_count_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_notification_events_count_args() noexcept;
   NotificationEventsCountRequest rqst;
@@ -28318,12 +24397,7 @@ class ThriftHiveMetastore_get_notification_events_count_args {
 
   void __set_rqst(const NotificationEventsCountRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_notification_events_count_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_notification_events_count_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_notification_events_count_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28357,8 +24431,7 @@ class ThriftHiveMetastore_get_notification_events_count_result {
 
   ThriftHiveMetastore_get_notification_events_count_result(const ThriftHiveMetastore_get_notification_events_count_result&) noexcept;
   ThriftHiveMetastore_get_notification_events_count_result& operator=(const ThriftHiveMetastore_get_notification_events_count_result&) noexcept;
-  ThriftHiveMetastore_get_notification_events_count_result() noexcept {
-  }
+  ThriftHiveMetastore_get_notification_events_count_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_notification_events_count_result() noexcept;
   NotificationEventsCountResponse success;
@@ -28367,12 +24440,7 @@ class ThriftHiveMetastore_get_notification_events_count_result {
 
   void __set_success(const NotificationEventsCountResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_notification_events_count_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_notification_events_count_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_notification_events_count_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28412,8 +24480,7 @@ class ThriftHiveMetastore_fire_listener_event_args {
 
   ThriftHiveMetastore_fire_listener_event_args(const ThriftHiveMetastore_fire_listener_event_args&);
   ThriftHiveMetastore_fire_listener_event_args& operator=(const ThriftHiveMetastore_fire_listener_event_args&);
-  ThriftHiveMetastore_fire_listener_event_args() noexcept {
-  }
+  ThriftHiveMetastore_fire_listener_event_args() noexcept;
 
   virtual ~ThriftHiveMetastore_fire_listener_event_args() noexcept;
   FireEventRequest rqst;
@@ -28422,12 +24489,7 @@ class ThriftHiveMetastore_fire_listener_event_args {
 
   void __set_rqst(const FireEventRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_fire_listener_event_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_fire_listener_event_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_fire_listener_event_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28461,8 +24523,7 @@ class ThriftHiveMetastore_fire_listener_event_result {
 
   ThriftHiveMetastore_fire_listener_event_result(const ThriftHiveMetastore_fire_listener_event_result&);
   ThriftHiveMetastore_fire_listener_event_result& operator=(const ThriftHiveMetastore_fire_listener_event_result&);
-  ThriftHiveMetastore_fire_listener_event_result() noexcept {
-  }
+  ThriftHiveMetastore_fire_listener_event_result() noexcept;
 
   virtual ~ThriftHiveMetastore_fire_listener_event_result() noexcept;
   FireEventResponse success;
@@ -28471,12 +24532,7 @@ class ThriftHiveMetastore_fire_listener_event_result {
 
   void __set_success(const FireEventResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_fire_listener_event_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_fire_listener_event_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_fire_listener_event_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28512,15 +24568,11 @@ class ThriftHiveMetastore_flushCache_args {
 
   ThriftHiveMetastore_flushCache_args(const ThriftHiveMetastore_flushCache_args&) noexcept;
   ThriftHiveMetastore_flushCache_args& operator=(const ThriftHiveMetastore_flushCache_args&) noexcept;
-  ThriftHiveMetastore_flushCache_args() noexcept {
-  }
+  ThriftHiveMetastore_flushCache_args() noexcept;
 
   virtual ~ThriftHiveMetastore_flushCache_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_flushCache_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_flushCache_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_flushCache_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28549,15 +24601,11 @@ class ThriftHiveMetastore_flushCache_result {
 
   ThriftHiveMetastore_flushCache_result(const ThriftHiveMetastore_flushCache_result&) noexcept;
   ThriftHiveMetastore_flushCache_result& operator=(const ThriftHiveMetastore_flushCache_result&) noexcept;
-  ThriftHiveMetastore_flushCache_result() noexcept {
-  }
+  ThriftHiveMetastore_flushCache_result() noexcept;
 
   virtual ~ThriftHiveMetastore_flushCache_result() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_flushCache_result & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_flushCache_result & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_flushCache_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28590,8 +24638,7 @@ class ThriftHiveMetastore_add_write_notification_log_args {
 
   ThriftHiveMetastore_add_write_notification_log_args(const ThriftHiveMetastore_add_write_notification_log_args&);
   ThriftHiveMetastore_add_write_notification_log_args& operator=(const ThriftHiveMetastore_add_write_notification_log_args&);
-  ThriftHiveMetastore_add_write_notification_log_args() noexcept {
-  }
+  ThriftHiveMetastore_add_write_notification_log_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_write_notification_log_args() noexcept;
   WriteNotificationLogRequest rqst;
@@ -28600,12 +24647,7 @@ class ThriftHiveMetastore_add_write_notification_log_args {
 
   void __set_rqst(const WriteNotificationLogRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_write_notification_log_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_write_notification_log_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_write_notification_log_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28639,8 +24681,7 @@ class ThriftHiveMetastore_add_write_notification_log_result {
 
   ThriftHiveMetastore_add_write_notification_log_result(const ThriftHiveMetastore_add_write_notification_log_result&) noexcept;
   ThriftHiveMetastore_add_write_notification_log_result& operator=(const ThriftHiveMetastore_add_write_notification_log_result&) noexcept;
-  ThriftHiveMetastore_add_write_notification_log_result() noexcept {
-  }
+  ThriftHiveMetastore_add_write_notification_log_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_write_notification_log_result() noexcept;
   WriteNotificationLogResponse success;
@@ -28649,12 +24690,7 @@ class ThriftHiveMetastore_add_write_notification_log_result {
 
   void __set_success(const WriteNotificationLogResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_add_write_notification_log_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_write_notification_log_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_write_notification_log_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28694,8 +24730,7 @@ class ThriftHiveMetastore_add_write_notification_log_in_batch_args {
 
   ThriftHiveMetastore_add_write_notification_log_in_batch_args(const ThriftHiveMetastore_add_write_notification_log_in_batch_args&);
   ThriftHiveMetastore_add_write_notification_log_in_batch_args& operator=(const ThriftHiveMetastore_add_write_notification_log_in_batch_args&);
-  ThriftHiveMetastore_add_write_notification_log_in_batch_args() noexcept {
-  }
+  ThriftHiveMetastore_add_write_notification_log_in_batch_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_write_notification_log_in_batch_args() noexcept;
   WriteNotificationLogBatchRequest rqst;
@@ -28704,12 +24739,7 @@ class ThriftHiveMetastore_add_write_notification_log_in_batch_args {
 
   void __set_rqst(const WriteNotificationLogBatchRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_write_notification_log_in_batch_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_write_notification_log_in_batch_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_write_notification_log_in_batch_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28743,8 +24773,7 @@ class ThriftHiveMetastore_add_write_notification_log_in_batch_result {
 
   ThriftHiveMetastore_add_write_notification_log_in_batch_result(const ThriftHiveMetastore_add_write_notification_log_in_batch_result&) noexcept;
   ThriftHiveMetastore_add_write_notification_log_in_batch_result& operator=(const ThriftHiveMetastore_add_write_notification_log_in_batch_result&) noexcept;
-  ThriftHiveMetastore_add_write_notification_log_in_batch_result() noexcept {
-  }
+  ThriftHiveMetastore_add_write_notification_log_in_batch_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_write_notification_log_in_batch_result() noexcept;
   WriteNotificationLogBatchResponse success;
@@ -28753,12 +24782,7 @@ class ThriftHiveMetastore_add_write_notification_log_in_batch_result {
 
   void __set_success(const WriteNotificationLogBatchResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_add_write_notification_log_in_batch_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_write_notification_log_in_batch_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_write_notification_log_in_batch_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28798,8 +24822,7 @@ class ThriftHiveMetastore_cm_recycle_args {
 
   ThriftHiveMetastore_cm_recycle_args(const ThriftHiveMetastore_cm_recycle_args&);
   ThriftHiveMetastore_cm_recycle_args& operator=(const ThriftHiveMetastore_cm_recycle_args&);
-  ThriftHiveMetastore_cm_recycle_args() noexcept {
-  }
+  ThriftHiveMetastore_cm_recycle_args() noexcept;
 
   virtual ~ThriftHiveMetastore_cm_recycle_args() noexcept;
   CmRecycleRequest request;
@@ -28808,12 +24831,7 @@ class ThriftHiveMetastore_cm_recycle_args {
 
   void __set_request(const CmRecycleRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_cm_recycle_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_cm_recycle_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_cm_recycle_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28848,8 +24866,7 @@ class ThriftHiveMetastore_cm_recycle_result {
 
   ThriftHiveMetastore_cm_recycle_result(const ThriftHiveMetastore_cm_recycle_result&);
   ThriftHiveMetastore_cm_recycle_result& operator=(const ThriftHiveMetastore_cm_recycle_result&);
-  ThriftHiveMetastore_cm_recycle_result() noexcept {
-  }
+  ThriftHiveMetastore_cm_recycle_result() noexcept;
 
   virtual ~ThriftHiveMetastore_cm_recycle_result() noexcept;
   CmRecycleResponse success;
@@ -28861,14 +24878,7 @@ class ThriftHiveMetastore_cm_recycle_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_cm_recycle_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_cm_recycle_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_cm_recycle_result &rhs) const {
     return !(*this == rhs);
   }
@@ -28910,8 +24920,7 @@ class ThriftHiveMetastore_get_file_metadata_by_expr_args {
 
   ThriftHiveMetastore_get_file_metadata_by_expr_args(const ThriftHiveMetastore_get_file_metadata_by_expr_args&);
   ThriftHiveMetastore_get_file_metadata_by_expr_args& operator=(const ThriftHiveMetastore_get_file_metadata_by_expr_args&);
-  ThriftHiveMetastore_get_file_metadata_by_expr_args() noexcept {
-  }
+  ThriftHiveMetastore_get_file_metadata_by_expr_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_file_metadata_by_expr_args() noexcept;
   GetFileMetadataByExprRequest req;
@@ -28920,12 +24929,7 @@ class ThriftHiveMetastore_get_file_metadata_by_expr_args {
 
   void __set_req(const GetFileMetadataByExprRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_file_metadata_by_expr_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_file_metadata_by_expr_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_file_metadata_by_expr_args &rhs) const {
     return !(*this == rhs);
   }
@@ -28959,8 +24963,7 @@ class ThriftHiveMetastore_get_file_metadata_by_expr_result {
 
   ThriftHiveMetastore_get_file_metadata_by_expr_result(const ThriftHiveMetastore_get_file_metadata_by_expr_result&);
   ThriftHiveMetastore_get_file_metadata_by_expr_result& operator=(const ThriftHiveMetastore_get_file_metadata_by_expr_result&);
-  ThriftHiveMetastore_get_file_metadata_by_expr_result() noexcept {
-  }
+  ThriftHiveMetastore_get_file_metadata_by_expr_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_file_metadata_by_expr_result() noexcept;
   GetFileMetadataByExprResult success;
@@ -28969,12 +24972,7 @@ class ThriftHiveMetastore_get_file_metadata_by_expr_result {
 
   void __set_success(const GetFileMetadataByExprResult& val);
 
-  bool operator == (const ThriftHiveMetastore_get_file_metadata_by_expr_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_file_metadata_by_expr_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_file_metadata_by_expr_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29014,8 +25012,7 @@ class ThriftHiveMetastore_get_file_metadata_args {
 
   ThriftHiveMetastore_get_file_metadata_args(const ThriftHiveMetastore_get_file_metadata_args&);
   ThriftHiveMetastore_get_file_metadata_args& operator=(const ThriftHiveMetastore_get_file_metadata_args&);
-  ThriftHiveMetastore_get_file_metadata_args() noexcept {
-  }
+  ThriftHiveMetastore_get_file_metadata_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_file_metadata_args() noexcept;
   GetFileMetadataRequest req;
@@ -29024,12 +25021,7 @@ class ThriftHiveMetastore_get_file_metadata_args {
 
   void __set_req(const GetFileMetadataRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_file_metadata_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_file_metadata_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_file_metadata_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29063,8 +25055,7 @@ class ThriftHiveMetastore_get_file_metadata_result {
 
   ThriftHiveMetastore_get_file_metadata_result(const ThriftHiveMetastore_get_file_metadata_result&);
   ThriftHiveMetastore_get_file_metadata_result& operator=(const ThriftHiveMetastore_get_file_metadata_result&);
-  ThriftHiveMetastore_get_file_metadata_result() noexcept {
-  }
+  ThriftHiveMetastore_get_file_metadata_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_file_metadata_result() noexcept;
   GetFileMetadataResult success;
@@ -29073,12 +25064,7 @@ class ThriftHiveMetastore_get_file_metadata_result {
 
   void __set_success(const GetFileMetadataResult& val);
 
-  bool operator == (const ThriftHiveMetastore_get_file_metadata_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_file_metadata_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_file_metadata_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29118,8 +25104,7 @@ class ThriftHiveMetastore_put_file_metadata_args {
 
   ThriftHiveMetastore_put_file_metadata_args(const ThriftHiveMetastore_put_file_metadata_args&);
   ThriftHiveMetastore_put_file_metadata_args& operator=(const ThriftHiveMetastore_put_file_metadata_args&);
-  ThriftHiveMetastore_put_file_metadata_args() noexcept {
-  }
+  ThriftHiveMetastore_put_file_metadata_args() noexcept;
 
   virtual ~ThriftHiveMetastore_put_file_metadata_args() noexcept;
   PutFileMetadataRequest req;
@@ -29128,12 +25113,7 @@ class ThriftHiveMetastore_put_file_metadata_args {
 
   void __set_req(const PutFileMetadataRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_put_file_metadata_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_put_file_metadata_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_put_file_metadata_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29167,8 +25147,7 @@ class ThriftHiveMetastore_put_file_metadata_result {
 
   ThriftHiveMetastore_put_file_metadata_result(const ThriftHiveMetastore_put_file_metadata_result&) noexcept;
   ThriftHiveMetastore_put_file_metadata_result& operator=(const ThriftHiveMetastore_put_file_metadata_result&) noexcept;
-  ThriftHiveMetastore_put_file_metadata_result() noexcept {
-  }
+  ThriftHiveMetastore_put_file_metadata_result() noexcept;
 
   virtual ~ThriftHiveMetastore_put_file_metadata_result() noexcept;
   PutFileMetadataResult success;
@@ -29177,12 +25156,7 @@ class ThriftHiveMetastore_put_file_metadata_result {
 
   void __set_success(const PutFileMetadataResult& val);
 
-  bool operator == (const ThriftHiveMetastore_put_file_metadata_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_put_file_metadata_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_put_file_metadata_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29222,8 +25196,7 @@ class ThriftHiveMetastore_clear_file_metadata_args {
 
   ThriftHiveMetastore_clear_file_metadata_args(const ThriftHiveMetastore_clear_file_metadata_args&);
   ThriftHiveMetastore_clear_file_metadata_args& operator=(const ThriftHiveMetastore_clear_file_metadata_args&);
-  ThriftHiveMetastore_clear_file_metadata_args() noexcept {
-  }
+  ThriftHiveMetastore_clear_file_metadata_args() noexcept;
 
   virtual ~ThriftHiveMetastore_clear_file_metadata_args() noexcept;
   ClearFileMetadataRequest req;
@@ -29232,12 +25205,7 @@ class ThriftHiveMetastore_clear_file_metadata_args {
 
   void __set_req(const ClearFileMetadataRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_clear_file_metadata_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_clear_file_metadata_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_clear_file_metadata_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29271,8 +25239,7 @@ class ThriftHiveMetastore_clear_file_metadata_result {
 
   ThriftHiveMetastore_clear_file_metadata_result(const ThriftHiveMetastore_clear_file_metadata_result&) noexcept;
   ThriftHiveMetastore_clear_file_metadata_result& operator=(const ThriftHiveMetastore_clear_file_metadata_result&) noexcept;
-  ThriftHiveMetastore_clear_file_metadata_result() noexcept {
-  }
+  ThriftHiveMetastore_clear_file_metadata_result() noexcept;
 
   virtual ~ThriftHiveMetastore_clear_file_metadata_result() noexcept;
   ClearFileMetadataResult success;
@@ -29281,12 +25248,7 @@ class ThriftHiveMetastore_clear_file_metadata_result {
 
   void __set_success(const ClearFileMetadataResult& val);
 
-  bool operator == (const ThriftHiveMetastore_clear_file_metadata_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_clear_file_metadata_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_clear_file_metadata_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29326,8 +25288,7 @@ class ThriftHiveMetastore_cache_file_metadata_args {
 
   ThriftHiveMetastore_cache_file_metadata_args(const ThriftHiveMetastore_cache_file_metadata_args&);
   ThriftHiveMetastore_cache_file_metadata_args& operator=(const ThriftHiveMetastore_cache_file_metadata_args&);
-  ThriftHiveMetastore_cache_file_metadata_args() noexcept {
-  }
+  ThriftHiveMetastore_cache_file_metadata_args() noexcept;
 
   virtual ~ThriftHiveMetastore_cache_file_metadata_args() noexcept;
   CacheFileMetadataRequest req;
@@ -29336,12 +25297,7 @@ class ThriftHiveMetastore_cache_file_metadata_args {
 
   void __set_req(const CacheFileMetadataRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_cache_file_metadata_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_cache_file_metadata_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_cache_file_metadata_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29375,8 +25331,7 @@ class ThriftHiveMetastore_cache_file_metadata_result {
 
   ThriftHiveMetastore_cache_file_metadata_result(const ThriftHiveMetastore_cache_file_metadata_result&) noexcept;
   ThriftHiveMetastore_cache_file_metadata_result& operator=(const ThriftHiveMetastore_cache_file_metadata_result&) noexcept;
-  ThriftHiveMetastore_cache_file_metadata_result() noexcept {
-  }
+  ThriftHiveMetastore_cache_file_metadata_result() noexcept;
 
   virtual ~ThriftHiveMetastore_cache_file_metadata_result() noexcept;
   CacheFileMetadataResult success;
@@ -29385,12 +25340,7 @@ class ThriftHiveMetastore_cache_file_metadata_result {
 
   void __set_success(const CacheFileMetadataResult& val);
 
-  bool operator == (const ThriftHiveMetastore_cache_file_metadata_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_cache_file_metadata_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_cache_file_metadata_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29426,15 +25376,11 @@ class ThriftHiveMetastore_get_metastore_db_uuid_args {
 
   ThriftHiveMetastore_get_metastore_db_uuid_args(const ThriftHiveMetastore_get_metastore_db_uuid_args&) noexcept;
   ThriftHiveMetastore_get_metastore_db_uuid_args& operator=(const ThriftHiveMetastore_get_metastore_db_uuid_args&) noexcept;
-  ThriftHiveMetastore_get_metastore_db_uuid_args() noexcept {
-  }
+  ThriftHiveMetastore_get_metastore_db_uuid_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_metastore_db_uuid_args() noexcept;
 
-  bool operator == (const ThriftHiveMetastore_get_metastore_db_uuid_args & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_metastore_db_uuid_args & /* rhs */) const;
   bool operator != (const ThriftHiveMetastore_get_metastore_db_uuid_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29468,9 +25414,7 @@ class ThriftHiveMetastore_get_metastore_db_uuid_result {
 
   ThriftHiveMetastore_get_metastore_db_uuid_result(const ThriftHiveMetastore_get_metastore_db_uuid_result&);
   ThriftHiveMetastore_get_metastore_db_uuid_result& operator=(const ThriftHiveMetastore_get_metastore_db_uuid_result&);
-  ThriftHiveMetastore_get_metastore_db_uuid_result() noexcept
-                                                   : success() {
-  }
+  ThriftHiveMetastore_get_metastore_db_uuid_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_metastore_db_uuid_result() noexcept;
   std::string success;
@@ -29482,14 +25426,7 @@ class ThriftHiveMetastore_get_metastore_db_uuid_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_metastore_db_uuid_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_metastore_db_uuid_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_metastore_db_uuid_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29531,8 +25468,7 @@ class ThriftHiveMetastore_create_resource_plan_args {
 
   ThriftHiveMetastore_create_resource_plan_args(const ThriftHiveMetastore_create_resource_plan_args&);
   ThriftHiveMetastore_create_resource_plan_args& operator=(const ThriftHiveMetastore_create_resource_plan_args&);
-  ThriftHiveMetastore_create_resource_plan_args() noexcept {
-  }
+  ThriftHiveMetastore_create_resource_plan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_resource_plan_args() noexcept;
   WMCreateResourcePlanRequest request;
@@ -29541,12 +25477,7 @@ class ThriftHiveMetastore_create_resource_plan_args {
 
   void __set_request(const WMCreateResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_resource_plan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_resource_plan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_resource_plan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29583,8 +25514,7 @@ class ThriftHiveMetastore_create_resource_plan_result {
 
   ThriftHiveMetastore_create_resource_plan_result(const ThriftHiveMetastore_create_resource_plan_result&);
   ThriftHiveMetastore_create_resource_plan_result& operator=(const ThriftHiveMetastore_create_resource_plan_result&);
-  ThriftHiveMetastore_create_resource_plan_result() noexcept {
-  }
+  ThriftHiveMetastore_create_resource_plan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_resource_plan_result() noexcept;
   WMCreateResourcePlanResponse success;
@@ -29602,18 +25532,7 @@ class ThriftHiveMetastore_create_resource_plan_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_resource_plan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_resource_plan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_resource_plan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29659,8 +25578,7 @@ class ThriftHiveMetastore_get_resource_plan_args {
 
   ThriftHiveMetastore_get_resource_plan_args(const ThriftHiveMetastore_get_resource_plan_args&);
   ThriftHiveMetastore_get_resource_plan_args& operator=(const ThriftHiveMetastore_get_resource_plan_args&);
-  ThriftHiveMetastore_get_resource_plan_args() noexcept {
-  }
+  ThriftHiveMetastore_get_resource_plan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_resource_plan_args() noexcept;
   WMGetResourcePlanRequest request;
@@ -29669,12 +25587,7 @@ class ThriftHiveMetastore_get_resource_plan_args {
 
   void __set_request(const WMGetResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_resource_plan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_resource_plan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_resource_plan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29710,8 +25623,7 @@ class ThriftHiveMetastore_get_resource_plan_result {
 
   ThriftHiveMetastore_get_resource_plan_result(const ThriftHiveMetastore_get_resource_plan_result&);
   ThriftHiveMetastore_get_resource_plan_result& operator=(const ThriftHiveMetastore_get_resource_plan_result&);
-  ThriftHiveMetastore_get_resource_plan_result() noexcept {
-  }
+  ThriftHiveMetastore_get_resource_plan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_resource_plan_result() noexcept;
   WMGetResourcePlanResponse success;
@@ -29726,16 +25638,7 @@ class ThriftHiveMetastore_get_resource_plan_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_resource_plan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_resource_plan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_resource_plan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29779,8 +25682,7 @@ class ThriftHiveMetastore_get_active_resource_plan_args {
 
   ThriftHiveMetastore_get_active_resource_plan_args(const ThriftHiveMetastore_get_active_resource_plan_args&);
   ThriftHiveMetastore_get_active_resource_plan_args& operator=(const ThriftHiveMetastore_get_active_resource_plan_args&);
-  ThriftHiveMetastore_get_active_resource_plan_args() noexcept {
-  }
+  ThriftHiveMetastore_get_active_resource_plan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_active_resource_plan_args() noexcept;
   WMGetActiveResourcePlanRequest request;
@@ -29789,12 +25691,7 @@ class ThriftHiveMetastore_get_active_resource_plan_args {
 
   void __set_request(const WMGetActiveResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_active_resource_plan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_active_resource_plan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_active_resource_plan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29829,8 +25726,7 @@ class ThriftHiveMetastore_get_active_resource_plan_result {
 
   ThriftHiveMetastore_get_active_resource_plan_result(const ThriftHiveMetastore_get_active_resource_plan_result&);
   ThriftHiveMetastore_get_active_resource_plan_result& operator=(const ThriftHiveMetastore_get_active_resource_plan_result&);
-  ThriftHiveMetastore_get_active_resource_plan_result() noexcept {
-  }
+  ThriftHiveMetastore_get_active_resource_plan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_active_resource_plan_result() noexcept;
   WMGetActiveResourcePlanResponse success;
@@ -29842,14 +25738,7 @@ class ThriftHiveMetastore_get_active_resource_plan_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_active_resource_plan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_active_resource_plan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_active_resource_plan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -29891,8 +25780,7 @@ class ThriftHiveMetastore_get_all_resource_plans_args {
 
   ThriftHiveMetastore_get_all_resource_plans_args(const ThriftHiveMetastore_get_all_resource_plans_args&);
   ThriftHiveMetastore_get_all_resource_plans_args& operator=(const ThriftHiveMetastore_get_all_resource_plans_args&);
-  ThriftHiveMetastore_get_all_resource_plans_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_resource_plans_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_resource_plans_args() noexcept;
   WMGetAllResourcePlanRequest request;
@@ -29901,12 +25789,7 @@ class ThriftHiveMetastore_get_all_resource_plans_args {
 
   void __set_request(const WMGetAllResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_resource_plans_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_resource_plans_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_resource_plans_args &rhs) const {
     return !(*this == rhs);
   }
@@ -29941,8 +25824,7 @@ class ThriftHiveMetastore_get_all_resource_plans_result {
 
   ThriftHiveMetastore_get_all_resource_plans_result(const ThriftHiveMetastore_get_all_resource_plans_result&);
   ThriftHiveMetastore_get_all_resource_plans_result& operator=(const ThriftHiveMetastore_get_all_resource_plans_result&);
-  ThriftHiveMetastore_get_all_resource_plans_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_resource_plans_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_resource_plans_result() noexcept;
   WMGetAllResourcePlanResponse success;
@@ -29954,14 +25836,7 @@ class ThriftHiveMetastore_get_all_resource_plans_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_resource_plans_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_resource_plans_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_resource_plans_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30003,8 +25878,7 @@ class ThriftHiveMetastore_alter_resource_plan_args {
 
   ThriftHiveMetastore_alter_resource_plan_args(const ThriftHiveMetastore_alter_resource_plan_args&);
   ThriftHiveMetastore_alter_resource_plan_args& operator=(const ThriftHiveMetastore_alter_resource_plan_args&);
-  ThriftHiveMetastore_alter_resource_plan_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_resource_plan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_resource_plan_args() noexcept;
   WMAlterResourcePlanRequest request;
@@ -30013,12 +25887,7 @@ class ThriftHiveMetastore_alter_resource_plan_args {
 
   void __set_request(const WMAlterResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_resource_plan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_resource_plan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_resource_plan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30055,8 +25924,7 @@ class ThriftHiveMetastore_alter_resource_plan_result {
 
   ThriftHiveMetastore_alter_resource_plan_result(const ThriftHiveMetastore_alter_resource_plan_result&);
   ThriftHiveMetastore_alter_resource_plan_result& operator=(const ThriftHiveMetastore_alter_resource_plan_result&);
-  ThriftHiveMetastore_alter_resource_plan_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_resource_plan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_resource_plan_result() noexcept;
   WMAlterResourcePlanResponse success;
@@ -30074,18 +25942,7 @@ class ThriftHiveMetastore_alter_resource_plan_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_resource_plan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_resource_plan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_resource_plan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30131,8 +25988,7 @@ class ThriftHiveMetastore_validate_resource_plan_args {
 
   ThriftHiveMetastore_validate_resource_plan_args(const ThriftHiveMetastore_validate_resource_plan_args&);
   ThriftHiveMetastore_validate_resource_plan_args& operator=(const ThriftHiveMetastore_validate_resource_plan_args&);
-  ThriftHiveMetastore_validate_resource_plan_args() noexcept {
-  }
+  ThriftHiveMetastore_validate_resource_plan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_validate_resource_plan_args() noexcept;
   WMValidateResourcePlanRequest request;
@@ -30141,12 +25997,7 @@ class ThriftHiveMetastore_validate_resource_plan_args {
 
   void __set_request(const WMValidateResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_validate_resource_plan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_validate_resource_plan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_validate_resource_plan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30182,8 +26033,7 @@ class ThriftHiveMetastore_validate_resource_plan_result {
 
   ThriftHiveMetastore_validate_resource_plan_result(const ThriftHiveMetastore_validate_resource_plan_result&);
   ThriftHiveMetastore_validate_resource_plan_result& operator=(const ThriftHiveMetastore_validate_resource_plan_result&);
-  ThriftHiveMetastore_validate_resource_plan_result() noexcept {
-  }
+  ThriftHiveMetastore_validate_resource_plan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_validate_resource_plan_result() noexcept;
   WMValidateResourcePlanResponse success;
@@ -30198,16 +26048,7 @@ class ThriftHiveMetastore_validate_resource_plan_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_validate_resource_plan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_validate_resource_plan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_validate_resource_plan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30251,8 +26092,7 @@ class ThriftHiveMetastore_drop_resource_plan_args {
 
   ThriftHiveMetastore_drop_resource_plan_args(const ThriftHiveMetastore_drop_resource_plan_args&);
   ThriftHiveMetastore_drop_resource_plan_args& operator=(const ThriftHiveMetastore_drop_resource_plan_args&);
-  ThriftHiveMetastore_drop_resource_plan_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_resource_plan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_resource_plan_args() noexcept;
   WMDropResourcePlanRequest request;
@@ -30261,12 +26101,7 @@ class ThriftHiveMetastore_drop_resource_plan_args {
 
   void __set_request(const WMDropResourcePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_resource_plan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_resource_plan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_resource_plan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30303,8 +26138,7 @@ class ThriftHiveMetastore_drop_resource_plan_result {
 
   ThriftHiveMetastore_drop_resource_plan_result(const ThriftHiveMetastore_drop_resource_plan_result&);
   ThriftHiveMetastore_drop_resource_plan_result& operator=(const ThriftHiveMetastore_drop_resource_plan_result&);
-  ThriftHiveMetastore_drop_resource_plan_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_resource_plan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_resource_plan_result() noexcept;
   WMDropResourcePlanResponse success;
@@ -30322,18 +26156,7 @@ class ThriftHiveMetastore_drop_resource_plan_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_resource_plan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_resource_plan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_resource_plan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30379,8 +26202,7 @@ class ThriftHiveMetastore_create_wm_trigger_args {
 
   ThriftHiveMetastore_create_wm_trigger_args(const ThriftHiveMetastore_create_wm_trigger_args&);
   ThriftHiveMetastore_create_wm_trigger_args& operator=(const ThriftHiveMetastore_create_wm_trigger_args&);
-  ThriftHiveMetastore_create_wm_trigger_args() noexcept {
-  }
+  ThriftHiveMetastore_create_wm_trigger_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_wm_trigger_args() noexcept;
   WMCreateTriggerRequest request;
@@ -30389,12 +26211,7 @@ class ThriftHiveMetastore_create_wm_trigger_args {
 
   void __set_request(const WMCreateTriggerRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_wm_trigger_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_wm_trigger_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_wm_trigger_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30432,8 +26249,7 @@ class ThriftHiveMetastore_create_wm_trigger_result {
 
   ThriftHiveMetastore_create_wm_trigger_result(const ThriftHiveMetastore_create_wm_trigger_result&);
   ThriftHiveMetastore_create_wm_trigger_result& operator=(const ThriftHiveMetastore_create_wm_trigger_result&);
-  ThriftHiveMetastore_create_wm_trigger_result() noexcept {
-  }
+  ThriftHiveMetastore_create_wm_trigger_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_wm_trigger_result() noexcept;
   WMCreateTriggerResponse success;
@@ -30454,20 +26270,7 @@ class ThriftHiveMetastore_create_wm_trigger_result {
 
   void __set_o4(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_wm_trigger_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_wm_trigger_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_wm_trigger_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30515,8 +26318,7 @@ class ThriftHiveMetastore_alter_wm_trigger_args {
 
   ThriftHiveMetastore_alter_wm_trigger_args(const ThriftHiveMetastore_alter_wm_trigger_args&);
   ThriftHiveMetastore_alter_wm_trigger_args& operator=(const ThriftHiveMetastore_alter_wm_trigger_args&);
-  ThriftHiveMetastore_alter_wm_trigger_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_wm_trigger_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_wm_trigger_args() noexcept;
   WMAlterTriggerRequest request;
@@ -30525,12 +26327,7 @@ class ThriftHiveMetastore_alter_wm_trigger_args {
 
   void __set_request(const WMAlterTriggerRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_wm_trigger_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_wm_trigger_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_wm_trigger_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30567,8 +26364,7 @@ class ThriftHiveMetastore_alter_wm_trigger_result {
 
   ThriftHiveMetastore_alter_wm_trigger_result(const ThriftHiveMetastore_alter_wm_trigger_result&);
   ThriftHiveMetastore_alter_wm_trigger_result& operator=(const ThriftHiveMetastore_alter_wm_trigger_result&);
-  ThriftHiveMetastore_alter_wm_trigger_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_wm_trigger_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_wm_trigger_result() noexcept;
   WMAlterTriggerResponse success;
@@ -30586,18 +26382,7 @@ class ThriftHiveMetastore_alter_wm_trigger_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_wm_trigger_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_wm_trigger_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_wm_trigger_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30643,8 +26428,7 @@ class ThriftHiveMetastore_drop_wm_trigger_args {
 
   ThriftHiveMetastore_drop_wm_trigger_args(const ThriftHiveMetastore_drop_wm_trigger_args&);
   ThriftHiveMetastore_drop_wm_trigger_args& operator=(const ThriftHiveMetastore_drop_wm_trigger_args&);
-  ThriftHiveMetastore_drop_wm_trigger_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_wm_trigger_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_wm_trigger_args() noexcept;
   WMDropTriggerRequest request;
@@ -30653,12 +26437,7 @@ class ThriftHiveMetastore_drop_wm_trigger_args {
 
   void __set_request(const WMDropTriggerRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_wm_trigger_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_wm_trigger_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_wm_trigger_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30695,8 +26474,7 @@ class ThriftHiveMetastore_drop_wm_trigger_result {
 
   ThriftHiveMetastore_drop_wm_trigger_result(const ThriftHiveMetastore_drop_wm_trigger_result&);
   ThriftHiveMetastore_drop_wm_trigger_result& operator=(const ThriftHiveMetastore_drop_wm_trigger_result&);
-  ThriftHiveMetastore_drop_wm_trigger_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_wm_trigger_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_wm_trigger_result() noexcept;
   WMDropTriggerResponse success;
@@ -30714,18 +26492,7 @@ class ThriftHiveMetastore_drop_wm_trigger_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_wm_trigger_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_wm_trigger_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_wm_trigger_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30771,8 +26538,7 @@ class ThriftHiveMetastore_get_triggers_for_resourceplan_args {
 
   ThriftHiveMetastore_get_triggers_for_resourceplan_args(const ThriftHiveMetastore_get_triggers_for_resourceplan_args&);
   ThriftHiveMetastore_get_triggers_for_resourceplan_args& operator=(const ThriftHiveMetastore_get_triggers_for_resourceplan_args&);
-  ThriftHiveMetastore_get_triggers_for_resourceplan_args() noexcept {
-  }
+  ThriftHiveMetastore_get_triggers_for_resourceplan_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_triggers_for_resourceplan_args() noexcept;
   WMGetTriggersForResourePlanRequest request;
@@ -30781,12 +26547,7 @@ class ThriftHiveMetastore_get_triggers_for_resourceplan_args {
 
   void __set_request(const WMGetTriggersForResourePlanRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_triggers_for_resourceplan_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_triggers_for_resourceplan_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_triggers_for_resourceplan_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30822,8 +26583,7 @@ class ThriftHiveMetastore_get_triggers_for_resourceplan_result {
 
   ThriftHiveMetastore_get_triggers_for_resourceplan_result(const ThriftHiveMetastore_get_triggers_for_resourceplan_result&);
   ThriftHiveMetastore_get_triggers_for_resourceplan_result& operator=(const ThriftHiveMetastore_get_triggers_for_resourceplan_result&);
-  ThriftHiveMetastore_get_triggers_for_resourceplan_result() noexcept {
-  }
+  ThriftHiveMetastore_get_triggers_for_resourceplan_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_triggers_for_resourceplan_result() noexcept;
   WMGetTriggersForResourePlanResponse success;
@@ -30838,16 +26598,7 @@ class ThriftHiveMetastore_get_triggers_for_resourceplan_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_triggers_for_resourceplan_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_triggers_for_resourceplan_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_triggers_for_resourceplan_result &rhs) const {
     return !(*this == rhs);
   }
@@ -30891,8 +26642,7 @@ class ThriftHiveMetastore_create_wm_pool_args {
 
   ThriftHiveMetastore_create_wm_pool_args(const ThriftHiveMetastore_create_wm_pool_args&);
   ThriftHiveMetastore_create_wm_pool_args& operator=(const ThriftHiveMetastore_create_wm_pool_args&);
-  ThriftHiveMetastore_create_wm_pool_args() noexcept {
-  }
+  ThriftHiveMetastore_create_wm_pool_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_wm_pool_args() noexcept;
   WMCreatePoolRequest request;
@@ -30901,12 +26651,7 @@ class ThriftHiveMetastore_create_wm_pool_args {
 
   void __set_request(const WMCreatePoolRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_wm_pool_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_wm_pool_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_wm_pool_args &rhs) const {
     return !(*this == rhs);
   }
@@ -30944,8 +26689,7 @@ class ThriftHiveMetastore_create_wm_pool_result {
 
   ThriftHiveMetastore_create_wm_pool_result(const ThriftHiveMetastore_create_wm_pool_result&);
   ThriftHiveMetastore_create_wm_pool_result& operator=(const ThriftHiveMetastore_create_wm_pool_result&);
-  ThriftHiveMetastore_create_wm_pool_result() noexcept {
-  }
+  ThriftHiveMetastore_create_wm_pool_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_wm_pool_result() noexcept;
   WMCreatePoolResponse success;
@@ -30966,20 +26710,7 @@ class ThriftHiveMetastore_create_wm_pool_result {
 
   void __set_o4(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_wm_pool_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_wm_pool_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_wm_pool_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31027,8 +26758,7 @@ class ThriftHiveMetastore_alter_wm_pool_args {
 
   ThriftHiveMetastore_alter_wm_pool_args(const ThriftHiveMetastore_alter_wm_pool_args&);
   ThriftHiveMetastore_alter_wm_pool_args& operator=(const ThriftHiveMetastore_alter_wm_pool_args&);
-  ThriftHiveMetastore_alter_wm_pool_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_wm_pool_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_wm_pool_args() noexcept;
   WMAlterPoolRequest request;
@@ -31037,12 +26767,7 @@ class ThriftHiveMetastore_alter_wm_pool_args {
 
   void __set_request(const WMAlterPoolRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_wm_pool_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_wm_pool_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_wm_pool_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31080,8 +26805,7 @@ class ThriftHiveMetastore_alter_wm_pool_result {
 
   ThriftHiveMetastore_alter_wm_pool_result(const ThriftHiveMetastore_alter_wm_pool_result&);
   ThriftHiveMetastore_alter_wm_pool_result& operator=(const ThriftHiveMetastore_alter_wm_pool_result&);
-  ThriftHiveMetastore_alter_wm_pool_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_wm_pool_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_wm_pool_result() noexcept;
   WMAlterPoolResponse success;
@@ -31102,20 +26826,7 @@ class ThriftHiveMetastore_alter_wm_pool_result {
 
   void __set_o4(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_wm_pool_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_wm_pool_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_wm_pool_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31163,8 +26874,7 @@ class ThriftHiveMetastore_drop_wm_pool_args {
 
   ThriftHiveMetastore_drop_wm_pool_args(const ThriftHiveMetastore_drop_wm_pool_args&);
   ThriftHiveMetastore_drop_wm_pool_args& operator=(const ThriftHiveMetastore_drop_wm_pool_args&);
-  ThriftHiveMetastore_drop_wm_pool_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_wm_pool_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_wm_pool_args() noexcept;
   WMDropPoolRequest request;
@@ -31173,12 +26883,7 @@ class ThriftHiveMetastore_drop_wm_pool_args {
 
   void __set_request(const WMDropPoolRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_wm_pool_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_wm_pool_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_wm_pool_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31215,8 +26920,7 @@ class ThriftHiveMetastore_drop_wm_pool_result {
 
   ThriftHiveMetastore_drop_wm_pool_result(const ThriftHiveMetastore_drop_wm_pool_result&);
   ThriftHiveMetastore_drop_wm_pool_result& operator=(const ThriftHiveMetastore_drop_wm_pool_result&);
-  ThriftHiveMetastore_drop_wm_pool_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_wm_pool_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_wm_pool_result() noexcept;
   WMDropPoolResponse success;
@@ -31234,18 +26938,7 @@ class ThriftHiveMetastore_drop_wm_pool_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_wm_pool_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_wm_pool_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_wm_pool_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31291,8 +26984,7 @@ class ThriftHiveMetastore_create_or_update_wm_mapping_args {
 
   ThriftHiveMetastore_create_or_update_wm_mapping_args(const ThriftHiveMetastore_create_or_update_wm_mapping_args&);
   ThriftHiveMetastore_create_or_update_wm_mapping_args& operator=(const ThriftHiveMetastore_create_or_update_wm_mapping_args&);
-  ThriftHiveMetastore_create_or_update_wm_mapping_args() noexcept {
-  }
+  ThriftHiveMetastore_create_or_update_wm_mapping_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_or_update_wm_mapping_args() noexcept;
   WMCreateOrUpdateMappingRequest request;
@@ -31301,12 +26993,7 @@ class ThriftHiveMetastore_create_or_update_wm_mapping_args {
 
   void __set_request(const WMCreateOrUpdateMappingRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_or_update_wm_mapping_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_or_update_wm_mapping_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_or_update_wm_mapping_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31344,8 +27031,7 @@ class ThriftHiveMetastore_create_or_update_wm_mapping_result {
 
   ThriftHiveMetastore_create_or_update_wm_mapping_result(const ThriftHiveMetastore_create_or_update_wm_mapping_result&);
   ThriftHiveMetastore_create_or_update_wm_mapping_result& operator=(const ThriftHiveMetastore_create_or_update_wm_mapping_result&);
-  ThriftHiveMetastore_create_or_update_wm_mapping_result() noexcept {
-  }
+  ThriftHiveMetastore_create_or_update_wm_mapping_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_or_update_wm_mapping_result() noexcept;
   WMCreateOrUpdateMappingResponse success;
@@ -31366,20 +27052,7 @@ class ThriftHiveMetastore_create_or_update_wm_mapping_result {
 
   void __set_o4(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_or_update_wm_mapping_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_or_update_wm_mapping_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_or_update_wm_mapping_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31427,8 +27100,7 @@ class ThriftHiveMetastore_drop_wm_mapping_args {
 
   ThriftHiveMetastore_drop_wm_mapping_args(const ThriftHiveMetastore_drop_wm_mapping_args&);
   ThriftHiveMetastore_drop_wm_mapping_args& operator=(const ThriftHiveMetastore_drop_wm_mapping_args&);
-  ThriftHiveMetastore_drop_wm_mapping_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_wm_mapping_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_wm_mapping_args() noexcept;
   WMDropMappingRequest request;
@@ -31437,12 +27109,7 @@ class ThriftHiveMetastore_drop_wm_mapping_args {
 
   void __set_request(const WMDropMappingRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_wm_mapping_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_wm_mapping_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_wm_mapping_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31479,8 +27146,7 @@ class ThriftHiveMetastore_drop_wm_mapping_result {
 
   ThriftHiveMetastore_drop_wm_mapping_result(const ThriftHiveMetastore_drop_wm_mapping_result&);
   ThriftHiveMetastore_drop_wm_mapping_result& operator=(const ThriftHiveMetastore_drop_wm_mapping_result&);
-  ThriftHiveMetastore_drop_wm_mapping_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_wm_mapping_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_wm_mapping_result() noexcept;
   WMDropMappingResponse success;
@@ -31498,18 +27164,7 @@ class ThriftHiveMetastore_drop_wm_mapping_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_wm_mapping_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_wm_mapping_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_wm_mapping_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31555,8 +27210,7 @@ class ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args {
 
   ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args(const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args&);
   ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args& operator=(const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args&);
-  ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args() noexcept {
-  }
+  ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args() noexcept;
   WMCreateOrDropTriggerToPoolMappingRequest request;
@@ -31565,12 +27219,7 @@ class ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args {
 
   void __set_request(const WMCreateOrDropTriggerToPoolMappingRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31608,8 +27257,7 @@ class ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result {
 
   ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result(const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result&);
   ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result& operator=(const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result&);
-  ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result() noexcept {
-  }
+  ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result() noexcept;
   WMCreateOrDropTriggerToPoolMappingResponse success;
@@ -31630,20 +27278,7 @@ class ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result {
 
   void __set_o4(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31691,8 +27326,7 @@ class ThriftHiveMetastore_create_ischema_args {
 
   ThriftHiveMetastore_create_ischema_args(const ThriftHiveMetastore_create_ischema_args&);
   ThriftHiveMetastore_create_ischema_args& operator=(const ThriftHiveMetastore_create_ischema_args&);
-  ThriftHiveMetastore_create_ischema_args() noexcept {
-  }
+  ThriftHiveMetastore_create_ischema_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_ischema_args() noexcept;
   ISchema schema;
@@ -31701,12 +27335,7 @@ class ThriftHiveMetastore_create_ischema_args {
 
   void __set_schema(const ISchema& val);
 
-  bool operator == (const ThriftHiveMetastore_create_ischema_args & rhs) const
-  {
-    if (!(schema == rhs.schema))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_ischema_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_ischema_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31742,8 +27371,7 @@ class ThriftHiveMetastore_create_ischema_result {
 
   ThriftHiveMetastore_create_ischema_result(const ThriftHiveMetastore_create_ischema_result&);
   ThriftHiveMetastore_create_ischema_result& operator=(const ThriftHiveMetastore_create_ischema_result&);
-  ThriftHiveMetastore_create_ischema_result() noexcept {
-  }
+  ThriftHiveMetastore_create_ischema_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_ischema_result() noexcept;
   AlreadyExistsException o1;
@@ -31758,16 +27386,7 @@ class ThriftHiveMetastore_create_ischema_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_ischema_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_ischema_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_ischema_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31811,8 +27430,7 @@ class ThriftHiveMetastore_alter_ischema_args {
 
   ThriftHiveMetastore_alter_ischema_args(const ThriftHiveMetastore_alter_ischema_args&);
   ThriftHiveMetastore_alter_ischema_args& operator=(const ThriftHiveMetastore_alter_ischema_args&);
-  ThriftHiveMetastore_alter_ischema_args() noexcept {
-  }
+  ThriftHiveMetastore_alter_ischema_args() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_ischema_args() noexcept;
   AlterISchemaRequest rqst;
@@ -31821,12 +27439,7 @@ class ThriftHiveMetastore_alter_ischema_args {
 
   void __set_rqst(const AlterISchemaRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_ischema_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_ischema_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_ischema_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31861,8 +27474,7 @@ class ThriftHiveMetastore_alter_ischema_result {
 
   ThriftHiveMetastore_alter_ischema_result(const ThriftHiveMetastore_alter_ischema_result&);
   ThriftHiveMetastore_alter_ischema_result& operator=(const ThriftHiveMetastore_alter_ischema_result&);
-  ThriftHiveMetastore_alter_ischema_result() noexcept {
-  }
+  ThriftHiveMetastore_alter_ischema_result() noexcept;
 
   virtual ~ThriftHiveMetastore_alter_ischema_result() noexcept;
   NoSuchObjectException o1;
@@ -31874,14 +27486,7 @@ class ThriftHiveMetastore_alter_ischema_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_alter_ischema_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_alter_ischema_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_alter_ischema_result &rhs) const {
     return !(*this == rhs);
   }
@@ -31923,8 +27528,7 @@ class ThriftHiveMetastore_get_ischema_args {
 
   ThriftHiveMetastore_get_ischema_args(const ThriftHiveMetastore_get_ischema_args&);
   ThriftHiveMetastore_get_ischema_args& operator=(const ThriftHiveMetastore_get_ischema_args&);
-  ThriftHiveMetastore_get_ischema_args() noexcept {
-  }
+  ThriftHiveMetastore_get_ischema_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_ischema_args() noexcept;
   ISchemaName name;
@@ -31933,12 +27537,7 @@ class ThriftHiveMetastore_get_ischema_args {
 
   void __set_name(const ISchemaName& val);
 
-  bool operator == (const ThriftHiveMetastore_get_ischema_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_ischema_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_ischema_args &rhs) const {
     return !(*this == rhs);
   }
@@ -31974,8 +27573,7 @@ class ThriftHiveMetastore_get_ischema_result {
 
   ThriftHiveMetastore_get_ischema_result(const ThriftHiveMetastore_get_ischema_result&);
   ThriftHiveMetastore_get_ischema_result& operator=(const ThriftHiveMetastore_get_ischema_result&);
-  ThriftHiveMetastore_get_ischema_result() noexcept {
-  }
+  ThriftHiveMetastore_get_ischema_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_ischema_result() noexcept;
   ISchema success;
@@ -31990,16 +27588,7 @@ class ThriftHiveMetastore_get_ischema_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_ischema_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_ischema_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_ischema_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32043,8 +27632,7 @@ class ThriftHiveMetastore_drop_ischema_args {
 
   ThriftHiveMetastore_drop_ischema_args(const ThriftHiveMetastore_drop_ischema_args&);
   ThriftHiveMetastore_drop_ischema_args& operator=(const ThriftHiveMetastore_drop_ischema_args&);
-  ThriftHiveMetastore_drop_ischema_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_ischema_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_ischema_args() noexcept;
   ISchemaName name;
@@ -32053,12 +27641,7 @@ class ThriftHiveMetastore_drop_ischema_args {
 
   void __set_name(const ISchemaName& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_ischema_args & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_ischema_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_ischema_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32094,8 +27677,7 @@ class ThriftHiveMetastore_drop_ischema_result {
 
   ThriftHiveMetastore_drop_ischema_result(const ThriftHiveMetastore_drop_ischema_result&);
   ThriftHiveMetastore_drop_ischema_result& operator=(const ThriftHiveMetastore_drop_ischema_result&);
-  ThriftHiveMetastore_drop_ischema_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_ischema_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_ischema_result() noexcept;
   NoSuchObjectException o1;
@@ -32110,16 +27692,7 @@ class ThriftHiveMetastore_drop_ischema_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_ischema_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_ischema_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_ischema_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32163,8 +27736,7 @@ class ThriftHiveMetastore_add_schema_version_args {
 
   ThriftHiveMetastore_add_schema_version_args(const ThriftHiveMetastore_add_schema_version_args&);
   ThriftHiveMetastore_add_schema_version_args& operator=(const ThriftHiveMetastore_add_schema_version_args&);
-  ThriftHiveMetastore_add_schema_version_args() noexcept {
-  }
+  ThriftHiveMetastore_add_schema_version_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_schema_version_args() noexcept;
   SchemaVersion schemaVersion;
@@ -32173,12 +27745,7 @@ class ThriftHiveMetastore_add_schema_version_args {
 
   void __set_schemaVersion(const SchemaVersion& val);
 
-  bool operator == (const ThriftHiveMetastore_add_schema_version_args & rhs) const
-  {
-    if (!(schemaVersion == rhs.schemaVersion))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_schema_version_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_schema_version_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32214,8 +27781,7 @@ class ThriftHiveMetastore_add_schema_version_result {
 
   ThriftHiveMetastore_add_schema_version_result(const ThriftHiveMetastore_add_schema_version_result&);
   ThriftHiveMetastore_add_schema_version_result& operator=(const ThriftHiveMetastore_add_schema_version_result&);
-  ThriftHiveMetastore_add_schema_version_result() noexcept {
-  }
+  ThriftHiveMetastore_add_schema_version_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_schema_version_result() noexcept;
   AlreadyExistsException o1;
@@ -32230,16 +27796,7 @@ class ThriftHiveMetastore_add_schema_version_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_schema_version_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_schema_version_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_schema_version_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32283,8 +27840,7 @@ class ThriftHiveMetastore_get_schema_version_args {
 
   ThriftHiveMetastore_get_schema_version_args(const ThriftHiveMetastore_get_schema_version_args&);
   ThriftHiveMetastore_get_schema_version_args& operator=(const ThriftHiveMetastore_get_schema_version_args&);
-  ThriftHiveMetastore_get_schema_version_args() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_version_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_version_args() noexcept;
   SchemaVersionDescriptor schemaVersion;
@@ -32293,12 +27849,7 @@ class ThriftHiveMetastore_get_schema_version_args {
 
   void __set_schemaVersion(const SchemaVersionDescriptor& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_version_args & rhs) const
-  {
-    if (!(schemaVersion == rhs.schemaVersion))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_version_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_version_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32334,8 +27885,7 @@ class ThriftHiveMetastore_get_schema_version_result {
 
   ThriftHiveMetastore_get_schema_version_result(const ThriftHiveMetastore_get_schema_version_result&);
   ThriftHiveMetastore_get_schema_version_result& operator=(const ThriftHiveMetastore_get_schema_version_result&);
-  ThriftHiveMetastore_get_schema_version_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_version_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_version_result() noexcept;
   SchemaVersion success;
@@ -32350,16 +27900,7 @@ class ThriftHiveMetastore_get_schema_version_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_version_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_version_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_version_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32403,8 +27944,7 @@ class ThriftHiveMetastore_get_schema_latest_version_args {
 
   ThriftHiveMetastore_get_schema_latest_version_args(const ThriftHiveMetastore_get_schema_latest_version_args&);
   ThriftHiveMetastore_get_schema_latest_version_args& operator=(const ThriftHiveMetastore_get_schema_latest_version_args&);
-  ThriftHiveMetastore_get_schema_latest_version_args() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_latest_version_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_latest_version_args() noexcept;
   ISchemaName schemaName;
@@ -32413,12 +27953,7 @@ class ThriftHiveMetastore_get_schema_latest_version_args {
 
   void __set_schemaName(const ISchemaName& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_latest_version_args & rhs) const
-  {
-    if (!(schemaName == rhs.schemaName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_latest_version_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_latest_version_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32454,8 +27989,7 @@ class ThriftHiveMetastore_get_schema_latest_version_result {
 
   ThriftHiveMetastore_get_schema_latest_version_result(const ThriftHiveMetastore_get_schema_latest_version_result&);
   ThriftHiveMetastore_get_schema_latest_version_result& operator=(const ThriftHiveMetastore_get_schema_latest_version_result&);
-  ThriftHiveMetastore_get_schema_latest_version_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_latest_version_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_latest_version_result() noexcept;
   SchemaVersion success;
@@ -32470,16 +28004,7 @@ class ThriftHiveMetastore_get_schema_latest_version_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_latest_version_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_latest_version_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_latest_version_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32523,8 +28048,7 @@ class ThriftHiveMetastore_get_schema_all_versions_args {
 
   ThriftHiveMetastore_get_schema_all_versions_args(const ThriftHiveMetastore_get_schema_all_versions_args&);
   ThriftHiveMetastore_get_schema_all_versions_args& operator=(const ThriftHiveMetastore_get_schema_all_versions_args&);
-  ThriftHiveMetastore_get_schema_all_versions_args() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_all_versions_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_all_versions_args() noexcept;
   ISchemaName schemaName;
@@ -32533,12 +28057,7 @@ class ThriftHiveMetastore_get_schema_all_versions_args {
 
   void __set_schemaName(const ISchemaName& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_all_versions_args & rhs) const
-  {
-    if (!(schemaName == rhs.schemaName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_all_versions_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_all_versions_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32574,8 +28093,7 @@ class ThriftHiveMetastore_get_schema_all_versions_result {
 
   ThriftHiveMetastore_get_schema_all_versions_result(const ThriftHiveMetastore_get_schema_all_versions_result&);
   ThriftHiveMetastore_get_schema_all_versions_result& operator=(const ThriftHiveMetastore_get_schema_all_versions_result&);
-  ThriftHiveMetastore_get_schema_all_versions_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schema_all_versions_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schema_all_versions_result() noexcept;
   std::vector<SchemaVersion>  success;
@@ -32590,16 +28108,7 @@ class ThriftHiveMetastore_get_schema_all_versions_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schema_all_versions_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schema_all_versions_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schema_all_versions_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32643,8 +28152,7 @@ class ThriftHiveMetastore_drop_schema_version_args {
 
   ThriftHiveMetastore_drop_schema_version_args(const ThriftHiveMetastore_drop_schema_version_args&);
   ThriftHiveMetastore_drop_schema_version_args& operator=(const ThriftHiveMetastore_drop_schema_version_args&);
-  ThriftHiveMetastore_drop_schema_version_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_schema_version_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_schema_version_args() noexcept;
   SchemaVersionDescriptor schemaVersion;
@@ -32653,12 +28161,7 @@ class ThriftHiveMetastore_drop_schema_version_args {
 
   void __set_schemaVersion(const SchemaVersionDescriptor& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_schema_version_args & rhs) const
-  {
-    if (!(schemaVersion == rhs.schemaVersion))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_schema_version_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_schema_version_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32693,8 +28196,7 @@ class ThriftHiveMetastore_drop_schema_version_result {
 
   ThriftHiveMetastore_drop_schema_version_result(const ThriftHiveMetastore_drop_schema_version_result&);
   ThriftHiveMetastore_drop_schema_version_result& operator=(const ThriftHiveMetastore_drop_schema_version_result&);
-  ThriftHiveMetastore_drop_schema_version_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_schema_version_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_schema_version_result() noexcept;
   NoSuchObjectException o1;
@@ -32706,14 +28208,7 @@ class ThriftHiveMetastore_drop_schema_version_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_schema_version_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_schema_version_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_schema_version_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32755,8 +28250,7 @@ class ThriftHiveMetastore_get_schemas_by_cols_args {
 
   ThriftHiveMetastore_get_schemas_by_cols_args(const ThriftHiveMetastore_get_schemas_by_cols_args&);
   ThriftHiveMetastore_get_schemas_by_cols_args& operator=(const ThriftHiveMetastore_get_schemas_by_cols_args&);
-  ThriftHiveMetastore_get_schemas_by_cols_args() noexcept {
-  }
+  ThriftHiveMetastore_get_schemas_by_cols_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schemas_by_cols_args() noexcept;
   FindSchemasByColsRqst rqst;
@@ -32765,12 +28259,7 @@ class ThriftHiveMetastore_get_schemas_by_cols_args {
 
   void __set_rqst(const FindSchemasByColsRqst& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schemas_by_cols_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schemas_by_cols_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schemas_by_cols_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32805,8 +28294,7 @@ class ThriftHiveMetastore_get_schemas_by_cols_result {
 
   ThriftHiveMetastore_get_schemas_by_cols_result(const ThriftHiveMetastore_get_schemas_by_cols_result&);
   ThriftHiveMetastore_get_schemas_by_cols_result& operator=(const ThriftHiveMetastore_get_schemas_by_cols_result&);
-  ThriftHiveMetastore_get_schemas_by_cols_result() noexcept {
-  }
+  ThriftHiveMetastore_get_schemas_by_cols_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_schemas_by_cols_result() noexcept;
   FindSchemasByColsResp success;
@@ -32818,14 +28306,7 @@ class ThriftHiveMetastore_get_schemas_by_cols_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_schemas_by_cols_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_schemas_by_cols_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_schemas_by_cols_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32867,8 +28348,7 @@ class ThriftHiveMetastore_map_schema_version_to_serde_args {
 
   ThriftHiveMetastore_map_schema_version_to_serde_args(const ThriftHiveMetastore_map_schema_version_to_serde_args&);
   ThriftHiveMetastore_map_schema_version_to_serde_args& operator=(const ThriftHiveMetastore_map_schema_version_to_serde_args&);
-  ThriftHiveMetastore_map_schema_version_to_serde_args() noexcept {
-  }
+  ThriftHiveMetastore_map_schema_version_to_serde_args() noexcept;
 
   virtual ~ThriftHiveMetastore_map_schema_version_to_serde_args() noexcept;
   MapSchemaVersionToSerdeRequest rqst;
@@ -32877,12 +28357,7 @@ class ThriftHiveMetastore_map_schema_version_to_serde_args {
 
   void __set_rqst(const MapSchemaVersionToSerdeRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_map_schema_version_to_serde_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_map_schema_version_to_serde_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_map_schema_version_to_serde_args &rhs) const {
     return !(*this == rhs);
   }
@@ -32917,8 +28392,7 @@ class ThriftHiveMetastore_map_schema_version_to_serde_result {
 
   ThriftHiveMetastore_map_schema_version_to_serde_result(const ThriftHiveMetastore_map_schema_version_to_serde_result&);
   ThriftHiveMetastore_map_schema_version_to_serde_result& operator=(const ThriftHiveMetastore_map_schema_version_to_serde_result&);
-  ThriftHiveMetastore_map_schema_version_to_serde_result() noexcept {
-  }
+  ThriftHiveMetastore_map_schema_version_to_serde_result() noexcept;
 
   virtual ~ThriftHiveMetastore_map_schema_version_to_serde_result() noexcept;
   NoSuchObjectException o1;
@@ -32930,14 +28404,7 @@ class ThriftHiveMetastore_map_schema_version_to_serde_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_map_schema_version_to_serde_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_map_schema_version_to_serde_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_map_schema_version_to_serde_result &rhs) const {
     return !(*this == rhs);
   }
@@ -32979,8 +28446,7 @@ class ThriftHiveMetastore_set_schema_version_state_args {
 
   ThriftHiveMetastore_set_schema_version_state_args(const ThriftHiveMetastore_set_schema_version_state_args&);
   ThriftHiveMetastore_set_schema_version_state_args& operator=(const ThriftHiveMetastore_set_schema_version_state_args&);
-  ThriftHiveMetastore_set_schema_version_state_args() noexcept {
-  }
+  ThriftHiveMetastore_set_schema_version_state_args() noexcept;
 
   virtual ~ThriftHiveMetastore_set_schema_version_state_args() noexcept;
   SetSchemaVersionStateRequest rqst;
@@ -32989,12 +28455,7 @@ class ThriftHiveMetastore_set_schema_version_state_args {
 
   void __set_rqst(const SetSchemaVersionStateRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_set_schema_version_state_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_schema_version_state_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_schema_version_state_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33030,8 +28491,7 @@ class ThriftHiveMetastore_set_schema_version_state_result {
 
   ThriftHiveMetastore_set_schema_version_state_result(const ThriftHiveMetastore_set_schema_version_state_result&);
   ThriftHiveMetastore_set_schema_version_state_result& operator=(const ThriftHiveMetastore_set_schema_version_state_result&);
-  ThriftHiveMetastore_set_schema_version_state_result() noexcept {
-  }
+  ThriftHiveMetastore_set_schema_version_state_result() noexcept;
 
   virtual ~ThriftHiveMetastore_set_schema_version_state_result() noexcept;
   NoSuchObjectException o1;
@@ -33046,16 +28506,7 @@ class ThriftHiveMetastore_set_schema_version_state_result {
 
   void __set_o3(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_set_schema_version_state_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_set_schema_version_state_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_set_schema_version_state_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33099,8 +28550,7 @@ class ThriftHiveMetastore_add_serde_args {
 
   ThriftHiveMetastore_add_serde_args(const ThriftHiveMetastore_add_serde_args&);
   ThriftHiveMetastore_add_serde_args& operator=(const ThriftHiveMetastore_add_serde_args&);
-  ThriftHiveMetastore_add_serde_args() noexcept {
-  }
+  ThriftHiveMetastore_add_serde_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_serde_args() noexcept;
   SerDeInfo serde;
@@ -33109,12 +28559,7 @@ class ThriftHiveMetastore_add_serde_args {
 
   void __set_serde(const SerDeInfo& val);
 
-  bool operator == (const ThriftHiveMetastore_add_serde_args & rhs) const
-  {
-    if (!(serde == rhs.serde))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_serde_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_serde_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33149,8 +28594,7 @@ class ThriftHiveMetastore_add_serde_result {
 
   ThriftHiveMetastore_add_serde_result(const ThriftHiveMetastore_add_serde_result&);
   ThriftHiveMetastore_add_serde_result& operator=(const ThriftHiveMetastore_add_serde_result&);
-  ThriftHiveMetastore_add_serde_result() noexcept {
-  }
+  ThriftHiveMetastore_add_serde_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_serde_result() noexcept;
   AlreadyExistsException o1;
@@ -33162,14 +28606,7 @@ class ThriftHiveMetastore_add_serde_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_serde_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_serde_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_serde_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33211,8 +28648,7 @@ class ThriftHiveMetastore_get_serde_args {
 
   ThriftHiveMetastore_get_serde_args(const ThriftHiveMetastore_get_serde_args&);
   ThriftHiveMetastore_get_serde_args& operator=(const ThriftHiveMetastore_get_serde_args&);
-  ThriftHiveMetastore_get_serde_args() noexcept {
-  }
+  ThriftHiveMetastore_get_serde_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_serde_args() noexcept;
   GetSerdeRequest rqst;
@@ -33221,12 +28657,7 @@ class ThriftHiveMetastore_get_serde_args {
 
   void __set_rqst(const GetSerdeRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_serde_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_serde_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_serde_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33262,8 +28693,7 @@ class ThriftHiveMetastore_get_serde_result {
 
   ThriftHiveMetastore_get_serde_result(const ThriftHiveMetastore_get_serde_result&);
   ThriftHiveMetastore_get_serde_result& operator=(const ThriftHiveMetastore_get_serde_result&);
-  ThriftHiveMetastore_get_serde_result() noexcept {
-  }
+  ThriftHiveMetastore_get_serde_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_serde_result() noexcept;
   SerDeInfo success;
@@ -33278,16 +28708,7 @@ class ThriftHiveMetastore_get_serde_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_serde_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_serde_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_serde_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33333,11 +28754,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_args {
 
   ThriftHiveMetastore_get_lock_materialization_rebuild_args(const ThriftHiveMetastore_get_lock_materialization_rebuild_args&);
   ThriftHiveMetastore_get_lock_materialization_rebuild_args& operator=(const ThriftHiveMetastore_get_lock_materialization_rebuild_args&);
-  ThriftHiveMetastore_get_lock_materialization_rebuild_args() noexcept
-                                                            : dbName(),
-                                                              tableName(),
-                                                              txnId(0) {
-  }
+  ThriftHiveMetastore_get_lock_materialization_rebuild_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_lock_materialization_rebuild_args() noexcept;
   std::string dbName;
@@ -33352,16 +28769,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_args {
 
   void __set_txnId(const int64_t val);
 
-  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(txnId == rhs.txnId))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_lock_materialization_rebuild_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33397,8 +28805,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_result {
 
   ThriftHiveMetastore_get_lock_materialization_rebuild_result(const ThriftHiveMetastore_get_lock_materialization_rebuild_result&);
   ThriftHiveMetastore_get_lock_materialization_rebuild_result& operator=(const ThriftHiveMetastore_get_lock_materialization_rebuild_result&);
-  ThriftHiveMetastore_get_lock_materialization_rebuild_result() noexcept {
-  }
+  ThriftHiveMetastore_get_lock_materialization_rebuild_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_lock_materialization_rebuild_result() noexcept;
   LockResponse success;
@@ -33407,12 +28814,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_result {
 
   void __set_success(const LockResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_lock_materialization_rebuild_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33454,11 +28856,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args {
 
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args&);
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args& operator=(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args&);
-  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args() noexcept
-                                                                  : dbName(),
-                                                                    tableName(),
-                                                                    txnId(0) {
-  }
+  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args() noexcept;
   std::string dbName;
@@ -33473,16 +28871,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args {
 
   void __set_txnId(const int64_t val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(txnId == rhs.txnId))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33518,9 +28907,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result {
 
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result&) noexcept;
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result& operator=(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result&) noexcept;
-  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result() noexcept
-                                                                    : success(0) {
-  }
+  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result() noexcept;
   bool success;
@@ -33529,12 +28916,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result {
 
   void __set_success(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33574,8 +28956,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_req_args {
 
   ThriftHiveMetastore_get_lock_materialization_rebuild_req_args(const ThriftHiveMetastore_get_lock_materialization_rebuild_req_args&);
   ThriftHiveMetastore_get_lock_materialization_rebuild_req_args& operator=(const ThriftHiveMetastore_get_lock_materialization_rebuild_req_args&);
-  ThriftHiveMetastore_get_lock_materialization_rebuild_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_lock_materialization_rebuild_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_lock_materialization_rebuild_req_args() noexcept;
   LockMaterializationRebuildRequest req;
@@ -33584,12 +28965,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_req_args {
 
   void __set_req(const LockMaterializationRebuildRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_lock_materialization_rebuild_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33623,8 +28999,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_req_result {
 
   ThriftHiveMetastore_get_lock_materialization_rebuild_req_result(const ThriftHiveMetastore_get_lock_materialization_rebuild_req_result&);
   ThriftHiveMetastore_get_lock_materialization_rebuild_req_result& operator=(const ThriftHiveMetastore_get_lock_materialization_rebuild_req_result&);
-  ThriftHiveMetastore_get_lock_materialization_rebuild_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_lock_materialization_rebuild_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_lock_materialization_rebuild_req_result() noexcept;
   LockResponse success;
@@ -33633,12 +29008,7 @@ class ThriftHiveMetastore_get_lock_materialization_rebuild_req_result {
 
   void __set_success(const LockResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_lock_materialization_rebuild_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_lock_materialization_rebuild_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33678,8 +29048,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args {
 
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args&);
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args& operator=(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args&);
-  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args() noexcept {
-  }
+  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args() noexcept;
   LockMaterializationRebuildRequest req;
@@ -33688,12 +29057,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args {
 
   void __set_req(const LockMaterializationRebuildRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args & rhs) const
-  {
-    if (!(req == rhs.req))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33727,9 +29091,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result {
 
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result&) noexcept;
   ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result& operator=(const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result&) noexcept;
-  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result() noexcept
-                                                                        : success(0) {
-  }
+  ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result() noexcept;
   bool success;
@@ -33738,12 +29100,7 @@ class ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result {
 
   void __set_success(const bool val);
 
-  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33783,8 +29140,7 @@ class ThriftHiveMetastore_add_runtime_stats_args {
 
   ThriftHiveMetastore_add_runtime_stats_args(const ThriftHiveMetastore_add_runtime_stats_args&);
   ThriftHiveMetastore_add_runtime_stats_args& operator=(const ThriftHiveMetastore_add_runtime_stats_args&);
-  ThriftHiveMetastore_add_runtime_stats_args() noexcept {
-  }
+  ThriftHiveMetastore_add_runtime_stats_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_runtime_stats_args() noexcept;
   RuntimeStat stat;
@@ -33793,12 +29149,7 @@ class ThriftHiveMetastore_add_runtime_stats_args {
 
   void __set_stat(const RuntimeStat& val);
 
-  bool operator == (const ThriftHiveMetastore_add_runtime_stats_args & rhs) const
-  {
-    if (!(stat == rhs.stat))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_runtime_stats_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_runtime_stats_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33832,8 +29183,7 @@ class ThriftHiveMetastore_add_runtime_stats_result {
 
   ThriftHiveMetastore_add_runtime_stats_result(const ThriftHiveMetastore_add_runtime_stats_result&);
   ThriftHiveMetastore_add_runtime_stats_result& operator=(const ThriftHiveMetastore_add_runtime_stats_result&);
-  ThriftHiveMetastore_add_runtime_stats_result() noexcept {
-  }
+  ThriftHiveMetastore_add_runtime_stats_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_runtime_stats_result() noexcept;
   MetaException o1;
@@ -33842,12 +29192,7 @@ class ThriftHiveMetastore_add_runtime_stats_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_runtime_stats_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_runtime_stats_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_runtime_stats_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33887,8 +29232,7 @@ class ThriftHiveMetastore_get_runtime_stats_args {
 
   ThriftHiveMetastore_get_runtime_stats_args(const ThriftHiveMetastore_get_runtime_stats_args&) noexcept;
   ThriftHiveMetastore_get_runtime_stats_args& operator=(const ThriftHiveMetastore_get_runtime_stats_args&) noexcept;
-  ThriftHiveMetastore_get_runtime_stats_args() noexcept {
-  }
+  ThriftHiveMetastore_get_runtime_stats_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_runtime_stats_args() noexcept;
   GetRuntimeStatsRequest rqst;
@@ -33897,12 +29241,7 @@ class ThriftHiveMetastore_get_runtime_stats_args {
 
   void __set_rqst(const GetRuntimeStatsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_runtime_stats_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_runtime_stats_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_runtime_stats_args &rhs) const {
     return !(*this == rhs);
   }
@@ -33937,8 +29276,7 @@ class ThriftHiveMetastore_get_runtime_stats_result {
 
   ThriftHiveMetastore_get_runtime_stats_result(const ThriftHiveMetastore_get_runtime_stats_result&);
   ThriftHiveMetastore_get_runtime_stats_result& operator=(const ThriftHiveMetastore_get_runtime_stats_result&);
-  ThriftHiveMetastore_get_runtime_stats_result() noexcept {
-  }
+  ThriftHiveMetastore_get_runtime_stats_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_runtime_stats_result() noexcept;
   std::vector<RuntimeStat>  success;
@@ -33950,14 +29288,7 @@ class ThriftHiveMetastore_get_runtime_stats_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_runtime_stats_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_runtime_stats_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_runtime_stats_result &rhs) const {
     return !(*this == rhs);
   }
@@ -33999,8 +29330,7 @@ class ThriftHiveMetastore_get_partitions_with_specs_args {
 
   ThriftHiveMetastore_get_partitions_with_specs_args(const ThriftHiveMetastore_get_partitions_with_specs_args&);
   ThriftHiveMetastore_get_partitions_with_specs_args& operator=(const ThriftHiveMetastore_get_partitions_with_specs_args&);
-  ThriftHiveMetastore_get_partitions_with_specs_args() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_with_specs_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_with_specs_args() noexcept;
   GetPartitionsRequest request;
@@ -34009,12 +29339,7 @@ class ThriftHiveMetastore_get_partitions_with_specs_args {
 
   void __set_request(const GetPartitionsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_with_specs_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_with_specs_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_with_specs_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34049,8 +29374,7 @@ class ThriftHiveMetastore_get_partitions_with_specs_result {
 
   ThriftHiveMetastore_get_partitions_with_specs_result(const ThriftHiveMetastore_get_partitions_with_specs_result&);
   ThriftHiveMetastore_get_partitions_with_specs_result& operator=(const ThriftHiveMetastore_get_partitions_with_specs_result&);
-  ThriftHiveMetastore_get_partitions_with_specs_result() noexcept {
-  }
+  ThriftHiveMetastore_get_partitions_with_specs_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_partitions_with_specs_result() noexcept;
   GetPartitionsResponse success;
@@ -34062,14 +29386,7 @@ class ThriftHiveMetastore_get_partitions_with_specs_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_partitions_with_specs_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_partitions_with_specs_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_partitions_with_specs_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34111,8 +29428,7 @@ class ThriftHiveMetastore_scheduled_query_poll_args {
 
   ThriftHiveMetastore_scheduled_query_poll_args(const ThriftHiveMetastore_scheduled_query_poll_args&);
   ThriftHiveMetastore_scheduled_query_poll_args& operator=(const ThriftHiveMetastore_scheduled_query_poll_args&);
-  ThriftHiveMetastore_scheduled_query_poll_args() noexcept {
-  }
+  ThriftHiveMetastore_scheduled_query_poll_args() noexcept;
 
   virtual ~ThriftHiveMetastore_scheduled_query_poll_args() noexcept;
   ScheduledQueryPollRequest request;
@@ -34121,12 +29437,7 @@ class ThriftHiveMetastore_scheduled_query_poll_args {
 
   void __set_request(const ScheduledQueryPollRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_scheduled_query_poll_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_scheduled_query_poll_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_scheduled_query_poll_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34161,8 +29472,7 @@ class ThriftHiveMetastore_scheduled_query_poll_result {
 
   ThriftHiveMetastore_scheduled_query_poll_result(const ThriftHiveMetastore_scheduled_query_poll_result&);
   ThriftHiveMetastore_scheduled_query_poll_result& operator=(const ThriftHiveMetastore_scheduled_query_poll_result&);
-  ThriftHiveMetastore_scheduled_query_poll_result() noexcept {
-  }
+  ThriftHiveMetastore_scheduled_query_poll_result() noexcept;
 
   virtual ~ThriftHiveMetastore_scheduled_query_poll_result() noexcept;
   ScheduledQueryPollResponse success;
@@ -34174,14 +29484,7 @@ class ThriftHiveMetastore_scheduled_query_poll_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_scheduled_query_poll_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_scheduled_query_poll_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_scheduled_query_poll_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34223,8 +29526,7 @@ class ThriftHiveMetastore_scheduled_query_maintenance_args {
 
   ThriftHiveMetastore_scheduled_query_maintenance_args(const ThriftHiveMetastore_scheduled_query_maintenance_args&);
   ThriftHiveMetastore_scheduled_query_maintenance_args& operator=(const ThriftHiveMetastore_scheduled_query_maintenance_args&);
-  ThriftHiveMetastore_scheduled_query_maintenance_args() noexcept {
-  }
+  ThriftHiveMetastore_scheduled_query_maintenance_args() noexcept;
 
   virtual ~ThriftHiveMetastore_scheduled_query_maintenance_args() noexcept;
   ScheduledQueryMaintenanceRequest request;
@@ -34233,12 +29535,7 @@ class ThriftHiveMetastore_scheduled_query_maintenance_args {
 
   void __set_request(const ScheduledQueryMaintenanceRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_scheduled_query_maintenance_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_scheduled_query_maintenance_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_scheduled_query_maintenance_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34275,8 +29572,7 @@ class ThriftHiveMetastore_scheduled_query_maintenance_result {
 
   ThriftHiveMetastore_scheduled_query_maintenance_result(const ThriftHiveMetastore_scheduled_query_maintenance_result&);
   ThriftHiveMetastore_scheduled_query_maintenance_result& operator=(const ThriftHiveMetastore_scheduled_query_maintenance_result&);
-  ThriftHiveMetastore_scheduled_query_maintenance_result() noexcept {
-  }
+  ThriftHiveMetastore_scheduled_query_maintenance_result() noexcept;
 
   virtual ~ThriftHiveMetastore_scheduled_query_maintenance_result() noexcept;
   MetaException o1;
@@ -34294,18 +29590,7 @@ class ThriftHiveMetastore_scheduled_query_maintenance_result {
 
   void __set_o4(const InvalidInputException& val);
 
-  bool operator == (const ThriftHiveMetastore_scheduled_query_maintenance_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    if (!(o3 == rhs.o3))
-      return false;
-    if (!(o4 == rhs.o4))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_scheduled_query_maintenance_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_scheduled_query_maintenance_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34351,8 +29636,7 @@ class ThriftHiveMetastore_scheduled_query_progress_args {
 
   ThriftHiveMetastore_scheduled_query_progress_args(const ThriftHiveMetastore_scheduled_query_progress_args&);
   ThriftHiveMetastore_scheduled_query_progress_args& operator=(const ThriftHiveMetastore_scheduled_query_progress_args&);
-  ThriftHiveMetastore_scheduled_query_progress_args() noexcept {
-  }
+  ThriftHiveMetastore_scheduled_query_progress_args() noexcept;
 
   virtual ~ThriftHiveMetastore_scheduled_query_progress_args() noexcept;
   ScheduledQueryProgressInfo info;
@@ -34361,12 +29645,7 @@ class ThriftHiveMetastore_scheduled_query_progress_args {
 
   void __set_info(const ScheduledQueryProgressInfo& val);
 
-  bool operator == (const ThriftHiveMetastore_scheduled_query_progress_args & rhs) const
-  {
-    if (!(info == rhs.info))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_scheduled_query_progress_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_scheduled_query_progress_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34401,8 +29680,7 @@ class ThriftHiveMetastore_scheduled_query_progress_result {
 
   ThriftHiveMetastore_scheduled_query_progress_result(const ThriftHiveMetastore_scheduled_query_progress_result&);
   ThriftHiveMetastore_scheduled_query_progress_result& operator=(const ThriftHiveMetastore_scheduled_query_progress_result&);
-  ThriftHiveMetastore_scheduled_query_progress_result() noexcept {
-  }
+  ThriftHiveMetastore_scheduled_query_progress_result() noexcept;
 
   virtual ~ThriftHiveMetastore_scheduled_query_progress_result() noexcept;
   MetaException o1;
@@ -34414,14 +29692,7 @@ class ThriftHiveMetastore_scheduled_query_progress_result {
 
   void __set_o2(const InvalidOperationException& val);
 
-  bool operator == (const ThriftHiveMetastore_scheduled_query_progress_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_scheduled_query_progress_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_scheduled_query_progress_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34463,8 +29734,7 @@ class ThriftHiveMetastore_get_scheduled_query_args {
 
   ThriftHiveMetastore_get_scheduled_query_args(const ThriftHiveMetastore_get_scheduled_query_args&);
   ThriftHiveMetastore_get_scheduled_query_args& operator=(const ThriftHiveMetastore_get_scheduled_query_args&);
-  ThriftHiveMetastore_get_scheduled_query_args() noexcept {
-  }
+  ThriftHiveMetastore_get_scheduled_query_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_scheduled_query_args() noexcept;
   ScheduledQueryKey scheduleKey;
@@ -34473,12 +29743,7 @@ class ThriftHiveMetastore_get_scheduled_query_args {
 
   void __set_scheduleKey(const ScheduledQueryKey& val);
 
-  bool operator == (const ThriftHiveMetastore_get_scheduled_query_args & rhs) const
-  {
-    if (!(scheduleKey == rhs.scheduleKey))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_scheduled_query_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_scheduled_query_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34514,8 +29779,7 @@ class ThriftHiveMetastore_get_scheduled_query_result {
 
   ThriftHiveMetastore_get_scheduled_query_result(const ThriftHiveMetastore_get_scheduled_query_result&);
   ThriftHiveMetastore_get_scheduled_query_result& operator=(const ThriftHiveMetastore_get_scheduled_query_result&);
-  ThriftHiveMetastore_get_scheduled_query_result() noexcept {
-  }
+  ThriftHiveMetastore_get_scheduled_query_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_scheduled_query_result() noexcept;
   ScheduledQuery success;
@@ -34530,16 +29794,7 @@ class ThriftHiveMetastore_get_scheduled_query_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_scheduled_query_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_scheduled_query_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_scheduled_query_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34583,8 +29838,7 @@ class ThriftHiveMetastore_add_replication_metrics_args {
 
   ThriftHiveMetastore_add_replication_metrics_args(const ThriftHiveMetastore_add_replication_metrics_args&);
   ThriftHiveMetastore_add_replication_metrics_args& operator=(const ThriftHiveMetastore_add_replication_metrics_args&);
-  ThriftHiveMetastore_add_replication_metrics_args() noexcept {
-  }
+  ThriftHiveMetastore_add_replication_metrics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_replication_metrics_args() noexcept;
   ReplicationMetricList replicationMetricList;
@@ -34593,12 +29847,7 @@ class ThriftHiveMetastore_add_replication_metrics_args {
 
   void __set_replicationMetricList(const ReplicationMetricList& val);
 
-  bool operator == (const ThriftHiveMetastore_add_replication_metrics_args & rhs) const
-  {
-    if (!(replicationMetricList == rhs.replicationMetricList))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_replication_metrics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_replication_metrics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34632,8 +29881,7 @@ class ThriftHiveMetastore_add_replication_metrics_result {
 
   ThriftHiveMetastore_add_replication_metrics_result(const ThriftHiveMetastore_add_replication_metrics_result&);
   ThriftHiveMetastore_add_replication_metrics_result& operator=(const ThriftHiveMetastore_add_replication_metrics_result&);
-  ThriftHiveMetastore_add_replication_metrics_result() noexcept {
-  }
+  ThriftHiveMetastore_add_replication_metrics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_replication_metrics_result() noexcept;
   MetaException o1;
@@ -34642,12 +29890,7 @@ class ThriftHiveMetastore_add_replication_metrics_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_replication_metrics_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_replication_metrics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_replication_metrics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34687,8 +29930,7 @@ class ThriftHiveMetastore_get_replication_metrics_args {
 
   ThriftHiveMetastore_get_replication_metrics_args(const ThriftHiveMetastore_get_replication_metrics_args&);
   ThriftHiveMetastore_get_replication_metrics_args& operator=(const ThriftHiveMetastore_get_replication_metrics_args&);
-  ThriftHiveMetastore_get_replication_metrics_args() noexcept {
-  }
+  ThriftHiveMetastore_get_replication_metrics_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_replication_metrics_args() noexcept;
   GetReplicationMetricsRequest rqst;
@@ -34697,12 +29939,7 @@ class ThriftHiveMetastore_get_replication_metrics_args {
 
   void __set_rqst(const GetReplicationMetricsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_replication_metrics_args & rhs) const
-  {
-    if (!(rqst == rhs.rqst))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_replication_metrics_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_replication_metrics_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34737,8 +29974,7 @@ class ThriftHiveMetastore_get_replication_metrics_result {
 
   ThriftHiveMetastore_get_replication_metrics_result(const ThriftHiveMetastore_get_replication_metrics_result&);
   ThriftHiveMetastore_get_replication_metrics_result& operator=(const ThriftHiveMetastore_get_replication_metrics_result&);
-  ThriftHiveMetastore_get_replication_metrics_result() noexcept {
-  }
+  ThriftHiveMetastore_get_replication_metrics_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_replication_metrics_result() noexcept;
   ReplicationMetricList success;
@@ -34750,14 +29986,7 @@ class ThriftHiveMetastore_get_replication_metrics_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_replication_metrics_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_replication_metrics_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_replication_metrics_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34799,8 +30028,7 @@ class ThriftHiveMetastore_get_open_txns_req_args {
 
   ThriftHiveMetastore_get_open_txns_req_args(const ThriftHiveMetastore_get_open_txns_req_args&);
   ThriftHiveMetastore_get_open_txns_req_args& operator=(const ThriftHiveMetastore_get_open_txns_req_args&);
-  ThriftHiveMetastore_get_open_txns_req_args() noexcept {
-  }
+  ThriftHiveMetastore_get_open_txns_req_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_open_txns_req_args() noexcept;
   GetOpenTxnsRequest getOpenTxnsRequest;
@@ -34809,12 +30037,7 @@ class ThriftHiveMetastore_get_open_txns_req_args {
 
   void __set_getOpenTxnsRequest(const GetOpenTxnsRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_open_txns_req_args & rhs) const
-  {
-    if (!(getOpenTxnsRequest == rhs.getOpenTxnsRequest))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_open_txns_req_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_open_txns_req_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34848,8 +30071,7 @@ class ThriftHiveMetastore_get_open_txns_req_result {
 
   ThriftHiveMetastore_get_open_txns_req_result(const ThriftHiveMetastore_get_open_txns_req_result&);
   ThriftHiveMetastore_get_open_txns_req_result& operator=(const ThriftHiveMetastore_get_open_txns_req_result&);
-  ThriftHiveMetastore_get_open_txns_req_result() noexcept {
-  }
+  ThriftHiveMetastore_get_open_txns_req_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_open_txns_req_result() noexcept;
   GetOpenTxnsResponse success;
@@ -34858,12 +30080,7 @@ class ThriftHiveMetastore_get_open_txns_req_result {
 
   void __set_success(const GetOpenTxnsResponse& val);
 
-  bool operator == (const ThriftHiveMetastore_get_open_txns_req_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_open_txns_req_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_open_txns_req_result &rhs) const {
     return !(*this == rhs);
   }
@@ -34903,8 +30120,7 @@ class ThriftHiveMetastore_create_stored_procedure_args {
 
   ThriftHiveMetastore_create_stored_procedure_args(const ThriftHiveMetastore_create_stored_procedure_args&);
   ThriftHiveMetastore_create_stored_procedure_args& operator=(const ThriftHiveMetastore_create_stored_procedure_args&);
-  ThriftHiveMetastore_create_stored_procedure_args() noexcept {
-  }
+  ThriftHiveMetastore_create_stored_procedure_args() noexcept;
 
   virtual ~ThriftHiveMetastore_create_stored_procedure_args() noexcept;
   StoredProcedure proc;
@@ -34913,12 +30129,7 @@ class ThriftHiveMetastore_create_stored_procedure_args {
 
   void __set_proc(const StoredProcedure& val);
 
-  bool operator == (const ThriftHiveMetastore_create_stored_procedure_args & rhs) const
-  {
-    if (!(proc == rhs.proc))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_stored_procedure_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_stored_procedure_args &rhs) const {
     return !(*this == rhs);
   }
@@ -34953,8 +30164,7 @@ class ThriftHiveMetastore_create_stored_procedure_result {
 
   ThriftHiveMetastore_create_stored_procedure_result(const ThriftHiveMetastore_create_stored_procedure_result&);
   ThriftHiveMetastore_create_stored_procedure_result& operator=(const ThriftHiveMetastore_create_stored_procedure_result&);
-  ThriftHiveMetastore_create_stored_procedure_result() noexcept {
-  }
+  ThriftHiveMetastore_create_stored_procedure_result() noexcept;
 
   virtual ~ThriftHiveMetastore_create_stored_procedure_result() noexcept;
   NoSuchObjectException o1;
@@ -34966,14 +30176,7 @@ class ThriftHiveMetastore_create_stored_procedure_result {
 
   void __set_o2(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_create_stored_procedure_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_create_stored_procedure_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_create_stored_procedure_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35015,8 +30218,7 @@ class ThriftHiveMetastore_get_stored_procedure_args {
 
   ThriftHiveMetastore_get_stored_procedure_args(const ThriftHiveMetastore_get_stored_procedure_args&);
   ThriftHiveMetastore_get_stored_procedure_args& operator=(const ThriftHiveMetastore_get_stored_procedure_args&);
-  ThriftHiveMetastore_get_stored_procedure_args() noexcept {
-  }
+  ThriftHiveMetastore_get_stored_procedure_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_stored_procedure_args() noexcept;
   StoredProcedureRequest request;
@@ -35025,12 +30227,7 @@ class ThriftHiveMetastore_get_stored_procedure_args {
 
   void __set_request(const StoredProcedureRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_stored_procedure_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_stored_procedure_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_stored_procedure_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35066,8 +30263,7 @@ class ThriftHiveMetastore_get_stored_procedure_result {
 
   ThriftHiveMetastore_get_stored_procedure_result(const ThriftHiveMetastore_get_stored_procedure_result&);
   ThriftHiveMetastore_get_stored_procedure_result& operator=(const ThriftHiveMetastore_get_stored_procedure_result&);
-  ThriftHiveMetastore_get_stored_procedure_result() noexcept {
-  }
+  ThriftHiveMetastore_get_stored_procedure_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_stored_procedure_result() noexcept;
   StoredProcedure success;
@@ -35082,16 +30278,7 @@ class ThriftHiveMetastore_get_stored_procedure_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_stored_procedure_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_stored_procedure_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_stored_procedure_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35135,8 +30322,7 @@ class ThriftHiveMetastore_drop_stored_procedure_args {
 
   ThriftHiveMetastore_drop_stored_procedure_args(const ThriftHiveMetastore_drop_stored_procedure_args&);
   ThriftHiveMetastore_drop_stored_procedure_args& operator=(const ThriftHiveMetastore_drop_stored_procedure_args&);
-  ThriftHiveMetastore_drop_stored_procedure_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_stored_procedure_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_stored_procedure_args() noexcept;
   StoredProcedureRequest request;
@@ -35145,12 +30331,7 @@ class ThriftHiveMetastore_drop_stored_procedure_args {
 
   void __set_request(const StoredProcedureRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_stored_procedure_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_stored_procedure_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_stored_procedure_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35184,8 +30365,7 @@ class ThriftHiveMetastore_drop_stored_procedure_result {
 
   ThriftHiveMetastore_drop_stored_procedure_result(const ThriftHiveMetastore_drop_stored_procedure_result&);
   ThriftHiveMetastore_drop_stored_procedure_result& operator=(const ThriftHiveMetastore_drop_stored_procedure_result&);
-  ThriftHiveMetastore_drop_stored_procedure_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_stored_procedure_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_stored_procedure_result() noexcept;
   MetaException o1;
@@ -35194,12 +30374,7 @@ class ThriftHiveMetastore_drop_stored_procedure_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_stored_procedure_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_stored_procedure_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_stored_procedure_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35239,8 +30414,7 @@ class ThriftHiveMetastore_get_all_stored_procedures_args {
 
   ThriftHiveMetastore_get_all_stored_procedures_args(const ThriftHiveMetastore_get_all_stored_procedures_args&);
   ThriftHiveMetastore_get_all_stored_procedures_args& operator=(const ThriftHiveMetastore_get_all_stored_procedures_args&);
-  ThriftHiveMetastore_get_all_stored_procedures_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_stored_procedures_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_stored_procedures_args() noexcept;
   ListStoredProcedureRequest request;
@@ -35249,12 +30423,7 @@ class ThriftHiveMetastore_get_all_stored_procedures_args {
 
   void __set_request(const ListStoredProcedureRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_stored_procedures_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_stored_procedures_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_stored_procedures_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35289,8 +30458,7 @@ class ThriftHiveMetastore_get_all_stored_procedures_result {
 
   ThriftHiveMetastore_get_all_stored_procedures_result(const ThriftHiveMetastore_get_all_stored_procedures_result&);
   ThriftHiveMetastore_get_all_stored_procedures_result& operator=(const ThriftHiveMetastore_get_all_stored_procedures_result&);
-  ThriftHiveMetastore_get_all_stored_procedures_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_stored_procedures_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_stored_procedures_result() noexcept;
   std::vector<std::string>  success;
@@ -35302,14 +30470,7 @@ class ThriftHiveMetastore_get_all_stored_procedures_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_stored_procedures_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_stored_procedures_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_stored_procedures_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35351,8 +30512,7 @@ class ThriftHiveMetastore_find_package_args {
 
   ThriftHiveMetastore_find_package_args(const ThriftHiveMetastore_find_package_args&);
   ThriftHiveMetastore_find_package_args& operator=(const ThriftHiveMetastore_find_package_args&);
-  ThriftHiveMetastore_find_package_args() noexcept {
-  }
+  ThriftHiveMetastore_find_package_args() noexcept;
 
   virtual ~ThriftHiveMetastore_find_package_args() noexcept;
   GetPackageRequest request;
@@ -35361,12 +30521,7 @@ class ThriftHiveMetastore_find_package_args {
 
   void __set_request(const GetPackageRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_find_package_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_package_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_package_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35402,8 +30557,7 @@ class ThriftHiveMetastore_find_package_result {
 
   ThriftHiveMetastore_find_package_result(const ThriftHiveMetastore_find_package_result&);
   ThriftHiveMetastore_find_package_result& operator=(const ThriftHiveMetastore_find_package_result&);
-  ThriftHiveMetastore_find_package_result() noexcept {
-  }
+  ThriftHiveMetastore_find_package_result() noexcept;
 
   virtual ~ThriftHiveMetastore_find_package_result() noexcept;
   Package success;
@@ -35418,16 +30572,7 @@ class ThriftHiveMetastore_find_package_result {
 
   void __set_o2(const NoSuchObjectException& val);
 
-  bool operator == (const ThriftHiveMetastore_find_package_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    if (!(o2 == rhs.o2))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_find_package_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_find_package_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35471,8 +30616,7 @@ class ThriftHiveMetastore_add_package_args {
 
   ThriftHiveMetastore_add_package_args(const ThriftHiveMetastore_add_package_args&);
   ThriftHiveMetastore_add_package_args& operator=(const ThriftHiveMetastore_add_package_args&);
-  ThriftHiveMetastore_add_package_args() noexcept {
-  }
+  ThriftHiveMetastore_add_package_args() noexcept;
 
   virtual ~ThriftHiveMetastore_add_package_args() noexcept;
   AddPackageRequest request;
@@ -35481,12 +30625,7 @@ class ThriftHiveMetastore_add_package_args {
 
   void __set_request(const AddPackageRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_add_package_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_package_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_package_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35520,8 +30659,7 @@ class ThriftHiveMetastore_add_package_result {
 
   ThriftHiveMetastore_add_package_result(const ThriftHiveMetastore_add_package_result&);
   ThriftHiveMetastore_add_package_result& operator=(const ThriftHiveMetastore_add_package_result&);
-  ThriftHiveMetastore_add_package_result() noexcept {
-  }
+  ThriftHiveMetastore_add_package_result() noexcept;
 
   virtual ~ThriftHiveMetastore_add_package_result() noexcept;
   MetaException o1;
@@ -35530,12 +30668,7 @@ class ThriftHiveMetastore_add_package_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_add_package_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_add_package_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_add_package_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35575,8 +30708,7 @@ class ThriftHiveMetastore_get_all_packages_args {
 
   ThriftHiveMetastore_get_all_packages_args(const ThriftHiveMetastore_get_all_packages_args&);
   ThriftHiveMetastore_get_all_packages_args& operator=(const ThriftHiveMetastore_get_all_packages_args&);
-  ThriftHiveMetastore_get_all_packages_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_packages_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_packages_args() noexcept;
   ListPackageRequest request;
@@ -35585,12 +30717,7 @@ class ThriftHiveMetastore_get_all_packages_args {
 
   void __set_request(const ListPackageRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_packages_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_packages_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_packages_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35625,8 +30752,7 @@ class ThriftHiveMetastore_get_all_packages_result {
 
   ThriftHiveMetastore_get_all_packages_result(const ThriftHiveMetastore_get_all_packages_result&);
   ThriftHiveMetastore_get_all_packages_result& operator=(const ThriftHiveMetastore_get_all_packages_result&);
-  ThriftHiveMetastore_get_all_packages_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_packages_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_packages_result() noexcept;
   std::vector<std::string>  success;
@@ -35638,14 +30764,7 @@ class ThriftHiveMetastore_get_all_packages_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_packages_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_packages_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_packages_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35687,8 +30806,7 @@ class ThriftHiveMetastore_drop_package_args {
 
   ThriftHiveMetastore_drop_package_args(const ThriftHiveMetastore_drop_package_args&);
   ThriftHiveMetastore_drop_package_args& operator=(const ThriftHiveMetastore_drop_package_args&);
-  ThriftHiveMetastore_drop_package_args() noexcept {
-  }
+  ThriftHiveMetastore_drop_package_args() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_package_args() noexcept;
   DropPackageRequest request;
@@ -35697,12 +30815,7 @@ class ThriftHiveMetastore_drop_package_args {
 
   void __set_request(const DropPackageRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_package_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_package_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_package_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35736,8 +30849,7 @@ class ThriftHiveMetastore_drop_package_result {
 
   ThriftHiveMetastore_drop_package_result(const ThriftHiveMetastore_drop_package_result&);
   ThriftHiveMetastore_drop_package_result& operator=(const ThriftHiveMetastore_drop_package_result&);
-  ThriftHiveMetastore_drop_package_result() noexcept {
-  }
+  ThriftHiveMetastore_drop_package_result() noexcept;
 
   virtual ~ThriftHiveMetastore_drop_package_result() noexcept;
   MetaException o1;
@@ -35746,12 +30858,7 @@ class ThriftHiveMetastore_drop_package_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_drop_package_result & rhs) const
-  {
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_drop_package_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_drop_package_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35791,8 +30898,7 @@ class ThriftHiveMetastore_get_all_write_event_info_args {
 
   ThriftHiveMetastore_get_all_write_event_info_args(const ThriftHiveMetastore_get_all_write_event_info_args&);
   ThriftHiveMetastore_get_all_write_event_info_args& operator=(const ThriftHiveMetastore_get_all_write_event_info_args&);
-  ThriftHiveMetastore_get_all_write_event_info_args() noexcept {
-  }
+  ThriftHiveMetastore_get_all_write_event_info_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_write_event_info_args() noexcept;
   GetAllWriteEventInfoRequest request;
@@ -35801,12 +30907,7 @@ class ThriftHiveMetastore_get_all_write_event_info_args {
 
   void __set_request(const GetAllWriteEventInfoRequest& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_write_event_info_args & rhs) const
-  {
-    if (!(request == rhs.request))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_write_event_info_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_write_event_info_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35841,8 +30942,7 @@ class ThriftHiveMetastore_get_all_write_event_info_result {
 
   ThriftHiveMetastore_get_all_write_event_info_result(const ThriftHiveMetastore_get_all_write_event_info_result&);
   ThriftHiveMetastore_get_all_write_event_info_result& operator=(const ThriftHiveMetastore_get_all_write_event_info_result&);
-  ThriftHiveMetastore_get_all_write_event_info_result() noexcept {
-  }
+  ThriftHiveMetastore_get_all_write_event_info_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_all_write_event_info_result() noexcept;
   std::vector<WriteEventInfo>  success;
@@ -35854,14 +30954,7 @@ class ThriftHiveMetastore_get_all_write_event_info_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_all_write_event_info_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_all_write_event_info_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_all_write_event_info_result &rhs) const {
     return !(*this == rhs);
   }
@@ -35903,9 +30996,7 @@ class ThriftHiveMetastore_get_replayed_txns_for_policy_args {
 
   ThriftHiveMetastore_get_replayed_txns_for_policy_args(const ThriftHiveMetastore_get_replayed_txns_for_policy_args&);
   ThriftHiveMetastore_get_replayed_txns_for_policy_args& operator=(const ThriftHiveMetastore_get_replayed_txns_for_policy_args&);
-  ThriftHiveMetastore_get_replayed_txns_for_policy_args() noexcept
-                                                        : policyName() {
-  }
+  ThriftHiveMetastore_get_replayed_txns_for_policy_args() noexcept;
 
   virtual ~ThriftHiveMetastore_get_replayed_txns_for_policy_args() noexcept;
   std::string policyName;
@@ -35914,12 +31005,7 @@ class ThriftHiveMetastore_get_replayed_txns_for_policy_args {
 
   void __set_policyName(const std::string& val);
 
-  bool operator == (const ThriftHiveMetastore_get_replayed_txns_for_policy_args & rhs) const
-  {
-    if (!(policyName == rhs.policyName))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_replayed_txns_for_policy_args & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_replayed_txns_for_policy_args &rhs) const {
     return !(*this == rhs);
   }
@@ -35954,8 +31040,7 @@ class ThriftHiveMetastore_get_replayed_txns_for_policy_result {
 
   ThriftHiveMetastore_get_replayed_txns_for_policy_result(const ThriftHiveMetastore_get_replayed_txns_for_policy_result&);
   ThriftHiveMetastore_get_replayed_txns_for_policy_result& operator=(const ThriftHiveMetastore_get_replayed_txns_for_policy_result&);
-  ThriftHiveMetastore_get_replayed_txns_for_policy_result() noexcept {
-  }
+  ThriftHiveMetastore_get_replayed_txns_for_policy_result() noexcept;
 
   virtual ~ThriftHiveMetastore_get_replayed_txns_for_policy_result() noexcept;
   ReplayedTxnsForPolicyResult success;
@@ -35967,14 +31052,7 @@ class ThriftHiveMetastore_get_replayed_txns_for_policy_result {
 
   void __set_o1(const MetaException& val);
 
-  bool operator == (const ThriftHiveMetastore_get_replayed_txns_for_policy_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
+  bool operator == (const ThriftHiveMetastore_get_replayed_txns_for_policy_result & rhs) const;
   bool operator != (const ThriftHiveMetastore_get_replayed_txns_for_policy_result &rhs) const {
     return !(*this == rhs);
   }
@@ -40263,9 +35341,9 @@ class ThriftHiveMetastoreMultiface : virtual public ThriftHiveMetastoreIf, publi
 // only be used when you need to share a connection among multiple threads
 class ThriftHiveMetastoreConcurrentClient : virtual public ThriftHiveMetastoreIf, public  ::facebook::fb303::FacebookServiceConcurrentClient {
  public:
-  ThriftHiveMetastoreConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot, std::shared_ptr<::apache::thrift::async::TConcurrentClientSyncInfo> sync) :
+  ThriftHiveMetastoreConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot, std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync) :
      ::facebook::fb303::FacebookServiceConcurrentClient(prot, prot, sync) {}
-  ThriftHiveMetastoreConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot, std::shared_ptr<::apache::thrift::async::TConcurrentClientSyncInfo> sync) :     ::facebook::fb303::FacebookServiceConcurrentClient(iprot, oprot, sync) {}
+  ThriftHiveMetastoreConcurrentClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot, std::shared_ptr< ::apache::thrift::async::TConcurrentClientSyncInfo> sync) :     ::facebook::fb303::FacebookServiceConcurrentClient(iprot, oprot, sync) {}
   std::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
     return piprot_;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/fb303_types.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/fb303_types.cpp
new file mode 100644
index 000000000000..3f1ccdf0df15
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/fb303_types.cpp
@@ -0,0 +1,53 @@
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#include "fb303_types.h"
+
+#include <algorithm>
+#include <ostream>
+
+#include <thrift/TToString.h>
+
+namespace facebook { namespace fb303 {
+
+int _kfb_statusValues[] = {
+  fb_status::DEAD,
+  fb_status::STARTING,
+  fb_status::ALIVE,
+  fb_status::STOPPING,
+  fb_status::STOPPED,
+  fb_status::WARNING
+};
+const char* _kfb_statusNames[] = {
+  "DEAD",
+  "STARTING",
+  "ALIVE",
+  "STOPPING",
+  "STOPPED",
+  "WARNING"
+};
+const std::map<int, const char*> _fb_status_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kfb_statusValues, _kfb_statusNames), ::apache::thrift::TEnumIterator(-1, nullptr, nullptr));
+
+std::ostream& operator<<(std::ostream& out, const fb_status::type& val) {
+  std::map<int, const char*>::const_iterator it = _fb_status_VALUES_TO_NAMES.find(val);
+  if (it != _fb_status_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
+std::string to_string(const fb_status::type& val) {
+  std::map<int, const char*>::const_iterator it = _fb_status_VALUES_TO_NAMES.find(val);
+  if (it != _fb_status_VALUES_TO_NAMES.end()) {
+    return std::string(it->second);
+  } else {
+    return std::to_string(static_cast<int>(val));
+  }
+}
+
+}} // namespace
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/fb303_types.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/fb303_types.h
new file mode 100644
index 000000000000..84df27616212
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/fb303_types.h
@@ -0,0 +1,46 @@
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#ifndef fb303_TYPES_H
+#define fb303_TYPES_H
+
+#include <iosfwd>
+
+#include <thrift/Thrift.h>
+#include <thrift/TApplicationException.h>
+#include <thrift/TBase.h>
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/transport/TTransport.h>
+
+#include <functional>
+#include <memory>
+
+
+namespace facebook { namespace fb303 {
+
+/**
+ * Common status reporting mechanism across all services
+ */
+struct fb_status {
+  enum type {
+    DEAD = 0,
+    STARTING = 1,
+    ALIVE = 2,
+    STOPPING = 3,
+    STOPPED = 4,
+    WARNING = 5
+  };
+};
+
+extern const std::map<int, const char*> _fb_status_VALUES_TO_NAMES;
+
+std::ostream& operator<<(std::ostream& out, const fb_status::type& val);
+
+std::string to_string(const fb_status::type& val);
+
+}} // namespace
+
+#endif
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
index 6bf57bc0c9ae..c48a723f3527 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.h
index 7feaa6df3499..fc7b05f5369d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.h
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
index cac4a8421474..ab0cfbb61e74 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -938,6 +938,10 @@ std::string to_string(const PartitionFilterMode::type& val) {
 Version::~Version() noexcept {
 }
 
+Version::Version() noexcept
+   : version(),
+     comments() {
+}
 
 void Version::__set_version(const std::string& val) {
   this->version = val;
@@ -1020,13 +1024,22 @@ uint32_t Version::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Version &a, Version &b) {
+void swap(Version &a, Version &b) noexcept {
   using ::std::swap;
   swap(a.version, b.version);
   swap(a.comments, b.comments);
   swap(a.__isset, b.__isset);
 }
 
+bool Version::operator==(const Version & rhs) const
+{
+  if (!(version == rhs.version))
+    return false;
+  if (!(comments == rhs.comments))
+    return false;
+  return true;
+}
+
 Version::Version(const Version& other0) {
   version = other0.version;
   comments = other0.comments;
@@ -1050,6 +1063,11 @@ void Version::printTo(std::ostream& out) const {
 FieldSchema::~FieldSchema() noexcept {
 }
 
+FieldSchema::FieldSchema() noexcept
+   : name(),
+     type(),
+     comment() {
+}
 
 void FieldSchema::__set_name(const std::string& val) {
   this->name = val;
@@ -1148,7 +1166,7 @@ uint32_t FieldSchema::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(FieldSchema &a, FieldSchema &b) {
+void swap(FieldSchema &a, FieldSchema &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.type, b.type);
@@ -1156,6 +1174,17 @@ void swap(FieldSchema &a, FieldSchema &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool FieldSchema::operator==(const FieldSchema & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (!(comment == rhs.comment))
+    return false;
+  return true;
+}
+
 FieldSchema::FieldSchema(const FieldSchema& other2) {
   name = other2.name;
   type = other2.type;
@@ -1182,6 +1211,8 @@ void FieldSchema::printTo(std::ostream& out) const {
 EnvironmentContext::~EnvironmentContext() noexcept {
 }
 
+EnvironmentContext::EnvironmentContext() noexcept {
+}
 
 void EnvironmentContext::__set_properties(const std::map<std::string, std::string> & val) {
   this->properties = val;
@@ -1272,12 +1303,19 @@ uint32_t EnvironmentContext::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(EnvironmentContext &a, EnvironmentContext &b) {
+void swap(EnvironmentContext &a, EnvironmentContext &b) noexcept {
   using ::std::swap;
   swap(a.properties, b.properties);
   swap(a.__isset, b.__isset);
 }
 
+bool EnvironmentContext::operator==(const EnvironmentContext & rhs) const
+{
+  if (!(properties == rhs.properties))
+    return false;
+  return true;
+}
+
 EnvironmentContext::EnvironmentContext(const EnvironmentContext& other12) {
   properties = other12.properties;
   __isset = other12.__isset;
@@ -1298,6 +1336,17 @@ void EnvironmentContext::printTo(std::ostream& out) const {
 SQLPrimaryKey::~SQLPrimaryKey() noexcept {
 }
 
+SQLPrimaryKey::SQLPrimaryKey() noexcept
+   : table_db(),
+     table_name(),
+     column_name(),
+     key_seq(0),
+     pk_name(),
+     enable_cstr(0),
+     validate_cstr(0),
+     rely_cstr(0),
+     catName() {
+}
 
 void SQLPrimaryKey::__set_table_db(const std::string& val) {
   this->table_db = val;
@@ -1494,7 +1543,7 @@ uint32_t SQLPrimaryKey::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(SQLPrimaryKey &a, SQLPrimaryKey &b) {
+void swap(SQLPrimaryKey &a, SQLPrimaryKey &b) noexcept {
   using ::std::swap;
   swap(a.table_db, b.table_db);
   swap(a.table_name, b.table_name);
@@ -1508,6 +1557,31 @@ void swap(SQLPrimaryKey &a, SQLPrimaryKey &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLPrimaryKey::operator==(const SQLPrimaryKey & rhs) const
+{
+  if (!(table_db == rhs.table_db))
+    return false;
+  if (!(table_name == rhs.table_name))
+    return false;
+  if (!(column_name == rhs.column_name))
+    return false;
+  if (!(key_seq == rhs.key_seq))
+    return false;
+  if (!(pk_name == rhs.pk_name))
+    return false;
+  if (!(enable_cstr == rhs.enable_cstr))
+    return false;
+  if (!(validate_cstr == rhs.validate_cstr))
+    return false;
+  if (!(rely_cstr == rhs.rely_cstr))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 SQLPrimaryKey::SQLPrimaryKey(const SQLPrimaryKey& other14) {
   table_db = other14.table_db;
   table_name = other14.table_name;
@@ -1552,6 +1626,23 @@ void SQLPrimaryKey::printTo(std::ostream& out) const {
 SQLForeignKey::~SQLForeignKey() noexcept {
 }
 
+SQLForeignKey::SQLForeignKey() noexcept
+   : pktable_db(),
+     pktable_name(),
+     pkcolumn_name(),
+     fktable_db(),
+     fktable_name(),
+     fkcolumn_name(),
+     key_seq(0),
+     update_rule(0),
+     delete_rule(0),
+     fk_name(),
+     pk_name(),
+     enable_cstr(0),
+     validate_cstr(0),
+     rely_cstr(0),
+     catName() {
+}
 
 void SQLForeignKey::__set_pktable_db(const std::string& val) {
   this->pktable_db = val;
@@ -1844,7 +1935,7 @@ uint32_t SQLForeignKey::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(SQLForeignKey &a, SQLForeignKey &b) {
+void swap(SQLForeignKey &a, SQLForeignKey &b) noexcept {
   using ::std::swap;
   swap(a.pktable_db, b.pktable_db);
   swap(a.pktable_name, b.pktable_name);
@@ -1864,6 +1955,43 @@ void swap(SQLForeignKey &a, SQLForeignKey &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLForeignKey::operator==(const SQLForeignKey & rhs) const
+{
+  if (!(pktable_db == rhs.pktable_db))
+    return false;
+  if (!(pktable_name == rhs.pktable_name))
+    return false;
+  if (!(pkcolumn_name == rhs.pkcolumn_name))
+    return false;
+  if (!(fktable_db == rhs.fktable_db))
+    return false;
+  if (!(fktable_name == rhs.fktable_name))
+    return false;
+  if (!(fkcolumn_name == rhs.fkcolumn_name))
+    return false;
+  if (!(key_seq == rhs.key_seq))
+    return false;
+  if (!(update_rule == rhs.update_rule))
+    return false;
+  if (!(delete_rule == rhs.delete_rule))
+    return false;
+  if (!(fk_name == rhs.fk_name))
+    return false;
+  if (!(pk_name == rhs.pk_name))
+    return false;
+  if (!(enable_cstr == rhs.enable_cstr))
+    return false;
+  if (!(validate_cstr == rhs.validate_cstr))
+    return false;
+  if (!(rely_cstr == rhs.rely_cstr))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 SQLForeignKey::SQLForeignKey(const SQLForeignKey& other16) {
   pktable_db = other16.pktable_db;
   pktable_name = other16.pktable_name;
@@ -1926,6 +2054,17 @@ void SQLForeignKey::printTo(std::ostream& out) const {
 SQLUniqueConstraint::~SQLUniqueConstraint() noexcept {
 }
 
+SQLUniqueConstraint::SQLUniqueConstraint() noexcept
+   : catName(),
+     table_db(),
+     table_name(),
+     column_name(),
+     key_seq(0),
+     uk_name(),
+     enable_cstr(0),
+     validate_cstr(0),
+     rely_cstr(0) {
+}
 
 void SQLUniqueConstraint::__set_catName(const std::string& val) {
   this->catName = val;
@@ -2120,7 +2259,7 @@ uint32_t SQLUniqueConstraint::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(SQLUniqueConstraint &a, SQLUniqueConstraint &b) {
+void swap(SQLUniqueConstraint &a, SQLUniqueConstraint &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.table_db, b.table_db);
@@ -2134,6 +2273,29 @@ void swap(SQLUniqueConstraint &a, SQLUniqueConstraint &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLUniqueConstraint::operator==(const SQLUniqueConstraint & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(table_db == rhs.table_db))
+    return false;
+  if (!(table_name == rhs.table_name))
+    return false;
+  if (!(column_name == rhs.column_name))
+    return false;
+  if (!(key_seq == rhs.key_seq))
+    return false;
+  if (!(uk_name == rhs.uk_name))
+    return false;
+  if (!(enable_cstr == rhs.enable_cstr))
+    return false;
+  if (!(validate_cstr == rhs.validate_cstr))
+    return false;
+  if (!(rely_cstr == rhs.rely_cstr))
+    return false;
+  return true;
+}
+
 SQLUniqueConstraint::SQLUniqueConstraint(const SQLUniqueConstraint& other18) {
   catName = other18.catName;
   table_db = other18.table_db;
@@ -2178,6 +2340,16 @@ void SQLUniqueConstraint::printTo(std::ostream& out) const {
 SQLNotNullConstraint::~SQLNotNullConstraint() noexcept {
 }
 
+SQLNotNullConstraint::SQLNotNullConstraint() noexcept
+   : catName(),
+     table_db(),
+     table_name(),
+     column_name(),
+     nn_name(),
+     enable_cstr(0),
+     validate_cstr(0),
+     rely_cstr(0) {
+}
 
 void SQLNotNullConstraint::__set_catName(const std::string& val) {
   this->catName = val;
@@ -2356,7 +2528,7 @@ uint32_t SQLNotNullConstraint::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(SQLNotNullConstraint &a, SQLNotNullConstraint &b) {
+void swap(SQLNotNullConstraint &a, SQLNotNullConstraint &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.table_db, b.table_db);
@@ -2369,6 +2541,27 @@ void swap(SQLNotNullConstraint &a, SQLNotNullConstraint &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLNotNullConstraint::operator==(const SQLNotNullConstraint & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(table_db == rhs.table_db))
+    return false;
+  if (!(table_name == rhs.table_name))
+    return false;
+  if (!(column_name == rhs.column_name))
+    return false;
+  if (!(nn_name == rhs.nn_name))
+    return false;
+  if (!(enable_cstr == rhs.enable_cstr))
+    return false;
+  if (!(validate_cstr == rhs.validate_cstr))
+    return false;
+  if (!(rely_cstr == rhs.rely_cstr))
+    return false;
+  return true;
+}
+
 SQLNotNullConstraint::SQLNotNullConstraint(const SQLNotNullConstraint& other20) {
   catName = other20.catName;
   table_db = other20.table_db;
@@ -2410,6 +2603,17 @@ void SQLNotNullConstraint::printTo(std::ostream& out) const {
 SQLDefaultConstraint::~SQLDefaultConstraint() noexcept {
 }
 
+SQLDefaultConstraint::SQLDefaultConstraint() noexcept
+   : catName(),
+     table_db(),
+     table_name(),
+     column_name(),
+     default_value(),
+     dc_name(),
+     enable_cstr(0),
+     validate_cstr(0),
+     rely_cstr(0) {
+}
 
 void SQLDefaultConstraint::__set_catName(const std::string& val) {
   this->catName = val;
@@ -2604,7 +2808,7 @@ uint32_t SQLDefaultConstraint::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(SQLDefaultConstraint &a, SQLDefaultConstraint &b) {
+void swap(SQLDefaultConstraint &a, SQLDefaultConstraint &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.table_db, b.table_db);
@@ -2618,6 +2822,29 @@ void swap(SQLDefaultConstraint &a, SQLDefaultConstraint &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLDefaultConstraint::operator==(const SQLDefaultConstraint & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(table_db == rhs.table_db))
+    return false;
+  if (!(table_name == rhs.table_name))
+    return false;
+  if (!(column_name == rhs.column_name))
+    return false;
+  if (!(default_value == rhs.default_value))
+    return false;
+  if (!(dc_name == rhs.dc_name))
+    return false;
+  if (!(enable_cstr == rhs.enable_cstr))
+    return false;
+  if (!(validate_cstr == rhs.validate_cstr))
+    return false;
+  if (!(rely_cstr == rhs.rely_cstr))
+    return false;
+  return true;
+}
+
 SQLDefaultConstraint::SQLDefaultConstraint(const SQLDefaultConstraint& other22) {
   catName = other22.catName;
   table_db = other22.table_db;
@@ -2662,6 +2889,17 @@ void SQLDefaultConstraint::printTo(std::ostream& out) const {
 SQLCheckConstraint::~SQLCheckConstraint() noexcept {
 }
 
+SQLCheckConstraint::SQLCheckConstraint() noexcept
+   : catName(),
+     table_db(),
+     table_name(),
+     column_name(),
+     check_expression(),
+     dc_name(),
+     enable_cstr(0),
+     validate_cstr(0),
+     rely_cstr(0) {
+}
 
 void SQLCheckConstraint::__set_catName(const std::string& val) {
   this->catName = val;
@@ -2856,7 +3094,7 @@ uint32_t SQLCheckConstraint::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(SQLCheckConstraint &a, SQLCheckConstraint &b) {
+void swap(SQLCheckConstraint &a, SQLCheckConstraint &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.table_db, b.table_db);
@@ -2870,6 +3108,29 @@ void swap(SQLCheckConstraint &a, SQLCheckConstraint &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLCheckConstraint::operator==(const SQLCheckConstraint & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(table_db == rhs.table_db))
+    return false;
+  if (!(table_name == rhs.table_name))
+    return false;
+  if (!(column_name == rhs.column_name))
+    return false;
+  if (!(check_expression == rhs.check_expression))
+    return false;
+  if (!(dc_name == rhs.dc_name))
+    return false;
+  if (!(enable_cstr == rhs.enable_cstr))
+    return false;
+  if (!(validate_cstr == rhs.validate_cstr))
+    return false;
+  if (!(rely_cstr == rhs.rely_cstr))
+    return false;
+  return true;
+}
+
 SQLCheckConstraint::SQLCheckConstraint(const SQLCheckConstraint& other24) {
   catName = other24.catName;
   table_db = other24.table_db;
@@ -2914,6 +3175,8 @@ void SQLCheckConstraint::printTo(std::ostream& out) const {
 SQLAllTableConstraints::~SQLAllTableConstraints() noexcept {
 }
 
+SQLAllTableConstraints::SQLAllTableConstraints() noexcept {
+}
 
 void SQLAllTableConstraints::__set_primaryKeys(const std::vector<SQLPrimaryKey> & val) {
   this->primaryKeys = val;
@@ -3192,7 +3455,7 @@ uint32_t SQLAllTableConstraints::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(SQLAllTableConstraints &a, SQLAllTableConstraints &b) {
+void swap(SQLAllTableConstraints &a, SQLAllTableConstraints &b) noexcept {
   using ::std::swap;
   swap(a.primaryKeys, b.primaryKeys);
   swap(a.foreignKeys, b.foreignKeys);
@@ -3203,6 +3466,35 @@ void swap(SQLAllTableConstraints &a, SQLAllTableConstraints &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SQLAllTableConstraints::operator==(const SQLAllTableConstraints & rhs) const
+{
+  if (__isset.primaryKeys != rhs.__isset.primaryKeys)
+    return false;
+  else if (__isset.primaryKeys && !(primaryKeys == rhs.primaryKeys))
+    return false;
+  if (__isset.foreignKeys != rhs.__isset.foreignKeys)
+    return false;
+  else if (__isset.foreignKeys && !(foreignKeys == rhs.foreignKeys))
+    return false;
+  if (__isset.uniqueConstraints != rhs.__isset.uniqueConstraints)
+    return false;
+  else if (__isset.uniqueConstraints && !(uniqueConstraints == rhs.uniqueConstraints))
+    return false;
+  if (__isset.notNullConstraints != rhs.__isset.notNullConstraints)
+    return false;
+  else if (__isset.notNullConstraints && !(notNullConstraints == rhs.notNullConstraints))
+    return false;
+  if (__isset.defaultConstraints != rhs.__isset.defaultConstraints)
+    return false;
+  else if (__isset.defaultConstraints && !(defaultConstraints == rhs.defaultConstraints))
+    return false;
+  if (__isset.checkConstraints != rhs.__isset.checkConstraints)
+    return false;
+  else if (__isset.checkConstraints && !(checkConstraints == rhs.checkConstraints))
+    return false;
+  return true;
+}
+
 SQLAllTableConstraints::SQLAllTableConstraints(const SQLAllTableConstraints& other62) {
   primaryKeys = other62.primaryKeys;
   foreignKeys = other62.foreignKeys;
@@ -3238,6 +3530,11 @@ void SQLAllTableConstraints::printTo(std::ostream& out) const {
 Type::~Type() noexcept {
 }
 
+Type::Type() noexcept
+   : name(),
+     type1(),
+     type2() {
+}
 
 void Type::__set_name(const std::string& val) {
   this->name = val;
@@ -3378,7 +3675,7 @@ uint32_t Type::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Type &a, Type &b) {
+void swap(Type &a, Type &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.type1, b.type1);
@@ -3387,6 +3684,25 @@ void swap(Type &a, Type &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Type::operator==(const Type & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (__isset.type1 != rhs.__isset.type1)
+    return false;
+  else if (__isset.type1 && !(type1 == rhs.type1))
+    return false;
+  if (__isset.type2 != rhs.__isset.type2)
+    return false;
+  else if (__isset.type2 && !(type2 == rhs.type2))
+    return false;
+  if (__isset.fields != rhs.__isset.fields)
+    return false;
+  else if (__isset.fields && !(fields == rhs.fields))
+    return false;
+  return true;
+}
+
 Type::Type(const Type& other70) {
   name = other70.name;
   type1 = other70.type1;
@@ -3416,6 +3732,9 @@ void Type::printTo(std::ostream& out) const {
 PropertySetRequest::~PropertySetRequest() noexcept {
 }
 
+PropertySetRequest::PropertySetRequest() noexcept
+   : nameSpace() {
+}
 
 void PropertySetRequest::__set_nameSpace(const std::string& val) {
   this->nameSpace = val;
@@ -3525,13 +3844,22 @@ uint32_t PropertySetRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PropertySetRequest &a, PropertySetRequest &b) {
+void swap(PropertySetRequest &a, PropertySetRequest &b) noexcept {
   using ::std::swap;
   swap(a.nameSpace, b.nameSpace);
   swap(a.propertyMap, b.propertyMap);
   swap(a.__isset, b.__isset);
 }
 
+bool PropertySetRequest::operator==(const PropertySetRequest & rhs) const
+{
+  if (!(nameSpace == rhs.nameSpace))
+    return false;
+  if (!(propertyMap == rhs.propertyMap))
+    return false;
+  return true;
+}
+
 PropertySetRequest::PropertySetRequest(const PropertySetRequest& other80) {
   nameSpace = other80.nameSpace;
   propertyMap = other80.propertyMap;
@@ -3555,6 +3883,11 @@ void PropertySetRequest::printTo(std::ostream& out) const {
 PropertyGetRequest::~PropertyGetRequest() noexcept {
 }
 
+PropertyGetRequest::PropertyGetRequest() noexcept
+   : nameSpace(),
+     mapPrefix(),
+     mapPredicate() {
+}
 
 void PropertyGetRequest::__set_nameSpace(const std::string& val) {
   this->nameSpace = val;
@@ -3696,7 +4029,7 @@ uint32_t PropertyGetRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PropertyGetRequest &a, PropertyGetRequest &b) {
+void swap(PropertyGetRequest &a, PropertyGetRequest &b) noexcept {
   using ::std::swap;
   swap(a.nameSpace, b.nameSpace);
   swap(a.mapPrefix, b.mapPrefix);
@@ -3705,6 +4038,23 @@ void swap(PropertyGetRequest &a, PropertyGetRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PropertyGetRequest::operator==(const PropertyGetRequest & rhs) const
+{
+  if (!(nameSpace == rhs.nameSpace))
+    return false;
+  if (!(mapPrefix == rhs.mapPrefix))
+    return false;
+  if (__isset.mapPredicate != rhs.__isset.mapPredicate)
+    return false;
+  else if (__isset.mapPredicate && !(mapPredicate == rhs.mapPredicate))
+    return false;
+  if (__isset.mapSelection != rhs.__isset.mapSelection)
+    return false;
+  else if (__isset.mapSelection && !(mapSelection == rhs.mapSelection))
+    return false;
+  return true;
+}
+
 PropertyGetRequest::PropertyGetRequest(const PropertyGetRequest& other88) {
   nameSpace = other88.nameSpace;
   mapPrefix = other88.mapPrefix;
@@ -3734,6 +4084,8 @@ void PropertyGetRequest::printTo(std::ostream& out) const {
 PropertyGetResponse::~PropertyGetResponse() noexcept {
 }
 
+PropertyGetResponse::PropertyGetResponse() noexcept {
+}
 
 void PropertyGetResponse::__set_properties(const std::map<std::string, std::map<std::string, std::string> > & val) {
   this->properties = val;
@@ -3848,12 +4200,19 @@ uint32_t PropertyGetResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(PropertyGetResponse &a, PropertyGetResponse &b) {
+void swap(PropertyGetResponse &a, PropertyGetResponse &b) noexcept {
   using ::std::swap;
   swap(a.properties, b.properties);
   swap(a.__isset, b.__isset);
 }
 
+bool PropertyGetResponse::operator==(const PropertyGetResponse & rhs) const
+{
+  if (!(properties == rhs.properties))
+    return false;
+  return true;
+}
+
 PropertyGetResponse::PropertyGetResponse(const PropertyGetResponse& other106) {
   properties = other106.properties;
   __isset = other106.__isset;
@@ -3874,6 +4233,13 @@ void PropertyGetResponse::printTo(std::ostream& out) const {
 HiveObjectRef::~HiveObjectRef() noexcept {
 }
 
+HiveObjectRef::HiveObjectRef() noexcept
+   : objectType(static_cast<HiveObjectType::type>(0)),
+     dbName(),
+     objectName(),
+     columnName(),
+     catName() {
+}
 
 void HiveObjectRef::__set_objectType(const HiveObjectType::type val) {
   this->objectType = val;
@@ -4044,7 +4410,7 @@ uint32_t HiveObjectRef::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(HiveObjectRef &a, HiveObjectRef &b) {
+void swap(HiveObjectRef &a, HiveObjectRef &b) noexcept {
   using ::std::swap;
   swap(a.objectType, b.objectType);
   swap(a.dbName, b.dbName);
@@ -4055,6 +4421,25 @@ void swap(HiveObjectRef &a, HiveObjectRef &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool HiveObjectRef::operator==(const HiveObjectRef & rhs) const
+{
+  if (!(objectType == rhs.objectType))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(objectName == rhs.objectName))
+    return false;
+  if (!(partValues == rhs.partValues))
+    return false;
+  if (!(columnName == rhs.columnName))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 HiveObjectRef::HiveObjectRef(const HiveObjectRef& other115) {
   objectType = other115.objectType;
   dbName = other115.dbName;
@@ -4090,6 +4475,13 @@ void HiveObjectRef::printTo(std::ostream& out) const {
 PrivilegeGrantInfo::~PrivilegeGrantInfo() noexcept {
 }
 
+PrivilegeGrantInfo::PrivilegeGrantInfo() noexcept
+   : privilege(),
+     createTime(0),
+     grantor(),
+     grantorType(static_cast<PrincipalType::type>(0)),
+     grantOption(0) {
+}
 
 void PrivilegeGrantInfo::__set_privilege(const std::string& val) {
   this->privilege = val;
@@ -4222,7 +4614,7 @@ uint32_t PrivilegeGrantInfo::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PrivilegeGrantInfo &a, PrivilegeGrantInfo &b) {
+void swap(PrivilegeGrantInfo &a, PrivilegeGrantInfo &b) noexcept {
   using ::std::swap;
   swap(a.privilege, b.privilege);
   swap(a.createTime, b.createTime);
@@ -4232,6 +4624,21 @@ void swap(PrivilegeGrantInfo &a, PrivilegeGrantInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PrivilegeGrantInfo::operator==(const PrivilegeGrantInfo & rhs) const
+{
+  if (!(privilege == rhs.privilege))
+    return false;
+  if (!(createTime == rhs.createTime))
+    return false;
+  if (!(grantor == rhs.grantor))
+    return false;
+  if (!(grantorType == rhs.grantorType))
+    return false;
+  if (!(grantOption == rhs.grantOption))
+    return false;
+  return true;
+}
+
 PrivilegeGrantInfo::PrivilegeGrantInfo(const PrivilegeGrantInfo& other118) {
   privilege = other118.privilege;
   createTime = other118.createTime;
@@ -4264,6 +4671,11 @@ void PrivilegeGrantInfo::printTo(std::ostream& out) const {
 HiveObjectPrivilege::~HiveObjectPrivilege() noexcept {
 }
 
+HiveObjectPrivilege::HiveObjectPrivilege() noexcept
+   : principalName(),
+     principalType(static_cast<PrincipalType::type>(0)),
+     authorizer() {
+}
 
 void HiveObjectPrivilege::__set_hiveObject(const HiveObjectRef& val) {
   this->hiveObject = val;
@@ -4396,7 +4808,7 @@ uint32_t HiveObjectPrivilege::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(HiveObjectPrivilege &a, HiveObjectPrivilege &b) {
+void swap(HiveObjectPrivilege &a, HiveObjectPrivilege &b) noexcept {
   using ::std::swap;
   swap(a.hiveObject, b.hiveObject);
   swap(a.principalName, b.principalName);
@@ -4406,6 +4818,21 @@ void swap(HiveObjectPrivilege &a, HiveObjectPrivilege &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool HiveObjectPrivilege::operator==(const HiveObjectPrivilege & rhs) const
+{
+  if (!(hiveObject == rhs.hiveObject))
+    return false;
+  if (!(principalName == rhs.principalName))
+    return false;
+  if (!(principalType == rhs.principalType))
+    return false;
+  if (!(grantInfo == rhs.grantInfo))
+    return false;
+  if (!(authorizer == rhs.authorizer))
+    return false;
+  return true;
+}
+
 HiveObjectPrivilege::HiveObjectPrivilege(const HiveObjectPrivilege& other121) {
   hiveObject = other121.hiveObject;
   principalName = other121.principalName;
@@ -4438,6 +4865,8 @@ void HiveObjectPrivilege::printTo(std::ostream& out) const {
 PrivilegeBag::~PrivilegeBag() noexcept {
 }
 
+PrivilegeBag::PrivilegeBag() noexcept {
+}
 
 void PrivilegeBag::__set_privileges(const std::vector<HiveObjectPrivilege> & val) {
   this->privileges = val;
@@ -4524,12 +4953,19 @@ uint32_t PrivilegeBag::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(PrivilegeBag &a, PrivilegeBag &b) {
+void swap(PrivilegeBag &a, PrivilegeBag &b) noexcept {
   using ::std::swap;
   swap(a.privileges, b.privileges);
   swap(a.__isset, b.__isset);
 }
 
+bool PrivilegeBag::operator==(const PrivilegeBag & rhs) const
+{
+  if (!(privileges == rhs.privileges))
+    return false;
+  return true;
+}
+
 PrivilegeBag::PrivilegeBag(const PrivilegeBag& other129) {
   privileges = other129.privileges;
   __isset = other129.__isset;
@@ -4550,6 +4986,8 @@ void PrivilegeBag::printTo(std::ostream& out) const {
 PrincipalPrivilegeSet::~PrincipalPrivilegeSet() noexcept {
 }
 
+PrincipalPrivilegeSet::PrincipalPrivilegeSet() noexcept {
+}
 
 void PrincipalPrivilegeSet::__set_userPrivileges(const std::map<std::string, std::vector<PrivilegeGrantInfo> > & val) {
   this->userPrivileges = val;
@@ -4780,7 +5218,7 @@ uint32_t PrincipalPrivilegeSet::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(PrincipalPrivilegeSet &a, PrincipalPrivilegeSet &b) {
+void swap(PrincipalPrivilegeSet &a, PrincipalPrivilegeSet &b) noexcept {
   using ::std::swap;
   swap(a.userPrivileges, b.userPrivileges);
   swap(a.groupPrivileges, b.groupPrivileges);
@@ -4788,6 +5226,17 @@ void swap(PrincipalPrivilegeSet &a, PrincipalPrivilegeSet &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PrincipalPrivilegeSet::operator==(const PrincipalPrivilegeSet & rhs) const
+{
+  if (!(userPrivileges == rhs.userPrivileges))
+    return false;
+  if (!(groupPrivileges == rhs.groupPrivileges))
+    return false;
+  if (!(rolePrivileges == rhs.rolePrivileges))
+    return false;
+  return true;
+}
+
 PrincipalPrivilegeSet::PrincipalPrivilegeSet(const PrincipalPrivilegeSet& other173) {
   userPrivileges = other173.userPrivileges;
   groupPrivileges = other173.groupPrivileges;
@@ -4814,6 +5263,10 @@ void PrincipalPrivilegeSet::printTo(std::ostream& out) const {
 GrantRevokePrivilegeRequest::~GrantRevokePrivilegeRequest() noexcept {
 }
 
+GrantRevokePrivilegeRequest::GrantRevokePrivilegeRequest() noexcept
+   : requestType(static_cast<GrantRevokeType::type>(0)),
+     revokeGrantOption(0) {
+}
 
 void GrantRevokePrivilegeRequest::__set_requestType(const GrantRevokeType::type val) {
   this->requestType = val;
@@ -4916,7 +5369,7 @@ uint32_t GrantRevokePrivilegeRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(GrantRevokePrivilegeRequest &a, GrantRevokePrivilegeRequest &b) {
+void swap(GrantRevokePrivilegeRequest &a, GrantRevokePrivilegeRequest &b) noexcept {
   using ::std::swap;
   swap(a.requestType, b.requestType);
   swap(a.privileges, b.privileges);
@@ -4924,6 +5377,19 @@ void swap(GrantRevokePrivilegeRequest &a, GrantRevokePrivilegeRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GrantRevokePrivilegeRequest::operator==(const GrantRevokePrivilegeRequest & rhs) const
+{
+  if (!(requestType == rhs.requestType))
+    return false;
+  if (!(privileges == rhs.privileges))
+    return false;
+  if (__isset.revokeGrantOption != rhs.__isset.revokeGrantOption)
+    return false;
+  else if (__isset.revokeGrantOption && !(revokeGrantOption == rhs.revokeGrantOption))
+    return false;
+  return true;
+}
+
 GrantRevokePrivilegeRequest::GrantRevokePrivilegeRequest(const GrantRevokePrivilegeRequest& other176) {
   requestType = other176.requestType;
   privileges = other176.privileges;
@@ -4950,6 +5416,9 @@ void GrantRevokePrivilegeRequest::printTo(std::ostream& out) const {
 GrantRevokePrivilegeResponse::~GrantRevokePrivilegeResponse() noexcept {
 }
 
+GrantRevokePrivilegeResponse::GrantRevokePrivilegeResponse() noexcept
+   : success(0) {
+}
 
 void GrantRevokePrivilegeResponse::__set_success(const bool val) {
   this->success = val;
@@ -5018,12 +5487,21 @@ uint32_t GrantRevokePrivilegeResponse::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(GrantRevokePrivilegeResponse &a, GrantRevokePrivilegeResponse &b) {
+void swap(GrantRevokePrivilegeResponse &a, GrantRevokePrivilegeResponse &b) noexcept {
   using ::std::swap;
   swap(a.success, b.success);
   swap(a.__isset, b.__isset);
 }
 
+bool GrantRevokePrivilegeResponse::operator==(const GrantRevokePrivilegeResponse & rhs) const
+{
+  if (__isset.success != rhs.__isset.success)
+    return false;
+  else if (__isset.success && !(success == rhs.success))
+    return false;
+  return true;
+}
+
 GrantRevokePrivilegeResponse::GrantRevokePrivilegeResponse(const GrantRevokePrivilegeResponse& other178) noexcept {
   success = other178.success;
   __isset = other178.__isset;
@@ -5044,6 +5522,12 @@ void GrantRevokePrivilegeResponse::printTo(std::ostream& out) const {
 TruncateTableRequest::~TruncateTableRequest() noexcept {
 }
 
+TruncateTableRequest::TruncateTableRequest() noexcept
+   : dbName(),
+     tableName(),
+     writeId(-1LL),
+     validWriteIdList() {
+}
 
 void TruncateTableRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -5224,7 +5708,7 @@ uint32_t TruncateTableRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(TruncateTableRequest &a, TruncateTableRequest &b) {
+void swap(TruncateTableRequest &a, TruncateTableRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tableName, b.tableName);
@@ -5235,6 +5719,31 @@ void swap(TruncateTableRequest &a, TruncateTableRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TruncateTableRequest::operator==(const TruncateTableRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (__isset.partNames != rhs.__isset.partNames)
+    return false;
+  else if (__isset.partNames && !(partNames == rhs.partNames))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  return true;
+}
+
 TruncateTableRequest::TruncateTableRequest(const TruncateTableRequest& other186) {
   dbName = other186.dbName;
   tableName = other186.tableName;
@@ -5270,6 +5779,8 @@ void TruncateTableRequest::printTo(std::ostream& out) const {
 TruncateTableResponse::~TruncateTableResponse() noexcept {
 }
 
+TruncateTableResponse::TruncateTableResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const TruncateTableResponse& obj)
 {
   obj.printTo(out);
@@ -5315,12 +5826,17 @@ uint32_t TruncateTableResponse::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(TruncateTableResponse &a, TruncateTableResponse &b) {
+void swap(TruncateTableResponse &a, TruncateTableResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool TruncateTableResponse::operator==(const TruncateTableResponse & /* rhs */) const
+{
+  return true;
+}
+
 TruncateTableResponse::TruncateTableResponse(const TruncateTableResponse& other188) noexcept {
   (void) other188;
 }
@@ -5338,6 +5854,11 @@ void TruncateTableResponse::printTo(std::ostream& out) const {
 Role::~Role() noexcept {
 }
 
+Role::Role() noexcept
+   : roleName(),
+     createTime(0),
+     ownerName() {
+}
 
 void Role::__set_roleName(const std::string& val) {
   this->roleName = val;
@@ -5436,7 +5957,7 @@ uint32_t Role::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Role &a, Role &b) {
+void swap(Role &a, Role &b) noexcept {
   using ::std::swap;
   swap(a.roleName, b.roleName);
   swap(a.createTime, b.createTime);
@@ -5444,6 +5965,17 @@ void swap(Role &a, Role &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Role::operator==(const Role & rhs) const
+{
+  if (!(roleName == rhs.roleName))
+    return false;
+  if (!(createTime == rhs.createTime))
+    return false;
+  if (!(ownerName == rhs.ownerName))
+    return false;
+  return true;
+}
+
 Role::Role(const Role& other190) {
   roleName = other190.roleName;
   createTime = other190.createTime;
@@ -5470,6 +6002,15 @@ void Role::printTo(std::ostream& out) const {
 RolePrincipalGrant::~RolePrincipalGrant() noexcept {
 }
 
+RolePrincipalGrant::RolePrincipalGrant() noexcept
+   : roleName(),
+     principalName(),
+     principalType(static_cast<PrincipalType::type>(0)),
+     grantOption(0),
+     grantTime(0),
+     grantorName(),
+     grantorPrincipalType(static_cast<PrincipalType::type>(0)) {
+}
 
 void RolePrincipalGrant::__set_roleName(const std::string& val) {
   this->roleName = val;
@@ -5636,7 +6177,7 @@ uint32_t RolePrincipalGrant::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(RolePrincipalGrant &a, RolePrincipalGrant &b) {
+void swap(RolePrincipalGrant &a, RolePrincipalGrant &b) noexcept {
   using ::std::swap;
   swap(a.roleName, b.roleName);
   swap(a.principalName, b.principalName);
@@ -5648,6 +6189,25 @@ void swap(RolePrincipalGrant &a, RolePrincipalGrant &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool RolePrincipalGrant::operator==(const RolePrincipalGrant & rhs) const
+{
+  if (!(roleName == rhs.roleName))
+    return false;
+  if (!(principalName == rhs.principalName))
+    return false;
+  if (!(principalType == rhs.principalType))
+    return false;
+  if (!(grantOption == rhs.grantOption))
+    return false;
+  if (!(grantTime == rhs.grantTime))
+    return false;
+  if (!(grantorName == rhs.grantorName))
+    return false;
+  if (!(grantorPrincipalType == rhs.grantorPrincipalType))
+    return false;
+  return true;
+}
+
 RolePrincipalGrant::RolePrincipalGrant(const RolePrincipalGrant& other194) {
   roleName = other194.roleName;
   principalName = other194.principalName;
@@ -5686,6 +6246,10 @@ void RolePrincipalGrant::printTo(std::ostream& out) const {
 GetRoleGrantsForPrincipalRequest::~GetRoleGrantsForPrincipalRequest() noexcept {
 }
 
+GetRoleGrantsForPrincipalRequest::GetRoleGrantsForPrincipalRequest() noexcept
+   : principal_name(),
+     principal_type(static_cast<PrincipalType::type>(0)) {
+}
 
 void GetRoleGrantsForPrincipalRequest::__set_principal_name(const std::string& val) {
   this->principal_name = val;
@@ -5776,12 +6340,21 @@ uint32_t GetRoleGrantsForPrincipalRequest::write(::apache::thrift::protocol::TPr
   return xfer;
 }
 
-void swap(GetRoleGrantsForPrincipalRequest &a, GetRoleGrantsForPrincipalRequest &b) {
+void swap(GetRoleGrantsForPrincipalRequest &a, GetRoleGrantsForPrincipalRequest &b) noexcept {
   using ::std::swap;
   swap(a.principal_name, b.principal_name);
   swap(a.principal_type, b.principal_type);
 }
 
+bool GetRoleGrantsForPrincipalRequest::operator==(const GetRoleGrantsForPrincipalRequest & rhs) const
+{
+  if (!(principal_name == rhs.principal_name))
+    return false;
+  if (!(principal_type == rhs.principal_type))
+    return false;
+  return true;
+}
+
 GetRoleGrantsForPrincipalRequest::GetRoleGrantsForPrincipalRequest(const GetRoleGrantsForPrincipalRequest& other197) {
   principal_name = other197.principal_name;
   principal_type = other197.principal_type;
@@ -5803,6 +6376,8 @@ void GetRoleGrantsForPrincipalRequest::printTo(std::ostream& out) const {
 GetRoleGrantsForPrincipalResponse::~GetRoleGrantsForPrincipalResponse() noexcept {
 }
 
+GetRoleGrantsForPrincipalResponse::GetRoleGrantsForPrincipalResponse() noexcept {
+}
 
 void GetRoleGrantsForPrincipalResponse::__set_principalGrants(const std::vector<RolePrincipalGrant> & val) {
   this->principalGrants = val;
@@ -5892,11 +6467,18 @@ uint32_t GetRoleGrantsForPrincipalResponse::write(::apache::thrift::protocol::TP
   return xfer;
 }
 
-void swap(GetRoleGrantsForPrincipalResponse &a, GetRoleGrantsForPrincipalResponse &b) {
+void swap(GetRoleGrantsForPrincipalResponse &a, GetRoleGrantsForPrincipalResponse &b) noexcept {
   using ::std::swap;
   swap(a.principalGrants, b.principalGrants);
 }
 
+bool GetRoleGrantsForPrincipalResponse::operator==(const GetRoleGrantsForPrincipalResponse & rhs) const
+{
+  if (!(principalGrants == rhs.principalGrants))
+    return false;
+  return true;
+}
+
 GetRoleGrantsForPrincipalResponse::GetRoleGrantsForPrincipalResponse(const GetRoleGrantsForPrincipalResponse& other205) {
   principalGrants = other205.principalGrants;
 }
@@ -5915,6 +6497,9 @@ void GetRoleGrantsForPrincipalResponse::printTo(std::ostream& out) const {
 GetPrincipalsInRoleRequest::~GetPrincipalsInRoleRequest() noexcept {
 }
 
+GetPrincipalsInRoleRequest::GetPrincipalsInRoleRequest() noexcept
+   : roleName() {
+}
 
 void GetPrincipalsInRoleRequest::__set_roleName(const std::string& val) {
   this->roleName = val;
@@ -5984,11 +6569,18 @@ uint32_t GetPrincipalsInRoleRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(GetPrincipalsInRoleRequest &a, GetPrincipalsInRoleRequest &b) {
+void swap(GetPrincipalsInRoleRequest &a, GetPrincipalsInRoleRequest &b) noexcept {
   using ::std::swap;
   swap(a.roleName, b.roleName);
 }
 
+bool GetPrincipalsInRoleRequest::operator==(const GetPrincipalsInRoleRequest & rhs) const
+{
+  if (!(roleName == rhs.roleName))
+    return false;
+  return true;
+}
+
 GetPrincipalsInRoleRequest::GetPrincipalsInRoleRequest(const GetPrincipalsInRoleRequest& other207) {
   roleName = other207.roleName;
 }
@@ -6007,6 +6599,8 @@ void GetPrincipalsInRoleRequest::printTo(std::ostream& out) const {
 GetPrincipalsInRoleResponse::~GetPrincipalsInRoleResponse() noexcept {
 }
 
+GetPrincipalsInRoleResponse::GetPrincipalsInRoleResponse() noexcept {
+}
 
 void GetPrincipalsInRoleResponse::__set_principalGrants(const std::vector<RolePrincipalGrant> & val) {
   this->principalGrants = val;
@@ -6096,11 +6690,18 @@ uint32_t GetPrincipalsInRoleResponse::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(GetPrincipalsInRoleResponse &a, GetPrincipalsInRoleResponse &b) {
+void swap(GetPrincipalsInRoleResponse &a, GetPrincipalsInRoleResponse &b) noexcept {
   using ::std::swap;
   swap(a.principalGrants, b.principalGrants);
 }
 
+bool GetPrincipalsInRoleResponse::operator==(const GetPrincipalsInRoleResponse & rhs) const
+{
+  if (!(principalGrants == rhs.principalGrants))
+    return false;
+  return true;
+}
+
 GetPrincipalsInRoleResponse::GetPrincipalsInRoleResponse(const GetPrincipalsInRoleResponse& other215) {
   principalGrants = other215.principalGrants;
 }
@@ -6119,6 +6720,15 @@ void GetPrincipalsInRoleResponse::printTo(std::ostream& out) const {
 GrantRevokeRoleRequest::~GrantRevokeRoleRequest() noexcept {
 }
 
+GrantRevokeRoleRequest::GrantRevokeRoleRequest() noexcept
+   : requestType(static_cast<GrantRevokeType::type>(0)),
+     roleName(),
+     principalName(),
+     principalType(static_cast<PrincipalType::type>(0)),
+     grantor(),
+     grantorType(static_cast<PrincipalType::type>(0)),
+     grantOption(0) {
+}
 
 void GrantRevokeRoleRequest::__set_requestType(const GrantRevokeType::type val) {
   this->requestType = val;
@@ -6293,7 +6903,7 @@ uint32_t GrantRevokeRoleRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(GrantRevokeRoleRequest &a, GrantRevokeRoleRequest &b) {
+void swap(GrantRevokeRoleRequest &a, GrantRevokeRoleRequest &b) noexcept {
   using ::std::swap;
   swap(a.requestType, b.requestType);
   swap(a.roleName, b.roleName);
@@ -6305,6 +6915,31 @@ void swap(GrantRevokeRoleRequest &a, GrantRevokeRoleRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GrantRevokeRoleRequest::operator==(const GrantRevokeRoleRequest & rhs) const
+{
+  if (!(requestType == rhs.requestType))
+    return false;
+  if (!(roleName == rhs.roleName))
+    return false;
+  if (!(principalName == rhs.principalName))
+    return false;
+  if (!(principalType == rhs.principalType))
+    return false;
+  if (__isset.grantor != rhs.__isset.grantor)
+    return false;
+  else if (__isset.grantor && !(grantor == rhs.grantor))
+    return false;
+  if (__isset.grantorType != rhs.__isset.grantorType)
+    return false;
+  else if (__isset.grantorType && !(grantorType == rhs.grantorType))
+    return false;
+  if (__isset.grantOption != rhs.__isset.grantOption)
+    return false;
+  else if (__isset.grantOption && !(grantOption == rhs.grantOption))
+    return false;
+  return true;
+}
+
 GrantRevokeRoleRequest::GrantRevokeRoleRequest(const GrantRevokeRoleRequest& other220) {
   requestType = other220.requestType;
   roleName = other220.roleName;
@@ -6343,6 +6978,9 @@ void GrantRevokeRoleRequest::printTo(std::ostream& out) const {
 GrantRevokeRoleResponse::~GrantRevokeRoleResponse() noexcept {
 }
 
+GrantRevokeRoleResponse::GrantRevokeRoleResponse() noexcept
+   : success(0) {
+}
 
 void GrantRevokeRoleResponse::__set_success(const bool val) {
   this->success = val;
@@ -6411,12 +7049,21 @@ uint32_t GrantRevokeRoleResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(GrantRevokeRoleResponse &a, GrantRevokeRoleResponse &b) {
+void swap(GrantRevokeRoleResponse &a, GrantRevokeRoleResponse &b) noexcept {
   using ::std::swap;
   swap(a.success, b.success);
   swap(a.__isset, b.__isset);
 }
 
+bool GrantRevokeRoleResponse::operator==(const GrantRevokeRoleResponse & rhs) const
+{
+  if (__isset.success != rhs.__isset.success)
+    return false;
+  else if (__isset.success && !(success == rhs.success))
+    return false;
+  return true;
+}
+
 GrantRevokeRoleResponse::GrantRevokeRoleResponse(const GrantRevokeRoleResponse& other222) noexcept {
   success = other222.success;
   __isset = other222.__isset;
@@ -6437,6 +7084,12 @@ void GrantRevokeRoleResponse::printTo(std::ostream& out) const {
 Catalog::~Catalog() noexcept {
 }
 
+Catalog::Catalog() noexcept
+   : name(),
+     description(),
+     locationUri(),
+     createTime(0) {
+}
 
 void Catalog::__set_name(const std::string& val) {
   this->name = val;
@@ -6597,7 +7250,7 @@ uint32_t Catalog::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Catalog &a, Catalog &b) {
+void swap(Catalog &a, Catalog &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.description, b.description);
@@ -6607,6 +7260,27 @@ void swap(Catalog &a, Catalog &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Catalog::operator==(const Catalog & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (__isset.description != rhs.__isset.description)
+    return false;
+  else if (__isset.description && !(description == rhs.description))
+    return false;
+  if (!(locationUri == rhs.locationUri))
+    return false;
+  if (__isset.createTime != rhs.__isset.createTime)
+    return false;
+  else if (__isset.createTime && !(createTime == rhs.createTime))
+    return false;
+  if (__isset.parameters != rhs.__isset.parameters)
+    return false;
+  else if (__isset.parameters && !(parameters == rhs.parameters))
+    return false;
+  return true;
+}
+
 Catalog::Catalog(const Catalog& other232) {
   name = other232.name;
   description = other232.description;
@@ -6639,6 +7313,8 @@ void Catalog::printTo(std::ostream& out) const {
 CreateCatalogRequest::~CreateCatalogRequest() noexcept {
 }
 
+CreateCatalogRequest::CreateCatalogRequest() noexcept {
+}
 
 void CreateCatalogRequest::__set_catalog(const Catalog& val) {
   this->catalog = val;
@@ -6705,12 +7381,19 @@ uint32_t CreateCatalogRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(CreateCatalogRequest &a, CreateCatalogRequest &b) {
+void swap(CreateCatalogRequest &a, CreateCatalogRequest &b) noexcept {
   using ::std::swap;
   swap(a.catalog, b.catalog);
   swap(a.__isset, b.__isset);
 }
 
+bool CreateCatalogRequest::operator==(const CreateCatalogRequest & rhs) const
+{
+  if (!(catalog == rhs.catalog))
+    return false;
+  return true;
+}
+
 CreateCatalogRequest::CreateCatalogRequest(const CreateCatalogRequest& other234) {
   catalog = other234.catalog;
   __isset = other234.__isset;
@@ -6731,6 +7414,9 @@ void CreateCatalogRequest::printTo(std::ostream& out) const {
 AlterCatalogRequest::~AlterCatalogRequest() noexcept {
 }
 
+AlterCatalogRequest::AlterCatalogRequest() noexcept
+   : name() {
+}
 
 void AlterCatalogRequest::__set_name(const std::string& val) {
   this->name = val;
@@ -6813,13 +7499,22 @@ uint32_t AlterCatalogRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(AlterCatalogRequest &a, AlterCatalogRequest &b) {
+void swap(AlterCatalogRequest &a, AlterCatalogRequest &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.newCat, b.newCat);
   swap(a.__isset, b.__isset);
 }
 
+bool AlterCatalogRequest::operator==(const AlterCatalogRequest & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(newCat == rhs.newCat))
+    return false;
+  return true;
+}
+
 AlterCatalogRequest::AlterCatalogRequest(const AlterCatalogRequest& other236) {
   name = other236.name;
   newCat = other236.newCat;
@@ -6843,6 +7538,9 @@ void AlterCatalogRequest::printTo(std::ostream& out) const {
 GetCatalogRequest::~GetCatalogRequest() noexcept {
 }
 
+GetCatalogRequest::GetCatalogRequest() noexcept
+   : name() {
+}
 
 void GetCatalogRequest::__set_name(const std::string& val) {
   this->name = val;
@@ -6909,12 +7607,19 @@ uint32_t GetCatalogRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetCatalogRequest &a, GetCatalogRequest &b) {
+void swap(GetCatalogRequest &a, GetCatalogRequest &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.__isset, b.__isset);
 }
 
+bool GetCatalogRequest::operator==(const GetCatalogRequest & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  return true;
+}
+
 GetCatalogRequest::GetCatalogRequest(const GetCatalogRequest& other238) {
   name = other238.name;
   __isset = other238.__isset;
@@ -6935,6 +7640,8 @@ void GetCatalogRequest::printTo(std::ostream& out) const {
 GetCatalogResponse::~GetCatalogResponse() noexcept {
 }
 
+GetCatalogResponse::GetCatalogResponse() noexcept {
+}
 
 void GetCatalogResponse::__set_catalog(const Catalog& val) {
   this->catalog = val;
@@ -7001,12 +7708,19 @@ uint32_t GetCatalogResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetCatalogResponse &a, GetCatalogResponse &b) {
+void swap(GetCatalogResponse &a, GetCatalogResponse &b) noexcept {
   using ::std::swap;
   swap(a.catalog, b.catalog);
   swap(a.__isset, b.__isset);
 }
 
+bool GetCatalogResponse::operator==(const GetCatalogResponse & rhs) const
+{
+  if (!(catalog == rhs.catalog))
+    return false;
+  return true;
+}
+
 GetCatalogResponse::GetCatalogResponse(const GetCatalogResponse& other240) {
   catalog = other240.catalog;
   __isset = other240.__isset;
@@ -7027,6 +7741,8 @@ void GetCatalogResponse::printTo(std::ostream& out) const {
 GetCatalogsResponse::~GetCatalogsResponse() noexcept {
 }
 
+GetCatalogsResponse::GetCatalogsResponse() noexcept {
+}
 
 void GetCatalogsResponse::__set_names(const std::vector<std::string> & val) {
   this->names = val;
@@ -7113,12 +7829,19 @@ uint32_t GetCatalogsResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(GetCatalogsResponse &a, GetCatalogsResponse &b) {
+void swap(GetCatalogsResponse &a, GetCatalogsResponse &b) noexcept {
   using ::std::swap;
   swap(a.names, b.names);
   swap(a.__isset, b.__isset);
 }
 
+bool GetCatalogsResponse::operator==(const GetCatalogsResponse & rhs) const
+{
+  if (!(names == rhs.names))
+    return false;
+  return true;
+}
+
 GetCatalogsResponse::GetCatalogsResponse(const GetCatalogsResponse& other248) {
   names = other248.names;
   __isset = other248.__isset;
@@ -7139,6 +7862,10 @@ void GetCatalogsResponse::printTo(std::ostream& out) const {
 DropCatalogRequest::~DropCatalogRequest() noexcept {
 }
 
+DropCatalogRequest::DropCatalogRequest() noexcept
+   : name(),
+     ifExists(true) {
+}
 
 void DropCatalogRequest::__set_name(const std::string& val) {
   this->name = val;
@@ -7223,13 +7950,24 @@ uint32_t DropCatalogRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(DropCatalogRequest &a, DropCatalogRequest &b) {
+void swap(DropCatalogRequest &a, DropCatalogRequest &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.ifExists, b.ifExists);
   swap(a.__isset, b.__isset);
 }
 
+bool DropCatalogRequest::operator==(const DropCatalogRequest & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (__isset.ifExists != rhs.__isset.ifExists)
+    return false;
+  else if (__isset.ifExists && !(ifExists == rhs.ifExists))
+    return false;
+  return true;
+}
+
 DropCatalogRequest::DropCatalogRequest(const DropCatalogRequest& other250) {
   name = other250.name;
   ifExists = other250.ifExists;
@@ -7253,6 +7991,19 @@ void DropCatalogRequest::printTo(std::ostream& out) const {
 Database::~Database() noexcept {
 }
 
+Database::Database() noexcept
+   : name(),
+     description(),
+     locationUri(),
+     ownerName(),
+     ownerType(static_cast<PrincipalType::type>(0)),
+     catalogName(),
+     createTime(0),
+     managedLocationUri(),
+     type(static_cast<DatabaseType::type>(0)),
+     connector_name(),
+     remote_dbname() {
+}
 
 void Database::__set_name(const std::string& val) {
   this->name = val;
@@ -7557,7 +8308,7 @@ uint32_t Database::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Database &a, Database &b) {
+void swap(Database &a, Database &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.description, b.description);
@@ -7575,6 +8326,55 @@ void swap(Database &a, Database &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Database::operator==(const Database & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(description == rhs.description))
+    return false;
+  if (!(locationUri == rhs.locationUri))
+    return false;
+  if (!(parameters == rhs.parameters))
+    return false;
+  if (__isset.privileges != rhs.__isset.privileges)
+    return false;
+  else if (__isset.privileges && !(privileges == rhs.privileges))
+    return false;
+  if (__isset.ownerName != rhs.__isset.ownerName)
+    return false;
+  else if (__isset.ownerName && !(ownerName == rhs.ownerName))
+    return false;
+  if (__isset.ownerType != rhs.__isset.ownerType)
+    return false;
+  else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.createTime != rhs.__isset.createTime)
+    return false;
+  else if (__isset.createTime && !(createTime == rhs.createTime))
+    return false;
+  if (__isset.managedLocationUri != rhs.__isset.managedLocationUri)
+    return false;
+  else if (__isset.managedLocationUri && !(managedLocationUri == rhs.managedLocationUri))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  if (__isset.connector_name != rhs.__isset.connector_name)
+    return false;
+  else if (__isset.connector_name && !(connector_name == rhs.connector_name))
+    return false;
+  if (__isset.remote_dbname != rhs.__isset.remote_dbname)
+    return false;
+  else if (__isset.remote_dbname && !(remote_dbname == rhs.remote_dbname))
+    return false;
+  return true;
+}
+
 Database::Database(const Database& other262) {
   name = other262.name;
   description = other262.description;
@@ -7631,6 +8431,10 @@ void Database::printTo(std::ostream& out) const {
 GetDatabaseObjectsRequest::~GetDatabaseObjectsRequest() noexcept {
 }
 
+GetDatabaseObjectsRequest::GetDatabaseObjectsRequest() noexcept
+   : catalogName(),
+     pattern() {
+}
 
 void GetDatabaseObjectsRequest::__set_catalogName(const std::string& val) {
   this->catalogName = val;
@@ -7717,13 +8521,26 @@ uint32_t GetDatabaseObjectsRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(GetDatabaseObjectsRequest &a, GetDatabaseObjectsRequest &b) {
+void swap(GetDatabaseObjectsRequest &a, GetDatabaseObjectsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catalogName, b.catalogName);
   swap(a.pattern, b.pattern);
   swap(a.__isset, b.__isset);
 }
 
+bool GetDatabaseObjectsRequest::operator==(const GetDatabaseObjectsRequest & rhs) const
+{
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.pattern != rhs.__isset.pattern)
+    return false;
+  else if (__isset.pattern && !(pattern == rhs.pattern))
+    return false;
+  return true;
+}
+
 GetDatabaseObjectsRequest::GetDatabaseObjectsRequest(const GetDatabaseObjectsRequest& other264) {
   catalogName = other264.catalogName;
   pattern = other264.pattern;
@@ -7747,6 +8564,8 @@ void GetDatabaseObjectsRequest::printTo(std::ostream& out) const {
 GetDatabaseObjectsResponse::~GetDatabaseObjectsResponse() noexcept {
 }
 
+GetDatabaseObjectsResponse::GetDatabaseObjectsResponse() noexcept {
+}
 
 void GetDatabaseObjectsResponse::__set_databases(const std::vector<Database> & val) {
   this->databases = val;
@@ -7836,11 +8655,18 @@ uint32_t GetDatabaseObjectsResponse::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(GetDatabaseObjectsResponse &a, GetDatabaseObjectsResponse &b) {
+void swap(GetDatabaseObjectsResponse &a, GetDatabaseObjectsResponse &b) noexcept {
   using ::std::swap;
   swap(a.databases, b.databases);
 }
 
+bool GetDatabaseObjectsResponse::operator==(const GetDatabaseObjectsResponse & rhs) const
+{
+  if (!(databases == rhs.databases))
+    return false;
+  return true;
+}
+
 GetDatabaseObjectsResponse::GetDatabaseObjectsResponse(const GetDatabaseObjectsResponse& other272) {
   databases = other272.databases;
 }
@@ -7859,6 +8685,14 @@ void GetDatabaseObjectsResponse::printTo(std::ostream& out) const {
 SerDeInfo::~SerDeInfo() noexcept {
 }
 
+SerDeInfo::SerDeInfo() noexcept
+   : name(),
+     serializationLib(),
+     description(),
+     serializerClass(),
+     deserializerClass(),
+     serdeType(static_cast<SerdeType::type>(0)) {
+}
 
 void SerDeInfo::__set_name(const std::string& val) {
   this->name = val;
@@ -8055,7 +8889,7 @@ uint32_t SerDeInfo::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(SerDeInfo &a, SerDeInfo &b) {
+void swap(SerDeInfo &a, SerDeInfo &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.serializationLib, b.serializationLib);
@@ -8067,6 +8901,33 @@ void swap(SerDeInfo &a, SerDeInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SerDeInfo::operator==(const SerDeInfo & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(serializationLib == rhs.serializationLib))
+    return false;
+  if (!(parameters == rhs.parameters))
+    return false;
+  if (__isset.description != rhs.__isset.description)
+    return false;
+  else if (__isset.description && !(description == rhs.description))
+    return false;
+  if (__isset.serializerClass != rhs.__isset.serializerClass)
+    return false;
+  else if (__isset.serializerClass && !(serializerClass == rhs.serializerClass))
+    return false;
+  if (__isset.deserializerClass != rhs.__isset.deserializerClass)
+    return false;
+  else if (__isset.deserializerClass && !(deserializerClass == rhs.deserializerClass))
+    return false;
+  if (__isset.serdeType != rhs.__isset.serdeType)
+    return false;
+  else if (__isset.serdeType && !(serdeType == rhs.serdeType))
+    return false;
+  return true;
+}
+
 SerDeInfo::SerDeInfo(const SerDeInfo& other283) {
   name = other283.name;
   serializationLib = other283.serializationLib;
@@ -8105,6 +8966,10 @@ void SerDeInfo::printTo(std::ostream& out) const {
 Order::~Order() noexcept {
 }
 
+Order::Order() noexcept
+   : col(),
+     order(0) {
+}
 
 void Order::__set_col(const std::string& val) {
   this->col = val;
@@ -8187,13 +9052,22 @@ uint32_t Order::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Order &a, Order &b) {
+void swap(Order &a, Order &b) noexcept {
   using ::std::swap;
   swap(a.col, b.col);
   swap(a.order, b.order);
   swap(a.__isset, b.__isset);
 }
 
+bool Order::operator==(const Order & rhs) const
+{
+  if (!(col == rhs.col))
+    return false;
+  if (!(order == rhs.order))
+    return false;
+  return true;
+}
+
 Order::Order(const Order& other285) {
   col = other285.col;
   order = other285.order;
@@ -8217,6 +9091,8 @@ void Order::printTo(std::ostream& out) const {
 SkewedInfo::~SkewedInfo() noexcept {
 }
 
+SkewedInfo::SkewedInfo() noexcept {
+}
 
 void SkewedInfo::__set_skewedColNames(const std::vector<std::string> & val) {
   this->skewedColNames = val;
@@ -8419,7 +9295,7 @@ uint32_t SkewedInfo::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(SkewedInfo &a, SkewedInfo &b) {
+void swap(SkewedInfo &a, SkewedInfo &b) noexcept {
   using ::std::swap;
   swap(a.skewedColNames, b.skewedColNames);
   swap(a.skewedColValues, b.skewedColValues);
@@ -8427,6 +9303,17 @@ void swap(SkewedInfo &a, SkewedInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SkewedInfo::operator==(const SkewedInfo & rhs) const
+{
+  if (!(skewedColNames == rhs.skewedColNames))
+    return false;
+  if (!(skewedColValues == rhs.skewedColValues))
+    return false;
+  if (!(skewedColValueLocationMaps == rhs.skewedColValueLocationMaps))
+    return false;
+  return true;
+}
+
 SkewedInfo::SkewedInfo(const SkewedInfo& other319) {
   skewedColNames = other319.skewedColNames;
   skewedColValues = other319.skewedColValues;
@@ -8453,6 +9340,14 @@ void SkewedInfo::printTo(std::ostream& out) const {
 StorageDescriptor::~StorageDescriptor() noexcept {
 }
 
+StorageDescriptor::StorageDescriptor() noexcept
+   : location(),
+     inputFormat(),
+     outputFormat(),
+     compressed(0),
+     numBuckets(0),
+     storedAsSubDirectories(0) {
+}
 
 void StorageDescriptor::__set_cols(const std::vector<FieldSchema> & val) {
   this->cols = val;
@@ -8783,7 +9678,7 @@ uint32_t StorageDescriptor::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(StorageDescriptor &a, StorageDescriptor &b) {
+void swap(StorageDescriptor &a, StorageDescriptor &b) noexcept {
   using ::std::swap;
   swap(a.cols, b.cols);
   swap(a.location, b.location);
@@ -8800,6 +9695,39 @@ void swap(StorageDescriptor &a, StorageDescriptor &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool StorageDescriptor::operator==(const StorageDescriptor & rhs) const
+{
+  if (!(cols == rhs.cols))
+    return false;
+  if (!(location == rhs.location))
+    return false;
+  if (!(inputFormat == rhs.inputFormat))
+    return false;
+  if (!(outputFormat == rhs.outputFormat))
+    return false;
+  if (!(compressed == rhs.compressed))
+    return false;
+  if (!(numBuckets == rhs.numBuckets))
+    return false;
+  if (!(serdeInfo == rhs.serdeInfo))
+    return false;
+  if (!(bucketCols == rhs.bucketCols))
+    return false;
+  if (!(sortCols == rhs.sortCols))
+    return false;
+  if (!(parameters == rhs.parameters))
+    return false;
+  if (__isset.skewedInfo != rhs.__isset.skewedInfo)
+    return false;
+  else if (__isset.skewedInfo && !(skewedInfo == rhs.skewedInfo))
+    return false;
+  if (__isset.storedAsSubDirectories != rhs.__isset.storedAsSubDirectories)
+    return false;
+  else if (__isset.storedAsSubDirectories && !(storedAsSubDirectories == rhs.storedAsSubDirectories))
+    return false;
+  return true;
+}
+
 StorageDescriptor::StorageDescriptor(const StorageDescriptor& other347) {
   cols = other347.cols;
   location = other347.location;
@@ -8853,6 +9781,13 @@ void StorageDescriptor::printTo(std::ostream& out) const {
 CreationMetadata::~CreationMetadata() noexcept {
 }
 
+CreationMetadata::CreationMetadata() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     validTxnList(),
+     materializationTime(0) {
+}
 
 void CreationMetadata::__set_catName(const std::string& val) {
   this->catName = val;
@@ -9074,7 +10009,7 @@ uint32_t CreationMetadata::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(CreationMetadata &a, CreationMetadata &b) {
+void swap(CreationMetadata &a, CreationMetadata &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -9086,6 +10021,31 @@ void swap(CreationMetadata &a, CreationMetadata &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CreationMetadata::operator==(const CreationMetadata & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(tablesUsed == rhs.tablesUsed))
+    return false;
+  if (__isset.validTxnList != rhs.__isset.validTxnList)
+    return false;
+  else if (__isset.validTxnList && !(validTxnList == rhs.validTxnList))
+    return false;
+  if (__isset.materializationTime != rhs.__isset.materializationTime)
+    return false;
+  else if (__isset.materializationTime && !(materializationTime == rhs.materializationTime))
+    return false;
+  if (__isset.sourceTables != rhs.__isset.sourceTables)
+    return false;
+  else if (__isset.sourceTables && !(sourceTables == rhs.sourceTables))
+    return false;
+  return true;
+}
+
 CreationMetadata::CreationMetadata(const CreationMetadata& other362) {
   catName = other362.catName;
   dbName = other362.dbName;
@@ -9124,6 +10084,12 @@ void CreationMetadata::printTo(std::ostream& out) const {
 BooleanColumnStatsData::~BooleanColumnStatsData() noexcept {
 }
 
+BooleanColumnStatsData::BooleanColumnStatsData() noexcept
+   : numTrues(0),
+     numFalses(0),
+     numNulls(0),
+     bitVectors() {
+}
 
 void BooleanColumnStatsData::__set_numTrues(const int64_t val) {
   this->numTrues = val;
@@ -9249,7 +10215,7 @@ uint32_t BooleanColumnStatsData::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(BooleanColumnStatsData &a, BooleanColumnStatsData &b) {
+void swap(BooleanColumnStatsData &a, BooleanColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.numTrues, b.numTrues);
   swap(a.numFalses, b.numFalses);
@@ -9258,6 +10224,21 @@ void swap(BooleanColumnStatsData &a, BooleanColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool BooleanColumnStatsData::operator==(const BooleanColumnStatsData & rhs) const
+{
+  if (!(numTrues == rhs.numTrues))
+    return false;
+  if (!(numFalses == rhs.numFalses))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  return true;
+}
+
 BooleanColumnStatsData::BooleanColumnStatsData(const BooleanColumnStatsData& other364) {
   numTrues = other364.numTrues;
   numFalses = other364.numFalses;
@@ -9287,6 +10268,14 @@ void BooleanColumnStatsData::printTo(std::ostream& out) const {
 DoubleColumnStatsData::~DoubleColumnStatsData() noexcept {
 }
 
+DoubleColumnStatsData::DoubleColumnStatsData() noexcept
+   : lowValue(0),
+     highValue(0),
+     numNulls(0),
+     numDVs(0),
+     bitVectors(),
+     histogram() {
+}
 
 void DoubleColumnStatsData::__set_lowValue(const double val) {
   this->lowValue = val;
@@ -9447,7 +10436,7 @@ uint32_t DoubleColumnStatsData::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(DoubleColumnStatsData &a, DoubleColumnStatsData &b) {
+void swap(DoubleColumnStatsData &a, DoubleColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.lowValue, b.lowValue);
   swap(a.highValue, b.highValue);
@@ -9458,6 +10447,31 @@ void swap(DoubleColumnStatsData &a, DoubleColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DoubleColumnStatsData::operator==(const DoubleColumnStatsData & rhs) const
+{
+  if (__isset.lowValue != rhs.__isset.lowValue)
+    return false;
+  else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+    return false;
+  if (__isset.highValue != rhs.__isset.highValue)
+    return false;
+  else if (__isset.highValue && !(highValue == rhs.highValue))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (!(numDVs == rhs.numDVs))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  if (__isset.histogram != rhs.__isset.histogram)
+    return false;
+  else if (__isset.histogram && !(histogram == rhs.histogram))
+    return false;
+  return true;
+}
+
 DoubleColumnStatsData::DoubleColumnStatsData(const DoubleColumnStatsData& other366) {
   lowValue = other366.lowValue;
   highValue = other366.highValue;
@@ -9493,6 +10507,14 @@ void DoubleColumnStatsData::printTo(std::ostream& out) const {
 LongColumnStatsData::~LongColumnStatsData() noexcept {
 }
 
+LongColumnStatsData::LongColumnStatsData() noexcept
+   : lowValue(0),
+     highValue(0),
+     numNulls(0),
+     numDVs(0),
+     bitVectors(),
+     histogram() {
+}
 
 void LongColumnStatsData::__set_lowValue(const int64_t val) {
   this->lowValue = val;
@@ -9653,7 +10675,7 @@ uint32_t LongColumnStatsData::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(LongColumnStatsData &a, LongColumnStatsData &b) {
+void swap(LongColumnStatsData &a, LongColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.lowValue, b.lowValue);
   swap(a.highValue, b.highValue);
@@ -9664,6 +10686,31 @@ void swap(LongColumnStatsData &a, LongColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool LongColumnStatsData::operator==(const LongColumnStatsData & rhs) const
+{
+  if (__isset.lowValue != rhs.__isset.lowValue)
+    return false;
+  else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+    return false;
+  if (__isset.highValue != rhs.__isset.highValue)
+    return false;
+  else if (__isset.highValue && !(highValue == rhs.highValue))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (!(numDVs == rhs.numDVs))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  if (__isset.histogram != rhs.__isset.histogram)
+    return false;
+  else if (__isset.histogram && !(histogram == rhs.histogram))
+    return false;
+  return true;
+}
+
 LongColumnStatsData::LongColumnStatsData(const LongColumnStatsData& other368) {
   lowValue = other368.lowValue;
   highValue = other368.highValue;
@@ -9699,6 +10746,13 @@ void LongColumnStatsData::printTo(std::ostream& out) const {
 StringColumnStatsData::~StringColumnStatsData() noexcept {
 }
 
+StringColumnStatsData::StringColumnStatsData() noexcept
+   : maxColLen(0),
+     avgColLen(0),
+     numNulls(0),
+     numDVs(0),
+     bitVectors() {
+}
 
 void StringColumnStatsData::__set_maxColLen(const int64_t val) {
   this->maxColLen = val;
@@ -9843,7 +10897,7 @@ uint32_t StringColumnStatsData::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(StringColumnStatsData &a, StringColumnStatsData &b) {
+void swap(StringColumnStatsData &a, StringColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.maxColLen, b.maxColLen);
   swap(a.avgColLen, b.avgColLen);
@@ -9853,6 +10907,23 @@ void swap(StringColumnStatsData &a, StringColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool StringColumnStatsData::operator==(const StringColumnStatsData & rhs) const
+{
+  if (!(maxColLen == rhs.maxColLen))
+    return false;
+  if (!(avgColLen == rhs.avgColLen))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (!(numDVs == rhs.numDVs))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  return true;
+}
+
 StringColumnStatsData::StringColumnStatsData(const StringColumnStatsData& other370) {
   maxColLen = other370.maxColLen;
   avgColLen = other370.avgColLen;
@@ -9885,6 +10956,12 @@ void StringColumnStatsData::printTo(std::ostream& out) const {
 BinaryColumnStatsData::~BinaryColumnStatsData() noexcept {
 }
 
+BinaryColumnStatsData::BinaryColumnStatsData() noexcept
+   : maxColLen(0),
+     avgColLen(0),
+     numNulls(0),
+     bitVectors() {
+}
 
 void BinaryColumnStatsData::__set_maxColLen(const int64_t val) {
   this->maxColLen = val;
@@ -10010,7 +11087,7 @@ uint32_t BinaryColumnStatsData::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(BinaryColumnStatsData &a, BinaryColumnStatsData &b) {
+void swap(BinaryColumnStatsData &a, BinaryColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.maxColLen, b.maxColLen);
   swap(a.avgColLen, b.avgColLen);
@@ -10019,6 +11096,21 @@ void swap(BinaryColumnStatsData &a, BinaryColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool BinaryColumnStatsData::operator==(const BinaryColumnStatsData & rhs) const
+{
+  if (!(maxColLen == rhs.maxColLen))
+    return false;
+  if (!(avgColLen == rhs.avgColLen))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  return true;
+}
+
 BinaryColumnStatsData::BinaryColumnStatsData(const BinaryColumnStatsData& other372) {
   maxColLen = other372.maxColLen;
   avgColLen = other372.avgColLen;
@@ -10048,6 +11140,10 @@ void BinaryColumnStatsData::printTo(std::ostream& out) const {
 Decimal::~Decimal() noexcept {
 }
 
+Decimal::Decimal() noexcept
+   : scale(0),
+     unscaled() {
+}
 
 void Decimal::__set_scale(const int16_t val) {
   this->scale = val;
@@ -10136,12 +11232,21 @@ uint32_t Decimal::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Decimal &a, Decimal &b) {
+void swap(Decimal &a, Decimal &b) noexcept {
   using ::std::swap;
   swap(a.scale, b.scale);
   swap(a.unscaled, b.unscaled);
 }
 
+bool Decimal::operator==(const Decimal & rhs) const
+{
+  if (!(scale == rhs.scale))
+    return false;
+  if (!(unscaled == rhs.unscaled))
+    return false;
+  return true;
+}
+
 Decimal::Decimal(const Decimal& other374) {
   scale = other374.scale;
   unscaled = other374.unscaled;
@@ -10163,6 +11268,12 @@ void Decimal::printTo(std::ostream& out) const {
 DecimalColumnStatsData::~DecimalColumnStatsData() noexcept {
 }
 
+DecimalColumnStatsData::DecimalColumnStatsData() noexcept
+   : numNulls(0),
+     numDVs(0),
+     bitVectors(),
+     histogram() {
+}
 
 void DecimalColumnStatsData::__set_lowValue(const Decimal& val) {
   this->lowValue = val;
@@ -10323,7 +11434,7 @@ uint32_t DecimalColumnStatsData::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(DecimalColumnStatsData &a, DecimalColumnStatsData &b) {
+void swap(DecimalColumnStatsData &a, DecimalColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.lowValue, b.lowValue);
   swap(a.highValue, b.highValue);
@@ -10334,6 +11445,31 @@ void swap(DecimalColumnStatsData &a, DecimalColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DecimalColumnStatsData::operator==(const DecimalColumnStatsData & rhs) const
+{
+  if (__isset.lowValue != rhs.__isset.lowValue)
+    return false;
+  else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+    return false;
+  if (__isset.highValue != rhs.__isset.highValue)
+    return false;
+  else if (__isset.highValue && !(highValue == rhs.highValue))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (!(numDVs == rhs.numDVs))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  if (__isset.histogram != rhs.__isset.histogram)
+    return false;
+  else if (__isset.histogram && !(histogram == rhs.histogram))
+    return false;
+  return true;
+}
+
 DecimalColumnStatsData::DecimalColumnStatsData(const DecimalColumnStatsData& other376) {
   lowValue = other376.lowValue;
   highValue = other376.highValue;
@@ -10369,6 +11505,9 @@ void DecimalColumnStatsData::printTo(std::ostream& out) const {
 Date::~Date() noexcept {
 }
 
+Date::Date() noexcept
+   : daysSinceEpoch(0) {
+}
 
 void Date::__set_daysSinceEpoch(const int64_t val) {
   this->daysSinceEpoch = val;
@@ -10438,11 +11577,18 @@ uint32_t Date::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Date &a, Date &b) {
+void swap(Date &a, Date &b) noexcept {
   using ::std::swap;
   swap(a.daysSinceEpoch, b.daysSinceEpoch);
 }
 
+bool Date::operator==(const Date & rhs) const
+{
+  if (!(daysSinceEpoch == rhs.daysSinceEpoch))
+    return false;
+  return true;
+}
+
 Date::Date(const Date& other378) noexcept {
   daysSinceEpoch = other378.daysSinceEpoch;
 }
@@ -10461,6 +11607,12 @@ void Date::printTo(std::ostream& out) const {
 DateColumnStatsData::~DateColumnStatsData() noexcept {
 }
 
+DateColumnStatsData::DateColumnStatsData() noexcept
+   : numNulls(0),
+     numDVs(0),
+     bitVectors(),
+     histogram() {
+}
 
 void DateColumnStatsData::__set_lowValue(const Date& val) {
   this->lowValue = val;
@@ -10621,7 +11773,7 @@ uint32_t DateColumnStatsData::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(DateColumnStatsData &a, DateColumnStatsData &b) {
+void swap(DateColumnStatsData &a, DateColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.lowValue, b.lowValue);
   swap(a.highValue, b.highValue);
@@ -10632,6 +11784,31 @@ void swap(DateColumnStatsData &a, DateColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DateColumnStatsData::operator==(const DateColumnStatsData & rhs) const
+{
+  if (__isset.lowValue != rhs.__isset.lowValue)
+    return false;
+  else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+    return false;
+  if (__isset.highValue != rhs.__isset.highValue)
+    return false;
+  else if (__isset.highValue && !(highValue == rhs.highValue))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (!(numDVs == rhs.numDVs))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  if (__isset.histogram != rhs.__isset.histogram)
+    return false;
+  else if (__isset.histogram && !(histogram == rhs.histogram))
+    return false;
+  return true;
+}
+
 DateColumnStatsData::DateColumnStatsData(const DateColumnStatsData& other380) {
   lowValue = other380.lowValue;
   highValue = other380.highValue;
@@ -10667,6 +11844,9 @@ void DateColumnStatsData::printTo(std::ostream& out) const {
 Timestamp::~Timestamp() noexcept {
 }
 
+Timestamp::Timestamp() noexcept
+   : secondsSinceEpoch(0) {
+}
 
 void Timestamp::__set_secondsSinceEpoch(const int64_t val) {
   this->secondsSinceEpoch = val;
@@ -10736,11 +11916,18 @@ uint32_t Timestamp::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Timestamp &a, Timestamp &b) {
+void swap(Timestamp &a, Timestamp &b) noexcept {
   using ::std::swap;
   swap(a.secondsSinceEpoch, b.secondsSinceEpoch);
 }
 
+bool Timestamp::operator==(const Timestamp & rhs) const
+{
+  if (!(secondsSinceEpoch == rhs.secondsSinceEpoch))
+    return false;
+  return true;
+}
+
 Timestamp::Timestamp(const Timestamp& other382) noexcept {
   secondsSinceEpoch = other382.secondsSinceEpoch;
 }
@@ -10759,6 +11946,12 @@ void Timestamp::printTo(std::ostream& out) const {
 TimestampColumnStatsData::~TimestampColumnStatsData() noexcept {
 }
 
+TimestampColumnStatsData::TimestampColumnStatsData() noexcept
+   : numNulls(0),
+     numDVs(0),
+     bitVectors(),
+     histogram() {
+}
 
 void TimestampColumnStatsData::__set_lowValue(const Timestamp& val) {
   this->lowValue = val;
@@ -10919,7 +12112,7 @@ uint32_t TimestampColumnStatsData::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(TimestampColumnStatsData &a, TimestampColumnStatsData &b) {
+void swap(TimestampColumnStatsData &a, TimestampColumnStatsData &b) noexcept {
   using ::std::swap;
   swap(a.lowValue, b.lowValue);
   swap(a.highValue, b.highValue);
@@ -10930,6 +12123,31 @@ void swap(TimestampColumnStatsData &a, TimestampColumnStatsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TimestampColumnStatsData::operator==(const TimestampColumnStatsData & rhs) const
+{
+  if (__isset.lowValue != rhs.__isset.lowValue)
+    return false;
+  else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+    return false;
+  if (__isset.highValue != rhs.__isset.highValue)
+    return false;
+  else if (__isset.highValue && !(highValue == rhs.highValue))
+    return false;
+  if (!(numNulls == rhs.numNulls))
+    return false;
+  if (!(numDVs == rhs.numDVs))
+    return false;
+  if (__isset.bitVectors != rhs.__isset.bitVectors)
+    return false;
+  else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
+    return false;
+  if (__isset.histogram != rhs.__isset.histogram)
+    return false;
+  else if (__isset.histogram && !(histogram == rhs.histogram))
+    return false;
+  return true;
+}
+
 TimestampColumnStatsData::TimestampColumnStatsData(const TimestampColumnStatsData& other384) {
   lowValue = other384.lowValue;
   highValue = other384.highValue;
@@ -10965,6 +12183,8 @@ void TimestampColumnStatsData::printTo(std::ostream& out) const {
 ColumnStatisticsData::~ColumnStatisticsData() noexcept {
 }
 
+ColumnStatisticsData::ColumnStatisticsData() noexcept {
+}
 
 void ColumnStatisticsData::__set_booleanStats(const BooleanColumnStatsData& val) {
   this->booleanStats = val;
@@ -11159,7 +12379,7 @@ uint32_t ColumnStatisticsData::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(ColumnStatisticsData &a, ColumnStatisticsData &b) {
+void swap(ColumnStatisticsData &a, ColumnStatisticsData &b) noexcept {
   using ::std::swap;
   swap(a.booleanStats, b.booleanStats);
   swap(a.longStats, b.longStats);
@@ -11172,6 +12392,43 @@ void swap(ColumnStatisticsData &a, ColumnStatisticsData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ColumnStatisticsData::operator==(const ColumnStatisticsData & rhs) const
+{
+  if (__isset.booleanStats != rhs.__isset.booleanStats)
+    return false;
+  else if (__isset.booleanStats && !(booleanStats == rhs.booleanStats))
+    return false;
+  if (__isset.longStats != rhs.__isset.longStats)
+    return false;
+  else if (__isset.longStats && !(longStats == rhs.longStats))
+    return false;
+  if (__isset.doubleStats != rhs.__isset.doubleStats)
+    return false;
+  else if (__isset.doubleStats && !(doubleStats == rhs.doubleStats))
+    return false;
+  if (__isset.stringStats != rhs.__isset.stringStats)
+    return false;
+  else if (__isset.stringStats && !(stringStats == rhs.stringStats))
+    return false;
+  if (__isset.binaryStats != rhs.__isset.binaryStats)
+    return false;
+  else if (__isset.binaryStats && !(binaryStats == rhs.binaryStats))
+    return false;
+  if (__isset.decimalStats != rhs.__isset.decimalStats)
+    return false;
+  else if (__isset.decimalStats && !(decimalStats == rhs.decimalStats))
+    return false;
+  if (__isset.dateStats != rhs.__isset.dateStats)
+    return false;
+  else if (__isset.dateStats && !(dateStats == rhs.dateStats))
+    return false;
+  if (__isset.timestampStats != rhs.__isset.timestampStats)
+    return false;
+  else if (__isset.timestampStats && !(timestampStats == rhs.timestampStats))
+    return false;
+  return true;
+}
+
 ColumnStatisticsData::ColumnStatisticsData(const ColumnStatisticsData& other386) {
   booleanStats = other386.booleanStats;
   longStats = other386.longStats;
@@ -11213,6 +12470,10 @@ void ColumnStatisticsData::printTo(std::ostream& out) const {
 ColumnStatisticsObj::~ColumnStatisticsObj() noexcept {
 }
 
+ColumnStatisticsObj::ColumnStatisticsObj() noexcept
+   : colName(),
+     colType() {
+}
 
 void ColumnStatisticsObj::__set_colName(const std::string& val) {
   this->colName = val;
@@ -11320,13 +12581,24 @@ uint32_t ColumnStatisticsObj::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(ColumnStatisticsObj &a, ColumnStatisticsObj &b) {
+void swap(ColumnStatisticsObj &a, ColumnStatisticsObj &b) noexcept {
   using ::std::swap;
   swap(a.colName, b.colName);
   swap(a.colType, b.colType);
   swap(a.statsData, b.statsData);
 }
 
+bool ColumnStatisticsObj::operator==(const ColumnStatisticsObj & rhs) const
+{
+  if (!(colName == rhs.colName))
+    return false;
+  if (!(colType == rhs.colType))
+    return false;
+  if (!(statsData == rhs.statsData))
+    return false;
+  return true;
+}
+
 ColumnStatisticsObj::ColumnStatisticsObj(const ColumnStatisticsObj& other388) {
   colName = other388.colName;
   colType = other388.colType;
@@ -11351,6 +12623,14 @@ void ColumnStatisticsObj::printTo(std::ostream& out) const {
 ColumnStatisticsDesc::~ColumnStatisticsDesc() noexcept {
 }
 
+ColumnStatisticsDesc::ColumnStatisticsDesc() noexcept
+   : isTblLevel(0),
+     dbName(),
+     tableName(),
+     partName(),
+     lastAnalyzed(0),
+     catName() {
+}
 
 void ColumnStatisticsDesc::__set_isTblLevel(const bool val) {
   this->isTblLevel = val;
@@ -11512,7 +12792,7 @@ uint32_t ColumnStatisticsDesc::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(ColumnStatisticsDesc &a, ColumnStatisticsDesc &b) {
+void swap(ColumnStatisticsDesc &a, ColumnStatisticsDesc &b) noexcept {
   using ::std::swap;
   swap(a.isTblLevel, b.isTblLevel);
   swap(a.dbName, b.dbName);
@@ -11523,6 +12803,29 @@ void swap(ColumnStatisticsDesc &a, ColumnStatisticsDesc &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ColumnStatisticsDesc::operator==(const ColumnStatisticsDesc & rhs) const
+{
+  if (!(isTblLevel == rhs.isTblLevel))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (__isset.partName != rhs.__isset.partName)
+    return false;
+  else if (__isset.partName && !(partName == rhs.partName))
+    return false;
+  if (__isset.lastAnalyzed != rhs.__isset.lastAnalyzed)
+    return false;
+  else if (__isset.lastAnalyzed && !(lastAnalyzed == rhs.lastAnalyzed))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 ColumnStatisticsDesc::ColumnStatisticsDesc(const ColumnStatisticsDesc& other390) {
   isTblLevel = other390.isTblLevel;
   dbName = other390.dbName;
@@ -11558,6 +12861,9 @@ void ColumnStatisticsDesc::printTo(std::ostream& out) const {
 ColumnStatistics::~ColumnStatistics() noexcept {
 }
 
+ColumnStatistics::ColumnStatistics() : isStatsCompliant(0),
+   engine("hive") {
+}
 
 void ColumnStatistics::__set_statsDesc(const ColumnStatisticsDesc& val) {
   this->statsDesc = val;
@@ -11702,7 +13008,7 @@ uint32_t ColumnStatistics::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(ColumnStatistics &a, ColumnStatistics &b) {
+void swap(ColumnStatistics &a, ColumnStatistics &b) noexcept {
   using ::std::swap;
   swap(a.statsDesc, b.statsDesc);
   swap(a.statsObj, b.statsObj);
@@ -11711,6 +13017,23 @@ void swap(ColumnStatistics &a, ColumnStatistics &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ColumnStatistics::operator==(const ColumnStatistics & rhs) const
+{
+  if (!(statsDesc == rhs.statsDesc))
+    return false;
+  if (!(statsObj == rhs.statsObj))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  return true;
+}
+
 ColumnStatistics::ColumnStatistics(const ColumnStatistics& other398) {
   statsDesc = other398.statsDesc;
   statsObj = other398.statsObj;
@@ -11740,6 +13063,10 @@ void ColumnStatistics::printTo(std::ostream& out) const {
 FileMetadata::~FileMetadata() noexcept {
 }
 
+FileMetadata::FileMetadata() noexcept
+   : type(1),
+     version(1) {
+}
 
 void FileMetadata::__set_type(const int8_t val) {
   this->type = val;
@@ -11858,7 +13185,7 @@ uint32_t FileMetadata::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(FileMetadata &a, FileMetadata &b) {
+void swap(FileMetadata &a, FileMetadata &b) noexcept {
   using ::std::swap;
   swap(a.type, b.type);
   swap(a.version, b.version);
@@ -11866,6 +13193,17 @@ void swap(FileMetadata &a, FileMetadata &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool FileMetadata::operator==(const FileMetadata & rhs) const
+{
+  if (!(type == rhs.type))
+    return false;
+  if (!(version == rhs.version))
+    return false;
+  if (!(data == rhs.data))
+    return false;
+  return true;
+}
+
 FileMetadata::FileMetadata(const FileMetadata& other406) {
   type = other406.type;
   version = other406.version;
@@ -11892,6 +13230,8 @@ void FileMetadata::printTo(std::ostream& out) const {
 ObjectDictionary::~ObjectDictionary() noexcept {
 }
 
+ObjectDictionary::ObjectDictionary() noexcept {
+}
 
 void ObjectDictionary::__set_values(const std::map<std::string, std::vector<std::string> > & val) {
   this->values = val;
@@ -12005,11 +13345,18 @@ uint32_t ObjectDictionary::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(ObjectDictionary &a, ObjectDictionary &b) {
+void swap(ObjectDictionary &a, ObjectDictionary &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
 }
 
+bool ObjectDictionary::operator==(const ObjectDictionary & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  return true;
+}
+
 ObjectDictionary::ObjectDictionary(const ObjectDictionary& other422) {
   values = other422.values;
 }
@@ -12028,6 +13375,26 @@ void ObjectDictionary::printTo(std::ostream& out) const {
 Table::~Table() noexcept {
 }
 
+Table::Table() noexcept
+   : tableName(),
+     dbName(),
+     owner(),
+     createTime(0),
+     lastAccessTime(0),
+     retention(0),
+     viewOriginalText(),
+     viewExpandedText(),
+     tableType(),
+     temporary(false),
+     rewriteEnabled(0),
+     catName(),
+     ownerType(static_cast<PrincipalType::type>(1)),
+     writeId(-1LL),
+     isStatsCompliant(0),
+     accessType(0),
+     id(0),
+     txnId(0) {
+}
 
 void Table::__set_tableName(const std::string& val) {
   this->tableName = val;
@@ -12644,7 +14011,7 @@ uint32_t Table::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Table &a, Table &b) {
+void swap(Table &a, Table &b) noexcept {
   using ::std::swap;
   swap(a.tableName, b.tableName);
   swap(a.dbName, b.dbName);
@@ -12677,6 +14044,99 @@ void swap(Table &a, Table &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Table::operator==(const Table & rhs) const
+{
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(owner == rhs.owner))
+    return false;
+  if (!(createTime == rhs.createTime))
+    return false;
+  if (!(lastAccessTime == rhs.lastAccessTime))
+    return false;
+  if (!(retention == rhs.retention))
+    return false;
+  if (!(sd == rhs.sd))
+    return false;
+  if (!(partitionKeys == rhs.partitionKeys))
+    return false;
+  if (!(parameters == rhs.parameters))
+    return false;
+  if (!(viewOriginalText == rhs.viewOriginalText))
+    return false;
+  if (!(viewExpandedText == rhs.viewExpandedText))
+    return false;
+  if (!(tableType == rhs.tableType))
+    return false;
+  if (__isset.privileges != rhs.__isset.privileges)
+    return false;
+  else if (__isset.privileges && !(privileges == rhs.privileges))
+    return false;
+  if (__isset.temporary != rhs.__isset.temporary)
+    return false;
+  else if (__isset.temporary && !(temporary == rhs.temporary))
+    return false;
+  if (__isset.rewriteEnabled != rhs.__isset.rewriteEnabled)
+    return false;
+  else if (__isset.rewriteEnabled && !(rewriteEnabled == rhs.rewriteEnabled))
+    return false;
+  if (__isset.creationMetadata != rhs.__isset.creationMetadata)
+    return false;
+  else if (__isset.creationMetadata && !(creationMetadata == rhs.creationMetadata))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.ownerType != rhs.__isset.ownerType)
+    return false;
+  else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  if (__isset.colStats != rhs.__isset.colStats)
+    return false;
+  else if (__isset.colStats && !(colStats == rhs.colStats))
+    return false;
+  if (__isset.accessType != rhs.__isset.accessType)
+    return false;
+  else if (__isset.accessType && !(accessType == rhs.accessType))
+    return false;
+  if (__isset.requiredReadCapabilities != rhs.__isset.requiredReadCapabilities)
+    return false;
+  else if (__isset.requiredReadCapabilities && !(requiredReadCapabilities == rhs.requiredReadCapabilities))
+    return false;
+  if (__isset.requiredWriteCapabilities != rhs.__isset.requiredWriteCapabilities)
+    return false;
+  else if (__isset.requiredWriteCapabilities && !(requiredWriteCapabilities == rhs.requiredWriteCapabilities))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.fileMetadata != rhs.__isset.fileMetadata)
+    return false;
+  else if (__isset.fileMetadata && !(fileMetadata == rhs.fileMetadata))
+    return false;
+  if (__isset.dictionary != rhs.__isset.dictionary)
+    return false;
+  else if (__isset.dictionary && !(dictionary == rhs.dictionary))
+    return false;
+  if (__isset.txnId != rhs.__isset.txnId)
+    return false;
+  else if (__isset.txnId && !(txnId == rhs.txnId))
+    return false;
+  return true;
+}
+
 Table::Table(const Table& other451) {
   tableName = other451.tableName;
   dbName = other451.dbName;
@@ -12778,6 +14238,11 @@ void Table::printTo(std::ostream& out) const {
 SourceTable::~SourceTable() noexcept {
 }
 
+SourceTable::SourceTable() noexcept
+   : insertedCount(0),
+     updatedCount(0),
+     deletedCount(0) {
+}
 
 void SourceTable::__set_table(const Table& val) {
   this->table = val;
@@ -12904,7 +14369,7 @@ uint32_t SourceTable::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(SourceTable &a, SourceTable &b) {
+void swap(SourceTable &a, SourceTable &b) noexcept {
   using ::std::swap;
   swap(a.table, b.table);
   swap(a.insertedCount, b.insertedCount);
@@ -12912,6 +14377,19 @@ void swap(SourceTable &a, SourceTable &b) {
   swap(a.deletedCount, b.deletedCount);
 }
 
+bool SourceTable::operator==(const SourceTable & rhs) const
+{
+  if (!(table == rhs.table))
+    return false;
+  if (!(insertedCount == rhs.insertedCount))
+    return false;
+  if (!(updatedCount == rhs.updatedCount))
+    return false;
+  if (!(deletedCount == rhs.deletedCount))
+    return false;
+  return true;
+}
+
 SourceTable::SourceTable(const SourceTable& other453) {
   table = other453.table;
   insertedCount = other453.insertedCount;
@@ -12939,6 +14417,15 @@ void SourceTable::printTo(std::ostream& out) const {
 Partition::~Partition() noexcept {
 }
 
+Partition::Partition() noexcept
+   : dbName(),
+     tableName(),
+     createTime(0),
+     lastAccessTime(0),
+     catName(),
+     writeId(-1LL),
+     isStatsCompliant(0) {
+}
 
 void Partition::__set_values(const std::vector<std::string> & val) {
   this->values = val;
@@ -13253,7 +14740,7 @@ uint32_t Partition::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Partition &a, Partition &b) {
+void swap(Partition &a, Partition &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.dbName, b.dbName);
@@ -13271,6 +14758,49 @@ void swap(Partition &a, Partition &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Partition::operator==(const Partition & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(createTime == rhs.createTime))
+    return false;
+  if (!(lastAccessTime == rhs.lastAccessTime))
+    return false;
+  if (!(sd == rhs.sd))
+    return false;
+  if (!(parameters == rhs.parameters))
+    return false;
+  if (__isset.privileges != rhs.__isset.privileges)
+    return false;
+  else if (__isset.privileges && !(privileges == rhs.privileges))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  if (__isset.colStats != rhs.__isset.colStats)
+    return false;
+  else if (__isset.colStats && !(colStats == rhs.colStats))
+    return false;
+  if (__isset.fileMetadata != rhs.__isset.fileMetadata)
+    return false;
+  else if (__isset.fileMetadata && !(fileMetadata == rhs.fileMetadata))
+    return false;
+  return true;
+}
+
 Partition::Partition(const Partition& other469) {
   values = other469.values;
   dbName = other469.dbName;
@@ -13327,6 +14857,11 @@ void Partition::printTo(std::ostream& out) const {
 PartitionWithoutSD::~PartitionWithoutSD() noexcept {
 }
 
+PartitionWithoutSD::PartitionWithoutSD() noexcept
+   : createTime(0),
+     lastAccessTime(0),
+     relativePath() {
+}
 
 void PartitionWithoutSD::__set_values(const std::vector<std::string> & val) {
   this->values = val;
@@ -13519,7 +15054,7 @@ uint32_t PartitionWithoutSD::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PartitionWithoutSD &a, PartitionWithoutSD &b) {
+void swap(PartitionWithoutSD &a, PartitionWithoutSD &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
   swap(a.createTime, b.createTime);
@@ -13530,6 +15065,25 @@ void swap(PartitionWithoutSD &a, PartitionWithoutSD &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionWithoutSD::operator==(const PartitionWithoutSD & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  if (!(createTime == rhs.createTime))
+    return false;
+  if (!(lastAccessTime == rhs.lastAccessTime))
+    return false;
+  if (!(relativePath == rhs.relativePath))
+    return false;
+  if (!(parameters == rhs.parameters))
+    return false;
+  if (__isset.privileges != rhs.__isset.privileges)
+    return false;
+  else if (__isset.privileges && !(privileges == rhs.privileges))
+    return false;
+  return true;
+}
+
 PartitionWithoutSD::PartitionWithoutSD(const PartitionWithoutSD& other485) {
   values = other485.values;
   createTime = other485.createTime;
@@ -13565,6 +15119,8 @@ void PartitionWithoutSD::printTo(std::ostream& out) const {
 PartitionSpecWithSharedSD::~PartitionSpecWithSharedSD() noexcept {
 }
 
+PartitionSpecWithSharedSD::PartitionSpecWithSharedSD() noexcept {
+}
 
 void PartitionSpecWithSharedSD::__set_partitions(const std::vector<PartitionWithoutSD> & val) {
   this->partitions = val;
@@ -13667,13 +15223,22 @@ uint32_t PartitionSpecWithSharedSD::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(PartitionSpecWithSharedSD &a, PartitionSpecWithSharedSD &b) {
+void swap(PartitionSpecWithSharedSD &a, PartitionSpecWithSharedSD &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
   swap(a.sd, b.sd);
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionSpecWithSharedSD::operator==(const PartitionSpecWithSharedSD & rhs) const
+{
+  if (!(partitions == rhs.partitions))
+    return false;
+  if (!(sd == rhs.sd))
+    return false;
+  return true;
+}
+
 PartitionSpecWithSharedSD::PartitionSpecWithSharedSD(const PartitionSpecWithSharedSD& other493) {
   partitions = other493.partitions;
   sd = other493.sd;
@@ -13697,6 +15262,8 @@ void PartitionSpecWithSharedSD::printTo(std::ostream& out) const {
 PartitionListComposingSpec::~PartitionListComposingSpec() noexcept {
 }
 
+PartitionListComposingSpec::PartitionListComposingSpec() noexcept {
+}
 
 void PartitionListComposingSpec::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -13783,12 +15350,19 @@ uint32_t PartitionListComposingSpec::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(PartitionListComposingSpec &a, PartitionListComposingSpec &b) {
+void swap(PartitionListComposingSpec &a, PartitionListComposingSpec &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionListComposingSpec::operator==(const PartitionListComposingSpec & rhs) const
+{
+  if (!(partitions == rhs.partitions))
+    return false;
+  return true;
+}
+
 PartitionListComposingSpec::PartitionListComposingSpec(const PartitionListComposingSpec& other501) {
   partitions = other501.partitions;
   __isset = other501.__isset;
@@ -13809,6 +15383,14 @@ void PartitionListComposingSpec::printTo(std::ostream& out) const {
 PartitionSpec::~PartitionSpec() noexcept {
 }
 
+PartitionSpec::PartitionSpec() noexcept
+   : dbName(),
+     tableName(),
+     rootPath(),
+     catName(),
+     writeId(-1LL),
+     isStatsCompliant(0) {
+}
 
 void PartitionSpec::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -13997,7 +15579,7 @@ uint32_t PartitionSpec::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(PartitionSpec &a, PartitionSpec &b) {
+void swap(PartitionSpec &a, PartitionSpec &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tableName, b.tableName);
@@ -14010,6 +15592,37 @@ void swap(PartitionSpec &a, PartitionSpec &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionSpec::operator==(const PartitionSpec & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(rootPath == rhs.rootPath))
+    return false;
+  if (__isset.sharedSDPartitionSpec != rhs.__isset.sharedSDPartitionSpec)
+    return false;
+  else if (__isset.sharedSDPartitionSpec && !(sharedSDPartitionSpec == rhs.sharedSDPartitionSpec))
+    return false;
+  if (__isset.partitionList != rhs.__isset.partitionList)
+    return false;
+  else if (__isset.partitionList && !(partitionList == rhs.partitionList))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  return true;
+}
+
 PartitionSpec::PartitionSpec(const PartitionSpec& other503) {
   dbName = other503.dbName;
   tableName = other503.tableName;
@@ -14051,6 +15664,10 @@ void PartitionSpec::printTo(std::ostream& out) const {
 AggrStats::~AggrStats() noexcept {
 }
 
+AggrStats::AggrStats() noexcept
+   : partsFound(0),
+     isStatsCompliant(0) {
+}
 
 void AggrStats::__set_colStats(const std::vector<ColumnStatisticsObj> & val) {
   this->colStats = val;
@@ -14177,7 +15794,7 @@ uint32_t AggrStats::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(AggrStats &a, AggrStats &b) {
+void swap(AggrStats &a, AggrStats &b) noexcept {
   using ::std::swap;
   swap(a.colStats, b.colStats);
   swap(a.partsFound, b.partsFound);
@@ -14185,6 +15802,19 @@ void swap(AggrStats &a, AggrStats &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AggrStats::operator==(const AggrStats & rhs) const
+{
+  if (!(colStats == rhs.colStats))
+    return false;
+  if (!(partsFound == rhs.partsFound))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  return true;
+}
+
 AggrStats::AggrStats(const AggrStats& other511) {
   colStats = other511.colStats;
   partsFound = other511.partsFound;
@@ -14211,6 +15841,11 @@ void AggrStats::printTo(std::ostream& out) const {
 SetPartitionsStatsRequest::~SetPartitionsStatsRequest() noexcept {
 }
 
+SetPartitionsStatsRequest::SetPartitionsStatsRequest() : needMerge(0),
+   writeId(-1LL),
+   validWriteIdList(),
+   engine("hive") {
+}
 
 void SetPartitionsStatsRequest::__set_colStats(const std::vector<ColumnStatistics> & val) {
   this->colStats = val;
@@ -14372,7 +16007,7 @@ uint32_t SetPartitionsStatsRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(SetPartitionsStatsRequest &a, SetPartitionsStatsRequest &b) {
+void swap(SetPartitionsStatsRequest &a, SetPartitionsStatsRequest &b) noexcept {
   using ::std::swap;
   swap(a.colStats, b.colStats);
   swap(a.needMerge, b.needMerge);
@@ -14382,6 +16017,29 @@ void swap(SetPartitionsStatsRequest &a, SetPartitionsStatsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SetPartitionsStatsRequest::operator==(const SetPartitionsStatsRequest & rhs) const
+{
+  if (!(colStats == rhs.colStats))
+    return false;
+  if (__isset.needMerge != rhs.__isset.needMerge)
+    return false;
+  else if (__isset.needMerge && !(needMerge == rhs.needMerge))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  return true;
+}
+
 SetPartitionsStatsRequest::SetPartitionsStatsRequest(const SetPartitionsStatsRequest& other519) {
   colStats = other519.colStats;
   needMerge = other519.needMerge;
@@ -14414,6 +16072,9 @@ void SetPartitionsStatsRequest::printTo(std::ostream& out) const {
 SetPartitionsStatsResponse::~SetPartitionsStatsResponse() noexcept {
 }
 
+SetPartitionsStatsResponse::SetPartitionsStatsResponse() noexcept
+   : result(0) {
+}
 
 void SetPartitionsStatsResponse::__set_result(const bool val) {
   this->result = val;
@@ -14483,11 +16144,18 @@ uint32_t SetPartitionsStatsResponse::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(SetPartitionsStatsResponse &a, SetPartitionsStatsResponse &b) {
+void swap(SetPartitionsStatsResponse &a, SetPartitionsStatsResponse &b) noexcept {
   using ::std::swap;
   swap(a.result, b.result);
 }
 
+bool SetPartitionsStatsResponse::operator==(const SetPartitionsStatsResponse & rhs) const
+{
+  if (!(result == rhs.result))
+    return false;
+  return true;
+}
+
 SetPartitionsStatsResponse::SetPartitionsStatsResponse(const SetPartitionsStatsResponse& other521) noexcept {
   result = other521.result;
 }
@@ -14506,6 +16174,8 @@ void SetPartitionsStatsResponse::printTo(std::ostream& out) const {
 Schema::~Schema() noexcept {
 }
 
+Schema::Schema() noexcept {
+}
 
 void Schema::__set_fieldSchemas(const std::vector<FieldSchema> & val) {
   this->fieldSchemas = val;
@@ -14632,13 +16302,22 @@ uint32_t Schema::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Schema &a, Schema &b) {
+void swap(Schema &a, Schema &b) noexcept {
   using ::std::swap;
   swap(a.fieldSchemas, b.fieldSchemas);
   swap(a.properties, b.properties);
   swap(a.__isset, b.__isset);
 }
 
+bool Schema::operator==(const Schema & rhs) const
+{
+  if (!(fieldSchemas == rhs.fieldSchemas))
+    return false;
+  if (!(properties == rhs.properties))
+    return false;
+  return true;
+}
+
 Schema::Schema(const Schema& other537) {
   fieldSchemas = other537.fieldSchemas;
   properties = other537.properties;
@@ -14662,6 +16341,11 @@ void Schema::printTo(std::ostream& out) const {
 PrimaryKeysRequest::~PrimaryKeysRequest() noexcept {
 }
 
+PrimaryKeysRequest::PrimaryKeysRequest() noexcept
+   : db_name(),
+     tbl_name(),
+     catName() {
+}
 
 void PrimaryKeysRequest::__set_db_name(const std::string& val) {
   this->db_name = val;
@@ -14768,7 +16452,7 @@ uint32_t PrimaryKeysRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PrimaryKeysRequest &a, PrimaryKeysRequest &b) {
+void swap(PrimaryKeysRequest &a, PrimaryKeysRequest &b) noexcept {
   using ::std::swap;
   swap(a.db_name, b.db_name);
   swap(a.tbl_name, b.tbl_name);
@@ -14776,6 +16460,19 @@ void swap(PrimaryKeysRequest &a, PrimaryKeysRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PrimaryKeysRequest::operator==(const PrimaryKeysRequest & rhs) const
+{
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 PrimaryKeysRequest::PrimaryKeysRequest(const PrimaryKeysRequest& other539) {
   db_name = other539.db_name;
   tbl_name = other539.tbl_name;
@@ -14802,6 +16499,8 @@ void PrimaryKeysRequest::printTo(std::ostream& out) const {
 PrimaryKeysResponse::~PrimaryKeysResponse() noexcept {
 }
 
+PrimaryKeysResponse::PrimaryKeysResponse() noexcept {
+}
 
 void PrimaryKeysResponse::__set_primaryKeys(const std::vector<SQLPrimaryKey> & val) {
   this->primaryKeys = val;
@@ -14891,11 +16590,18 @@ uint32_t PrimaryKeysResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(PrimaryKeysResponse &a, PrimaryKeysResponse &b) {
+void swap(PrimaryKeysResponse &a, PrimaryKeysResponse &b) noexcept {
   using ::std::swap;
   swap(a.primaryKeys, b.primaryKeys);
 }
 
+bool PrimaryKeysResponse::operator==(const PrimaryKeysResponse & rhs) const
+{
+  if (!(primaryKeys == rhs.primaryKeys))
+    return false;
+  return true;
+}
+
 PrimaryKeysResponse::PrimaryKeysResponse(const PrimaryKeysResponse& other547) {
   primaryKeys = other547.primaryKeys;
 }
@@ -14914,6 +16620,13 @@ void PrimaryKeysResponse::printTo(std::ostream& out) const {
 ForeignKeysRequest::~ForeignKeysRequest() noexcept {
 }
 
+ForeignKeysRequest::ForeignKeysRequest() noexcept
+   : parent_db_name(),
+     parent_tbl_name(),
+     foreign_db_name(),
+     foreign_tbl_name(),
+     catName() {
+}
 
 void ForeignKeysRequest::__set_parent_db_name(const std::string& val) {
   this->parent_db_name = val;
@@ -15046,7 +16759,7 @@ uint32_t ForeignKeysRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ForeignKeysRequest &a, ForeignKeysRequest &b) {
+void swap(ForeignKeysRequest &a, ForeignKeysRequest &b) noexcept {
   using ::std::swap;
   swap(a.parent_db_name, b.parent_db_name);
   swap(a.parent_tbl_name, b.parent_tbl_name);
@@ -15056,6 +16769,23 @@ void swap(ForeignKeysRequest &a, ForeignKeysRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ForeignKeysRequest::operator==(const ForeignKeysRequest & rhs) const
+{
+  if (!(parent_db_name == rhs.parent_db_name))
+    return false;
+  if (!(parent_tbl_name == rhs.parent_tbl_name))
+    return false;
+  if (!(foreign_db_name == rhs.foreign_db_name))
+    return false;
+  if (!(foreign_tbl_name == rhs.foreign_tbl_name))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 ForeignKeysRequest::ForeignKeysRequest(const ForeignKeysRequest& other549) {
   parent_db_name = other549.parent_db_name;
   parent_tbl_name = other549.parent_tbl_name;
@@ -15088,6 +16818,8 @@ void ForeignKeysRequest::printTo(std::ostream& out) const {
 ForeignKeysResponse::~ForeignKeysResponse() noexcept {
 }
 
+ForeignKeysResponse::ForeignKeysResponse() noexcept {
+}
 
 void ForeignKeysResponse::__set_foreignKeys(const std::vector<SQLForeignKey> & val) {
   this->foreignKeys = val;
@@ -15177,11 +16909,18 @@ uint32_t ForeignKeysResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(ForeignKeysResponse &a, ForeignKeysResponse &b) {
+void swap(ForeignKeysResponse &a, ForeignKeysResponse &b) noexcept {
   using ::std::swap;
   swap(a.foreignKeys, b.foreignKeys);
 }
 
+bool ForeignKeysResponse::operator==(const ForeignKeysResponse & rhs) const
+{
+  if (!(foreignKeys == rhs.foreignKeys))
+    return false;
+  return true;
+}
+
 ForeignKeysResponse::ForeignKeysResponse(const ForeignKeysResponse& other557) {
   foreignKeys = other557.foreignKeys;
 }
@@ -15200,6 +16939,11 @@ void ForeignKeysResponse::printTo(std::ostream& out) const {
 UniqueConstraintsRequest::~UniqueConstraintsRequest() noexcept {
 }
 
+UniqueConstraintsRequest::UniqueConstraintsRequest() noexcept
+   : catName(),
+     db_name(),
+     tbl_name() {
+}
 
 void UniqueConstraintsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -15307,13 +17051,24 @@ uint32_t UniqueConstraintsRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(UniqueConstraintsRequest &a, UniqueConstraintsRequest &b) {
+void swap(UniqueConstraintsRequest &a, UniqueConstraintsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.db_name, b.db_name);
   swap(a.tbl_name, b.tbl_name);
 }
 
+bool UniqueConstraintsRequest::operator==(const UniqueConstraintsRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  return true;
+}
+
 UniqueConstraintsRequest::UniqueConstraintsRequest(const UniqueConstraintsRequest& other559) {
   catName = other559.catName;
   db_name = other559.db_name;
@@ -15338,6 +17093,8 @@ void UniqueConstraintsRequest::printTo(std::ostream& out) const {
 UniqueConstraintsResponse::~UniqueConstraintsResponse() noexcept {
 }
 
+UniqueConstraintsResponse::UniqueConstraintsResponse() noexcept {
+}
 
 void UniqueConstraintsResponse::__set_uniqueConstraints(const std::vector<SQLUniqueConstraint> & val) {
   this->uniqueConstraints = val;
@@ -15427,11 +17184,18 @@ uint32_t UniqueConstraintsResponse::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(UniqueConstraintsResponse &a, UniqueConstraintsResponse &b) {
+void swap(UniqueConstraintsResponse &a, UniqueConstraintsResponse &b) noexcept {
   using ::std::swap;
   swap(a.uniqueConstraints, b.uniqueConstraints);
 }
 
+bool UniqueConstraintsResponse::operator==(const UniqueConstraintsResponse & rhs) const
+{
+  if (!(uniqueConstraints == rhs.uniqueConstraints))
+    return false;
+  return true;
+}
+
 UniqueConstraintsResponse::UniqueConstraintsResponse(const UniqueConstraintsResponse& other567) {
   uniqueConstraints = other567.uniqueConstraints;
 }
@@ -15450,6 +17214,11 @@ void UniqueConstraintsResponse::printTo(std::ostream& out) const {
 NotNullConstraintsRequest::~NotNullConstraintsRequest() noexcept {
 }
 
+NotNullConstraintsRequest::NotNullConstraintsRequest() noexcept
+   : catName(),
+     db_name(),
+     tbl_name() {
+}
 
 void NotNullConstraintsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -15557,13 +17326,24 @@ uint32_t NotNullConstraintsRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(NotNullConstraintsRequest &a, NotNullConstraintsRequest &b) {
+void swap(NotNullConstraintsRequest &a, NotNullConstraintsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.db_name, b.db_name);
   swap(a.tbl_name, b.tbl_name);
 }
 
+bool NotNullConstraintsRequest::operator==(const NotNullConstraintsRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  return true;
+}
+
 NotNullConstraintsRequest::NotNullConstraintsRequest(const NotNullConstraintsRequest& other569) {
   catName = other569.catName;
   db_name = other569.db_name;
@@ -15588,6 +17368,8 @@ void NotNullConstraintsRequest::printTo(std::ostream& out) const {
 NotNullConstraintsResponse::~NotNullConstraintsResponse() noexcept {
 }
 
+NotNullConstraintsResponse::NotNullConstraintsResponse() noexcept {
+}
 
 void NotNullConstraintsResponse::__set_notNullConstraints(const std::vector<SQLNotNullConstraint> & val) {
   this->notNullConstraints = val;
@@ -15677,11 +17459,18 @@ uint32_t NotNullConstraintsResponse::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(NotNullConstraintsResponse &a, NotNullConstraintsResponse &b) {
+void swap(NotNullConstraintsResponse &a, NotNullConstraintsResponse &b) noexcept {
   using ::std::swap;
   swap(a.notNullConstraints, b.notNullConstraints);
 }
 
+bool NotNullConstraintsResponse::operator==(const NotNullConstraintsResponse & rhs) const
+{
+  if (!(notNullConstraints == rhs.notNullConstraints))
+    return false;
+  return true;
+}
+
 NotNullConstraintsResponse::NotNullConstraintsResponse(const NotNullConstraintsResponse& other577) {
   notNullConstraints = other577.notNullConstraints;
 }
@@ -15700,6 +17489,11 @@ void NotNullConstraintsResponse::printTo(std::ostream& out) const {
 DefaultConstraintsRequest::~DefaultConstraintsRequest() noexcept {
 }
 
+DefaultConstraintsRequest::DefaultConstraintsRequest() noexcept
+   : catName(),
+     db_name(),
+     tbl_name() {
+}
 
 void DefaultConstraintsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -15807,13 +17601,24 @@ uint32_t DefaultConstraintsRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(DefaultConstraintsRequest &a, DefaultConstraintsRequest &b) {
+void swap(DefaultConstraintsRequest &a, DefaultConstraintsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.db_name, b.db_name);
   swap(a.tbl_name, b.tbl_name);
 }
 
+bool DefaultConstraintsRequest::operator==(const DefaultConstraintsRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  return true;
+}
+
 DefaultConstraintsRequest::DefaultConstraintsRequest(const DefaultConstraintsRequest& other579) {
   catName = other579.catName;
   db_name = other579.db_name;
@@ -15838,6 +17643,8 @@ void DefaultConstraintsRequest::printTo(std::ostream& out) const {
 DefaultConstraintsResponse::~DefaultConstraintsResponse() noexcept {
 }
 
+DefaultConstraintsResponse::DefaultConstraintsResponse() noexcept {
+}
 
 void DefaultConstraintsResponse::__set_defaultConstraints(const std::vector<SQLDefaultConstraint> & val) {
   this->defaultConstraints = val;
@@ -15927,11 +17734,18 @@ uint32_t DefaultConstraintsResponse::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(DefaultConstraintsResponse &a, DefaultConstraintsResponse &b) {
+void swap(DefaultConstraintsResponse &a, DefaultConstraintsResponse &b) noexcept {
   using ::std::swap;
   swap(a.defaultConstraints, b.defaultConstraints);
 }
 
+bool DefaultConstraintsResponse::operator==(const DefaultConstraintsResponse & rhs) const
+{
+  if (!(defaultConstraints == rhs.defaultConstraints))
+    return false;
+  return true;
+}
+
 DefaultConstraintsResponse::DefaultConstraintsResponse(const DefaultConstraintsResponse& other587) {
   defaultConstraints = other587.defaultConstraints;
 }
@@ -15950,6 +17764,11 @@ void DefaultConstraintsResponse::printTo(std::ostream& out) const {
 CheckConstraintsRequest::~CheckConstraintsRequest() noexcept {
 }
 
+CheckConstraintsRequest::CheckConstraintsRequest() noexcept
+   : catName(),
+     db_name(),
+     tbl_name() {
+}
 
 void CheckConstraintsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -16057,13 +17876,24 @@ uint32_t CheckConstraintsRequest::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(CheckConstraintsRequest &a, CheckConstraintsRequest &b) {
+void swap(CheckConstraintsRequest &a, CheckConstraintsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.db_name, b.db_name);
   swap(a.tbl_name, b.tbl_name);
 }
 
+bool CheckConstraintsRequest::operator==(const CheckConstraintsRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  return true;
+}
+
 CheckConstraintsRequest::CheckConstraintsRequest(const CheckConstraintsRequest& other589) {
   catName = other589.catName;
   db_name = other589.db_name;
@@ -16088,6 +17918,8 @@ void CheckConstraintsRequest::printTo(std::ostream& out) const {
 CheckConstraintsResponse::~CheckConstraintsResponse() noexcept {
 }
 
+CheckConstraintsResponse::CheckConstraintsResponse() noexcept {
+}
 
 void CheckConstraintsResponse::__set_checkConstraints(const std::vector<SQLCheckConstraint> & val) {
   this->checkConstraints = val;
@@ -16177,11 +18009,18 @@ uint32_t CheckConstraintsResponse::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(CheckConstraintsResponse &a, CheckConstraintsResponse &b) {
+void swap(CheckConstraintsResponse &a, CheckConstraintsResponse &b) noexcept {
   using ::std::swap;
   swap(a.checkConstraints, b.checkConstraints);
 }
 
+bool CheckConstraintsResponse::operator==(const CheckConstraintsResponse & rhs) const
+{
+  if (!(checkConstraints == rhs.checkConstraints))
+    return false;
+  return true;
+}
+
 CheckConstraintsResponse::CheckConstraintsResponse(const CheckConstraintsResponse& other597) {
   checkConstraints = other597.checkConstraints;
 }
@@ -16200,6 +18039,11 @@ void CheckConstraintsResponse::printTo(std::ostream& out) const {
 AllTableConstraintsRequest::~AllTableConstraintsRequest() noexcept {
 }
 
+AllTableConstraintsRequest::AllTableConstraintsRequest() noexcept
+   : dbName(),
+     tblName(),
+     catName() {
+}
 
 void AllTableConstraintsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -16307,13 +18151,24 @@ uint32_t AllTableConstraintsRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(AllTableConstraintsRequest &a, AllTableConstraintsRequest &b) {
+void swap(AllTableConstraintsRequest &a, AllTableConstraintsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
   swap(a.catName, b.catName);
 }
 
+bool AllTableConstraintsRequest::operator==(const AllTableConstraintsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 AllTableConstraintsRequest::AllTableConstraintsRequest(const AllTableConstraintsRequest& other599) {
   dbName = other599.dbName;
   tblName = other599.tblName;
@@ -16338,6 +18193,8 @@ void AllTableConstraintsRequest::printTo(std::ostream& out) const {
 AllTableConstraintsResponse::~AllTableConstraintsResponse() noexcept {
 }
 
+AllTableConstraintsResponse::AllTableConstraintsResponse() noexcept {
+}
 
 void AllTableConstraintsResponse::__set_allTableConstraints(const SQLAllTableConstraints& val) {
   this->allTableConstraints = val;
@@ -16407,11 +18264,18 @@ uint32_t AllTableConstraintsResponse::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(AllTableConstraintsResponse &a, AllTableConstraintsResponse &b) {
+void swap(AllTableConstraintsResponse &a, AllTableConstraintsResponse &b) noexcept {
   using ::std::swap;
   swap(a.allTableConstraints, b.allTableConstraints);
 }
 
+bool AllTableConstraintsResponse::operator==(const AllTableConstraintsResponse & rhs) const
+{
+  if (!(allTableConstraints == rhs.allTableConstraints))
+    return false;
+  return true;
+}
+
 AllTableConstraintsResponse::AllTableConstraintsResponse(const AllTableConstraintsResponse& other601) {
   allTableConstraints = other601.allTableConstraints;
 }
@@ -16430,6 +18294,12 @@ void AllTableConstraintsResponse::printTo(std::ostream& out) const {
 DropConstraintRequest::~DropConstraintRequest() noexcept {
 }
 
+DropConstraintRequest::DropConstraintRequest() noexcept
+   : dbname(),
+     tablename(),
+     constraintname(),
+     catName() {
+}
 
 void DropConstraintRequest::__set_dbname(const std::string& val) {
   this->dbname = val;
@@ -16555,7 +18425,7 @@ uint32_t DropConstraintRequest::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(DropConstraintRequest &a, DropConstraintRequest &b) {
+void swap(DropConstraintRequest &a, DropConstraintRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbname, b.dbname);
   swap(a.tablename, b.tablename);
@@ -16564,6 +18434,21 @@ void swap(DropConstraintRequest &a, DropConstraintRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DropConstraintRequest::operator==(const DropConstraintRequest & rhs) const
+{
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tablename == rhs.tablename))
+    return false;
+  if (!(constraintname == rhs.constraintname))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 DropConstraintRequest::DropConstraintRequest(const DropConstraintRequest& other603) {
   dbname = other603.dbname;
   tablename = other603.tablename;
@@ -16593,6 +18478,8 @@ void DropConstraintRequest::printTo(std::ostream& out) const {
 AddPrimaryKeyRequest::~AddPrimaryKeyRequest() noexcept {
 }
 
+AddPrimaryKeyRequest::AddPrimaryKeyRequest() noexcept {
+}
 
 void AddPrimaryKeyRequest::__set_primaryKeyCols(const std::vector<SQLPrimaryKey> & val) {
   this->primaryKeyCols = val;
@@ -16682,11 +18569,18 @@ uint32_t AddPrimaryKeyRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(AddPrimaryKeyRequest &a, AddPrimaryKeyRequest &b) {
+void swap(AddPrimaryKeyRequest &a, AddPrimaryKeyRequest &b) noexcept {
   using ::std::swap;
   swap(a.primaryKeyCols, b.primaryKeyCols);
 }
 
+bool AddPrimaryKeyRequest::operator==(const AddPrimaryKeyRequest & rhs) const
+{
+  if (!(primaryKeyCols == rhs.primaryKeyCols))
+    return false;
+  return true;
+}
+
 AddPrimaryKeyRequest::AddPrimaryKeyRequest(const AddPrimaryKeyRequest& other611) {
   primaryKeyCols = other611.primaryKeyCols;
 }
@@ -16705,6 +18599,8 @@ void AddPrimaryKeyRequest::printTo(std::ostream& out) const {
 AddForeignKeyRequest::~AddForeignKeyRequest() noexcept {
 }
 
+AddForeignKeyRequest::AddForeignKeyRequest() noexcept {
+}
 
 void AddForeignKeyRequest::__set_foreignKeyCols(const std::vector<SQLForeignKey> & val) {
   this->foreignKeyCols = val;
@@ -16794,11 +18690,18 @@ uint32_t AddForeignKeyRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(AddForeignKeyRequest &a, AddForeignKeyRequest &b) {
+void swap(AddForeignKeyRequest &a, AddForeignKeyRequest &b) noexcept {
   using ::std::swap;
   swap(a.foreignKeyCols, b.foreignKeyCols);
 }
 
+bool AddForeignKeyRequest::operator==(const AddForeignKeyRequest & rhs) const
+{
+  if (!(foreignKeyCols == rhs.foreignKeyCols))
+    return false;
+  return true;
+}
+
 AddForeignKeyRequest::AddForeignKeyRequest(const AddForeignKeyRequest& other619) {
   foreignKeyCols = other619.foreignKeyCols;
 }
@@ -16817,6 +18720,8 @@ void AddForeignKeyRequest::printTo(std::ostream& out) const {
 AddUniqueConstraintRequest::~AddUniqueConstraintRequest() noexcept {
 }
 
+AddUniqueConstraintRequest::AddUniqueConstraintRequest() noexcept {
+}
 
 void AddUniqueConstraintRequest::__set_uniqueConstraintCols(const std::vector<SQLUniqueConstraint> & val) {
   this->uniqueConstraintCols = val;
@@ -16906,11 +18811,18 @@ uint32_t AddUniqueConstraintRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(AddUniqueConstraintRequest &a, AddUniqueConstraintRequest &b) {
+void swap(AddUniqueConstraintRequest &a, AddUniqueConstraintRequest &b) noexcept {
   using ::std::swap;
   swap(a.uniqueConstraintCols, b.uniqueConstraintCols);
 }
 
+bool AddUniqueConstraintRequest::operator==(const AddUniqueConstraintRequest & rhs) const
+{
+  if (!(uniqueConstraintCols == rhs.uniqueConstraintCols))
+    return false;
+  return true;
+}
+
 AddUniqueConstraintRequest::AddUniqueConstraintRequest(const AddUniqueConstraintRequest& other627) {
   uniqueConstraintCols = other627.uniqueConstraintCols;
 }
@@ -16929,6 +18841,8 @@ void AddUniqueConstraintRequest::printTo(std::ostream& out) const {
 AddNotNullConstraintRequest::~AddNotNullConstraintRequest() noexcept {
 }
 
+AddNotNullConstraintRequest::AddNotNullConstraintRequest() noexcept {
+}
 
 void AddNotNullConstraintRequest::__set_notNullConstraintCols(const std::vector<SQLNotNullConstraint> & val) {
   this->notNullConstraintCols = val;
@@ -17018,11 +18932,18 @@ uint32_t AddNotNullConstraintRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(AddNotNullConstraintRequest &a, AddNotNullConstraintRequest &b) {
+void swap(AddNotNullConstraintRequest &a, AddNotNullConstraintRequest &b) noexcept {
   using ::std::swap;
   swap(a.notNullConstraintCols, b.notNullConstraintCols);
 }
 
+bool AddNotNullConstraintRequest::operator==(const AddNotNullConstraintRequest & rhs) const
+{
+  if (!(notNullConstraintCols == rhs.notNullConstraintCols))
+    return false;
+  return true;
+}
+
 AddNotNullConstraintRequest::AddNotNullConstraintRequest(const AddNotNullConstraintRequest& other635) {
   notNullConstraintCols = other635.notNullConstraintCols;
 }
@@ -17041,6 +18962,8 @@ void AddNotNullConstraintRequest::printTo(std::ostream& out) const {
 AddDefaultConstraintRequest::~AddDefaultConstraintRequest() noexcept {
 }
 
+AddDefaultConstraintRequest::AddDefaultConstraintRequest() noexcept {
+}
 
 void AddDefaultConstraintRequest::__set_defaultConstraintCols(const std::vector<SQLDefaultConstraint> & val) {
   this->defaultConstraintCols = val;
@@ -17130,11 +19053,18 @@ uint32_t AddDefaultConstraintRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(AddDefaultConstraintRequest &a, AddDefaultConstraintRequest &b) {
+void swap(AddDefaultConstraintRequest &a, AddDefaultConstraintRequest &b) noexcept {
   using ::std::swap;
   swap(a.defaultConstraintCols, b.defaultConstraintCols);
 }
 
+bool AddDefaultConstraintRequest::operator==(const AddDefaultConstraintRequest & rhs) const
+{
+  if (!(defaultConstraintCols == rhs.defaultConstraintCols))
+    return false;
+  return true;
+}
+
 AddDefaultConstraintRequest::AddDefaultConstraintRequest(const AddDefaultConstraintRequest& other643) {
   defaultConstraintCols = other643.defaultConstraintCols;
 }
@@ -17153,6 +19083,8 @@ void AddDefaultConstraintRequest::printTo(std::ostream& out) const {
 AddCheckConstraintRequest::~AddCheckConstraintRequest() noexcept {
 }
 
+AddCheckConstraintRequest::AddCheckConstraintRequest() noexcept {
+}
 
 void AddCheckConstraintRequest::__set_checkConstraintCols(const std::vector<SQLCheckConstraint> & val) {
   this->checkConstraintCols = val;
@@ -17242,11 +19174,18 @@ uint32_t AddCheckConstraintRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(AddCheckConstraintRequest &a, AddCheckConstraintRequest &b) {
+void swap(AddCheckConstraintRequest &a, AddCheckConstraintRequest &b) noexcept {
   using ::std::swap;
   swap(a.checkConstraintCols, b.checkConstraintCols);
 }
 
+bool AddCheckConstraintRequest::operator==(const AddCheckConstraintRequest & rhs) const
+{
+  if (!(checkConstraintCols == rhs.checkConstraintCols))
+    return false;
+  return true;
+}
+
 AddCheckConstraintRequest::AddCheckConstraintRequest(const AddCheckConstraintRequest& other651) {
   checkConstraintCols = other651.checkConstraintCols;
 }
@@ -17265,6 +19204,9 @@ void AddCheckConstraintRequest::printTo(std::ostream& out) const {
 PartitionsByExprResult::~PartitionsByExprResult() noexcept {
 }
 
+PartitionsByExprResult::PartitionsByExprResult() noexcept
+   : hasUnknownPartitions(0) {
+}
 
 void PartitionsByExprResult::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -17373,12 +19315,21 @@ uint32_t PartitionsByExprResult::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(PartitionsByExprResult &a, PartitionsByExprResult &b) {
+void swap(PartitionsByExprResult &a, PartitionsByExprResult &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
   swap(a.hasUnknownPartitions, b.hasUnknownPartitions);
 }
 
+bool PartitionsByExprResult::operator==(const PartitionsByExprResult & rhs) const
+{
+  if (!(partitions == rhs.partitions))
+    return false;
+  if (!(hasUnknownPartitions == rhs.hasUnknownPartitions))
+    return false;
+  return true;
+}
+
 PartitionsByExprResult::PartitionsByExprResult(const PartitionsByExprResult& other659) {
   partitions = other659.partitions;
   hasUnknownPartitions = other659.hasUnknownPartitions;
@@ -17400,6 +19351,9 @@ void PartitionsByExprResult::printTo(std::ostream& out) const {
 PartitionsSpecByExprResult::~PartitionsSpecByExprResult() noexcept {
 }
 
+PartitionsSpecByExprResult::PartitionsSpecByExprResult() noexcept
+   : hasUnknownPartitions(0) {
+}
 
 void PartitionsSpecByExprResult::__set_partitionsSpec(const std::vector<PartitionSpec> & val) {
   this->partitionsSpec = val;
@@ -17508,12 +19462,21 @@ uint32_t PartitionsSpecByExprResult::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(PartitionsSpecByExprResult &a, PartitionsSpecByExprResult &b) {
+void swap(PartitionsSpecByExprResult &a, PartitionsSpecByExprResult &b) noexcept {
   using ::std::swap;
   swap(a.partitionsSpec, b.partitionsSpec);
   swap(a.hasUnknownPartitions, b.hasUnknownPartitions);
 }
 
+bool PartitionsSpecByExprResult::operator==(const PartitionsSpecByExprResult & rhs) const
+{
+  if (!(partitionsSpec == rhs.partitionsSpec))
+    return false;
+  if (!(hasUnknownPartitions == rhs.hasUnknownPartitions))
+    return false;
+  return true;
+}
+
 PartitionsSpecByExprResult::PartitionsSpecByExprResult(const PartitionsSpecByExprResult& other667) {
   partitionsSpec = other667.partitionsSpec;
   hasUnknownPartitions = other667.hasUnknownPartitions;
@@ -17535,6 +19498,20 @@ void PartitionsSpecByExprResult::printTo(std::ostream& out) const {
 PartitionsByExprRequest::~PartitionsByExprRequest() noexcept {
 }
 
+PartitionsByExprRequest::PartitionsByExprRequest() noexcept
+   : dbName(),
+     tblName(),
+     expr(),
+     defaultPartitionName(),
+     maxParts(-1),
+     catName(),
+     order(),
+     validWriteIdList(),
+     id(-1LL),
+     skipColumnSchemaForPartition(0),
+     includeParamKeyPattern(),
+     excludeParamKeyPattern() {
+}
 
 void PartitionsByExprRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -17804,7 +19781,7 @@ uint32_t PartitionsByExprRequest::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(PartitionsByExprRequest &a, PartitionsByExprRequest &b) {
+void swap(PartitionsByExprRequest &a, PartitionsByExprRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -17821,6 +19798,53 @@ void swap(PartitionsByExprRequest &a, PartitionsByExprRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionsByExprRequest::operator==(const PartitionsByExprRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(expr == rhs.expr))
+    return false;
+  if (__isset.defaultPartitionName != rhs.__isset.defaultPartitionName)
+    return false;
+  else if (__isset.defaultPartitionName && !(defaultPartitionName == rhs.defaultPartitionName))
+    return false;
+  if (__isset.maxParts != rhs.__isset.maxParts)
+    return false;
+  else if (__isset.maxParts && !(maxParts == rhs.maxParts))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.order != rhs.__isset.order)
+    return false;
+  else if (__isset.order && !(order == rhs.order))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
+    return false;
+  else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
+    return false;
+  if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
+    return false;
+  else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+    return false;
+  return true;
+}
+
 PartitionsByExprRequest::PartitionsByExprRequest(const PartitionsByExprRequest& other669) {
   dbName = other669.dbName;
   tblName = other669.tblName;
@@ -17874,6 +19898,9 @@ void PartitionsByExprRequest::printTo(std::ostream& out) const {
 TableStatsResult::~TableStatsResult() noexcept {
 }
 
+TableStatsResult::TableStatsResult() noexcept
+   : isStatsCompliant(0) {
+}
 
 void TableStatsResult::__set_tableStats(const std::vector<ColumnStatisticsObj> & val) {
   this->tableStats = val;
@@ -17981,13 +20008,24 @@ uint32_t TableStatsResult::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TableStatsResult &a, TableStatsResult &b) {
+void swap(TableStatsResult &a, TableStatsResult &b) noexcept {
   using ::std::swap;
   swap(a.tableStats, b.tableStats);
   swap(a.isStatsCompliant, b.isStatsCompliant);
   swap(a.__isset, b.__isset);
 }
 
+bool TableStatsResult::operator==(const TableStatsResult & rhs) const
+{
+  if (!(tableStats == rhs.tableStats))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  return true;
+}
+
 TableStatsResult::TableStatsResult(const TableStatsResult& other677) {
   tableStats = other677.tableStats;
   isStatsCompliant = other677.isStatsCompliant;
@@ -18011,6 +20049,9 @@ void TableStatsResult::printTo(std::ostream& out) const {
 PartitionsStatsResult::~PartitionsStatsResult() noexcept {
 }
 
+PartitionsStatsResult::PartitionsStatsResult() noexcept
+   : isStatsCompliant(0) {
+}
 
 void PartitionsStatsResult::__set_partStats(const std::map<std::string, std::vector<ColumnStatisticsObj> > & val) {
   this->partStats = val;
@@ -18142,13 +20183,24 @@ uint32_t PartitionsStatsResult::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(PartitionsStatsResult &a, PartitionsStatsResult &b) {
+void swap(PartitionsStatsResult &a, PartitionsStatsResult &b) noexcept {
   using ::std::swap;
   swap(a.partStats, b.partStats);
   swap(a.isStatsCompliant, b.isStatsCompliant);
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionsStatsResult::operator==(const PartitionsStatsResult & rhs) const
+{
+  if (!(partStats == rhs.partStats))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  return true;
+}
+
 PartitionsStatsResult::PartitionsStatsResult(const PartitionsStatsResult& other693) {
   partStats = other693.partStats;
   isStatsCompliant = other693.isStatsCompliant;
@@ -18172,6 +20224,13 @@ void PartitionsStatsResult::printTo(std::ostream& out) const {
 TableStatsRequest::~TableStatsRequest() noexcept {
 }
 
+TableStatsRequest::TableStatsRequest() : dbName(),
+   tblName(),
+   catName(),
+   validWriteIdList(),
+   engine("hive"),
+   id(-1LL) {
+}
 
 void TableStatsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -18371,7 +20430,7 @@ uint32_t TableStatsRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TableStatsRequest &a, TableStatsRequest &b) {
+void swap(TableStatsRequest &a, TableStatsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -18383,6 +20442,33 @@ void swap(TableStatsRequest &a, TableStatsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TableStatsRequest::operator==(const TableStatsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(colNames == rhs.colNames))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  return true;
+}
+
 TableStatsRequest::TableStatsRequest(const TableStatsRequest& other701) {
   dbName = other701.dbName;
   tblName = other701.tblName;
@@ -18421,6 +20507,12 @@ void TableStatsRequest::printTo(std::ostream& out) const {
 PartitionsStatsRequest::~PartitionsStatsRequest() noexcept {
 }
 
+PartitionsStatsRequest::PartitionsStatsRequest() : dbName(),
+   tblName(),
+   catName(),
+   validWriteIdList(),
+   engine("hive") {
+}
 
 void PartitionsStatsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -18641,7 +20733,7 @@ uint32_t PartitionsStatsRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(PartitionsStatsRequest &a, PartitionsStatsRequest &b) {
+void swap(PartitionsStatsRequest &a, PartitionsStatsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -18653,6 +20745,31 @@ void swap(PartitionsStatsRequest &a, PartitionsStatsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionsStatsRequest::operator==(const PartitionsStatsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(colNames == rhs.colNames))
+    return false;
+  if (!(partNames == rhs.partNames))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  return true;
+}
+
 PartitionsStatsRequest::PartitionsStatsRequest(const PartitionsStatsRequest& other715) {
   dbName = other715.dbName;
   tblName = other715.tblName;
@@ -18691,6 +20808,9 @@ void PartitionsStatsRequest::printTo(std::ostream& out) const {
 AddPartitionsResult::~AddPartitionsResult() noexcept {
 }
 
+AddPartitionsResult::AddPartitionsResult() noexcept
+   : isStatsCompliant(0) {
+}
 
 void AddPartitionsResult::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -18835,7 +20955,7 @@ uint32_t AddPartitionsResult::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(AddPartitionsResult &a, AddPartitionsResult &b) {
+void swap(AddPartitionsResult &a, AddPartitionsResult &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
   swap(a.isStatsCompliant, b.isStatsCompliant);
@@ -18843,6 +20963,23 @@ void swap(AddPartitionsResult &a, AddPartitionsResult &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AddPartitionsResult::operator==(const AddPartitionsResult & rhs) const
+{
+  if (__isset.partitions != rhs.__isset.partitions)
+    return false;
+  else if (__isset.partitions && !(partitions == rhs.partitions))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  if (__isset.partitionColSchema != rhs.__isset.partitionColSchema)
+    return false;
+  else if (__isset.partitionColSchema && !(partitionColSchema == rhs.partitionColSchema))
+    return false;
+  return true;
+}
+
 AddPartitionsResult::AddPartitionsResult(const AddPartitionsResult& other729) {
   partitions = other729.partitions;
   isStatsCompliant = other729.isStatsCompliant;
@@ -18869,6 +21006,15 @@ void AddPartitionsResult::printTo(std::ostream& out) const {
 AddPartitionsRequest::~AddPartitionsRequest() noexcept {
 }
 
+AddPartitionsRequest::AddPartitionsRequest() noexcept
+   : dbName(),
+     tblName(),
+     ifNotExists(0),
+     needResult(true),
+     catName(),
+     validWriteIdList(),
+     skipColumnSchemaForPartition(0) {
+}
 
 void AddPartitionsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -19143,7 +21289,7 @@ uint32_t AddPartitionsRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(AddPartitionsRequest &a, AddPartitionsRequest &b) {
+void swap(AddPartitionsRequest &a, AddPartitionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -19158,6 +21304,43 @@ void swap(AddPartitionsRequest &a, AddPartitionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AddPartitionsRequest::operator==(const AddPartitionsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(parts == rhs.parts))
+    return false;
+  if (!(ifNotExists == rhs.ifNotExists))
+    return false;
+  if (__isset.needResult != rhs.__isset.needResult)
+    return false;
+  else if (__isset.needResult && !(needResult == rhs.needResult))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.partitionColSchema != rhs.__isset.partitionColSchema)
+    return false;
+  else if (__isset.partitionColSchema && !(partitionColSchema == rhs.partitionColSchema))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  return true;
+}
+
 AddPartitionsRequest::AddPartitionsRequest(const AddPartitionsRequest& other743) {
   dbName = other743.dbName;
   tblName = other743.tblName;
@@ -19205,6 +21388,8 @@ void AddPartitionsRequest::printTo(std::ostream& out) const {
 DropPartitionsResult::~DropPartitionsResult() noexcept {
 }
 
+DropPartitionsResult::DropPartitionsResult() noexcept {
+}
 
 void DropPartitionsResult::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -19293,12 +21478,21 @@ uint32_t DropPartitionsResult::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(DropPartitionsResult &a, DropPartitionsResult &b) {
+void swap(DropPartitionsResult &a, DropPartitionsResult &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
   swap(a.__isset, b.__isset);
 }
 
+bool DropPartitionsResult::operator==(const DropPartitionsResult & rhs) const
+{
+  if (__isset.partitions != rhs.__isset.partitions)
+    return false;
+  else if (__isset.partitions && !(partitions == rhs.partitions))
+    return false;
+  return true;
+}
+
 DropPartitionsResult::DropPartitionsResult(const DropPartitionsResult& other751) {
   partitions = other751.partitions;
   __isset = other751.__isset;
@@ -19319,6 +21513,10 @@ void DropPartitionsResult::printTo(std::ostream& out) const {
 DropPartitionsExpr::~DropPartitionsExpr() noexcept {
 }
 
+DropPartitionsExpr::DropPartitionsExpr() noexcept
+   : expr(),
+     partArchiveLevel(0) {
+}
 
 void DropPartitionsExpr::__set_expr(const std::string& val) {
   this->expr = val;
@@ -19406,13 +21604,24 @@ uint32_t DropPartitionsExpr::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(DropPartitionsExpr &a, DropPartitionsExpr &b) {
+void swap(DropPartitionsExpr &a, DropPartitionsExpr &b) noexcept {
   using ::std::swap;
   swap(a.expr, b.expr);
   swap(a.partArchiveLevel, b.partArchiveLevel);
   swap(a.__isset, b.__isset);
 }
 
+bool DropPartitionsExpr::operator==(const DropPartitionsExpr & rhs) const
+{
+  if (!(expr == rhs.expr))
+    return false;
+  if (__isset.partArchiveLevel != rhs.__isset.partArchiveLevel)
+    return false;
+  else if (__isset.partArchiveLevel && !(partArchiveLevel == rhs.partArchiveLevel))
+    return false;
+  return true;
+}
+
 DropPartitionsExpr::DropPartitionsExpr(const DropPartitionsExpr& other753) {
   expr = other753.expr;
   partArchiveLevel = other753.partArchiveLevel;
@@ -19436,6 +21645,8 @@ void DropPartitionsExpr::printTo(std::ostream& out) const {
 RequestPartsSpec::~RequestPartsSpec() noexcept {
 }
 
+RequestPartsSpec::RequestPartsSpec() noexcept {
+}
 
 void RequestPartsSpec::__set_names(const std::vector<std::string> & val) {
   this->names = val;
@@ -19562,13 +21773,26 @@ uint32_t RequestPartsSpec::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(RequestPartsSpec &a, RequestPartsSpec &b) {
+void swap(RequestPartsSpec &a, RequestPartsSpec &b) noexcept {
   using ::std::swap;
   swap(a.names, b.names);
   swap(a.exprs, b.exprs);
   swap(a.__isset, b.__isset);
 }
 
+bool RequestPartsSpec::operator==(const RequestPartsSpec & rhs) const
+{
+  if (__isset.names != rhs.__isset.names)
+    return false;
+  else if (__isset.names && !(names == rhs.names))
+    return false;
+  if (__isset.exprs != rhs.__isset.exprs)
+    return false;
+  else if (__isset.exprs && !(exprs == rhs.exprs))
+    return false;
+  return true;
+}
+
 RequestPartsSpec::RequestPartsSpec(const RequestPartsSpec& other767) {
   names = other767.names;
   exprs = other767.exprs;
@@ -19592,6 +21816,16 @@ void RequestPartsSpec::printTo(std::ostream& out) const {
 DropPartitionsRequest::~DropPartitionsRequest() noexcept {
 }
 
+DropPartitionsRequest::DropPartitionsRequest() noexcept
+   : dbName(),
+     tblName(),
+     deleteData(0),
+     ifExists(true),
+     ignoreProtection(0),
+     needResult(true),
+     catName(),
+     skipColumnSchemaForPartition(0) {
+}
 
 void DropPartitionsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -19825,7 +22059,7 @@ uint32_t DropPartitionsRequest::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(DropPartitionsRequest &a, DropPartitionsRequest &b) {
+void swap(DropPartitionsRequest &a, DropPartitionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -19840,6 +22074,45 @@ void swap(DropPartitionsRequest &a, DropPartitionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DropPartitionsRequest::operator==(const DropPartitionsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(parts == rhs.parts))
+    return false;
+  if (__isset.deleteData != rhs.__isset.deleteData)
+    return false;
+  else if (__isset.deleteData && !(deleteData == rhs.deleteData))
+    return false;
+  if (__isset.ifExists != rhs.__isset.ifExists)
+    return false;
+  else if (__isset.ifExists && !(ifExists == rhs.ifExists))
+    return false;
+  if (__isset.ignoreProtection != rhs.__isset.ignoreProtection)
+    return false;
+  else if (__isset.ignoreProtection && !(ignoreProtection == rhs.ignoreProtection))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  if (__isset.needResult != rhs.__isset.needResult)
+    return false;
+  else if (__isset.needResult && !(needResult == rhs.needResult))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  return true;
+}
+
 DropPartitionsRequest::DropPartitionsRequest(const DropPartitionsRequest& other769) {
   dbName = other769.dbName;
   tblName = other769.tblName;
@@ -19887,6 +22160,13 @@ void DropPartitionsRequest::printTo(std::ostream& out) const {
 DropPartitionRequest::~DropPartitionRequest() noexcept {
 }
 
+DropPartitionRequest::DropPartitionRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     partName(),
+     deleteData(0) {
+}
 
 void DropPartitionRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -20085,7 +22365,7 @@ uint32_t DropPartitionRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(DropPartitionRequest &a, DropPartitionRequest &b) {
+void swap(DropPartitionRequest &a, DropPartitionRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -20097,6 +22377,35 @@ void swap(DropPartitionRequest &a, DropPartitionRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DropPartitionRequest::operator==(const DropPartitionRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.partName != rhs.__isset.partName)
+    return false;
+  else if (__isset.partName && !(partName == rhs.partName))
+    return false;
+  if (__isset.partVals != rhs.__isset.partVals)
+    return false;
+  else if (__isset.partVals && !(partVals == rhs.partVals))
+    return false;
+  if (__isset.deleteData != rhs.__isset.deleteData)
+    return false;
+  else if (__isset.deleteData && !(deleteData == rhs.deleteData))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  return true;
+}
+
 DropPartitionRequest::DropPartitionRequest(const DropPartitionRequest& other777) {
   catName = other777.catName;
   dbName = other777.dbName;
@@ -20135,6 +22444,16 @@ void DropPartitionRequest::printTo(std::ostream& out) const {
 PartitionValuesRequest::~PartitionValuesRequest() noexcept {
 }
 
+PartitionValuesRequest::PartitionValuesRequest() noexcept
+   : dbName(),
+     tblName(),
+     applyDistinct(true),
+     filter(),
+     ascending(true),
+     maxParts(-1LL),
+     catName(),
+     validWriteIdList() {
+}
 
 void PartitionValuesRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -20408,7 +22727,7 @@ uint32_t PartitionValuesRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(PartitionValuesRequest &a, PartitionValuesRequest &b) {
+void swap(PartitionValuesRequest &a, PartitionValuesRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -20423,6 +22742,45 @@ void swap(PartitionValuesRequest &a, PartitionValuesRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionValuesRequest::operator==(const PartitionValuesRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(partitionKeys == rhs.partitionKeys))
+    return false;
+  if (__isset.applyDistinct != rhs.__isset.applyDistinct)
+    return false;
+  else if (__isset.applyDistinct && !(applyDistinct == rhs.applyDistinct))
+    return false;
+  if (__isset.filter != rhs.__isset.filter)
+    return false;
+  else if (__isset.filter && !(filter == rhs.filter))
+    return false;
+  if (__isset.partitionOrder != rhs.__isset.partitionOrder)
+    return false;
+  else if (__isset.partitionOrder && !(partitionOrder == rhs.partitionOrder))
+    return false;
+  if (__isset.ascending != rhs.__isset.ascending)
+    return false;
+  else if (__isset.ascending && !(ascending == rhs.ascending))
+    return false;
+  if (__isset.maxParts != rhs.__isset.maxParts)
+    return false;
+  else if (__isset.maxParts && !(maxParts == rhs.maxParts))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  return true;
+}
+
 PartitionValuesRequest::PartitionValuesRequest(const PartitionValuesRequest& other791) {
   dbName = other791.dbName;
   tblName = other791.tblName;
@@ -20470,6 +22828,8 @@ void PartitionValuesRequest::printTo(std::ostream& out) const {
 PartitionValuesRow::~PartitionValuesRow() noexcept {
 }
 
+PartitionValuesRow::PartitionValuesRow() noexcept {
+}
 
 void PartitionValuesRow::__set_row(const std::vector<std::string> & val) {
   this->row = val;
@@ -20559,11 +22919,18 @@ uint32_t PartitionValuesRow::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PartitionValuesRow &a, PartitionValuesRow &b) {
+void swap(PartitionValuesRow &a, PartitionValuesRow &b) noexcept {
   using ::std::swap;
   swap(a.row, b.row);
 }
 
+bool PartitionValuesRow::operator==(const PartitionValuesRow & rhs) const
+{
+  if (!(row == rhs.row))
+    return false;
+  return true;
+}
+
 PartitionValuesRow::PartitionValuesRow(const PartitionValuesRow& other799) {
   row = other799.row;
 }
@@ -20582,6 +22949,8 @@ void PartitionValuesRow::printTo(std::ostream& out) const {
 PartitionValuesResponse::~PartitionValuesResponse() noexcept {
 }
 
+PartitionValuesResponse::PartitionValuesResponse() noexcept {
+}
 
 void PartitionValuesResponse::__set_partitionValues(const std::vector<PartitionValuesRow> & val) {
   this->partitionValues = val;
@@ -20671,11 +23040,18 @@ uint32_t PartitionValuesResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(PartitionValuesResponse &a, PartitionValuesResponse &b) {
+void swap(PartitionValuesResponse &a, PartitionValuesResponse &b) noexcept {
   using ::std::swap;
   swap(a.partitionValues, b.partitionValues);
 }
 
+bool PartitionValuesResponse::operator==(const PartitionValuesResponse & rhs) const
+{
+  if (!(partitionValues == rhs.partitionValues))
+    return false;
+  return true;
+}
+
 PartitionValuesResponse::PartitionValuesResponse(const PartitionValuesResponse& other807) {
   partitionValues = other807.partitionValues;
 }
@@ -20694,6 +23070,18 @@ void PartitionValuesResponse::printTo(std::ostream& out) const {
 GetPartitionsByNamesRequest::~GetPartitionsByNamesRequest() noexcept {
 }
 
+GetPartitionsByNamesRequest::GetPartitionsByNamesRequest() : db_name(),
+   tbl_name(),
+   get_col_stats(0),
+   processorIdentifier(),
+   engine("hive"),
+   validWriteIdList(),
+   getFileMetadata(0),
+   id(-1LL),
+   skipColumnSchemaForPartition(0),
+   includeParamKeyPattern(),
+   excludeParamKeyPattern() {
+}
 
 void GetPartitionsByNamesRequest::__set_db_name(const std::string& val) {
   this->db_name = val;
@@ -21020,7 +23408,7 @@ uint32_t GetPartitionsByNamesRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(GetPartitionsByNamesRequest &a, GetPartitionsByNamesRequest &b) {
+void swap(GetPartitionsByNamesRequest &a, GetPartitionsByNamesRequest &b) noexcept {
   using ::std::swap;
   swap(a.db_name, b.db_name);
   swap(a.tbl_name, b.tbl_name);
@@ -21038,6 +23426,59 @@ void swap(GetPartitionsByNamesRequest &a, GetPartitionsByNamesRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsByNamesRequest::operator==(const GetPartitionsByNamesRequest & rhs) const
+{
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  if (__isset.names != rhs.__isset.names)
+    return false;
+  else if (__isset.names && !(names == rhs.names))
+    return false;
+  if (__isset.get_col_stats != rhs.__isset.get_col_stats)
+    return false;
+  else if (__isset.get_col_stats && !(get_col_stats == rhs.get_col_stats))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.getFileMetadata != rhs.__isset.getFileMetadata)
+    return false;
+  else if (__isset.getFileMetadata && !(getFileMetadata == rhs.getFileMetadata))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
+    return false;
+  else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
+    return false;
+  if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
+    return false;
+  else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+    return false;
+  return true;
+}
+
 GetPartitionsByNamesRequest::GetPartitionsByNamesRequest(const GetPartitionsByNamesRequest& other821) {
   db_name = other821.db_name;
   tbl_name = other821.tbl_name;
@@ -21094,6 +23535,8 @@ void GetPartitionsByNamesRequest::printTo(std::ostream& out) const {
 GetPartitionsByNamesResult::~GetPartitionsByNamesResult() noexcept {
 }
 
+GetPartitionsByNamesResult::GetPartitionsByNamesResult() noexcept {
+}
 
 void GetPartitionsByNamesResult::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -21201,13 +23644,24 @@ uint32_t GetPartitionsByNamesResult::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(GetPartitionsByNamesResult &a, GetPartitionsByNamesResult &b) {
+void swap(GetPartitionsByNamesResult &a, GetPartitionsByNamesResult &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
   swap(a.dictionary, b.dictionary);
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsByNamesResult::operator==(const GetPartitionsByNamesResult & rhs) const
+{
+  if (!(partitions == rhs.partitions))
+    return false;
+  if (__isset.dictionary != rhs.__isset.dictionary)
+    return false;
+  else if (__isset.dictionary && !(dictionary == rhs.dictionary))
+    return false;
+  return true;
+}
+
 GetPartitionsByNamesResult::GetPartitionsByNamesResult(const GetPartitionsByNamesResult& other829) {
   partitions = other829.partitions;
   dictionary = other829.dictionary;
@@ -21231,6 +23685,15 @@ void GetPartitionsByNamesResult::printTo(std::ostream& out) const {
 DataConnector::~DataConnector() noexcept {
 }
 
+DataConnector::DataConnector() noexcept
+   : name(),
+     type(),
+     url(),
+     description(),
+     ownerName(),
+     ownerType(static_cast<PrincipalType::type>(0)),
+     createTime(0) {
+}
 
 void DataConnector::__set_name(const std::string& val) {
   this->name = val;
@@ -21445,7 +23908,7 @@ uint32_t DataConnector::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(DataConnector &a, DataConnector &b) {
+void swap(DataConnector &a, DataConnector &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.type, b.type);
@@ -21458,6 +23921,37 @@ void swap(DataConnector &a, DataConnector &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DataConnector::operator==(const DataConnector & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (!(url == rhs.url))
+    return false;
+  if (__isset.description != rhs.__isset.description)
+    return false;
+  else if (__isset.description && !(description == rhs.description))
+    return false;
+  if (__isset.parameters != rhs.__isset.parameters)
+    return false;
+  else if (__isset.parameters && !(parameters == rhs.parameters))
+    return false;
+  if (__isset.ownerName != rhs.__isset.ownerName)
+    return false;
+  else if (__isset.ownerName && !(ownerName == rhs.ownerName))
+    return false;
+  if (__isset.ownerType != rhs.__isset.ownerType)
+    return false;
+  else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+    return false;
+  if (__isset.createTime != rhs.__isset.createTime)
+    return false;
+  else if (__isset.createTime && !(createTime == rhs.createTime))
+    return false;
+  return true;
+}
+
 DataConnector::DataConnector(const DataConnector& other840) {
   name = other840.name;
   type = other840.type;
@@ -21499,6 +23993,10 @@ void DataConnector::printTo(std::ostream& out) const {
 ResourceUri::~ResourceUri() noexcept {
 }
 
+ResourceUri::ResourceUri() noexcept
+   : resourceType(static_cast<ResourceType::type>(0)),
+     uri() {
+}
 
 void ResourceUri::__set_resourceType(const ResourceType::type val) {
   this->resourceType = val;
@@ -21583,13 +24081,22 @@ uint32_t ResourceUri::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(ResourceUri &a, ResourceUri &b) {
+void swap(ResourceUri &a, ResourceUri &b) noexcept {
   using ::std::swap;
   swap(a.resourceType, b.resourceType);
   swap(a.uri, b.uri);
   swap(a.__isset, b.__isset);
 }
 
+bool ResourceUri::operator==(const ResourceUri & rhs) const
+{
+  if (!(resourceType == rhs.resourceType))
+    return false;
+  if (!(uri == rhs.uri))
+    return false;
+  return true;
+}
+
 ResourceUri::ResourceUri(const ResourceUri& other843) {
   resourceType = other843.resourceType;
   uri = other843.uri;
@@ -21613,6 +24120,16 @@ void ResourceUri::printTo(std::ostream& out) const {
 Function::~Function() noexcept {
 }
 
+Function::Function() noexcept
+   : functionName(),
+     dbName(),
+     className(),
+     ownerName(),
+     ownerType(static_cast<PrincipalType::type>(0)),
+     createTime(0),
+     functionType(static_cast<FunctionType::type>(0)),
+     catName() {
+}
 
 void Function::__set_functionName(const std::string& val) {
   this->functionName = val;
@@ -21833,7 +24350,7 @@ uint32_t Function::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Function &a, Function &b) {
+void swap(Function &a, Function &b) noexcept {
   using ::std::swap;
   swap(a.functionName, b.functionName);
   swap(a.dbName, b.dbName);
@@ -21847,6 +24364,31 @@ void swap(Function &a, Function &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Function::operator==(const Function & rhs) const
+{
+  if (!(functionName == rhs.functionName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(className == rhs.className))
+    return false;
+  if (!(ownerName == rhs.ownerName))
+    return false;
+  if (!(ownerType == rhs.ownerType))
+    return false;
+  if (!(createTime == rhs.createTime))
+    return false;
+  if (!(functionType == rhs.functionType))
+    return false;
+  if (!(resourceUris == rhs.resourceUris))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 Function::Function(const Function& other853) {
   functionName = other853.functionName;
   dbName = other853.dbName;
@@ -21891,6 +24433,16 @@ void Function::printTo(std::ostream& out) const {
 TxnInfo::~TxnInfo() noexcept {
 }
 
+TxnInfo::TxnInfo() : id(0),
+   state(static_cast<TxnState::type>(0)),
+   user(),
+   hostname(),
+   agentInfo("Unknown"),
+   heartbeatCount(0),
+   metaInfo(),
+   startedTime(0),
+   lastHeartbeatTime(0) {
+}
 
 void TxnInfo::__set_id(const int64_t val) {
   this->id = val;
@@ -22109,7 +24661,7 @@ uint32_t TxnInfo::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TxnInfo &a, TxnInfo &b) {
+void swap(TxnInfo &a, TxnInfo &b) noexcept {
   using ::std::swap;
   swap(a.id, b.id);
   swap(a.state, b.state);
@@ -22123,6 +24675,39 @@ void swap(TxnInfo &a, TxnInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TxnInfo::operator==(const TxnInfo & rhs) const
+{
+  if (!(id == rhs.id))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  if (!(user == rhs.user))
+    return false;
+  if (!(hostname == rhs.hostname))
+    return false;
+  if (__isset.agentInfo != rhs.__isset.agentInfo)
+    return false;
+  else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
+    return false;
+  if (__isset.heartbeatCount != rhs.__isset.heartbeatCount)
+    return false;
+  else if (__isset.heartbeatCount && !(heartbeatCount == rhs.heartbeatCount))
+    return false;
+  if (__isset.metaInfo != rhs.__isset.metaInfo)
+    return false;
+  else if (__isset.metaInfo && !(metaInfo == rhs.metaInfo))
+    return false;
+  if (__isset.startedTime != rhs.__isset.startedTime)
+    return false;
+  else if (__isset.startedTime && !(startedTime == rhs.startedTime))
+    return false;
+  if (__isset.lastHeartbeatTime != rhs.__isset.lastHeartbeatTime)
+    return false;
+  else if (__isset.lastHeartbeatTime && !(lastHeartbeatTime == rhs.lastHeartbeatTime))
+    return false;
+  return true;
+}
+
 TxnInfo::TxnInfo(const TxnInfo& other856) {
   id = other856.id;
   state = other856.state;
@@ -22167,6 +24752,9 @@ void TxnInfo::printTo(std::ostream& out) const {
 GetOpenTxnsInfoResponse::~GetOpenTxnsInfoResponse() noexcept {
 }
 
+GetOpenTxnsInfoResponse::GetOpenTxnsInfoResponse() noexcept
+   : txn_high_water_mark(0) {
+}
 
 void GetOpenTxnsInfoResponse::__set_txn_high_water_mark(const int64_t val) {
   this->txn_high_water_mark = val;
@@ -22275,12 +24863,21 @@ uint32_t GetOpenTxnsInfoResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(GetOpenTxnsInfoResponse &a, GetOpenTxnsInfoResponse &b) {
+void swap(GetOpenTxnsInfoResponse &a, GetOpenTxnsInfoResponse &b) noexcept {
   using ::std::swap;
   swap(a.txn_high_water_mark, b.txn_high_water_mark);
   swap(a.open_txns, b.open_txns);
 }
 
+bool GetOpenTxnsInfoResponse::operator==(const GetOpenTxnsInfoResponse & rhs) const
+{
+  if (!(txn_high_water_mark == rhs.txn_high_water_mark))
+    return false;
+  if (!(open_txns == rhs.open_txns))
+    return false;
+  return true;
+}
+
 GetOpenTxnsInfoResponse::GetOpenTxnsInfoResponse(const GetOpenTxnsInfoResponse& other864) {
   txn_high_water_mark = other864.txn_high_water_mark;
   open_txns = other864.open_txns;
@@ -22302,6 +24899,11 @@ void GetOpenTxnsInfoResponse::printTo(std::ostream& out) const {
 GetOpenTxnsResponse::~GetOpenTxnsResponse() noexcept {
 }
 
+GetOpenTxnsResponse::GetOpenTxnsResponse() noexcept
+   : txn_high_water_mark(0),
+     min_open_txn(0),
+     abortedBits() {
+}
 
 void GetOpenTxnsResponse::__set_txn_high_water_mark(const int64_t val) {
   this->txn_high_water_mark = val;
@@ -22447,7 +25049,7 @@ uint32_t GetOpenTxnsResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(GetOpenTxnsResponse &a, GetOpenTxnsResponse &b) {
+void swap(GetOpenTxnsResponse &a, GetOpenTxnsResponse &b) noexcept {
   using ::std::swap;
   swap(a.txn_high_water_mark, b.txn_high_water_mark);
   swap(a.open_txns, b.open_txns);
@@ -22456,6 +25058,21 @@ void swap(GetOpenTxnsResponse &a, GetOpenTxnsResponse &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetOpenTxnsResponse::operator==(const GetOpenTxnsResponse & rhs) const
+{
+  if (!(txn_high_water_mark == rhs.txn_high_water_mark))
+    return false;
+  if (!(open_txns == rhs.open_txns))
+    return false;
+  if (__isset.min_open_txn != rhs.__isset.min_open_txn)
+    return false;
+  else if (__isset.min_open_txn && !(min_open_txn == rhs.min_open_txn))
+    return false;
+  if (!(abortedBits == rhs.abortedBits))
+    return false;
+  return true;
+}
+
 GetOpenTxnsResponse::GetOpenTxnsResponse(const GetOpenTxnsResponse& other872) {
   txn_high_water_mark = other872.txn_high_water_mark;
   open_txns = other872.open_txns;
@@ -22485,6 +25102,13 @@ void GetOpenTxnsResponse::printTo(std::ostream& out) const {
 OpenTxnRequest::~OpenTxnRequest() noexcept {
 }
 
+OpenTxnRequest::OpenTxnRequest() : num_txns(0),
+   user(),
+   hostname(),
+   agentInfo("Unknown"),
+   replPolicy(),
+   txn_type(static_cast<TxnType::type>(0)) {
+}
 
 void OpenTxnRequest::__set_num_txns(const int32_t val) {
   this->num_txns = val;
@@ -22686,7 +25310,7 @@ uint32_t OpenTxnRequest::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(OpenTxnRequest &a, OpenTxnRequest &b) {
+void swap(OpenTxnRequest &a, OpenTxnRequest &b) noexcept {
   using ::std::swap;
   swap(a.num_txns, b.num_txns);
   swap(a.user, b.user);
@@ -22698,6 +25322,33 @@ void swap(OpenTxnRequest &a, OpenTxnRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool OpenTxnRequest::operator==(const OpenTxnRequest & rhs) const
+{
+  if (!(num_txns == rhs.num_txns))
+    return false;
+  if (!(user == rhs.user))
+    return false;
+  if (!(hostname == rhs.hostname))
+    return false;
+  if (__isset.agentInfo != rhs.__isset.agentInfo)
+    return false;
+  else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
+    return false;
+  if (__isset.replPolicy != rhs.__isset.replPolicy)
+    return false;
+  else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
+    return false;
+  if (__isset.replSrcTxnIds != rhs.__isset.replSrcTxnIds)
+    return false;
+  else if (__isset.replSrcTxnIds && !(replSrcTxnIds == rhs.replSrcTxnIds))
+    return false;
+  if (__isset.txn_type != rhs.__isset.txn_type)
+    return false;
+  else if (__isset.txn_type && !(txn_type == rhs.txn_type))
+    return false;
+  return true;
+}
+
 OpenTxnRequest::OpenTxnRequest(const OpenTxnRequest& other881) {
   num_txns = other881.num_txns;
   user = other881.user;
@@ -22736,6 +25387,8 @@ void OpenTxnRequest::printTo(std::ostream& out) const {
 OpenTxnsResponse::~OpenTxnsResponse() noexcept {
 }
 
+OpenTxnsResponse::OpenTxnsResponse() noexcept {
+}
 
 void OpenTxnsResponse::__set_txn_ids(const std::vector<int64_t> & val) {
   this->txn_ids = val;
@@ -22825,11 +25478,18 @@ uint32_t OpenTxnsResponse::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(OpenTxnsResponse &a, OpenTxnsResponse &b) {
+void swap(OpenTxnsResponse &a, OpenTxnsResponse &b) noexcept {
   using ::std::swap;
   swap(a.txn_ids, b.txn_ids);
 }
 
+bool OpenTxnsResponse::operator==(const OpenTxnsResponse & rhs) const
+{
+  if (!(txn_ids == rhs.txn_ids))
+    return false;
+  return true;
+}
+
 OpenTxnsResponse::OpenTxnsResponse(const OpenTxnsResponse& other889) {
   txn_ids = other889.txn_ids;
 }
@@ -22848,6 +25508,12 @@ void OpenTxnsResponse::printTo(std::ostream& out) const {
 AbortTxnRequest::~AbortTxnRequest() noexcept {
 }
 
+AbortTxnRequest::AbortTxnRequest() noexcept
+   : txnid(0),
+     replPolicy(),
+     txn_type(static_cast<TxnType::type>(0)),
+     errorCode(0) {
+}
 
 void AbortTxnRequest::__set_txnid(const int64_t val) {
   this->txnid = val;
@@ -22973,7 +25639,7 @@ uint32_t AbortTxnRequest::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(AbortTxnRequest &a, AbortTxnRequest &b) {
+void swap(AbortTxnRequest &a, AbortTxnRequest &b) noexcept {
   using ::std::swap;
   swap(a.txnid, b.txnid);
   swap(a.replPolicy, b.replPolicy);
@@ -22982,6 +25648,25 @@ void swap(AbortTxnRequest &a, AbortTxnRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AbortTxnRequest::operator==(const AbortTxnRequest & rhs) const
+{
+  if (!(txnid == rhs.txnid))
+    return false;
+  if (__isset.replPolicy != rhs.__isset.replPolicy)
+    return false;
+  else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
+    return false;
+  if (__isset.txn_type != rhs.__isset.txn_type)
+    return false;
+  else if (__isset.txn_type && !(txn_type == rhs.txn_type))
+    return false;
+  if (__isset.errorCode != rhs.__isset.errorCode)
+    return false;
+  else if (__isset.errorCode && !(errorCode == rhs.errorCode))
+    return false;
+  return true;
+}
+
 AbortTxnRequest::AbortTxnRequest(const AbortTxnRequest& other892) {
   txnid = other892.txnid;
   replPolicy = other892.replPolicy;
@@ -23011,6 +25696,9 @@ void AbortTxnRequest::printTo(std::ostream& out) const {
 AbortTxnsRequest::~AbortTxnsRequest() noexcept {
 }
 
+AbortTxnsRequest::AbortTxnsRequest() noexcept
+   : errorCode(0) {
+}
 
 void AbortTxnsRequest::__set_txn_ids(const std::vector<int64_t> & val) {
   this->txn_ids = val;
@@ -23118,13 +25806,24 @@ uint32_t AbortTxnsRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(AbortTxnsRequest &a, AbortTxnsRequest &b) {
+void swap(AbortTxnsRequest &a, AbortTxnsRequest &b) noexcept {
   using ::std::swap;
   swap(a.txn_ids, b.txn_ids);
   swap(a.errorCode, b.errorCode);
   swap(a.__isset, b.__isset);
 }
 
+bool AbortTxnsRequest::operator==(const AbortTxnsRequest & rhs) const
+{
+  if (!(txn_ids == rhs.txn_ids))
+    return false;
+  if (__isset.errorCode != rhs.__isset.errorCode)
+    return false;
+  else if (__isset.errorCode && !(errorCode == rhs.errorCode))
+    return false;
+  return true;
+}
+
 AbortTxnsRequest::AbortTxnsRequest(const AbortTxnsRequest& other900) {
   txn_ids = other900.txn_ids;
   errorCode = other900.errorCode;
@@ -23148,6 +25847,11 @@ void AbortTxnsRequest::printTo(std::ostream& out) const {
 CommitTxnKeyValue::~CommitTxnKeyValue() noexcept {
 }
 
+CommitTxnKeyValue::CommitTxnKeyValue() noexcept
+   : tableId(0),
+     key(),
+     value() {
+}
 
 void CommitTxnKeyValue::__set_tableId(const int64_t val) {
   this->tableId = val;
@@ -23255,13 +25959,24 @@ uint32_t CommitTxnKeyValue::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(CommitTxnKeyValue &a, CommitTxnKeyValue &b) {
+void swap(CommitTxnKeyValue &a, CommitTxnKeyValue &b) noexcept {
   using ::std::swap;
   swap(a.tableId, b.tableId);
   swap(a.key, b.key);
   swap(a.value, b.value);
 }
 
+bool CommitTxnKeyValue::operator==(const CommitTxnKeyValue & rhs) const
+{
+  if (!(tableId == rhs.tableId))
+    return false;
+  if (!(key == rhs.key))
+    return false;
+  if (!(value == rhs.value))
+    return false;
+  return true;
+}
+
 CommitTxnKeyValue::CommitTxnKeyValue(const CommitTxnKeyValue& other902) {
   tableId = other902.tableId;
   key = other902.key;
@@ -23286,6 +26001,15 @@ void CommitTxnKeyValue::printTo(std::ostream& out) const {
 WriteEventInfo::~WriteEventInfo() noexcept {
 }
 
+WriteEventInfo::WriteEventInfo() noexcept
+   : writeId(0),
+     database(),
+     table(),
+     files(),
+     partition(),
+     tableObj(),
+     partitionObj() {
+}
 
 void WriteEventInfo::__set_writeId(const int64_t val) {
   this->writeId = val;
@@ -23466,7 +26190,7 @@ uint32_t WriteEventInfo::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(WriteEventInfo &a, WriteEventInfo &b) {
+void swap(WriteEventInfo &a, WriteEventInfo &b) noexcept {
   using ::std::swap;
   swap(a.writeId, b.writeId);
   swap(a.database, b.database);
@@ -23478,6 +26202,31 @@ void swap(WriteEventInfo &a, WriteEventInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WriteEventInfo::operator==(const WriteEventInfo & rhs) const
+{
+  if (!(writeId == rhs.writeId))
+    return false;
+  if (!(database == rhs.database))
+    return false;
+  if (!(table == rhs.table))
+    return false;
+  if (!(files == rhs.files))
+    return false;
+  if (__isset.partition != rhs.__isset.partition)
+    return false;
+  else if (__isset.partition && !(partition == rhs.partition))
+    return false;
+  if (__isset.tableObj != rhs.__isset.tableObj)
+    return false;
+  else if (__isset.tableObj && !(tableObj == rhs.tableObj))
+    return false;
+  if (__isset.partitionObj != rhs.__isset.partitionObj)
+    return false;
+  else if (__isset.partitionObj && !(partitionObj == rhs.partitionObj))
+    return false;
+  return true;
+}
+
 WriteEventInfo::WriteEventInfo(const WriteEventInfo& other904) {
   writeId = other904.writeId;
   database = other904.database;
@@ -23516,6 +26265,12 @@ void WriteEventInfo::printTo(std::ostream& out) const {
 ReplLastIdInfo::~ReplLastIdInfo() noexcept {
 }
 
+ReplLastIdInfo::ReplLastIdInfo() noexcept
+   : database(),
+     lastReplId(0),
+     table(),
+     catalog() {
+}
 
 void ReplLastIdInfo::__set_database(const std::string& val) {
   this->database = val;
@@ -23678,7 +26433,7 @@ uint32_t ReplLastIdInfo::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(ReplLastIdInfo &a, ReplLastIdInfo &b) {
+void swap(ReplLastIdInfo &a, ReplLastIdInfo &b) noexcept {
   using ::std::swap;
   swap(a.database, b.database);
   swap(a.lastReplId, b.lastReplId);
@@ -23688,6 +26443,27 @@ void swap(ReplLastIdInfo &a, ReplLastIdInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ReplLastIdInfo::operator==(const ReplLastIdInfo & rhs) const
+{
+  if (!(database == rhs.database))
+    return false;
+  if (!(lastReplId == rhs.lastReplId))
+    return false;
+  if (__isset.table != rhs.__isset.table)
+    return false;
+  else if (__isset.table && !(table == rhs.table))
+    return false;
+  if (__isset.catalog != rhs.__isset.catalog)
+    return false;
+  else if (__isset.catalog && !(catalog == rhs.catalog))
+    return false;
+  if (__isset.partitionList != rhs.__isset.partitionList)
+    return false;
+  else if (__isset.partitionList && !(partitionList == rhs.partitionList))
+    return false;
+  return true;
+}
+
 ReplLastIdInfo::ReplLastIdInfo(const ReplLastIdInfo& other912) {
   database = other912.database;
   lastReplId = other912.lastReplId;
@@ -23720,6 +26496,12 @@ void ReplLastIdInfo::printTo(std::ostream& out) const {
 UpdateTransactionalStatsRequest::~UpdateTransactionalStatsRequest() noexcept {
 }
 
+UpdateTransactionalStatsRequest::UpdateTransactionalStatsRequest() noexcept
+   : tableId(0),
+     insertCount(0),
+     updatedCount(0),
+     deletedCount(0) {
+}
 
 void UpdateTransactionalStatsRequest::__set_tableId(const int64_t val) {
   this->tableId = val;
@@ -23846,7 +26628,7 @@ uint32_t UpdateTransactionalStatsRequest::write(::apache::thrift::protocol::TPro
   return xfer;
 }
 
-void swap(UpdateTransactionalStatsRequest &a, UpdateTransactionalStatsRequest &b) {
+void swap(UpdateTransactionalStatsRequest &a, UpdateTransactionalStatsRequest &b) noexcept {
   using ::std::swap;
   swap(a.tableId, b.tableId);
   swap(a.insertCount, b.insertCount);
@@ -23854,6 +26636,19 @@ void swap(UpdateTransactionalStatsRequest &a, UpdateTransactionalStatsRequest &b
   swap(a.deletedCount, b.deletedCount);
 }
 
+bool UpdateTransactionalStatsRequest::operator==(const UpdateTransactionalStatsRequest & rhs) const
+{
+  if (!(tableId == rhs.tableId))
+    return false;
+  if (!(insertCount == rhs.insertCount))
+    return false;
+  if (!(updatedCount == rhs.updatedCount))
+    return false;
+  if (!(deletedCount == rhs.deletedCount))
+    return false;
+  return true;
+}
+
 UpdateTransactionalStatsRequest::UpdateTransactionalStatsRequest(const UpdateTransactionalStatsRequest& other914) noexcept {
   tableId = other914.tableId;
   insertCount = other914.insertCount;
@@ -23881,6 +26676,12 @@ void UpdateTransactionalStatsRequest::printTo(std::ostream& out) const {
 CommitTxnRequest::~CommitTxnRequest() noexcept {
 }
 
+CommitTxnRequest::CommitTxnRequest() noexcept
+   : txnid(0),
+     replPolicy(),
+     exclWriteEnabled(true),
+     txn_type(static_cast<TxnType::type>(0)) {
+}
 
 void CommitTxnRequest::__set_txnid(const int64_t val) {
   this->txnid = val;
@@ -24080,7 +26881,7 @@ uint32_t CommitTxnRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(CommitTxnRequest &a, CommitTxnRequest &b) {
+void swap(CommitTxnRequest &a, CommitTxnRequest &b) noexcept {
   using ::std::swap;
   swap(a.txnid, b.txnid);
   swap(a.replPolicy, b.replPolicy);
@@ -24092,6 +26893,37 @@ void swap(CommitTxnRequest &a, CommitTxnRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CommitTxnRequest::operator==(const CommitTxnRequest & rhs) const
+{
+  if (!(txnid == rhs.txnid))
+    return false;
+  if (__isset.replPolicy != rhs.__isset.replPolicy)
+    return false;
+  else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
+    return false;
+  if (__isset.writeEventInfos != rhs.__isset.writeEventInfos)
+    return false;
+  else if (__isset.writeEventInfos && !(writeEventInfos == rhs.writeEventInfos))
+    return false;
+  if (__isset.replLastIdInfo != rhs.__isset.replLastIdInfo)
+    return false;
+  else if (__isset.replLastIdInfo && !(replLastIdInfo == rhs.replLastIdInfo))
+    return false;
+  if (__isset.keyValue != rhs.__isset.keyValue)
+    return false;
+  else if (__isset.keyValue && !(keyValue == rhs.keyValue))
+    return false;
+  if (__isset.exclWriteEnabled != rhs.__isset.exclWriteEnabled)
+    return false;
+  else if (__isset.exclWriteEnabled && !(exclWriteEnabled == rhs.exclWriteEnabled))
+    return false;
+  if (__isset.txn_type != rhs.__isset.txn_type)
+    return false;
+  else if (__isset.txn_type && !(txn_type == rhs.txn_type))
+    return false;
+  return true;
+}
+
 CommitTxnRequest::CommitTxnRequest(const CommitTxnRequest& other923) {
   txnid = other923.txnid;
   replPolicy = other923.replPolicy;
@@ -24130,6 +26962,13 @@ void CommitTxnRequest::printTo(std::ostream& out) const {
 ReplTblWriteIdStateRequest::~ReplTblWriteIdStateRequest() noexcept {
 }
 
+ReplTblWriteIdStateRequest::ReplTblWriteIdStateRequest() noexcept
+   : validWriteIdlist(),
+     user(),
+     hostName(),
+     dbName(),
+     tableName() {
+}
 
 void ReplTblWriteIdStateRequest::__set_validWriteIdlist(const std::string& val) {
   this->validWriteIdlist = val;
@@ -24313,7 +27152,7 @@ uint32_t ReplTblWriteIdStateRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(ReplTblWriteIdStateRequest &a, ReplTblWriteIdStateRequest &b) {
+void swap(ReplTblWriteIdStateRequest &a, ReplTblWriteIdStateRequest &b) noexcept {
   using ::std::swap;
   swap(a.validWriteIdlist, b.validWriteIdlist);
   swap(a.user, b.user);
@@ -24324,6 +27163,25 @@ void swap(ReplTblWriteIdStateRequest &a, ReplTblWriteIdStateRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ReplTblWriteIdStateRequest::operator==(const ReplTblWriteIdStateRequest & rhs) const
+{
+  if (!(validWriteIdlist == rhs.validWriteIdlist))
+    return false;
+  if (!(user == rhs.user))
+    return false;
+  if (!(hostName == rhs.hostName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (__isset.partNames != rhs.__isset.partNames)
+    return false;
+  else if (__isset.partNames && !(partNames == rhs.partNames))
+    return false;
+  return true;
+}
+
 ReplTblWriteIdStateRequest::ReplTblWriteIdStateRequest(const ReplTblWriteIdStateRequest& other931) {
   validWriteIdlist = other931.validWriteIdlist;
   user = other931.user;
@@ -24359,6 +27217,10 @@ void ReplTblWriteIdStateRequest::printTo(std::ostream& out) const {
 GetValidWriteIdsRequest::~GetValidWriteIdsRequest() noexcept {
 }
 
+GetValidWriteIdsRequest::GetValidWriteIdsRequest() noexcept
+   : validTxnList(),
+     writeId(0) {
+}
 
 void GetValidWriteIdsRequest::__set_fullTableNames(const std::vector<std::string> & val) {
   this->fullTableNames = val;
@@ -24484,7 +27346,7 @@ uint32_t GetValidWriteIdsRequest::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(GetValidWriteIdsRequest &a, GetValidWriteIdsRequest &b) {
+void swap(GetValidWriteIdsRequest &a, GetValidWriteIdsRequest &b) noexcept {
   using ::std::swap;
   swap(a.fullTableNames, b.fullTableNames);
   swap(a.validTxnList, b.validTxnList);
@@ -24492,6 +27354,21 @@ void swap(GetValidWriteIdsRequest &a, GetValidWriteIdsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetValidWriteIdsRequest::operator==(const GetValidWriteIdsRequest & rhs) const
+{
+  if (!(fullTableNames == rhs.fullTableNames))
+    return false;
+  if (__isset.validTxnList != rhs.__isset.validTxnList)
+    return false;
+  else if (__isset.validTxnList && !(validTxnList == rhs.validTxnList))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  return true;
+}
+
 GetValidWriteIdsRequest::GetValidWriteIdsRequest(const GetValidWriteIdsRequest& other939) {
   fullTableNames = other939.fullTableNames;
   validTxnList = other939.validTxnList;
@@ -24518,6 +27395,12 @@ void GetValidWriteIdsRequest::printTo(std::ostream& out) const {
 TableValidWriteIds::~TableValidWriteIds() noexcept {
 }
 
+TableValidWriteIds::TableValidWriteIds() noexcept
+   : fullTableName(),
+     writeIdHighWaterMark(0),
+     minOpenWriteId(0),
+     abortedBits() {
+}
 
 void TableValidWriteIds::__set_fullTableName(const std::string& val) {
   this->fullTableName = val;
@@ -24682,7 +27565,7 @@ uint32_t TableValidWriteIds::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TableValidWriteIds &a, TableValidWriteIds &b) {
+void swap(TableValidWriteIds &a, TableValidWriteIds &b) noexcept {
   using ::std::swap;
   swap(a.fullTableName, b.fullTableName);
   swap(a.writeIdHighWaterMark, b.writeIdHighWaterMark);
@@ -24692,6 +27575,23 @@ void swap(TableValidWriteIds &a, TableValidWriteIds &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TableValidWriteIds::operator==(const TableValidWriteIds & rhs) const
+{
+  if (!(fullTableName == rhs.fullTableName))
+    return false;
+  if (!(writeIdHighWaterMark == rhs.writeIdHighWaterMark))
+    return false;
+  if (!(invalidWriteIds == rhs.invalidWriteIds))
+    return false;
+  if (__isset.minOpenWriteId != rhs.__isset.minOpenWriteId)
+    return false;
+  else if (__isset.minOpenWriteId && !(minOpenWriteId == rhs.minOpenWriteId))
+    return false;
+  if (!(abortedBits == rhs.abortedBits))
+    return false;
+  return true;
+}
+
 TableValidWriteIds::TableValidWriteIds(const TableValidWriteIds& other947) {
   fullTableName = other947.fullTableName;
   writeIdHighWaterMark = other947.writeIdHighWaterMark;
@@ -24724,6 +27624,8 @@ void TableValidWriteIds::printTo(std::ostream& out) const {
 GetValidWriteIdsResponse::~GetValidWriteIdsResponse() noexcept {
 }
 
+GetValidWriteIdsResponse::GetValidWriteIdsResponse() noexcept {
+}
 
 void GetValidWriteIdsResponse::__set_tblValidWriteIds(const std::vector<TableValidWriteIds> & val) {
   this->tblValidWriteIds = val;
@@ -24813,11 +27715,18 @@ uint32_t GetValidWriteIdsResponse::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(GetValidWriteIdsResponse &a, GetValidWriteIdsResponse &b) {
+void swap(GetValidWriteIdsResponse &a, GetValidWriteIdsResponse &b) noexcept {
   using ::std::swap;
   swap(a.tblValidWriteIds, b.tblValidWriteIds);
 }
 
+bool GetValidWriteIdsResponse::operator==(const GetValidWriteIdsResponse & rhs) const
+{
+  if (!(tblValidWriteIds == rhs.tblValidWriteIds))
+    return false;
+  return true;
+}
+
 GetValidWriteIdsResponse::GetValidWriteIdsResponse(const GetValidWriteIdsResponse& other955) {
   tblValidWriteIds = other955.tblValidWriteIds;
 }
@@ -24836,6 +27745,10 @@ void GetValidWriteIdsResponse::printTo(std::ostream& out) const {
 TxnToWriteId::~TxnToWriteId() noexcept {
 }
 
+TxnToWriteId::TxnToWriteId() noexcept
+   : txnId(0),
+     writeId(0) {
+}
 
 void TxnToWriteId::__set_txnId(const int64_t val) {
   this->txnId = val;
@@ -24924,12 +27837,21 @@ uint32_t TxnToWriteId::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(TxnToWriteId &a, TxnToWriteId &b) {
+void swap(TxnToWriteId &a, TxnToWriteId &b) noexcept {
   using ::std::swap;
   swap(a.txnId, b.txnId);
   swap(a.writeId, b.writeId);
 }
 
+bool TxnToWriteId::operator==(const TxnToWriteId & rhs) const
+{
+  if (!(txnId == rhs.txnId))
+    return false;
+  if (!(writeId == rhs.writeId))
+    return false;
+  return true;
+}
+
 TxnToWriteId::TxnToWriteId(const TxnToWriteId& other957) noexcept {
   txnId = other957.txnId;
   writeId = other957.writeId;
@@ -24951,6 +27873,12 @@ void TxnToWriteId::printTo(std::ostream& out) const {
 AllocateTableWriteIdsRequest::~AllocateTableWriteIdsRequest() noexcept {
 }
 
+AllocateTableWriteIdsRequest::AllocateTableWriteIdsRequest() noexcept
+   : dbName(),
+     tableName(),
+     replPolicy(),
+     reallocate(false) {
+}
 
 void AllocateTableWriteIdsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -25151,7 +28079,7 @@ uint32_t AllocateTableWriteIdsRequest::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(AllocateTableWriteIdsRequest &a, AllocateTableWriteIdsRequest &b) {
+void swap(AllocateTableWriteIdsRequest &a, AllocateTableWriteIdsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tableName, b.tableName);
@@ -25162,6 +28090,31 @@ void swap(AllocateTableWriteIdsRequest &a, AllocateTableWriteIdsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AllocateTableWriteIdsRequest::operator==(const AllocateTableWriteIdsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (__isset.txnIds != rhs.__isset.txnIds)
+    return false;
+  else if (__isset.txnIds && !(txnIds == rhs.txnIds))
+    return false;
+  if (__isset.replPolicy != rhs.__isset.replPolicy)
+    return false;
+  else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
+    return false;
+  if (__isset.srcTxnToWriteIdList != rhs.__isset.srcTxnToWriteIdList)
+    return false;
+  else if (__isset.srcTxnToWriteIdList && !(srcTxnToWriteIdList == rhs.srcTxnToWriteIdList))
+    return false;
+  if (__isset.reallocate != rhs.__isset.reallocate)
+    return false;
+  else if (__isset.reallocate && !(reallocate == rhs.reallocate))
+    return false;
+  return true;
+}
+
 AllocateTableWriteIdsRequest::AllocateTableWriteIdsRequest(const AllocateTableWriteIdsRequest& other971) {
   dbName = other971.dbName;
   tableName = other971.tableName;
@@ -25197,6 +28150,8 @@ void AllocateTableWriteIdsRequest::printTo(std::ostream& out) const {
 AllocateTableWriteIdsResponse::~AllocateTableWriteIdsResponse() noexcept {
 }
 
+AllocateTableWriteIdsResponse::AllocateTableWriteIdsResponse() noexcept {
+}
 
 void AllocateTableWriteIdsResponse::__set_txnToWriteIds(const std::vector<TxnToWriteId> & val) {
   this->txnToWriteIds = val;
@@ -25286,11 +28241,18 @@ uint32_t AllocateTableWriteIdsResponse::write(::apache::thrift::protocol::TProto
   return xfer;
 }
 
-void swap(AllocateTableWriteIdsResponse &a, AllocateTableWriteIdsResponse &b) {
+void swap(AllocateTableWriteIdsResponse &a, AllocateTableWriteIdsResponse &b) noexcept {
   using ::std::swap;
   swap(a.txnToWriteIds, b.txnToWriteIds);
 }
 
+bool AllocateTableWriteIdsResponse::operator==(const AllocateTableWriteIdsResponse & rhs) const
+{
+  if (!(txnToWriteIds == rhs.txnToWriteIds))
+    return false;
+  return true;
+}
+
 AllocateTableWriteIdsResponse::AllocateTableWriteIdsResponse(const AllocateTableWriteIdsResponse& other979) {
   txnToWriteIds = other979.txnToWriteIds;
 }
@@ -25309,6 +28271,10 @@ void AllocateTableWriteIdsResponse::printTo(std::ostream& out) const {
 MaxAllocatedTableWriteIdRequest::~MaxAllocatedTableWriteIdRequest() noexcept {
 }
 
+MaxAllocatedTableWriteIdRequest::MaxAllocatedTableWriteIdRequest() noexcept
+   : dbName(),
+     tableName() {
+}
 
 void MaxAllocatedTableWriteIdRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -25397,12 +28363,21 @@ uint32_t MaxAllocatedTableWriteIdRequest::write(::apache::thrift::protocol::TPro
   return xfer;
 }
 
-void swap(MaxAllocatedTableWriteIdRequest &a, MaxAllocatedTableWriteIdRequest &b) {
+void swap(MaxAllocatedTableWriteIdRequest &a, MaxAllocatedTableWriteIdRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tableName, b.tableName);
 }
 
+bool MaxAllocatedTableWriteIdRequest::operator==(const MaxAllocatedTableWriteIdRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  return true;
+}
+
 MaxAllocatedTableWriteIdRequest::MaxAllocatedTableWriteIdRequest(const MaxAllocatedTableWriteIdRequest& other981) {
   dbName = other981.dbName;
   tableName = other981.tableName;
@@ -25424,6 +28399,9 @@ void MaxAllocatedTableWriteIdRequest::printTo(std::ostream& out) const {
 MaxAllocatedTableWriteIdResponse::~MaxAllocatedTableWriteIdResponse() noexcept {
 }
 
+MaxAllocatedTableWriteIdResponse::MaxAllocatedTableWriteIdResponse() noexcept
+   : maxWriteId(0) {
+}
 
 void MaxAllocatedTableWriteIdResponse::__set_maxWriteId(const int64_t val) {
   this->maxWriteId = val;
@@ -25493,11 +28471,18 @@ uint32_t MaxAllocatedTableWriteIdResponse::write(::apache::thrift::protocol::TPr
   return xfer;
 }
 
-void swap(MaxAllocatedTableWriteIdResponse &a, MaxAllocatedTableWriteIdResponse &b) {
+void swap(MaxAllocatedTableWriteIdResponse &a, MaxAllocatedTableWriteIdResponse &b) noexcept {
   using ::std::swap;
   swap(a.maxWriteId, b.maxWriteId);
 }
 
+bool MaxAllocatedTableWriteIdResponse::operator==(const MaxAllocatedTableWriteIdResponse & rhs) const
+{
+  if (!(maxWriteId == rhs.maxWriteId))
+    return false;
+  return true;
+}
+
 MaxAllocatedTableWriteIdResponse::MaxAllocatedTableWriteIdResponse(const MaxAllocatedTableWriteIdResponse& other983) noexcept {
   maxWriteId = other983.maxWriteId;
 }
@@ -25516,6 +28501,11 @@ void MaxAllocatedTableWriteIdResponse::printTo(std::ostream& out) const {
 SeedTableWriteIdsRequest::~SeedTableWriteIdsRequest() noexcept {
 }
 
+SeedTableWriteIdsRequest::SeedTableWriteIdsRequest() noexcept
+   : dbName(),
+     tableName(),
+     seedWriteId(0) {
+}
 
 void SeedTableWriteIdsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -25623,13 +28613,24 @@ uint32_t SeedTableWriteIdsRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(SeedTableWriteIdsRequest &a, SeedTableWriteIdsRequest &b) {
+void swap(SeedTableWriteIdsRequest &a, SeedTableWriteIdsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tableName, b.tableName);
   swap(a.seedWriteId, b.seedWriteId);
 }
 
+bool SeedTableWriteIdsRequest::operator==(const SeedTableWriteIdsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(seedWriteId == rhs.seedWriteId))
+    return false;
+  return true;
+}
+
 SeedTableWriteIdsRequest::SeedTableWriteIdsRequest(const SeedTableWriteIdsRequest& other985) {
   dbName = other985.dbName;
   tableName = other985.tableName;
@@ -25654,6 +28655,9 @@ void SeedTableWriteIdsRequest::printTo(std::ostream& out) const {
 SeedTxnIdRequest::~SeedTxnIdRequest() noexcept {
 }
 
+SeedTxnIdRequest::SeedTxnIdRequest() noexcept
+   : seedTxnId(0) {
+}
 
 void SeedTxnIdRequest::__set_seedTxnId(const int64_t val) {
   this->seedTxnId = val;
@@ -25723,11 +28727,18 @@ uint32_t SeedTxnIdRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(SeedTxnIdRequest &a, SeedTxnIdRequest &b) {
+void swap(SeedTxnIdRequest &a, SeedTxnIdRequest &b) noexcept {
   using ::std::swap;
   swap(a.seedTxnId, b.seedTxnId);
 }
 
+bool SeedTxnIdRequest::operator==(const SeedTxnIdRequest & rhs) const
+{
+  if (!(seedTxnId == rhs.seedTxnId))
+    return false;
+  return true;
+}
+
 SeedTxnIdRequest::SeedTxnIdRequest(const SeedTxnIdRequest& other987) noexcept {
   seedTxnId = other987.seedTxnId;
 }
@@ -25746,6 +28757,16 @@ void SeedTxnIdRequest::printTo(std::ostream& out) const {
 LockComponent::~LockComponent() noexcept {
 }
 
+LockComponent::LockComponent() : type(static_cast<LockType::type>(0)),
+   level(static_cast<LockLevel::type>(0)),
+   dbname(),
+   tablename(),
+   partitionname(),
+   operationType(static_cast<DataOperationType::type>(5)),
+   isTransactional(false),
+   isDynamicPartitionWrite(false),
+   catName("hive") {
+}
 
 void LockComponent::__set_type(const LockType::type val) {
   this->type = val;
@@ -25967,7 +28988,7 @@ uint32_t LockComponent::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(LockComponent &a, LockComponent &b) {
+void swap(LockComponent &a, LockComponent &b) noexcept {
   using ::std::swap;
   swap(a.type, b.type);
   swap(a.level, b.level);
@@ -25981,6 +29002,41 @@ void swap(LockComponent &a, LockComponent &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool LockComponent::operator==(const LockComponent & rhs) const
+{
+  if (!(type == rhs.type))
+    return false;
+  if (!(level == rhs.level))
+    return false;
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (__isset.tablename != rhs.__isset.tablename)
+    return false;
+  else if (__isset.tablename && !(tablename == rhs.tablename))
+    return false;
+  if (__isset.partitionname != rhs.__isset.partitionname)
+    return false;
+  else if (__isset.partitionname && !(partitionname == rhs.partitionname))
+    return false;
+  if (__isset.operationType != rhs.__isset.operationType)
+    return false;
+  else if (__isset.operationType && !(operationType == rhs.operationType))
+    return false;
+  if (__isset.isTransactional != rhs.__isset.isTransactional)
+    return false;
+  else if (__isset.isTransactional && !(isTransactional == rhs.isTransactional))
+    return false;
+  if (__isset.isDynamicPartitionWrite != rhs.__isset.isDynamicPartitionWrite)
+    return false;
+  else if (__isset.isDynamicPartitionWrite && !(isDynamicPartitionWrite == rhs.isDynamicPartitionWrite))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 LockComponent::LockComponent(const LockComponent& other992) {
   type = other992.type;
   level = other992.level;
@@ -26025,6 +29081,14 @@ void LockComponent::printTo(std::ostream& out) const {
 LockRequest::~LockRequest() noexcept {
 }
 
+LockRequest::LockRequest() : txnid(0),
+   user(),
+   hostname(),
+   agentInfo("Unknown"),
+   zeroWaitReadEnabled(false),
+   exclusiveCTAS(false),
+   locklessReadsEnabled(false) {
+}
 
 void LockRequest::__set_component(const std::vector<LockComponent> & val) {
   this->component = val;
@@ -26242,7 +29306,7 @@ uint32_t LockRequest::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(LockRequest &a, LockRequest &b) {
+void swap(LockRequest &a, LockRequest &b) noexcept {
   using ::std::swap;
   swap(a.component, b.component);
   swap(a.txnid, b.txnid);
@@ -26255,6 +29319,37 @@ void swap(LockRequest &a, LockRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool LockRequest::operator==(const LockRequest & rhs) const
+{
+  if (!(component == rhs.component))
+    return false;
+  if (__isset.txnid != rhs.__isset.txnid)
+    return false;
+  else if (__isset.txnid && !(txnid == rhs.txnid))
+    return false;
+  if (!(user == rhs.user))
+    return false;
+  if (!(hostname == rhs.hostname))
+    return false;
+  if (__isset.agentInfo != rhs.__isset.agentInfo)
+    return false;
+  else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
+    return false;
+  if (__isset.zeroWaitReadEnabled != rhs.__isset.zeroWaitReadEnabled)
+    return false;
+  else if (__isset.zeroWaitReadEnabled && !(zeroWaitReadEnabled == rhs.zeroWaitReadEnabled))
+    return false;
+  if (__isset.exclusiveCTAS != rhs.__isset.exclusiveCTAS)
+    return false;
+  else if (__isset.exclusiveCTAS && !(exclusiveCTAS == rhs.exclusiveCTAS))
+    return false;
+  if (__isset.locklessReadsEnabled != rhs.__isset.locklessReadsEnabled)
+    return false;
+  else if (__isset.locklessReadsEnabled && !(locklessReadsEnabled == rhs.locklessReadsEnabled))
+    return false;
+  return true;
+}
+
 LockRequest::LockRequest(const LockRequest& other1000) {
   component = other1000.component;
   txnid = other1000.txnid;
@@ -26296,6 +29391,11 @@ void LockRequest::printTo(std::ostream& out) const {
 LockResponse::~LockResponse() noexcept {
 }
 
+LockResponse::LockResponse() noexcept
+   : lockid(0),
+     state(static_cast<LockState::type>(0)),
+     errorMessage() {
+}
 
 void LockResponse::__set_lockid(const int64_t val) {
   this->lockid = val;
@@ -26404,7 +29504,7 @@ uint32_t LockResponse::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(LockResponse &a, LockResponse &b) {
+void swap(LockResponse &a, LockResponse &b) noexcept {
   using ::std::swap;
   swap(a.lockid, b.lockid);
   swap(a.state, b.state);
@@ -26412,6 +29512,19 @@ void swap(LockResponse &a, LockResponse &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool LockResponse::operator==(const LockResponse & rhs) const
+{
+  if (!(lockid == rhs.lockid))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  if (__isset.errorMessage != rhs.__isset.errorMessage)
+    return false;
+  else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
+    return false;
+  return true;
+}
+
 LockResponse::LockResponse(const LockResponse& other1003) {
   lockid = other1003.lockid;
   state = other1003.state;
@@ -26438,6 +29551,11 @@ void LockResponse::printTo(std::ostream& out) const {
 CheckLockRequest::~CheckLockRequest() noexcept {
 }
 
+CheckLockRequest::CheckLockRequest() noexcept
+   : lockid(0),
+     txnid(0),
+     elapsed_ms(0) {
+}
 
 void CheckLockRequest::__set_lockid(const int64_t val) {
   this->lockid = val;
@@ -26543,7 +29661,7 @@ uint32_t CheckLockRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(CheckLockRequest &a, CheckLockRequest &b) {
+void swap(CheckLockRequest &a, CheckLockRequest &b) noexcept {
   using ::std::swap;
   swap(a.lockid, b.lockid);
   swap(a.txnid, b.txnid);
@@ -26551,6 +29669,21 @@ void swap(CheckLockRequest &a, CheckLockRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CheckLockRequest::operator==(const CheckLockRequest & rhs) const
+{
+  if (!(lockid == rhs.lockid))
+    return false;
+  if (__isset.txnid != rhs.__isset.txnid)
+    return false;
+  else if (__isset.txnid && !(txnid == rhs.txnid))
+    return false;
+  if (__isset.elapsed_ms != rhs.__isset.elapsed_ms)
+    return false;
+  else if (__isset.elapsed_ms && !(elapsed_ms == rhs.elapsed_ms))
+    return false;
+  return true;
+}
+
 CheckLockRequest::CheckLockRequest(const CheckLockRequest& other1005) noexcept {
   lockid = other1005.lockid;
   txnid = other1005.txnid;
@@ -26577,6 +29710,9 @@ void CheckLockRequest::printTo(std::ostream& out) const {
 UnlockRequest::~UnlockRequest() noexcept {
 }
 
+UnlockRequest::UnlockRequest() noexcept
+   : lockid(0) {
+}
 
 void UnlockRequest::__set_lockid(const int64_t val) {
   this->lockid = val;
@@ -26646,11 +29782,18 @@ uint32_t UnlockRequest::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(UnlockRequest &a, UnlockRequest &b) {
+void swap(UnlockRequest &a, UnlockRequest &b) noexcept {
   using ::std::swap;
   swap(a.lockid, b.lockid);
 }
 
+bool UnlockRequest::operator==(const UnlockRequest & rhs) const
+{
+  if (!(lockid == rhs.lockid))
+    return false;
+  return true;
+}
+
 UnlockRequest::UnlockRequest(const UnlockRequest& other1007) noexcept {
   lockid = other1007.lockid;
 }
@@ -26669,6 +29812,13 @@ void UnlockRequest::printTo(std::ostream& out) const {
 ShowLocksRequest::~ShowLocksRequest() noexcept {
 }
 
+ShowLocksRequest::ShowLocksRequest() : dbname(),
+   tablename(),
+   partname(),
+   isExtended(false),
+   txnid(0),
+   catname("hive") {
+}
 
 void ShowLocksRequest::__set_dbname(const std::string& val) {
   this->dbname = val;
@@ -26827,7 +29977,7 @@ uint32_t ShowLocksRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(ShowLocksRequest &a, ShowLocksRequest &b) {
+void swap(ShowLocksRequest &a, ShowLocksRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbname, b.dbname);
   swap(a.tablename, b.tablename);
@@ -26838,6 +29988,35 @@ void swap(ShowLocksRequest &a, ShowLocksRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ShowLocksRequest::operator==(const ShowLocksRequest & rhs) const
+{
+  if (__isset.dbname != rhs.__isset.dbname)
+    return false;
+  else if (__isset.dbname && !(dbname == rhs.dbname))
+    return false;
+  if (__isset.tablename != rhs.__isset.tablename)
+    return false;
+  else if (__isset.tablename && !(tablename == rhs.tablename))
+    return false;
+  if (__isset.partname != rhs.__isset.partname)
+    return false;
+  else if (__isset.partname && !(partname == rhs.partname))
+    return false;
+  if (__isset.isExtended != rhs.__isset.isExtended)
+    return false;
+  else if (__isset.isExtended && !(isExtended == rhs.isExtended))
+    return false;
+  if (__isset.txnid != rhs.__isset.txnid)
+    return false;
+  else if (__isset.txnid && !(txnid == rhs.txnid))
+    return false;
+  if (__isset.catname != rhs.__isset.catname)
+    return false;
+  else if (__isset.catname && !(catname == rhs.catname))
+    return false;
+  return true;
+}
+
 ShowLocksRequest::ShowLocksRequest(const ShowLocksRequest& other1009) {
   dbname = other1009.dbname;
   tablename = other1009.tablename;
@@ -26873,6 +30052,25 @@ void ShowLocksRequest::printTo(std::ostream& out) const {
 ShowLocksResponseElement::~ShowLocksResponseElement() noexcept {
 }
 
+ShowLocksResponseElement::ShowLocksResponseElement() noexcept
+   : lockid(0),
+     dbname(),
+     tablename(),
+     partname(),
+     state(static_cast<LockState::type>(0)),
+     type(static_cast<LockType::type>(0)),
+     txnid(0),
+     lastheartbeat(0),
+     acquiredat(0),
+     user(),
+     hostname(),
+     heartbeatCount(0),
+     agentInfo(),
+     blockedByExtId(0),
+     blockedByIntId(0),
+     lockIdInternal(0),
+     catname() {
+}
 
 void ShowLocksResponseElement::__set_lockid(const int64_t val) {
   this->lockid = val;
@@ -27241,7 +30439,7 @@ uint32_t ShowLocksResponseElement::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(ShowLocksResponseElement &a, ShowLocksResponseElement &b) {
+void swap(ShowLocksResponseElement &a, ShowLocksResponseElement &b) noexcept {
   using ::std::swap;
   swap(a.lockid, b.lockid);
   swap(a.dbname, b.dbname);
@@ -27263,6 +30461,63 @@ void swap(ShowLocksResponseElement &a, ShowLocksResponseElement &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ShowLocksResponseElement::operator==(const ShowLocksResponseElement & rhs) const
+{
+  if (!(lockid == rhs.lockid))
+    return false;
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (__isset.tablename != rhs.__isset.tablename)
+    return false;
+  else if (__isset.tablename && !(tablename == rhs.tablename))
+    return false;
+  if (__isset.partname != rhs.__isset.partname)
+    return false;
+  else if (__isset.partname && !(partname == rhs.partname))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (__isset.txnid != rhs.__isset.txnid)
+    return false;
+  else if (__isset.txnid && !(txnid == rhs.txnid))
+    return false;
+  if (!(lastheartbeat == rhs.lastheartbeat))
+    return false;
+  if (__isset.acquiredat != rhs.__isset.acquiredat)
+    return false;
+  else if (__isset.acquiredat && !(acquiredat == rhs.acquiredat))
+    return false;
+  if (!(user == rhs.user))
+    return false;
+  if (!(hostname == rhs.hostname))
+    return false;
+  if (__isset.heartbeatCount != rhs.__isset.heartbeatCount)
+    return false;
+  else if (__isset.heartbeatCount && !(heartbeatCount == rhs.heartbeatCount))
+    return false;
+  if (__isset.agentInfo != rhs.__isset.agentInfo)
+    return false;
+  else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
+    return false;
+  if (__isset.blockedByExtId != rhs.__isset.blockedByExtId)
+    return false;
+  else if (__isset.blockedByExtId && !(blockedByExtId == rhs.blockedByExtId))
+    return false;
+  if (__isset.blockedByIntId != rhs.__isset.blockedByIntId)
+    return false;
+  else if (__isset.blockedByIntId && !(blockedByIntId == rhs.blockedByIntId))
+    return false;
+  if (__isset.lockIdInternal != rhs.__isset.lockIdInternal)
+    return false;
+  else if (__isset.lockIdInternal && !(lockIdInternal == rhs.lockIdInternal))
+    return false;
+  if (!(catname == rhs.catname))
+    return false;
+  return true;
+}
+
 ShowLocksResponseElement::ShowLocksResponseElement(const ShowLocksResponseElement& other1013) {
   lockid = other1013.lockid;
   dbname = other1013.dbname;
@@ -27331,6 +30586,12 @@ void ShowLocksResponseElement::printTo(std::ostream& out) const {
 LockMaterializationRebuildRequest::~LockMaterializationRebuildRequest() noexcept {
 }
 
+LockMaterializationRebuildRequest::LockMaterializationRebuildRequest() noexcept
+   : catName(),
+     dbName(),
+     tableName(),
+     txnId(0) {
+}
 
 void LockMaterializationRebuildRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -27457,7 +30718,7 @@ uint32_t LockMaterializationRebuildRequest::write(::apache::thrift::protocol::TP
   return xfer;
 }
 
-void swap(LockMaterializationRebuildRequest &a, LockMaterializationRebuildRequest &b) {
+void swap(LockMaterializationRebuildRequest &a, LockMaterializationRebuildRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -27465,6 +30726,19 @@ void swap(LockMaterializationRebuildRequest &a, LockMaterializationRebuildReques
   swap(a.txnId, b.txnId);
 }
 
+bool LockMaterializationRebuildRequest::operator==(const LockMaterializationRebuildRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(txnId == rhs.txnId))
+    return false;
+  return true;
+}
+
 LockMaterializationRebuildRequest::LockMaterializationRebuildRequest(const LockMaterializationRebuildRequest& other1015) {
   catName = other1015.catName;
   dbName = other1015.dbName;
@@ -27492,6 +30766,8 @@ void LockMaterializationRebuildRequest::printTo(std::ostream& out) const {
 ShowLocksResponse::~ShowLocksResponse() noexcept {
 }
 
+ShowLocksResponse::ShowLocksResponse() noexcept {
+}
 
 void ShowLocksResponse::__set_locks(const std::vector<ShowLocksResponseElement> & val) {
   this->locks = val;
@@ -27578,12 +30854,19 @@ uint32_t ShowLocksResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ShowLocksResponse &a, ShowLocksResponse &b) {
+void swap(ShowLocksResponse &a, ShowLocksResponse &b) noexcept {
   using ::std::swap;
   swap(a.locks, b.locks);
   swap(a.__isset, b.__isset);
 }
 
+bool ShowLocksResponse::operator==(const ShowLocksResponse & rhs) const
+{
+  if (!(locks == rhs.locks))
+    return false;
+  return true;
+}
+
 ShowLocksResponse::ShowLocksResponse(const ShowLocksResponse& other1023) {
   locks = other1023.locks;
   __isset = other1023.__isset;
@@ -27604,6 +30887,10 @@ void ShowLocksResponse::printTo(std::ostream& out) const {
 HeartbeatRequest::~HeartbeatRequest() noexcept {
 }
 
+HeartbeatRequest::HeartbeatRequest() noexcept
+   : lockid(0),
+     txnid(0) {
+}
 
 void HeartbeatRequest::__set_lockid(const int64_t val) {
   this->lockid = val;
@@ -27690,13 +30977,26 @@ uint32_t HeartbeatRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(HeartbeatRequest &a, HeartbeatRequest &b) {
+void swap(HeartbeatRequest &a, HeartbeatRequest &b) noexcept {
   using ::std::swap;
   swap(a.lockid, b.lockid);
   swap(a.txnid, b.txnid);
   swap(a.__isset, b.__isset);
 }
 
+bool HeartbeatRequest::operator==(const HeartbeatRequest & rhs) const
+{
+  if (__isset.lockid != rhs.__isset.lockid)
+    return false;
+  else if (__isset.lockid && !(lockid == rhs.lockid))
+    return false;
+  if (__isset.txnid != rhs.__isset.txnid)
+    return false;
+  else if (__isset.txnid && !(txnid == rhs.txnid))
+    return false;
+  return true;
+}
+
 HeartbeatRequest::HeartbeatRequest(const HeartbeatRequest& other1025) noexcept {
   lockid = other1025.lockid;
   txnid = other1025.txnid;
@@ -27720,6 +31020,10 @@ void HeartbeatRequest::printTo(std::ostream& out) const {
 HeartbeatTxnRangeRequest::~HeartbeatTxnRangeRequest() noexcept {
 }
 
+HeartbeatTxnRangeRequest::HeartbeatTxnRangeRequest() noexcept
+   : min(0),
+     max(0) {
+}
 
 void HeartbeatTxnRangeRequest::__set_min(const int64_t val) {
   this->min = val;
@@ -27808,12 +31112,21 @@ uint32_t HeartbeatTxnRangeRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(HeartbeatTxnRangeRequest &a, HeartbeatTxnRangeRequest &b) {
+void swap(HeartbeatTxnRangeRequest &a, HeartbeatTxnRangeRequest &b) noexcept {
   using ::std::swap;
   swap(a.min, b.min);
   swap(a.max, b.max);
 }
 
+bool HeartbeatTxnRangeRequest::operator==(const HeartbeatTxnRangeRequest & rhs) const
+{
+  if (!(min == rhs.min))
+    return false;
+  if (!(max == rhs.max))
+    return false;
+  return true;
+}
+
 HeartbeatTxnRangeRequest::HeartbeatTxnRangeRequest(const HeartbeatTxnRangeRequest& other1027) noexcept {
   min = other1027.min;
   max = other1027.max;
@@ -27835,6 +31148,8 @@ void HeartbeatTxnRangeRequest::printTo(std::ostream& out) const {
 HeartbeatTxnRangeResponse::~HeartbeatTxnRangeResponse() noexcept {
 }
 
+HeartbeatTxnRangeResponse::HeartbeatTxnRangeResponse() noexcept {
+}
 
 void HeartbeatTxnRangeResponse::__set_aborted(const std::set<int64_t> & val) {
   this->aborted = val;
@@ -27965,12 +31280,21 @@ uint32_t HeartbeatTxnRangeResponse::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(HeartbeatTxnRangeResponse &a, HeartbeatTxnRangeResponse &b) {
+void swap(HeartbeatTxnRangeResponse &a, HeartbeatTxnRangeResponse &b) noexcept {
   using ::std::swap;
   swap(a.aborted, b.aborted);
   swap(a.nosuch, b.nosuch);
 }
 
+bool HeartbeatTxnRangeResponse::operator==(const HeartbeatTxnRangeResponse & rhs) const
+{
+  if (!(aborted == rhs.aborted))
+    return false;
+  if (!(nosuch == rhs.nosuch))
+    return false;
+  return true;
+}
+
 HeartbeatTxnRangeResponse::HeartbeatTxnRangeResponse(const HeartbeatTxnRangeResponse& other1043) {
   aborted = other1043.aborted;
   nosuch = other1043.nosuch;
@@ -27992,6 +31316,18 @@ void HeartbeatTxnRangeResponse::printTo(std::ostream& out) const {
 CompactionRequest::~CompactionRequest() noexcept {
 }
 
+CompactionRequest::CompactionRequest() noexcept
+   : dbname(),
+     tablename(),
+     partitionname(),
+     type(static_cast<CompactionType::type>(0)),
+     runas(),
+     initiatorId(),
+     initiatorVersion(),
+     poolName(),
+     numberOfBuckets(0),
+     orderByClause() {
+}
 
 void CompactionRequest::__set_dbname(const std::string& val) {
   this->dbname = val;
@@ -28269,7 +31605,7 @@ uint32_t CompactionRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(CompactionRequest &a, CompactionRequest &b) {
+void swap(CompactionRequest &a, CompactionRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbname, b.dbname);
   swap(a.tablename, b.tablename);
@@ -28285,6 +31621,49 @@ void swap(CompactionRequest &a, CompactionRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionRequest::operator==(const CompactionRequest & rhs) const
+{
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tablename == rhs.tablename))
+    return false;
+  if (__isset.partitionname != rhs.__isset.partitionname)
+    return false;
+  else if (__isset.partitionname && !(partitionname == rhs.partitionname))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (__isset.runas != rhs.__isset.runas)
+    return false;
+  else if (__isset.runas && !(runas == rhs.runas))
+    return false;
+  if (__isset.properties != rhs.__isset.properties)
+    return false;
+  else if (__isset.properties && !(properties == rhs.properties))
+    return false;
+  if (__isset.initiatorId != rhs.__isset.initiatorId)
+    return false;
+  else if (__isset.initiatorId && !(initiatorId == rhs.initiatorId))
+    return false;
+  if (__isset.initiatorVersion != rhs.__isset.initiatorVersion)
+    return false;
+  else if (__isset.initiatorVersion && !(initiatorVersion == rhs.initiatorVersion))
+    return false;
+  if (__isset.poolName != rhs.__isset.poolName)
+    return false;
+  else if (__isset.poolName && !(poolName == rhs.poolName))
+    return false;
+  if (__isset.numberOfBuckets != rhs.__isset.numberOfBuckets)
+    return false;
+  else if (__isset.numberOfBuckets && !(numberOfBuckets == rhs.numberOfBuckets))
+    return false;
+  if (__isset.orderByClause != rhs.__isset.orderByClause)
+    return false;
+  else if (__isset.orderByClause && !(orderByClause == rhs.orderByClause))
+    return false;
+  return true;
+}
+
 CompactionRequest::CompactionRequest(const CompactionRequest& other1054) {
   dbname = other1054.dbname;
   tablename = other1054.tablename;
@@ -28335,6 +31714,27 @@ void CompactionRequest::printTo(std::ostream& out) const {
 CompactionInfoStruct::~CompactionInfoStruct() noexcept {
 }
 
+CompactionInfoStruct::CompactionInfoStruct() noexcept
+   : id(0),
+     dbname(),
+     tablename(),
+     partitionname(),
+     type(static_cast<CompactionType::type>(0)),
+     runas(),
+     properties(),
+     toomanyaborts(0),
+     state(),
+     workerId(),
+     start(0),
+     highestWriteId(0),
+     errorMessage(),
+     hasoldabort(0),
+     enqueueTime(0),
+     retryRetention(0),
+     poolname(),
+     numberOfBuckets(0),
+     orderByClause() {
+}
 
 void CompactionInfoStruct::__set_id(const int64_t val) {
   this->id = val;
@@ -28733,7 +32133,7 @@ uint32_t CompactionInfoStruct::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(CompactionInfoStruct &a, CompactionInfoStruct &b) {
+void swap(CompactionInfoStruct &a, CompactionInfoStruct &b) noexcept {
   using ::std::swap;
   swap(a.id, b.id);
   swap(a.dbname, b.dbname);
@@ -28757,6 +32157,79 @@ void swap(CompactionInfoStruct &a, CompactionInfoStruct &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionInfoStruct::operator==(const CompactionInfoStruct & rhs) const
+{
+  if (!(id == rhs.id))
+    return false;
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tablename == rhs.tablename))
+    return false;
+  if (__isset.partitionname != rhs.__isset.partitionname)
+    return false;
+  else if (__isset.partitionname && !(partitionname == rhs.partitionname))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (__isset.runas != rhs.__isset.runas)
+    return false;
+  else if (__isset.runas && !(runas == rhs.runas))
+    return false;
+  if (__isset.properties != rhs.__isset.properties)
+    return false;
+  else if (__isset.properties && !(properties == rhs.properties))
+    return false;
+  if (__isset.toomanyaborts != rhs.__isset.toomanyaborts)
+    return false;
+  else if (__isset.toomanyaborts && !(toomanyaborts == rhs.toomanyaborts))
+    return false;
+  if (__isset.state != rhs.__isset.state)
+    return false;
+  else if (__isset.state && !(state == rhs.state))
+    return false;
+  if (__isset.workerId != rhs.__isset.workerId)
+    return false;
+  else if (__isset.workerId && !(workerId == rhs.workerId))
+    return false;
+  if (__isset.start != rhs.__isset.start)
+    return false;
+  else if (__isset.start && !(start == rhs.start))
+    return false;
+  if (__isset.highestWriteId != rhs.__isset.highestWriteId)
+    return false;
+  else if (__isset.highestWriteId && !(highestWriteId == rhs.highestWriteId))
+    return false;
+  if (__isset.errorMessage != rhs.__isset.errorMessage)
+    return false;
+  else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
+    return false;
+  if (__isset.hasoldabort != rhs.__isset.hasoldabort)
+    return false;
+  else if (__isset.hasoldabort && !(hasoldabort == rhs.hasoldabort))
+    return false;
+  if (__isset.enqueueTime != rhs.__isset.enqueueTime)
+    return false;
+  else if (__isset.enqueueTime && !(enqueueTime == rhs.enqueueTime))
+    return false;
+  if (__isset.retryRetention != rhs.__isset.retryRetention)
+    return false;
+  else if (__isset.retryRetention && !(retryRetention == rhs.retryRetention))
+    return false;
+  if (__isset.poolname != rhs.__isset.poolname)
+    return false;
+  else if (__isset.poolname && !(poolname == rhs.poolname))
+    return false;
+  if (__isset.numberOfBuckets != rhs.__isset.numberOfBuckets)
+    return false;
+  else if (__isset.numberOfBuckets && !(numberOfBuckets == rhs.numberOfBuckets))
+    return false;
+  if (__isset.orderByClause != rhs.__isset.orderByClause)
+    return false;
+  else if (__isset.orderByClause && !(orderByClause == rhs.orderByClause))
+    return false;
+  return true;
+}
+
 CompactionInfoStruct::CompactionInfoStruct(const CompactionInfoStruct& other1057) {
   id = other1057.id;
   dbname = other1057.dbname;
@@ -28831,6 +32304,8 @@ void CompactionInfoStruct::printTo(std::ostream& out) const {
 OptionalCompactionInfoStruct::~OptionalCompactionInfoStruct() noexcept {
 }
 
+OptionalCompactionInfoStruct::OptionalCompactionInfoStruct() noexcept {
+}
 
 void OptionalCompactionInfoStruct::__set_ci(const CompactionInfoStruct& val) {
   this->ci = val;
@@ -28899,12 +32374,21 @@ uint32_t OptionalCompactionInfoStruct::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(OptionalCompactionInfoStruct &a, OptionalCompactionInfoStruct &b) {
+void swap(OptionalCompactionInfoStruct &a, OptionalCompactionInfoStruct &b) noexcept {
   using ::std::swap;
   swap(a.ci, b.ci);
   swap(a.__isset, b.__isset);
 }
 
+bool OptionalCompactionInfoStruct::operator==(const OptionalCompactionInfoStruct & rhs) const
+{
+  if (__isset.ci != rhs.__isset.ci)
+    return false;
+  else if (__isset.ci && !(ci == rhs.ci))
+    return false;
+  return true;
+}
+
 OptionalCompactionInfoStruct::OptionalCompactionInfoStruct(const OptionalCompactionInfoStruct& other1059) {
   ci = other1059.ci;
   __isset = other1059.__isset;
@@ -28925,6 +32409,15 @@ void OptionalCompactionInfoStruct::printTo(std::ostream& out) const {
 CompactionMetricsDataStruct::~CompactionMetricsDataStruct() noexcept {
 }
 
+CompactionMetricsDataStruct::CompactionMetricsDataStruct() noexcept
+   : dbname(),
+     tblname(),
+     partitionname(),
+     type(static_cast<CompactionMetricsMetricType::type>(0)),
+     metricvalue(0),
+     version(0),
+     threshold(0) {
+}
 
 void CompactionMetricsDataStruct::__set_dbname(const std::string& val) {
   this->dbname = val;
@@ -29109,7 +32602,7 @@ uint32_t CompactionMetricsDataStruct::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(CompactionMetricsDataStruct &a, CompactionMetricsDataStruct &b) {
+void swap(CompactionMetricsDataStruct &a, CompactionMetricsDataStruct &b) noexcept {
   using ::std::swap;
   swap(a.dbname, b.dbname);
   swap(a.tblname, b.tblname);
@@ -29121,6 +32614,27 @@ void swap(CompactionMetricsDataStruct &a, CompactionMetricsDataStruct &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionMetricsDataStruct::operator==(const CompactionMetricsDataStruct & rhs) const
+{
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tblname == rhs.tblname))
+    return false;
+  if (__isset.partitionname != rhs.__isset.partitionname)
+    return false;
+  else if (__isset.partitionname && !(partitionname == rhs.partitionname))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (!(metricvalue == rhs.metricvalue))
+    return false;
+  if (!(version == rhs.version))
+    return false;
+  if (!(threshold == rhs.threshold))
+    return false;
+  return true;
+}
+
 CompactionMetricsDataStruct::CompactionMetricsDataStruct(const CompactionMetricsDataStruct& other1062) {
   dbname = other1062.dbname;
   tblname = other1062.tblname;
@@ -29159,6 +32673,8 @@ void CompactionMetricsDataStruct::printTo(std::ostream& out) const {
 CompactionMetricsDataResponse::~CompactionMetricsDataResponse() noexcept {
 }
 
+CompactionMetricsDataResponse::CompactionMetricsDataResponse() noexcept {
+}
 
 void CompactionMetricsDataResponse::__set_data(const CompactionMetricsDataStruct& val) {
   this->data = val;
@@ -29227,12 +32743,21 @@ uint32_t CompactionMetricsDataResponse::write(::apache::thrift::protocol::TProto
   return xfer;
 }
 
-void swap(CompactionMetricsDataResponse &a, CompactionMetricsDataResponse &b) {
+void swap(CompactionMetricsDataResponse &a, CompactionMetricsDataResponse &b) noexcept {
   using ::std::swap;
   swap(a.data, b.data);
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionMetricsDataResponse::operator==(const CompactionMetricsDataResponse & rhs) const
+{
+  if (__isset.data != rhs.__isset.data)
+    return false;
+  else if (__isset.data && !(data == rhs.data))
+    return false;
+  return true;
+}
+
 CompactionMetricsDataResponse::CompactionMetricsDataResponse(const CompactionMetricsDataResponse& other1064) {
   data = other1064.data;
   __isset = other1064.__isset;
@@ -29253,6 +32778,12 @@ void CompactionMetricsDataResponse::printTo(std::ostream& out) const {
 CompactionMetricsDataRequest::~CompactionMetricsDataRequest() noexcept {
 }
 
+CompactionMetricsDataRequest::CompactionMetricsDataRequest() noexcept
+   : dbName(),
+     tblName(),
+     partitionName(),
+     type(static_cast<CompactionMetricsMetricType::type>(0)) {
+}
 
 void CompactionMetricsDataRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -29380,7 +32911,7 @@ uint32_t CompactionMetricsDataRequest::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(CompactionMetricsDataRequest &a, CompactionMetricsDataRequest &b) {
+void swap(CompactionMetricsDataRequest &a, CompactionMetricsDataRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -29389,6 +32920,21 @@ void swap(CompactionMetricsDataRequest &a, CompactionMetricsDataRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionMetricsDataRequest::operator==(const CompactionMetricsDataRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.partitionName != rhs.__isset.partitionName)
+    return false;
+  else if (__isset.partitionName && !(partitionName == rhs.partitionName))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  return true;
+}
+
 CompactionMetricsDataRequest::CompactionMetricsDataRequest(const CompactionMetricsDataRequest& other1067) {
   dbName = other1067.dbName;
   tblName = other1067.tblName;
@@ -29418,6 +32964,12 @@ void CompactionMetricsDataRequest::printTo(std::ostream& out) const {
 CompactionResponse::~CompactionResponse() noexcept {
 }
 
+CompactionResponse::CompactionResponse() noexcept
+   : id(0),
+     state(),
+     accepted(0),
+     errormessage() {
+}
 
 void CompactionResponse::__set_id(const int64_t val) {
   this->id = val;
@@ -29543,7 +33095,7 @@ uint32_t CompactionResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(CompactionResponse &a, CompactionResponse &b) {
+void swap(CompactionResponse &a, CompactionResponse &b) noexcept {
   using ::std::swap;
   swap(a.id, b.id);
   swap(a.state, b.state);
@@ -29552,6 +33104,21 @@ void swap(CompactionResponse &a, CompactionResponse &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionResponse::operator==(const CompactionResponse & rhs) const
+{
+  if (!(id == rhs.id))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  if (!(accepted == rhs.accepted))
+    return false;
+  if (__isset.errormessage != rhs.__isset.errormessage)
+    return false;
+  else if (__isset.errormessage && !(errormessage == rhs.errormessage))
+    return false;
+  return true;
+}
+
 CompactionResponse::CompactionResponse(const CompactionResponse& other1069) {
   id = other1069.id;
   state = other1069.state;
@@ -29581,6 +33148,17 @@ void CompactionResponse::printTo(std::ostream& out) const {
 ShowCompactRequest::~ShowCompactRequest() noexcept {
 }
 
+ShowCompactRequest::ShowCompactRequest() noexcept
+   : id(0),
+     poolName(),
+     dbName(),
+     tbName(),
+     partName(),
+     type(static_cast<CompactionType::type>(0)),
+     state(),
+     limit(0),
+     order() {
+}
 
 void ShowCompactRequest::__set_id(const int64_t val) {
   this->id = val;
@@ -29795,7 +33373,7 @@ uint32_t ShowCompactRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ShowCompactRequest &a, ShowCompactRequest &b) {
+void swap(ShowCompactRequest &a, ShowCompactRequest &b) noexcept {
   using ::std::swap;
   swap(a.id, b.id);
   swap(a.poolName, b.poolName);
@@ -29809,6 +33387,47 @@ void swap(ShowCompactRequest &a, ShowCompactRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ShowCompactRequest::operator==(const ShowCompactRequest & rhs) const
+{
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.poolName != rhs.__isset.poolName)
+    return false;
+  else if (__isset.poolName && !(poolName == rhs.poolName))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  if (__isset.tbName != rhs.__isset.tbName)
+    return false;
+  else if (__isset.tbName && !(tbName == rhs.tbName))
+    return false;
+  if (__isset.partName != rhs.__isset.partName)
+    return false;
+  else if (__isset.partName && !(partName == rhs.partName))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  if (__isset.state != rhs.__isset.state)
+    return false;
+  else if (__isset.state && !(state == rhs.state))
+    return false;
+  if (__isset.limit != rhs.__isset.limit)
+    return false;
+  else if (__isset.limit && !(limit == rhs.limit))
+    return false;
+  if (__isset.order != rhs.__isset.order)
+    return false;
+  else if (__isset.order && !(order == rhs.order))
+    return false;
+  return true;
+}
+
 ShowCompactRequest::ShowCompactRequest(const ShowCompactRequest& other1072) {
   id = other1072.id;
   poolName = other1072.poolName;
@@ -29853,6 +33472,31 @@ void ShowCompactRequest::printTo(std::ostream& out) const {
 ShowCompactResponseElement::~ShowCompactResponseElement() noexcept {
 }
 
+ShowCompactResponseElement::ShowCompactResponseElement() : dbname(),
+   tablename(),
+   partitionname(),
+   type(static_cast<CompactionType::type>(0)),
+   state(),
+   workerid(),
+   start(0),
+   runAs(),
+   hightestTxnId(0),
+   metaInfo(),
+   endTime(0),
+   hadoopJobId("None"),
+   id(0),
+   errorMessage(),
+   enqueueTime(0),
+   workerVersion(),
+   initiatorId(),
+   initiatorVersion(),
+   cleanerStart(0),
+   poolName(),
+   nextTxnId(0),
+   txnId(0),
+   commitTime(0),
+   hightestWriteId(0) {
+}
 
 void ShowCompactResponseElement::__set_dbname(const std::string& val) {
   this->dbname = val;
@@ -30341,7 +33985,7 @@ uint32_t ShowCompactResponseElement::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(ShowCompactResponseElement &a, ShowCompactResponseElement &b) {
+void swap(ShowCompactResponseElement &a, ShowCompactResponseElement &b) noexcept {
   using ::std::swap;
   swap(a.dbname, b.dbname);
   swap(a.tablename, b.tablename);
@@ -30370,6 +34014,99 @@ void swap(ShowCompactResponseElement &a, ShowCompactResponseElement &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ShowCompactResponseElement::operator==(const ShowCompactResponseElement & rhs) const
+{
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tablename == rhs.tablename))
+    return false;
+  if (__isset.partitionname != rhs.__isset.partitionname)
+    return false;
+  else if (__isset.partitionname && !(partitionname == rhs.partitionname))
+    return false;
+  if (!(type == rhs.type))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  if (__isset.workerid != rhs.__isset.workerid)
+    return false;
+  else if (__isset.workerid && !(workerid == rhs.workerid))
+    return false;
+  if (__isset.start != rhs.__isset.start)
+    return false;
+  else if (__isset.start && !(start == rhs.start))
+    return false;
+  if (__isset.runAs != rhs.__isset.runAs)
+    return false;
+  else if (__isset.runAs && !(runAs == rhs.runAs))
+    return false;
+  if (__isset.hightestTxnId != rhs.__isset.hightestTxnId)
+    return false;
+  else if (__isset.hightestTxnId && !(hightestTxnId == rhs.hightestTxnId))
+    return false;
+  if (__isset.metaInfo != rhs.__isset.metaInfo)
+    return false;
+  else if (__isset.metaInfo && !(metaInfo == rhs.metaInfo))
+    return false;
+  if (__isset.endTime != rhs.__isset.endTime)
+    return false;
+  else if (__isset.endTime && !(endTime == rhs.endTime))
+    return false;
+  if (__isset.hadoopJobId != rhs.__isset.hadoopJobId)
+    return false;
+  else if (__isset.hadoopJobId && !(hadoopJobId == rhs.hadoopJobId))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.errorMessage != rhs.__isset.errorMessage)
+    return false;
+  else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
+    return false;
+  if (__isset.enqueueTime != rhs.__isset.enqueueTime)
+    return false;
+  else if (__isset.enqueueTime && !(enqueueTime == rhs.enqueueTime))
+    return false;
+  if (__isset.workerVersion != rhs.__isset.workerVersion)
+    return false;
+  else if (__isset.workerVersion && !(workerVersion == rhs.workerVersion))
+    return false;
+  if (__isset.initiatorId != rhs.__isset.initiatorId)
+    return false;
+  else if (__isset.initiatorId && !(initiatorId == rhs.initiatorId))
+    return false;
+  if (__isset.initiatorVersion != rhs.__isset.initiatorVersion)
+    return false;
+  else if (__isset.initiatorVersion && !(initiatorVersion == rhs.initiatorVersion))
+    return false;
+  if (__isset.cleanerStart != rhs.__isset.cleanerStart)
+    return false;
+  else if (__isset.cleanerStart && !(cleanerStart == rhs.cleanerStart))
+    return false;
+  if (__isset.poolName != rhs.__isset.poolName)
+    return false;
+  else if (__isset.poolName && !(poolName == rhs.poolName))
+    return false;
+  if (__isset.nextTxnId != rhs.__isset.nextTxnId)
+    return false;
+  else if (__isset.nextTxnId && !(nextTxnId == rhs.nextTxnId))
+    return false;
+  if (__isset.txnId != rhs.__isset.txnId)
+    return false;
+  else if (__isset.txnId && !(txnId == rhs.txnId))
+    return false;
+  if (__isset.commitTime != rhs.__isset.commitTime)
+    return false;
+  else if (__isset.commitTime && !(commitTime == rhs.commitTime))
+    return false;
+  if (__isset.hightestWriteId != rhs.__isset.hightestWriteId)
+    return false;
+  else if (__isset.hightestWriteId && !(hightestWriteId == rhs.hightestWriteId))
+    return false;
+  return true;
+}
+
 ShowCompactResponseElement::ShowCompactResponseElement(const ShowCompactResponseElement& other1075) {
   dbname = other1075.dbname;
   tablename = other1075.tablename;
@@ -30459,6 +34196,8 @@ void ShowCompactResponseElement::printTo(std::ostream& out) const {
 ShowCompactResponse::~ShowCompactResponse() noexcept {
 }
 
+ShowCompactResponse::ShowCompactResponse() noexcept {
+}
 
 void ShowCompactResponse::__set_compacts(const std::vector<ShowCompactResponseElement> & val) {
   this->compacts = val;
@@ -30548,11 +34287,18 @@ uint32_t ShowCompactResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(ShowCompactResponse &a, ShowCompactResponse &b) {
+void swap(ShowCompactResponse &a, ShowCompactResponse &b) noexcept {
   using ::std::swap;
   swap(a.compacts, b.compacts);
 }
 
+bool ShowCompactResponse::operator==(const ShowCompactResponse & rhs) const
+{
+  if (!(compacts == rhs.compacts))
+    return false;
+  return true;
+}
+
 ShowCompactResponse::ShowCompactResponse(const ShowCompactResponse& other1083) {
   compacts = other1083.compacts;
 }
@@ -30571,6 +34317,10 @@ void ShowCompactResponse::printTo(std::ostream& out) const {
 AbortCompactionRequest::~AbortCompactionRequest() noexcept {
 }
 
+AbortCompactionRequest::AbortCompactionRequest() noexcept
+   : type(),
+     poolName() {
+}
 
 void AbortCompactionRequest::__set_compactionIds(const std::vector<int64_t> & val) {
   this->compactionIds = val;
@@ -30696,7 +34446,7 @@ uint32_t AbortCompactionRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(AbortCompactionRequest &a, AbortCompactionRequest &b) {
+void swap(AbortCompactionRequest &a, AbortCompactionRequest &b) noexcept {
   using ::std::swap;
   swap(a.compactionIds, b.compactionIds);
   swap(a.type, b.type);
@@ -30704,6 +34454,21 @@ void swap(AbortCompactionRequest &a, AbortCompactionRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AbortCompactionRequest::operator==(const AbortCompactionRequest & rhs) const
+{
+  if (!(compactionIds == rhs.compactionIds))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  if (__isset.poolName != rhs.__isset.poolName)
+    return false;
+  else if (__isset.poolName && !(poolName == rhs.poolName))
+    return false;
+  return true;
+}
+
 AbortCompactionRequest::AbortCompactionRequest(const AbortCompactionRequest& other1091) {
   compactionIds = other1091.compactionIds;
   type = other1091.type;
@@ -30730,6 +34495,11 @@ void AbortCompactionRequest::printTo(std::ostream& out) const {
 AbortCompactionResponseElement::~AbortCompactionResponseElement() noexcept {
 }
 
+AbortCompactionResponseElement::AbortCompactionResponseElement() noexcept
+   : compactionId(0),
+     status(),
+     message() {
+}
 
 void AbortCompactionResponseElement::__set_compactionId(const int64_t val) {
   this->compactionId = val;
@@ -30835,7 +34605,7 @@ uint32_t AbortCompactionResponseElement::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(AbortCompactionResponseElement &a, AbortCompactionResponseElement &b) {
+void swap(AbortCompactionResponseElement &a, AbortCompactionResponseElement &b) noexcept {
   using ::std::swap;
   swap(a.compactionId, b.compactionId);
   swap(a.status, b.status);
@@ -30843,6 +34613,21 @@ void swap(AbortCompactionResponseElement &a, AbortCompactionResponseElement &b)
   swap(a.__isset, b.__isset);
 }
 
+bool AbortCompactionResponseElement::operator==(const AbortCompactionResponseElement & rhs) const
+{
+  if (!(compactionId == rhs.compactionId))
+    return false;
+  if (__isset.status != rhs.__isset.status)
+    return false;
+  else if (__isset.status && !(status == rhs.status))
+    return false;
+  if (__isset.message != rhs.__isset.message)
+    return false;
+  else if (__isset.message && !(message == rhs.message))
+    return false;
+  return true;
+}
+
 AbortCompactionResponseElement::AbortCompactionResponseElement(const AbortCompactionResponseElement& other1093) {
   compactionId = other1093.compactionId;
   status = other1093.status;
@@ -30869,6 +34654,8 @@ void AbortCompactionResponseElement::printTo(std::ostream& out) const {
 AbortCompactResponse::~AbortCompactResponse() noexcept {
 }
 
+AbortCompactResponse::AbortCompactResponse() noexcept {
+}
 
 void AbortCompactResponse::__set_abortedcompacts(const std::map<int64_t, AbortCompactionResponseElement> & val) {
   this->abortedcompacts = val;
@@ -30962,11 +34749,18 @@ uint32_t AbortCompactResponse::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(AbortCompactResponse &a, AbortCompactResponse &b) {
+void swap(AbortCompactResponse &a, AbortCompactResponse &b) noexcept {
   using ::std::swap;
   swap(a.abortedcompacts, b.abortedcompacts);
 }
 
+bool AbortCompactResponse::operator==(const AbortCompactResponse & rhs) const
+{
+  if (!(abortedcompacts == rhs.abortedcompacts))
+    return false;
+  return true;
+}
+
 AbortCompactResponse::AbortCompactResponse(const AbortCompactResponse& other1103) {
   abortedcompacts = other1103.abortedcompacts;
 }
@@ -30985,6 +34779,11 @@ void AbortCompactResponse::printTo(std::ostream& out) const {
 GetLatestCommittedCompactionInfoRequest::~GetLatestCommittedCompactionInfoRequest() noexcept {
 }
 
+GetLatestCommittedCompactionInfoRequest::GetLatestCommittedCompactionInfoRequest() noexcept
+   : dbname(),
+     tablename(),
+     lastCompactionId(0) {
+}
 
 void GetLatestCommittedCompactionInfoRequest::__set_dbname(const std::string& val) {
   this->dbname = val;
@@ -31129,7 +34928,7 @@ uint32_t GetLatestCommittedCompactionInfoRequest::write(::apache::thrift::protoc
   return xfer;
 }
 
-void swap(GetLatestCommittedCompactionInfoRequest &a, GetLatestCommittedCompactionInfoRequest &b) {
+void swap(GetLatestCommittedCompactionInfoRequest &a, GetLatestCommittedCompactionInfoRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbname, b.dbname);
   swap(a.tablename, b.tablename);
@@ -31138,6 +34937,23 @@ void swap(GetLatestCommittedCompactionInfoRequest &a, GetLatestCommittedCompacti
   swap(a.__isset, b.__isset);
 }
 
+bool GetLatestCommittedCompactionInfoRequest::operator==(const GetLatestCommittedCompactionInfoRequest & rhs) const
+{
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tablename == rhs.tablename))
+    return false;
+  if (__isset.partitionnames != rhs.__isset.partitionnames)
+    return false;
+  else if (__isset.partitionnames && !(partitionnames == rhs.partitionnames))
+    return false;
+  if (__isset.lastCompactionId != rhs.__isset.lastCompactionId)
+    return false;
+  else if (__isset.lastCompactionId && !(lastCompactionId == rhs.lastCompactionId))
+    return false;
+  return true;
+}
+
 GetLatestCommittedCompactionInfoRequest::GetLatestCommittedCompactionInfoRequest(const GetLatestCommittedCompactionInfoRequest& other1111) {
   dbname = other1111.dbname;
   tablename = other1111.tablename;
@@ -31167,6 +34983,8 @@ void GetLatestCommittedCompactionInfoRequest::printTo(std::ostream& out) const {
 GetLatestCommittedCompactionInfoResponse::~GetLatestCommittedCompactionInfoResponse() noexcept {
 }
 
+GetLatestCommittedCompactionInfoResponse::GetLatestCommittedCompactionInfoResponse() noexcept {
+}
 
 void GetLatestCommittedCompactionInfoResponse::__set_compactions(const std::vector<CompactionInfoStruct> & val) {
   this->compactions = val;
@@ -31256,11 +35074,18 @@ uint32_t GetLatestCommittedCompactionInfoResponse::write(::apache::thrift::proto
   return xfer;
 }
 
-void swap(GetLatestCommittedCompactionInfoResponse &a, GetLatestCommittedCompactionInfoResponse &b) {
+void swap(GetLatestCommittedCompactionInfoResponse &a, GetLatestCommittedCompactionInfoResponse &b) noexcept {
   using ::std::swap;
   swap(a.compactions, b.compactions);
 }
 
+bool GetLatestCommittedCompactionInfoResponse::operator==(const GetLatestCommittedCompactionInfoResponse & rhs) const
+{
+  if (!(compactions == rhs.compactions))
+    return false;
+  return true;
+}
+
 GetLatestCommittedCompactionInfoResponse::GetLatestCommittedCompactionInfoResponse(const GetLatestCommittedCompactionInfoResponse& other1119) {
   compactions = other1119.compactions;
 }
@@ -31279,6 +35104,11 @@ void GetLatestCommittedCompactionInfoResponse::printTo(std::ostream& out) const
 FindNextCompactRequest::~FindNextCompactRequest() noexcept {
 }
 
+FindNextCompactRequest::FindNextCompactRequest() noexcept
+   : workerId(),
+     workerVersion(),
+     poolName() {
+}
 
 void FindNextCompactRequest::__set_workerId(const std::string& val) {
   this->workerId = val;
@@ -31383,7 +35213,7 @@ uint32_t FindNextCompactRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(FindNextCompactRequest &a, FindNextCompactRequest &b) {
+void swap(FindNextCompactRequest &a, FindNextCompactRequest &b) noexcept {
   using ::std::swap;
   swap(a.workerId, b.workerId);
   swap(a.workerVersion, b.workerVersion);
@@ -31391,6 +35221,23 @@ void swap(FindNextCompactRequest &a, FindNextCompactRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool FindNextCompactRequest::operator==(const FindNextCompactRequest & rhs) const
+{
+  if (__isset.workerId != rhs.__isset.workerId)
+    return false;
+  else if (__isset.workerId && !(workerId == rhs.workerId))
+    return false;
+  if (__isset.workerVersion != rhs.__isset.workerVersion)
+    return false;
+  else if (__isset.workerVersion && !(workerVersion == rhs.workerVersion))
+    return false;
+  if (__isset.poolName != rhs.__isset.poolName)
+    return false;
+  else if (__isset.poolName && !(poolName == rhs.poolName))
+    return false;
+  return true;
+}
+
 FindNextCompactRequest::FindNextCompactRequest(const FindNextCompactRequest& other1121) {
   workerId = other1121.workerId;
   workerVersion = other1121.workerVersion;
@@ -31417,6 +35264,13 @@ void FindNextCompactRequest::printTo(std::ostream& out) const {
 AddDynamicPartitions::~AddDynamicPartitions() noexcept {
 }
 
+AddDynamicPartitions::AddDynamicPartitions() noexcept
+   : txnid(0),
+     writeid(0),
+     dbname(),
+     tablename(),
+     operationType(static_cast<DataOperationType::type>(5)) {
+}
 
 void AddDynamicPartitions::__set_txnid(const int64_t val) {
   this->txnid = val;
@@ -31602,7 +35456,7 @@ uint32_t AddDynamicPartitions::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(AddDynamicPartitions &a, AddDynamicPartitions &b) {
+void swap(AddDynamicPartitions &a, AddDynamicPartitions &b) noexcept {
   using ::std::swap;
   swap(a.txnid, b.txnid);
   swap(a.writeid, b.writeid);
@@ -31613,6 +35467,25 @@ void swap(AddDynamicPartitions &a, AddDynamicPartitions &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AddDynamicPartitions::operator==(const AddDynamicPartitions & rhs) const
+{
+  if (!(txnid == rhs.txnid))
+    return false;
+  if (!(writeid == rhs.writeid))
+    return false;
+  if (!(dbname == rhs.dbname))
+    return false;
+  if (!(tablename == rhs.tablename))
+    return false;
+  if (!(partitionnames == rhs.partitionnames))
+    return false;
+  if (__isset.operationType != rhs.__isset.operationType)
+    return false;
+  else if (__isset.operationType && !(operationType == rhs.operationType))
+    return false;
+  return true;
+}
+
 AddDynamicPartitions::AddDynamicPartitions(const AddDynamicPartitions& other1130) {
   txnid = other1130.txnid;
   writeid = other1130.writeid;
@@ -31648,6 +35521,14 @@ void AddDynamicPartitions::printTo(std::ostream& out) const {
 BasicTxnInfo::~BasicTxnInfo() noexcept {
 }
 
+BasicTxnInfo::BasicTxnInfo() noexcept
+   : isnull(0),
+     time(0),
+     txnid(0),
+     dbname(),
+     tablename(),
+     partitionname() {
+}
 
 void BasicTxnInfo::__set_isnull(const bool val) {
   this->isnull = val;
@@ -31807,7 +35688,7 @@ uint32_t BasicTxnInfo::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(BasicTxnInfo &a, BasicTxnInfo &b) {
+void swap(BasicTxnInfo &a, BasicTxnInfo &b) noexcept {
   using ::std::swap;
   swap(a.isnull, b.isnull);
   swap(a.time, b.time);
@@ -31818,6 +35699,33 @@ void swap(BasicTxnInfo &a, BasicTxnInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool BasicTxnInfo::operator==(const BasicTxnInfo & rhs) const
+{
+  if (!(isnull == rhs.isnull))
+    return false;
+  if (__isset.time != rhs.__isset.time)
+    return false;
+  else if (__isset.time && !(time == rhs.time))
+    return false;
+  if (__isset.txnid != rhs.__isset.txnid)
+    return false;
+  else if (__isset.txnid && !(txnid == rhs.txnid))
+    return false;
+  if (__isset.dbname != rhs.__isset.dbname)
+    return false;
+  else if (__isset.dbname && !(dbname == rhs.dbname))
+    return false;
+  if (__isset.tablename != rhs.__isset.tablename)
+    return false;
+  else if (__isset.tablename && !(tablename == rhs.tablename))
+    return false;
+  if (__isset.partitionname != rhs.__isset.partitionname)
+    return false;
+  else if (__isset.partitionname && !(partitionname == rhs.partitionname))
+    return false;
+  return true;
+}
+
 BasicTxnInfo::BasicTxnInfo(const BasicTxnInfo& other1132) {
   isnull = other1132.isnull;
   time = other1132.time;
@@ -31853,6 +35761,12 @@ void BasicTxnInfo::printTo(std::ostream& out) const {
 NotificationEventRequest::~NotificationEventRequest() noexcept {
 }
 
+NotificationEventRequest::NotificationEventRequest() noexcept
+   : lastEvent(0),
+     maxEvents(0),
+     catName(),
+     dbName() {
+}
 
 void NotificationEventRequest::__set_lastEvent(const int64_t val) {
   this->lastEvent = val;
@@ -32090,7 +36004,7 @@ uint32_t NotificationEventRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(NotificationEventRequest &a, NotificationEventRequest &b) {
+void swap(NotificationEventRequest &a, NotificationEventRequest &b) noexcept {
   using ::std::swap;
   swap(a.lastEvent, b.lastEvent);
   swap(a.maxEvents, b.maxEvents);
@@ -32102,6 +36016,37 @@ void swap(NotificationEventRequest &a, NotificationEventRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool NotificationEventRequest::operator==(const NotificationEventRequest & rhs) const
+{
+  if (!(lastEvent == rhs.lastEvent))
+    return false;
+  if (__isset.maxEvents != rhs.__isset.maxEvents)
+    return false;
+  else if (__isset.maxEvents && !(maxEvents == rhs.maxEvents))
+    return false;
+  if (__isset.eventTypeSkipList != rhs.__isset.eventTypeSkipList)
+    return false;
+  else if (__isset.eventTypeSkipList && !(eventTypeSkipList == rhs.eventTypeSkipList))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  if (__isset.tableNames != rhs.__isset.tableNames)
+    return false;
+  else if (__isset.tableNames && !(tableNames == rhs.tableNames))
+    return false;
+  if (__isset.eventTypeList != rhs.__isset.eventTypeList)
+    return false;
+  else if (__isset.eventTypeList && !(eventTypeList == rhs.eventTypeList))
+    return false;
+  return true;
+}
+
 NotificationEventRequest::NotificationEventRequest(const NotificationEventRequest& other1152) {
   lastEvent = other1152.lastEvent;
   maxEvents = other1152.maxEvents;
@@ -32140,6 +36085,16 @@ void NotificationEventRequest::printTo(std::ostream& out) const {
 NotificationEvent::~NotificationEvent() noexcept {
 }
 
+NotificationEvent::NotificationEvent() noexcept
+   : eventId(0),
+     eventTime(0),
+     eventType(),
+     dbName(),
+     tableName(),
+     message(),
+     messageFormat(),
+     catName() {
+}
 
 void NotificationEvent::__set_eventId(const int64_t val) {
   this->eventId = val;
@@ -32338,7 +36293,7 @@ uint32_t NotificationEvent::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(NotificationEvent &a, NotificationEvent &b) {
+void swap(NotificationEvent &a, NotificationEvent &b) noexcept {
   using ::std::swap;
   swap(a.eventId, b.eventId);
   swap(a.eventTime, b.eventTime);
@@ -32351,6 +36306,35 @@ void swap(NotificationEvent &a, NotificationEvent &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool NotificationEvent::operator==(const NotificationEvent & rhs) const
+{
+  if (!(eventId == rhs.eventId))
+    return false;
+  if (!(eventTime == rhs.eventTime))
+    return false;
+  if (!(eventType == rhs.eventType))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  if (!(message == rhs.message))
+    return false;
+  if (__isset.messageFormat != rhs.__isset.messageFormat)
+    return false;
+  else if (__isset.messageFormat && !(messageFormat == rhs.messageFormat))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  return true;
+}
+
 NotificationEvent::NotificationEvent(const NotificationEvent& other1154) {
   eventId = other1154.eventId;
   eventTime = other1154.eventTime;
@@ -32392,6 +36376,8 @@ void NotificationEvent::printTo(std::ostream& out) const {
 NotificationEventResponse::~NotificationEventResponse() noexcept {
 }
 
+NotificationEventResponse::NotificationEventResponse() noexcept {
+}
 
 void NotificationEventResponse::__set_events(const std::vector<NotificationEvent> & val) {
   this->events = val;
@@ -32481,11 +36467,18 @@ uint32_t NotificationEventResponse::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(NotificationEventResponse &a, NotificationEventResponse &b) {
+void swap(NotificationEventResponse &a, NotificationEventResponse &b) noexcept {
   using ::std::swap;
   swap(a.events, b.events);
 }
 
+bool NotificationEventResponse::operator==(const NotificationEventResponse & rhs) const
+{
+  if (!(events == rhs.events))
+    return false;
+  return true;
+}
+
 NotificationEventResponse::NotificationEventResponse(const NotificationEventResponse& other1162) {
   events = other1162.events;
 }
@@ -32504,6 +36497,9 @@ void NotificationEventResponse::printTo(std::ostream& out) const {
 CurrentNotificationEventId::~CurrentNotificationEventId() noexcept {
 }
 
+CurrentNotificationEventId::CurrentNotificationEventId() noexcept
+   : eventId(0) {
+}
 
 void CurrentNotificationEventId::__set_eventId(const int64_t val) {
   this->eventId = val;
@@ -32573,11 +36569,18 @@ uint32_t CurrentNotificationEventId::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(CurrentNotificationEventId &a, CurrentNotificationEventId &b) {
+void swap(CurrentNotificationEventId &a, CurrentNotificationEventId &b) noexcept {
   using ::std::swap;
   swap(a.eventId, b.eventId);
 }
 
+bool CurrentNotificationEventId::operator==(const CurrentNotificationEventId & rhs) const
+{
+  if (!(eventId == rhs.eventId))
+    return false;
+  return true;
+}
+
 CurrentNotificationEventId::CurrentNotificationEventId(const CurrentNotificationEventId& other1164) noexcept {
   eventId = other1164.eventId;
 }
@@ -32596,6 +36599,13 @@ void CurrentNotificationEventId::printTo(std::ostream& out) const {
 NotificationEventsCountRequest::~NotificationEventsCountRequest() noexcept {
 }
 
+NotificationEventsCountRequest::NotificationEventsCountRequest() noexcept
+   : fromEventId(0),
+     dbName(),
+     catName(),
+     toEventId(0),
+     limit(0) {
+}
 
 void NotificationEventsCountRequest::__set_fromEventId(const int64_t val) {
   this->fromEventId = val;
@@ -32776,7 +36786,7 @@ uint32_t NotificationEventsCountRequest::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(NotificationEventsCountRequest &a, NotificationEventsCountRequest &b) {
+void swap(NotificationEventsCountRequest &a, NotificationEventsCountRequest &b) noexcept {
   using ::std::swap;
   swap(a.fromEventId, b.fromEventId);
   swap(a.dbName, b.dbName);
@@ -32787,6 +36797,31 @@ void swap(NotificationEventsCountRequest &a, NotificationEventsCountRequest &b)
   swap(a.__isset, b.__isset);
 }
 
+bool NotificationEventsCountRequest::operator==(const NotificationEventsCountRequest & rhs) const
+{
+  if (!(fromEventId == rhs.fromEventId))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.toEventId != rhs.__isset.toEventId)
+    return false;
+  else if (__isset.toEventId && !(toEventId == rhs.toEventId))
+    return false;
+  if (__isset.limit != rhs.__isset.limit)
+    return false;
+  else if (__isset.limit && !(limit == rhs.limit))
+    return false;
+  if (__isset.tableNames != rhs.__isset.tableNames)
+    return false;
+  else if (__isset.tableNames && !(tableNames == rhs.tableNames))
+    return false;
+  return true;
+}
+
 NotificationEventsCountRequest::NotificationEventsCountRequest(const NotificationEventsCountRequest& other1172) {
   fromEventId = other1172.fromEventId;
   dbName = other1172.dbName;
@@ -32822,6 +36857,9 @@ void NotificationEventsCountRequest::printTo(std::ostream& out) const {
 NotificationEventsCountResponse::~NotificationEventsCountResponse() noexcept {
 }
 
+NotificationEventsCountResponse::NotificationEventsCountResponse() noexcept
+   : eventsCount(0) {
+}
 
 void NotificationEventsCountResponse::__set_eventsCount(const int64_t val) {
   this->eventsCount = val;
@@ -32891,11 +36929,18 @@ uint32_t NotificationEventsCountResponse::write(::apache::thrift::protocol::TPro
   return xfer;
 }
 
-void swap(NotificationEventsCountResponse &a, NotificationEventsCountResponse &b) {
+void swap(NotificationEventsCountResponse &a, NotificationEventsCountResponse &b) noexcept {
   using ::std::swap;
   swap(a.eventsCount, b.eventsCount);
 }
 
+bool NotificationEventsCountResponse::operator==(const NotificationEventsCountResponse & rhs) const
+{
+  if (!(eventsCount == rhs.eventsCount))
+    return false;
+  return true;
+}
+
 NotificationEventsCountResponse::NotificationEventsCountResponse(const NotificationEventsCountResponse& other1174) noexcept {
   eventsCount = other1174.eventsCount;
 }
@@ -32914,6 +36959,9 @@ void NotificationEventsCountResponse::printTo(std::ostream& out) const {
 InsertEventRequestData::~InsertEventRequestData() noexcept {
 }
 
+InsertEventRequestData::InsertEventRequestData() noexcept
+   : replace(0) {
+}
 
 void InsertEventRequestData::__set_replace(const bool val) {
   this->replace = val;
@@ -33135,7 +37183,7 @@ uint32_t InsertEventRequestData::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(InsertEventRequestData &a, InsertEventRequestData &b) {
+void swap(InsertEventRequestData &a, InsertEventRequestData &b) noexcept {
   using ::std::swap;
   swap(a.replace, b.replace);
   swap(a.filesAdded, b.filesAdded);
@@ -33145,6 +37193,29 @@ void swap(InsertEventRequestData &a, InsertEventRequestData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool InsertEventRequestData::operator==(const InsertEventRequestData & rhs) const
+{
+  if (__isset.replace != rhs.__isset.replace)
+    return false;
+  else if (__isset.replace && !(replace == rhs.replace))
+    return false;
+  if (!(filesAdded == rhs.filesAdded))
+    return false;
+  if (__isset.filesAddedChecksum != rhs.__isset.filesAddedChecksum)
+    return false;
+  else if (__isset.filesAddedChecksum && !(filesAddedChecksum == rhs.filesAddedChecksum))
+    return false;
+  if (__isset.subDirectoryList != rhs.__isset.subDirectoryList)
+    return false;
+  else if (__isset.subDirectoryList && !(subDirectoryList == rhs.subDirectoryList))
+    return false;
+  if (__isset.partitionVal != rhs.__isset.partitionVal)
+    return false;
+  else if (__isset.partitionVal && !(partitionVal == rhs.partitionVal))
+    return false;
+  return true;
+}
+
 InsertEventRequestData::InsertEventRequestData(const InsertEventRequestData& other1200) {
   replace = other1200.replace;
   filesAdded = other1200.filesAdded;
@@ -33177,6 +37248,9 @@ void InsertEventRequestData::printTo(std::ostream& out) const {
 FireEventRequestData::~FireEventRequestData() noexcept {
 }
 
+FireEventRequestData::FireEventRequestData() noexcept
+   : refreshEvent(0) {
+}
 
 void FireEventRequestData::__set_insertData(const InsertEventRequestData& val) {
   this->insertData = val;
@@ -33301,7 +37375,7 @@ uint32_t FireEventRequestData::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(FireEventRequestData &a, FireEventRequestData &b) {
+void swap(FireEventRequestData &a, FireEventRequestData &b) noexcept {
   using ::std::swap;
   swap(a.insertData, b.insertData);
   swap(a.insertDatas, b.insertDatas);
@@ -33309,6 +37383,23 @@ void swap(FireEventRequestData &a, FireEventRequestData &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool FireEventRequestData::operator==(const FireEventRequestData & rhs) const
+{
+  if (__isset.insertData != rhs.__isset.insertData)
+    return false;
+  else if (__isset.insertData && !(insertData == rhs.insertData))
+    return false;
+  if (__isset.insertDatas != rhs.__isset.insertDatas)
+    return false;
+  else if (__isset.insertDatas && !(insertDatas == rhs.insertDatas))
+    return false;
+  if (__isset.refreshEvent != rhs.__isset.refreshEvent)
+    return false;
+  else if (__isset.refreshEvent && !(refreshEvent == rhs.refreshEvent))
+    return false;
+  return true;
+}
+
 FireEventRequestData::FireEventRequestData(const FireEventRequestData& other1208) {
   insertData = other1208.insertData;
   insertDatas = other1208.insertDatas;
@@ -33335,6 +37426,12 @@ void FireEventRequestData::printTo(std::ostream& out) const {
 FireEventRequest::~FireEventRequest() noexcept {
 }
 
+FireEventRequest::FireEventRequest() noexcept
+   : successful(0),
+     dbName(),
+     tableName(),
+     catName() {
+}
 
 void FireEventRequest::__set_successful(const bool val) {
   this->successful = val;
@@ -33615,7 +37712,7 @@ uint32_t FireEventRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(FireEventRequest &a, FireEventRequest &b) {
+void swap(FireEventRequest &a, FireEventRequest &b) noexcept {
   using ::std::swap;
   swap(a.successful, b.successful);
   swap(a.data, b.data);
@@ -33628,6 +37725,39 @@ void swap(FireEventRequest &a, FireEventRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool FireEventRequest::operator==(const FireEventRequest & rhs) const
+{
+  if (!(successful == rhs.successful))
+    return false;
+  if (!(data == rhs.data))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  if (__isset.partitionVals != rhs.__isset.partitionVals)
+    return false;
+  else if (__isset.partitionVals && !(partitionVals == rhs.partitionVals))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.tblParams != rhs.__isset.tblParams)
+    return false;
+  else if (__isset.tblParams && !(tblParams == rhs.tblParams))
+    return false;
+  if (__isset.batchPartitionValsForRefresh != rhs.__isset.batchPartitionValsForRefresh)
+    return false;
+  else if (__isset.batchPartitionValsForRefresh && !(batchPartitionValsForRefresh == rhs.batchPartitionValsForRefresh))
+    return false;
+  return true;
+}
+
 FireEventRequest::FireEventRequest(const FireEventRequest& other1236) {
   successful = other1236.successful;
   data = other1236.data;
@@ -33669,6 +37799,8 @@ void FireEventRequest::printTo(std::ostream& out) const {
 FireEventResponse::~FireEventResponse() noexcept {
 }
 
+FireEventResponse::FireEventResponse() noexcept {
+}
 
 void FireEventResponse::__set_eventIds(const std::vector<int64_t> & val) {
   this->eventIds = val;
@@ -33755,12 +37887,19 @@ uint32_t FireEventResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(FireEventResponse &a, FireEventResponse &b) {
+void swap(FireEventResponse &a, FireEventResponse &b) noexcept {
   using ::std::swap;
   swap(a.eventIds, b.eventIds);
   swap(a.__isset, b.__isset);
 }
 
+bool FireEventResponse::operator==(const FireEventResponse & rhs) const
+{
+  if (!(eventIds == rhs.eventIds))
+    return false;
+  return true;
+}
+
 FireEventResponse::FireEventResponse(const FireEventResponse& other1244) {
   eventIds = other1244.eventIds;
   __isset = other1244.__isset;
@@ -33781,6 +37920,12 @@ void FireEventResponse::printTo(std::ostream& out) const {
 WriteNotificationLogRequest::~WriteNotificationLogRequest() noexcept {
 }
 
+WriteNotificationLogRequest::WriteNotificationLogRequest() noexcept
+   : txnId(0),
+     writeId(0),
+     db(),
+     table() {
+}
 
 void WriteNotificationLogRequest::__set_txnId(const int64_t val) {
   this->txnId = val;
@@ -33964,7 +38109,7 @@ uint32_t WriteNotificationLogRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(WriteNotificationLogRequest &a, WriteNotificationLogRequest &b) {
+void swap(WriteNotificationLogRequest &a, WriteNotificationLogRequest &b) noexcept {
   using ::std::swap;
   swap(a.txnId, b.txnId);
   swap(a.writeId, b.writeId);
@@ -33975,6 +38120,25 @@ void swap(WriteNotificationLogRequest &a, WriteNotificationLogRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WriteNotificationLogRequest::operator==(const WriteNotificationLogRequest & rhs) const
+{
+  if (!(txnId == rhs.txnId))
+    return false;
+  if (!(writeId == rhs.writeId))
+    return false;
+  if (!(db == rhs.db))
+    return false;
+  if (!(table == rhs.table))
+    return false;
+  if (!(fileInfo == rhs.fileInfo))
+    return false;
+  if (__isset.partitionVals != rhs.__isset.partitionVals)
+    return false;
+  else if (__isset.partitionVals && !(partitionVals == rhs.partitionVals))
+    return false;
+  return true;
+}
+
 WriteNotificationLogRequest::WriteNotificationLogRequest(const WriteNotificationLogRequest& other1252) {
   txnId = other1252.txnId;
   writeId = other1252.writeId;
@@ -34010,6 +38174,8 @@ void WriteNotificationLogRequest::printTo(std::ostream& out) const {
 WriteNotificationLogResponse::~WriteNotificationLogResponse() noexcept {
 }
 
+WriteNotificationLogResponse::WriteNotificationLogResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WriteNotificationLogResponse& obj)
 {
   obj.printTo(out);
@@ -34055,12 +38221,17 @@ uint32_t WriteNotificationLogResponse::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(WriteNotificationLogResponse &a, WriteNotificationLogResponse &b) {
+void swap(WriteNotificationLogResponse &a, WriteNotificationLogResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WriteNotificationLogResponse::operator==(const WriteNotificationLogResponse & /* rhs */) const
+{
+  return true;
+}
+
 WriteNotificationLogResponse::WriteNotificationLogResponse(const WriteNotificationLogResponse& other1254) noexcept {
   (void) other1254;
 }
@@ -34078,6 +38249,11 @@ void WriteNotificationLogResponse::printTo(std::ostream& out) const {
 WriteNotificationLogBatchRequest::~WriteNotificationLogBatchRequest() noexcept {
 }
 
+WriteNotificationLogBatchRequest::WriteNotificationLogBatchRequest() noexcept
+   : catalog(),
+     db(),
+     table() {
+}
 
 void WriteNotificationLogBatchRequest::__set_catalog(const std::string& val) {
   this->catalog = val;
@@ -34224,7 +38400,7 @@ uint32_t WriteNotificationLogBatchRequest::write(::apache::thrift::protocol::TPr
   return xfer;
 }
 
-void swap(WriteNotificationLogBatchRequest &a, WriteNotificationLogBatchRequest &b) {
+void swap(WriteNotificationLogBatchRequest &a, WriteNotificationLogBatchRequest &b) noexcept {
   using ::std::swap;
   swap(a.catalog, b.catalog);
   swap(a.db, b.db);
@@ -34232,6 +38408,19 @@ void swap(WriteNotificationLogBatchRequest &a, WriteNotificationLogBatchRequest
   swap(a.requestList, b.requestList);
 }
 
+bool WriteNotificationLogBatchRequest::operator==(const WriteNotificationLogBatchRequest & rhs) const
+{
+  if (!(catalog == rhs.catalog))
+    return false;
+  if (!(db == rhs.db))
+    return false;
+  if (!(table == rhs.table))
+    return false;
+  if (!(requestList == rhs.requestList))
+    return false;
+  return true;
+}
+
 WriteNotificationLogBatchRequest::WriteNotificationLogBatchRequest(const WriteNotificationLogBatchRequest& other1262) {
   catalog = other1262.catalog;
   db = other1262.db;
@@ -34259,6 +38448,8 @@ void WriteNotificationLogBatchRequest::printTo(std::ostream& out) const {
 WriteNotificationLogBatchResponse::~WriteNotificationLogBatchResponse() noexcept {
 }
 
+WriteNotificationLogBatchResponse::WriteNotificationLogBatchResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WriteNotificationLogBatchResponse& obj)
 {
   obj.printTo(out);
@@ -34304,12 +38495,17 @@ uint32_t WriteNotificationLogBatchResponse::write(::apache::thrift::protocol::TP
   return xfer;
 }
 
-void swap(WriteNotificationLogBatchResponse &a, WriteNotificationLogBatchResponse &b) {
+void swap(WriteNotificationLogBatchResponse &a, WriteNotificationLogBatchResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WriteNotificationLogBatchResponse::operator==(const WriteNotificationLogBatchResponse & /* rhs */) const
+{
+  return true;
+}
+
 WriteNotificationLogBatchResponse::WriteNotificationLogBatchResponse(const WriteNotificationLogBatchResponse& other1264) noexcept {
   (void) other1264;
 }
@@ -34327,6 +38523,10 @@ void WriteNotificationLogBatchResponse::printTo(std::ostream& out) const {
 MetadataPpdResult::~MetadataPpdResult() noexcept {
 }
 
+MetadataPpdResult::MetadataPpdResult() noexcept
+   : metadata(),
+     includeBitset() {
+}
 
 void MetadataPpdResult::__set_metadata(const std::string& val) {
   this->metadata = val;
@@ -34413,13 +38613,26 @@ uint32_t MetadataPpdResult::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(MetadataPpdResult &a, MetadataPpdResult &b) {
+void swap(MetadataPpdResult &a, MetadataPpdResult &b) noexcept {
   using ::std::swap;
   swap(a.metadata, b.metadata);
   swap(a.includeBitset, b.includeBitset);
   swap(a.__isset, b.__isset);
 }
 
+bool MetadataPpdResult::operator==(const MetadataPpdResult & rhs) const
+{
+  if (__isset.metadata != rhs.__isset.metadata)
+    return false;
+  else if (__isset.metadata && !(metadata == rhs.metadata))
+    return false;
+  if (__isset.includeBitset != rhs.__isset.includeBitset)
+    return false;
+  else if (__isset.includeBitset && !(includeBitset == rhs.includeBitset))
+    return false;
+  return true;
+}
+
 MetadataPpdResult::MetadataPpdResult(const MetadataPpdResult& other1266) {
   metadata = other1266.metadata;
   includeBitset = other1266.includeBitset;
@@ -34443,6 +38656,9 @@ void MetadataPpdResult::printTo(std::ostream& out) const {
 GetFileMetadataByExprResult::~GetFileMetadataByExprResult() noexcept {
 }
 
+GetFileMetadataByExprResult::GetFileMetadataByExprResult() noexcept
+   : isSupported(0) {
+}
 
 void GetFileMetadataByExprResult::__set_metadata(const std::map<int64_t, MetadataPpdResult> & val) {
   this->metadata = val;
@@ -34555,12 +38771,21 @@ uint32_t GetFileMetadataByExprResult::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(GetFileMetadataByExprResult &a, GetFileMetadataByExprResult &b) {
+void swap(GetFileMetadataByExprResult &a, GetFileMetadataByExprResult &b) noexcept {
   using ::std::swap;
   swap(a.metadata, b.metadata);
   swap(a.isSupported, b.isSupported);
 }
 
+bool GetFileMetadataByExprResult::operator==(const GetFileMetadataByExprResult & rhs) const
+{
+  if (!(metadata == rhs.metadata))
+    return false;
+  if (!(isSupported == rhs.isSupported))
+    return false;
+  return true;
+}
+
 GetFileMetadataByExprResult::GetFileMetadataByExprResult(const GetFileMetadataByExprResult& other1276) {
   metadata = other1276.metadata;
   isSupported = other1276.isSupported;
@@ -34582,6 +38807,11 @@ void GetFileMetadataByExprResult::printTo(std::ostream& out) const {
 GetFileMetadataByExprRequest::~GetFileMetadataByExprRequest() noexcept {
 }
 
+GetFileMetadataByExprRequest::GetFileMetadataByExprRequest() noexcept
+   : expr(),
+     doGetFooters(0),
+     type(static_cast<FileMetadataExprType::type>(0)) {
+}
 
 void GetFileMetadataByExprRequest::__set_fileIds(const std::vector<int64_t> & val) {
   this->fileIds = val;
@@ -34728,7 +38958,7 @@ uint32_t GetFileMetadataByExprRequest::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(GetFileMetadataByExprRequest &a, GetFileMetadataByExprRequest &b) {
+void swap(GetFileMetadataByExprRequest &a, GetFileMetadataByExprRequest &b) noexcept {
   using ::std::swap;
   swap(a.fileIds, b.fileIds);
   swap(a.expr, b.expr);
@@ -34737,6 +38967,23 @@ void swap(GetFileMetadataByExprRequest &a, GetFileMetadataByExprRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetFileMetadataByExprRequest::operator==(const GetFileMetadataByExprRequest & rhs) const
+{
+  if (!(fileIds == rhs.fileIds))
+    return false;
+  if (!(expr == rhs.expr))
+    return false;
+  if (__isset.doGetFooters != rhs.__isset.doGetFooters)
+    return false;
+  else if (__isset.doGetFooters && !(doGetFooters == rhs.doGetFooters))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  return true;
+}
+
 GetFileMetadataByExprRequest::GetFileMetadataByExprRequest(const GetFileMetadataByExprRequest& other1285) {
   fileIds = other1285.fileIds;
   expr = other1285.expr;
@@ -34766,6 +39013,9 @@ void GetFileMetadataByExprRequest::printTo(std::ostream& out) const {
 GetFileMetadataResult::~GetFileMetadataResult() noexcept {
 }
 
+GetFileMetadataResult::GetFileMetadataResult() noexcept
+   : isSupported(0) {
+}
 
 void GetFileMetadataResult::__set_metadata(const std::map<int64_t, std::string> & val) {
   this->metadata = val;
@@ -34878,12 +39128,21 @@ uint32_t GetFileMetadataResult::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(GetFileMetadataResult &a, GetFileMetadataResult &b) {
+void swap(GetFileMetadataResult &a, GetFileMetadataResult &b) noexcept {
   using ::std::swap;
   swap(a.metadata, b.metadata);
   swap(a.isSupported, b.isSupported);
 }
 
+bool GetFileMetadataResult::operator==(const GetFileMetadataResult & rhs) const
+{
+  if (!(metadata == rhs.metadata))
+    return false;
+  if (!(isSupported == rhs.isSupported))
+    return false;
+  return true;
+}
+
 GetFileMetadataResult::GetFileMetadataResult(const GetFileMetadataResult& other1295) {
   metadata = other1295.metadata;
   isSupported = other1295.isSupported;
@@ -34905,6 +39164,8 @@ void GetFileMetadataResult::printTo(std::ostream& out) const {
 GetFileMetadataRequest::~GetFileMetadataRequest() noexcept {
 }
 
+GetFileMetadataRequest::GetFileMetadataRequest() noexcept {
+}
 
 void GetFileMetadataRequest::__set_fileIds(const std::vector<int64_t> & val) {
   this->fileIds = val;
@@ -34994,11 +39255,18 @@ uint32_t GetFileMetadataRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(GetFileMetadataRequest &a, GetFileMetadataRequest &b) {
+void swap(GetFileMetadataRequest &a, GetFileMetadataRequest &b) noexcept {
   using ::std::swap;
   swap(a.fileIds, b.fileIds);
 }
 
+bool GetFileMetadataRequest::operator==(const GetFileMetadataRequest & rhs) const
+{
+  if (!(fileIds == rhs.fileIds))
+    return false;
+  return true;
+}
+
 GetFileMetadataRequest::GetFileMetadataRequest(const GetFileMetadataRequest& other1303) {
   fileIds = other1303.fileIds;
 }
@@ -35017,6 +39285,8 @@ void GetFileMetadataRequest::printTo(std::ostream& out) const {
 PutFileMetadataResult::~PutFileMetadataResult() noexcept {
 }
 
+PutFileMetadataResult::PutFileMetadataResult() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const PutFileMetadataResult& obj)
 {
   obj.printTo(out);
@@ -35062,12 +39332,17 @@ uint32_t PutFileMetadataResult::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(PutFileMetadataResult &a, PutFileMetadataResult &b) {
+void swap(PutFileMetadataResult &a, PutFileMetadataResult &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool PutFileMetadataResult::operator==(const PutFileMetadataResult & /* rhs */) const
+{
+  return true;
+}
+
 PutFileMetadataResult::PutFileMetadataResult(const PutFileMetadataResult& other1305) noexcept {
   (void) other1305;
 }
@@ -35085,6 +39360,9 @@ void PutFileMetadataResult::printTo(std::ostream& out) const {
 PutFileMetadataRequest::~PutFileMetadataRequest() noexcept {
 }
 
+PutFileMetadataRequest::PutFileMetadataRequest() noexcept
+   : type(static_cast<FileMetadataExprType::type>(0)) {
+}
 
 void PutFileMetadataRequest::__set_fileIds(const std::vector<int64_t> & val) {
   this->fileIds = val;
@@ -35233,7 +39511,7 @@ uint32_t PutFileMetadataRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(PutFileMetadataRequest &a, PutFileMetadataRequest &b) {
+void swap(PutFileMetadataRequest &a, PutFileMetadataRequest &b) noexcept {
   using ::std::swap;
   swap(a.fileIds, b.fileIds);
   swap(a.metadata, b.metadata);
@@ -35241,6 +39519,19 @@ void swap(PutFileMetadataRequest &a, PutFileMetadataRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PutFileMetadataRequest::operator==(const PutFileMetadataRequest & rhs) const
+{
+  if (!(fileIds == rhs.fileIds))
+    return false;
+  if (!(metadata == rhs.metadata))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  return true;
+}
+
 PutFileMetadataRequest::PutFileMetadataRequest(const PutFileMetadataRequest& other1320) {
   fileIds = other1320.fileIds;
   metadata = other1320.metadata;
@@ -35267,6 +39558,8 @@ void PutFileMetadataRequest::printTo(std::ostream& out) const {
 ClearFileMetadataResult::~ClearFileMetadataResult() noexcept {
 }
 
+ClearFileMetadataResult::ClearFileMetadataResult() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const ClearFileMetadataResult& obj)
 {
   obj.printTo(out);
@@ -35312,12 +39605,17 @@ uint32_t ClearFileMetadataResult::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(ClearFileMetadataResult &a, ClearFileMetadataResult &b) {
+void swap(ClearFileMetadataResult &a, ClearFileMetadataResult &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool ClearFileMetadataResult::operator==(const ClearFileMetadataResult & /* rhs */) const
+{
+  return true;
+}
+
 ClearFileMetadataResult::ClearFileMetadataResult(const ClearFileMetadataResult& other1322) noexcept {
   (void) other1322;
 }
@@ -35335,6 +39633,8 @@ void ClearFileMetadataResult::printTo(std::ostream& out) const {
 ClearFileMetadataRequest::~ClearFileMetadataRequest() noexcept {
 }
 
+ClearFileMetadataRequest::ClearFileMetadataRequest() noexcept {
+}
 
 void ClearFileMetadataRequest::__set_fileIds(const std::vector<int64_t> & val) {
   this->fileIds = val;
@@ -35424,11 +39724,18 @@ uint32_t ClearFileMetadataRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(ClearFileMetadataRequest &a, ClearFileMetadataRequest &b) {
+void swap(ClearFileMetadataRequest &a, ClearFileMetadataRequest &b) noexcept {
   using ::std::swap;
   swap(a.fileIds, b.fileIds);
 }
 
+bool ClearFileMetadataRequest::operator==(const ClearFileMetadataRequest & rhs) const
+{
+  if (!(fileIds == rhs.fileIds))
+    return false;
+  return true;
+}
+
 ClearFileMetadataRequest::ClearFileMetadataRequest(const ClearFileMetadataRequest& other1330) {
   fileIds = other1330.fileIds;
 }
@@ -35447,6 +39754,9 @@ void ClearFileMetadataRequest::printTo(std::ostream& out) const {
 CacheFileMetadataResult::~CacheFileMetadataResult() noexcept {
 }
 
+CacheFileMetadataResult::CacheFileMetadataResult() noexcept
+   : isSupported(0) {
+}
 
 void CacheFileMetadataResult::__set_isSupported(const bool val) {
   this->isSupported = val;
@@ -35516,11 +39826,18 @@ uint32_t CacheFileMetadataResult::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(CacheFileMetadataResult &a, CacheFileMetadataResult &b) {
+void swap(CacheFileMetadataResult &a, CacheFileMetadataResult &b) noexcept {
   using ::std::swap;
   swap(a.isSupported, b.isSupported);
 }
 
+bool CacheFileMetadataResult::operator==(const CacheFileMetadataResult & rhs) const
+{
+  if (!(isSupported == rhs.isSupported))
+    return false;
+  return true;
+}
+
 CacheFileMetadataResult::CacheFileMetadataResult(const CacheFileMetadataResult& other1332) noexcept {
   isSupported = other1332.isSupported;
 }
@@ -35539,6 +39856,12 @@ void CacheFileMetadataResult::printTo(std::ostream& out) const {
 CacheFileMetadataRequest::~CacheFileMetadataRequest() noexcept {
 }
 
+CacheFileMetadataRequest::CacheFileMetadataRequest() noexcept
+   : dbName(),
+     tblName(),
+     partName(),
+     isAllParts(0) {
+}
 
 void CacheFileMetadataRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -35663,7 +39986,7 @@ uint32_t CacheFileMetadataRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(CacheFileMetadataRequest &a, CacheFileMetadataRequest &b) {
+void swap(CacheFileMetadataRequest &a, CacheFileMetadataRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -35672,6 +39995,23 @@ void swap(CacheFileMetadataRequest &a, CacheFileMetadataRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CacheFileMetadataRequest::operator==(const CacheFileMetadataRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.partName != rhs.__isset.partName)
+    return false;
+  else if (__isset.partName && !(partName == rhs.partName))
+    return false;
+  if (__isset.isAllParts != rhs.__isset.isAllParts)
+    return false;
+  else if (__isset.isAllParts && !(isAllParts == rhs.isAllParts))
+    return false;
+  return true;
+}
+
 CacheFileMetadataRequest::CacheFileMetadataRequest(const CacheFileMetadataRequest& other1334) {
   dbName = other1334.dbName;
   tblName = other1334.tblName;
@@ -35701,6 +40041,8 @@ void CacheFileMetadataRequest::printTo(std::ostream& out) const {
 GetAllFunctionsResponse::~GetAllFunctionsResponse() noexcept {
 }
 
+GetAllFunctionsResponse::GetAllFunctionsResponse() noexcept {
+}
 
 void GetAllFunctionsResponse::__set_functions(const std::vector<Function> & val) {
   this->functions = val;
@@ -35789,12 +40131,21 @@ uint32_t GetAllFunctionsResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(GetAllFunctionsResponse &a, GetAllFunctionsResponse &b) {
+void swap(GetAllFunctionsResponse &a, GetAllFunctionsResponse &b) noexcept {
   using ::std::swap;
   swap(a.functions, b.functions);
   swap(a.__isset, b.__isset);
 }
 
+bool GetAllFunctionsResponse::operator==(const GetAllFunctionsResponse & rhs) const
+{
+  if (__isset.functions != rhs.__isset.functions)
+    return false;
+  else if (__isset.functions && !(functions == rhs.functions))
+    return false;
+  return true;
+}
+
 GetAllFunctionsResponse::GetAllFunctionsResponse(const GetAllFunctionsResponse& other1342) {
   functions = other1342.functions;
   __isset = other1342.__isset;
@@ -35815,6 +40166,8 @@ void GetAllFunctionsResponse::printTo(std::ostream& out) const {
 ClientCapabilities::~ClientCapabilities() noexcept {
 }
 
+ClientCapabilities::ClientCapabilities() noexcept {
+}
 
 void ClientCapabilities::__set_values(const std::vector<ClientCapability::type> & val) {
   this->values = val;
@@ -35906,11 +40259,18 @@ uint32_t ClientCapabilities::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ClientCapabilities &a, ClientCapabilities &b) {
+void swap(ClientCapabilities &a, ClientCapabilities &b) noexcept {
   using ::std::swap;
   swap(a.values, b.values);
 }
 
+bool ClientCapabilities::operator==(const ClientCapabilities & rhs) const
+{
+  if (!(values == rhs.values))
+    return false;
+  return true;
+}
+
 ClientCapabilities::ClientCapabilities(const ClientCapabilities& other1351) {
   values = other1351.values;
 }
@@ -35929,6 +40289,10 @@ void ClientCapabilities::printTo(std::ostream& out) const {
 GetProjectionsSpec::~GetProjectionsSpec() noexcept {
 }
 
+GetProjectionsSpec::GetProjectionsSpec() noexcept
+   : includeParamKeyPattern(),
+     excludeParamKeyPattern() {
+}
 
 void GetProjectionsSpec::__set_fieldList(const std::vector<std::string> & val) {
   this->fieldList = val;
@@ -36047,7 +40411,7 @@ uint32_t GetProjectionsSpec::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetProjectionsSpec &a, GetProjectionsSpec &b) {
+void swap(GetProjectionsSpec &a, GetProjectionsSpec &b) noexcept {
   using ::std::swap;
   swap(a.fieldList, b.fieldList);
   swap(a.includeParamKeyPattern, b.includeParamKeyPattern);
@@ -36055,6 +40419,17 @@ void swap(GetProjectionsSpec &a, GetProjectionsSpec &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetProjectionsSpec::operator==(const GetProjectionsSpec & rhs) const
+{
+  if (!(fieldList == rhs.fieldList))
+    return false;
+  if (!(includeParamKeyPattern == rhs.includeParamKeyPattern))
+    return false;
+  if (!(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+    return false;
+  return true;
+}
+
 GetProjectionsSpec::GetProjectionsSpec(const GetProjectionsSpec& other1359) {
   fieldList = other1359.fieldList;
   includeParamKeyPattern = other1359.includeParamKeyPattern;
@@ -36081,6 +40456,15 @@ void GetProjectionsSpec::printTo(std::ostream& out) const {
 GetTableRequest::~GetTableRequest() noexcept {
 }
 
+GetTableRequest::GetTableRequest() : dbName(),
+   tblName(),
+   catName(),
+   validWriteIdList(),
+   getColumnStats(0),
+   processorIdentifier(),
+   engine("hive"),
+   id(-1LL) {
+}
 
 void GetTableRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -36333,7 +40717,7 @@ uint32_t GetTableRequest::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(GetTableRequest &a, GetTableRequest &b) {
+void swap(GetTableRequest &a, GetTableRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblName, b.tblName);
@@ -36348,6 +40732,47 @@ void swap(GetTableRequest &a, GetTableRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetTableRequest::operator==(const GetTableRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.capabilities != rhs.__isset.capabilities)
+    return false;
+  else if (__isset.capabilities && !(capabilities == rhs.capabilities))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.getColumnStats != rhs.__isset.getColumnStats)
+    return false;
+  else if (__isset.getColumnStats && !(getColumnStats == rhs.getColumnStats))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  return true;
+}
+
 GetTableRequest::GetTableRequest(const GetTableRequest& other1367) {
   dbName = other1367.dbName;
   tblName = other1367.tblName;
@@ -36395,6 +40820,9 @@ void GetTableRequest::printTo(std::ostream& out) const {
 GetTableResult::~GetTableResult() noexcept {
 }
 
+GetTableResult::GetTableResult() noexcept
+   : isStatsCompliant(0) {
+}
 
 void GetTableResult::__set_table(const Table& val) {
   this->table = val;
@@ -36482,13 +40910,24 @@ uint32_t GetTableResult::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(GetTableResult &a, GetTableResult &b) {
+void swap(GetTableResult &a, GetTableResult &b) noexcept {
   using ::std::swap;
   swap(a.table, b.table);
   swap(a.isStatsCompliant, b.isStatsCompliant);
   swap(a.__isset, b.__isset);
 }
 
+bool GetTableResult::operator==(const GetTableResult & rhs) const
+{
+  if (!(table == rhs.table))
+    return false;
+  if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
+    return false;
+  else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
+    return false;
+  return true;
+}
+
 GetTableResult::GetTableResult(const GetTableResult& other1369) {
   table = other1369.table;
   isStatsCompliant = other1369.isStatsCompliant;
@@ -36512,6 +40951,12 @@ void GetTableResult::printTo(std::ostream& out) const {
 GetTablesRequest::~GetTablesRequest() noexcept {
 }
 
+GetTablesRequest::GetTablesRequest() noexcept
+   : dbName(),
+     catName(),
+     processorIdentifier(),
+     tablesPattern() {
+}
 
 void GetTablesRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -36747,7 +41192,7 @@ uint32_t GetTablesRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(GetTablesRequest &a, GetTablesRequest &b) {
+void swap(GetTablesRequest &a, GetTablesRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tblNames, b.tblNames);
@@ -36760,6 +41205,41 @@ void swap(GetTablesRequest &a, GetTablesRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetTablesRequest::operator==(const GetTablesRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (__isset.tblNames != rhs.__isset.tblNames)
+    return false;
+  else if (__isset.tblNames && !(tblNames == rhs.tblNames))
+    return false;
+  if (__isset.capabilities != rhs.__isset.capabilities)
+    return false;
+  else if (__isset.capabilities && !(capabilities == rhs.capabilities))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  if (__isset.projectionSpec != rhs.__isset.projectionSpec)
+    return false;
+  else if (__isset.projectionSpec && !(projectionSpec == rhs.projectionSpec))
+    return false;
+  if (__isset.tablesPattern != rhs.__isset.tablesPattern)
+    return false;
+  else if (__isset.tablesPattern && !(tablesPattern == rhs.tablesPattern))
+    return false;
+  return true;
+}
+
 GetTablesRequest::GetTablesRequest(const GetTablesRequest& other1383) {
   dbName = other1383.dbName;
   tblNames = other1383.tblNames;
@@ -36801,6 +41281,8 @@ void GetTablesRequest::printTo(std::ostream& out) const {
 GetTablesResult::~GetTablesResult() noexcept {
 }
 
+GetTablesResult::GetTablesResult() noexcept {
+}
 
 void GetTablesResult::__set_tables(const std::vector<Table> & val) {
   this->tables = val;
@@ -36890,11 +41372,18 @@ uint32_t GetTablesResult::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(GetTablesResult &a, GetTablesResult &b) {
+void swap(GetTablesResult &a, GetTablesResult &b) noexcept {
   using ::std::swap;
   swap(a.tables, b.tables);
 }
 
+bool GetTablesResult::operator==(const GetTablesResult & rhs) const
+{
+  if (!(tables == rhs.tables))
+    return false;
+  return true;
+}
+
 GetTablesResult::GetTablesResult(const GetTablesResult& other1391) {
   tables = other1391.tables;
 }
@@ -36913,6 +41402,14 @@ void GetTablesResult::printTo(std::ostream& out) const {
 GetTablesExtRequest::~GetTablesExtRequest() noexcept {
 }
 
+GetTablesExtRequest::GetTablesExtRequest() noexcept
+   : catalog(),
+     database(),
+     tableNamePattern(),
+     requestedFields(0),
+     limit(0),
+     processorIdentifier() {
+}
 
 void GetTablesExtRequest::__set_catalog(const std::string& val) {
   this->catalog = val;
@@ -37113,7 +41610,7 @@ uint32_t GetTablesExtRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(GetTablesExtRequest &a, GetTablesExtRequest &b) {
+void swap(GetTablesExtRequest &a, GetTablesExtRequest &b) noexcept {
   using ::std::swap;
   swap(a.catalog, b.catalog);
   swap(a.database, b.database);
@@ -37125,6 +41622,31 @@ void swap(GetTablesExtRequest &a, GetTablesExtRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetTablesExtRequest::operator==(const GetTablesExtRequest & rhs) const
+{
+  if (!(catalog == rhs.catalog))
+    return false;
+  if (!(database == rhs.database))
+    return false;
+  if (!(tableNamePattern == rhs.tableNamePattern))
+    return false;
+  if (!(requestedFields == rhs.requestedFields))
+    return false;
+  if (__isset.limit != rhs.__isset.limit)
+    return false;
+  else if (__isset.limit && !(limit == rhs.limit))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  return true;
+}
+
 GetTablesExtRequest::GetTablesExtRequest(const GetTablesExtRequest& other1399) {
   catalog = other1399.catalog;
   database = other1399.database;
@@ -37163,6 +41685,10 @@ void GetTablesExtRequest::printTo(std::ostream& out) const {
 ExtendedTableInfo::~ExtendedTableInfo() noexcept {
 }
 
+ExtendedTableInfo::ExtendedTableInfo() noexcept
+   : tblName(),
+     accessType(0) {
+}
 
 void ExtendedTableInfo::__set_tblName(const std::string& val) {
   this->tblName = val;
@@ -37326,7 +41852,7 @@ uint32_t ExtendedTableInfo::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ExtendedTableInfo &a, ExtendedTableInfo &b) {
+void swap(ExtendedTableInfo &a, ExtendedTableInfo &b) noexcept {
   using ::std::swap;
   swap(a.tblName, b.tblName);
   swap(a.accessType, b.accessType);
@@ -37335,6 +41861,25 @@ void swap(ExtendedTableInfo &a, ExtendedTableInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ExtendedTableInfo::operator==(const ExtendedTableInfo & rhs) const
+{
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.accessType != rhs.__isset.accessType)
+    return false;
+  else if (__isset.accessType && !(accessType == rhs.accessType))
+    return false;
+  if (__isset.requiredReadCapabilities != rhs.__isset.requiredReadCapabilities)
+    return false;
+  else if (__isset.requiredReadCapabilities && !(requiredReadCapabilities == rhs.requiredReadCapabilities))
+    return false;
+  if (__isset.requiredWriteCapabilities != rhs.__isset.requiredWriteCapabilities)
+    return false;
+  else if (__isset.requiredWriteCapabilities && !(requiredWriteCapabilities == rhs.requiredWriteCapabilities))
+    return false;
+  return true;
+}
+
 ExtendedTableInfo::ExtendedTableInfo(const ExtendedTableInfo& other1413) {
   tblName = other1413.tblName;
   accessType = other1413.accessType;
@@ -37364,6 +41909,16 @@ void ExtendedTableInfo::printTo(std::ostream& out) const {
 DropTableRequest::~DropTableRequest() noexcept {
 }
 
+DropTableRequest::DropTableRequest() noexcept
+   : catalogName(),
+     dbName(),
+     tableName(),
+     deleteData(0),
+     dropPartitions(0),
+     id(),
+     asyncDrop(0),
+     cancel(0) {
+}
 
 void DropTableRequest::__set_catalogName(const std::string& val) {
   this->catalogName = val;
@@ -37578,7 +42133,7 @@ uint32_t DropTableRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(DropTableRequest &a, DropTableRequest &b) {
+void swap(DropTableRequest &a, DropTableRequest &b) noexcept {
   using ::std::swap;
   swap(a.catalogName, b.catalogName);
   swap(a.dbName, b.dbName);
@@ -37592,6 +42147,43 @@ void swap(DropTableRequest &a, DropTableRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DropTableRequest::operator==(const DropTableRequest & rhs) const
+{
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (__isset.deleteData != rhs.__isset.deleteData)
+    return false;
+  else if (__isset.deleteData && !(deleteData == rhs.deleteData))
+    return false;
+  if (__isset.envContext != rhs.__isset.envContext)
+    return false;
+  else if (__isset.envContext && !(envContext == rhs.envContext))
+    return false;
+  if (__isset.dropPartitions != rhs.__isset.dropPartitions)
+    return false;
+  else if (__isset.dropPartitions && !(dropPartitions == rhs.dropPartitions))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.asyncDrop != rhs.__isset.asyncDrop)
+    return false;
+  else if (__isset.asyncDrop && !(asyncDrop == rhs.asyncDrop))
+    return false;
+  if (__isset.cancel != rhs.__isset.cancel)
+    return false;
+  else if (__isset.cancel && !(cancel == rhs.cancel))
+    return false;
+  return true;
+}
+
 DropTableRequest::DropTableRequest(const DropTableRequest& other1415) {
   catalogName = other1415.catalogName;
   dbName = other1415.dbName;
@@ -37636,6 +42228,11 @@ void DropTableRequest::printTo(std::ostream& out) const {
 AsyncOperationResp::~AsyncOperationResp() noexcept {
 }
 
+AsyncOperationResp::AsyncOperationResp() noexcept
+   : id(),
+     message(),
+     finished(0) {
+}
 
 void AsyncOperationResp::__set_id(const std::string& val) {
   this->id = val;
@@ -37741,7 +42338,7 @@ uint32_t AsyncOperationResp::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(AsyncOperationResp &a, AsyncOperationResp &b) {
+void swap(AsyncOperationResp &a, AsyncOperationResp &b) noexcept {
   using ::std::swap;
   swap(a.id, b.id);
   swap(a.message, b.message);
@@ -37749,6 +42346,21 @@ void swap(AsyncOperationResp &a, AsyncOperationResp &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AsyncOperationResp::operator==(const AsyncOperationResp & rhs) const
+{
+  if (!(id == rhs.id))
+    return false;
+  if (__isset.message != rhs.__isset.message)
+    return false;
+  else if (__isset.message && !(message == rhs.message))
+    return false;
+  if (__isset.finished != rhs.__isset.finished)
+    return false;
+  else if (__isset.finished && !(finished == rhs.finished))
+    return false;
+  return true;
+}
+
 AsyncOperationResp::AsyncOperationResp(const AsyncOperationResp& other1417) {
   id = other1417.id;
   message = other1417.message;
@@ -37775,6 +42387,11 @@ void AsyncOperationResp::printTo(std::ostream& out) const {
 GetDatabaseRequest::~GetDatabaseRequest() noexcept {
 }
 
+GetDatabaseRequest::GetDatabaseRequest() noexcept
+   : name(),
+     catalogName(),
+     processorIdentifier() {
+}
 
 void GetDatabaseRequest::__set_name(const std::string& val) {
   this->name = val;
@@ -37917,7 +42534,7 @@ uint32_t GetDatabaseRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetDatabaseRequest &a, GetDatabaseRequest &b) {
+void swap(GetDatabaseRequest &a, GetDatabaseRequest &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.catalogName, b.catalogName);
@@ -37926,6 +42543,27 @@ void swap(GetDatabaseRequest &a, GetDatabaseRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetDatabaseRequest::operator==(const GetDatabaseRequest & rhs) const
+{
+  if (__isset.name != rhs.__isset.name)
+    return false;
+  else if (__isset.name && !(name == rhs.name))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  return true;
+}
+
 GetDatabaseRequest::GetDatabaseRequest(const GetDatabaseRequest& other1425) {
   name = other1425.name;
   catalogName = other1425.catalogName;
@@ -37955,6 +42593,9 @@ void GetDatabaseRequest::printTo(std::ostream& out) const {
 AlterDatabaseRequest::~AlterDatabaseRequest() noexcept {
 }
 
+AlterDatabaseRequest::AlterDatabaseRequest() noexcept
+   : oldDbName() {
+}
 
 void AlterDatabaseRequest::__set_oldDbName(const std::string& val) {
   this->oldDbName = val;
@@ -38043,12 +42684,21 @@ uint32_t AlterDatabaseRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(AlterDatabaseRequest &a, AlterDatabaseRequest &b) {
+void swap(AlterDatabaseRequest &a, AlterDatabaseRequest &b) noexcept {
   using ::std::swap;
   swap(a.oldDbName, b.oldDbName);
   swap(a.newDb, b.newDb);
 }
 
+bool AlterDatabaseRequest::operator==(const AlterDatabaseRequest & rhs) const
+{
+  if (!(oldDbName == rhs.oldDbName))
+    return false;
+  if (!(newDb == rhs.newDb))
+    return false;
+  return true;
+}
+
 AlterDatabaseRequest::AlterDatabaseRequest(const AlterDatabaseRequest& other1427) {
   oldDbName = other1427.oldDbName;
   newDb = other1427.newDb;
@@ -38070,6 +42720,19 @@ void AlterDatabaseRequest::printTo(std::ostream& out) const {
 DropDatabaseRequest::~DropDatabaseRequest() noexcept {
 }
 
+DropDatabaseRequest::DropDatabaseRequest() noexcept
+   : name(),
+     catalogName(),
+     ignoreUnknownDb(0),
+     deleteData(0),
+     cascade(0),
+     softDelete(false),
+     txnId(0LL),
+     deleteManagedDir(true),
+     id(),
+     asyncDrop(0),
+     cancel(0) {
+}
 
 void DropDatabaseRequest::__set_name(const std::string& val) {
   this->name = val;
@@ -38322,7 +42985,7 @@ uint32_t DropDatabaseRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(DropDatabaseRequest &a, DropDatabaseRequest &b) {
+void swap(DropDatabaseRequest &a, DropDatabaseRequest &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.catalogName, b.catalogName);
@@ -38338,6 +43001,47 @@ void swap(DropDatabaseRequest &a, DropDatabaseRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DropDatabaseRequest::operator==(const DropDatabaseRequest & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (!(ignoreUnknownDb == rhs.ignoreUnknownDb))
+    return false;
+  if (!(deleteData == rhs.deleteData))
+    return false;
+  if (!(cascade == rhs.cascade))
+    return false;
+  if (__isset.softDelete != rhs.__isset.softDelete)
+    return false;
+  else if (__isset.softDelete && !(softDelete == rhs.softDelete))
+    return false;
+  if (__isset.txnId != rhs.__isset.txnId)
+    return false;
+  else if (__isset.txnId && !(txnId == rhs.txnId))
+    return false;
+  if (__isset.deleteManagedDir != rhs.__isset.deleteManagedDir)
+    return false;
+  else if (__isset.deleteManagedDir && !(deleteManagedDir == rhs.deleteManagedDir))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.asyncDrop != rhs.__isset.asyncDrop)
+    return false;
+  else if (__isset.asyncDrop && !(asyncDrop == rhs.asyncDrop))
+    return false;
+  if (__isset.cancel != rhs.__isset.cancel)
+    return false;
+  else if (__isset.cancel && !(cancel == rhs.cancel))
+    return false;
+  return true;
+}
+
 DropDatabaseRequest::DropDatabaseRequest(const DropDatabaseRequest& other1429) {
   name = other1429.name;
   catalogName = other1429.catalogName;
@@ -38388,6 +43092,12 @@ void DropDatabaseRequest::printTo(std::ostream& out) const {
 GetFunctionsRequest::~GetFunctionsRequest() noexcept {
 }
 
+GetFunctionsRequest::GetFunctionsRequest() noexcept
+   : dbName(),
+     catalogName(),
+     pattern(),
+     returnNames(true) {
+}
 
 void GetFunctionsRequest::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -38511,7 +43221,7 @@ uint32_t GetFunctionsRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(GetFunctionsRequest &a, GetFunctionsRequest &b) {
+void swap(GetFunctionsRequest &a, GetFunctionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.catalogName, b.catalogName);
@@ -38520,6 +43230,25 @@ void swap(GetFunctionsRequest &a, GetFunctionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetFunctionsRequest::operator==(const GetFunctionsRequest & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.pattern != rhs.__isset.pattern)
+    return false;
+  else if (__isset.pattern && !(pattern == rhs.pattern))
+    return false;
+  if (__isset.returnNames != rhs.__isset.returnNames)
+    return false;
+  else if (__isset.returnNames && !(returnNames == rhs.returnNames))
+    return false;
+  return true;
+}
+
 GetFunctionsRequest::GetFunctionsRequest(const GetFunctionsRequest& other1431) {
   dbName = other1431.dbName;
   catalogName = other1431.catalogName;
@@ -38549,6 +43278,8 @@ void GetFunctionsRequest::printTo(std::ostream& out) const {
 GetFunctionsResponse::~GetFunctionsResponse() noexcept {
 }
 
+GetFunctionsResponse::GetFunctionsResponse() noexcept {
+}
 
 void GetFunctionsResponse::__set_function_names(const std::vector<std::string> & val) {
   this->function_names = val;
@@ -38675,13 +43406,26 @@ uint32_t GetFunctionsResponse::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(GetFunctionsResponse &a, GetFunctionsResponse &b) {
+void swap(GetFunctionsResponse &a, GetFunctionsResponse &b) noexcept {
   using ::std::swap;
   swap(a.function_names, b.function_names);
   swap(a.functions, b.functions);
   swap(a.__isset, b.__isset);
 }
 
+bool GetFunctionsResponse::operator==(const GetFunctionsResponse & rhs) const
+{
+  if (__isset.function_names != rhs.__isset.function_names)
+    return false;
+  else if (__isset.function_names && !(function_names == rhs.function_names))
+    return false;
+  if (__isset.functions != rhs.__isset.functions)
+    return false;
+  else if (__isset.functions && !(functions == rhs.functions))
+    return false;
+  return true;
+}
+
 GetFunctionsResponse::GetFunctionsResponse(const GetFunctionsResponse& other1445) {
   function_names = other1445.function_names;
   functions = other1445.functions;
@@ -38705,6 +43449,10 @@ void GetFunctionsResponse::printTo(std::ostream& out) const {
 CmRecycleRequest::~CmRecycleRequest() noexcept {
 }
 
+CmRecycleRequest::CmRecycleRequest() noexcept
+   : dataPath(),
+     purge(0) {
+}
 
 void CmRecycleRequest::__set_dataPath(const std::string& val) {
   this->dataPath = val;
@@ -38793,12 +43541,21 @@ uint32_t CmRecycleRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(CmRecycleRequest &a, CmRecycleRequest &b) {
+void swap(CmRecycleRequest &a, CmRecycleRequest &b) noexcept {
   using ::std::swap;
   swap(a.dataPath, b.dataPath);
   swap(a.purge, b.purge);
 }
 
+bool CmRecycleRequest::operator==(const CmRecycleRequest & rhs) const
+{
+  if (!(dataPath == rhs.dataPath))
+    return false;
+  if (!(purge == rhs.purge))
+    return false;
+  return true;
+}
+
 CmRecycleRequest::CmRecycleRequest(const CmRecycleRequest& other1447) {
   dataPath = other1447.dataPath;
   purge = other1447.purge;
@@ -38820,6 +43577,8 @@ void CmRecycleRequest::printTo(std::ostream& out) const {
 CmRecycleResponse::~CmRecycleResponse() noexcept {
 }
 
+CmRecycleResponse::CmRecycleResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const CmRecycleResponse& obj)
 {
   obj.printTo(out);
@@ -38865,12 +43624,17 @@ uint32_t CmRecycleResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(CmRecycleResponse &a, CmRecycleResponse &b) {
+void swap(CmRecycleResponse &a, CmRecycleResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool CmRecycleResponse::operator==(const CmRecycleResponse & /* rhs */) const
+{
+  return true;
+}
+
 CmRecycleResponse::CmRecycleResponse(const CmRecycleResponse& other1449) noexcept {
   (void) other1449;
 }
@@ -38888,6 +43652,15 @@ void CmRecycleResponse::printTo(std::ostream& out) const {
 TableMeta::~TableMeta() noexcept {
 }
 
+TableMeta::TableMeta() noexcept
+   : dbName(),
+     tableName(),
+     tableType(),
+     comments(),
+     catName(),
+     ownerName(),
+     ownerType(static_cast<PrincipalType::type>(0)) {
+}
 
 void TableMeta::__set_dbName(const std::string& val) {
   this->dbName = val;
@@ -39069,7 +43842,7 @@ uint32_t TableMeta::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(TableMeta &a, TableMeta &b) {
+void swap(TableMeta &a, TableMeta &b) noexcept {
   using ::std::swap;
   swap(a.dbName, b.dbName);
   swap(a.tableName, b.tableName);
@@ -39081,6 +43854,33 @@ void swap(TableMeta &a, TableMeta &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TableMeta::operator==(const TableMeta & rhs) const
+{
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(tableType == rhs.tableType))
+    return false;
+  if (__isset.comments != rhs.__isset.comments)
+    return false;
+  else if (__isset.comments && !(comments == rhs.comments))
+    return false;
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (__isset.ownerName != rhs.__isset.ownerName)
+    return false;
+  else if (__isset.ownerName && !(ownerName == rhs.ownerName))
+    return false;
+  if (__isset.ownerType != rhs.__isset.ownerType)
+    return false;
+  else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+    return false;
+  return true;
+}
+
 TableMeta::TableMeta(const TableMeta& other1452) {
   dbName = other1452.dbName;
   tableName = other1452.tableName;
@@ -39119,6 +43919,10 @@ void TableMeta::printTo(std::ostream& out) const {
 Materialization::~Materialization() noexcept {
 }
 
+Materialization::Materialization() noexcept
+   : sourceTablesUpdateDeleteModified(0),
+     sourceTablesCompacted(0) {
+}
 
 void Materialization::__set_sourceTablesUpdateDeleteModified(const bool val) {
   this->sourceTablesUpdateDeleteModified = val;
@@ -39207,12 +44011,21 @@ uint32_t Materialization::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(Materialization &a, Materialization &b) {
+void swap(Materialization &a, Materialization &b) noexcept {
   using ::std::swap;
   swap(a.sourceTablesUpdateDeleteModified, b.sourceTablesUpdateDeleteModified);
   swap(a.sourceTablesCompacted, b.sourceTablesCompacted);
 }
 
+bool Materialization::operator==(const Materialization & rhs) const
+{
+  if (!(sourceTablesUpdateDeleteModified == rhs.sourceTablesUpdateDeleteModified))
+    return false;
+  if (!(sourceTablesCompacted == rhs.sourceTablesCompacted))
+    return false;
+  return true;
+}
+
 Materialization::Materialization(const Materialization& other1454) noexcept {
   sourceTablesUpdateDeleteModified = other1454.sourceTablesUpdateDeleteModified;
   sourceTablesCompacted = other1454.sourceTablesCompacted;
@@ -39234,6 +44047,13 @@ void Materialization::printTo(std::ostream& out) const {
 WMResourcePlan::~WMResourcePlan() noexcept {
 }
 
+WMResourcePlan::WMResourcePlan() noexcept
+   : name(),
+     status(static_cast<WMResourcePlanStatus::type>(0)),
+     queryParallelism(0),
+     defaultPoolPath(),
+     ns() {
+}
 
 void WMResourcePlan::__set_name(const std::string& val) {
   this->name = val;
@@ -39377,7 +44197,7 @@ uint32_t WMResourcePlan::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(WMResourcePlan &a, WMResourcePlan &b) {
+void swap(WMResourcePlan &a, WMResourcePlan &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.status, b.status);
@@ -39387,6 +44207,29 @@ void swap(WMResourcePlan &a, WMResourcePlan &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMResourcePlan::operator==(const WMResourcePlan & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (__isset.status != rhs.__isset.status)
+    return false;
+  else if (__isset.status && !(status == rhs.status))
+    return false;
+  if (__isset.queryParallelism != rhs.__isset.queryParallelism)
+    return false;
+  else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
+    return false;
+  if (__isset.defaultPoolPath != rhs.__isset.defaultPoolPath)
+    return false;
+  else if (__isset.defaultPoolPath && !(defaultPoolPath == rhs.defaultPoolPath))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMResourcePlan::WMResourcePlan(const WMResourcePlan& other1457) {
   name = other1457.name;
   status = other1457.status;
@@ -39419,6 +44262,15 @@ void WMResourcePlan::printTo(std::ostream& out) const {
 WMNullableResourcePlan::~WMNullableResourcePlan() noexcept {
 }
 
+WMNullableResourcePlan::WMNullableResourcePlan() noexcept
+   : name(),
+     status(static_cast<WMResourcePlanStatus::type>(0)),
+     queryParallelism(0),
+     isSetQueryParallelism(0),
+     defaultPoolPath(),
+     isSetDefaultPoolPath(0),
+     ns() {
+}
 
 void WMNullableResourcePlan::__set_name(const std::string& val) {
   this->name = val;
@@ -39597,7 +44449,7 @@ uint32_t WMNullableResourcePlan::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(WMNullableResourcePlan &a, WMNullableResourcePlan &b) {
+void swap(WMNullableResourcePlan &a, WMNullableResourcePlan &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.status, b.status);
@@ -39609,6 +44461,39 @@ void swap(WMNullableResourcePlan &a, WMNullableResourcePlan &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMNullableResourcePlan::operator==(const WMNullableResourcePlan & rhs) const
+{
+  if (__isset.name != rhs.__isset.name)
+    return false;
+  else if (__isset.name && !(name == rhs.name))
+    return false;
+  if (__isset.status != rhs.__isset.status)
+    return false;
+  else if (__isset.status && !(status == rhs.status))
+    return false;
+  if (__isset.queryParallelism != rhs.__isset.queryParallelism)
+    return false;
+  else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
+    return false;
+  if (__isset.isSetQueryParallelism != rhs.__isset.isSetQueryParallelism)
+    return false;
+  else if (__isset.isSetQueryParallelism && !(isSetQueryParallelism == rhs.isSetQueryParallelism))
+    return false;
+  if (__isset.defaultPoolPath != rhs.__isset.defaultPoolPath)
+    return false;
+  else if (__isset.defaultPoolPath && !(defaultPoolPath == rhs.defaultPoolPath))
+    return false;
+  if (__isset.isSetDefaultPoolPath != rhs.__isset.isSetDefaultPoolPath)
+    return false;
+  else if (__isset.isSetDefaultPoolPath && !(isSetDefaultPoolPath == rhs.isSetDefaultPoolPath))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMNullableResourcePlan::WMNullableResourcePlan(const WMNullableResourcePlan& other1460) {
   name = other1460.name;
   status = other1460.status;
@@ -39647,6 +44532,14 @@ void WMNullableResourcePlan::printTo(std::ostream& out) const {
 WMPool::~WMPool() noexcept {
 }
 
+WMPool::WMPool() noexcept
+   : resourcePlanName(),
+     poolPath(),
+     allocFraction(0),
+     queryParallelism(0),
+     schedulingPolicy(),
+     ns() {
+}
 
 void WMPool::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -39807,7 +44700,7 @@ uint32_t WMPool::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(WMPool &a, WMPool &b) {
+void swap(WMPool &a, WMPool &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.poolPath, b.poolPath);
@@ -39818,6 +44711,31 @@ void swap(WMPool &a, WMPool &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMPool::operator==(const WMPool & rhs) const
+{
+  if (!(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (!(poolPath == rhs.poolPath))
+    return false;
+  if (__isset.allocFraction != rhs.__isset.allocFraction)
+    return false;
+  else if (__isset.allocFraction && !(allocFraction == rhs.allocFraction))
+    return false;
+  if (__isset.queryParallelism != rhs.__isset.queryParallelism)
+    return false;
+  else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
+    return false;
+  if (__isset.schedulingPolicy != rhs.__isset.schedulingPolicy)
+    return false;
+  else if (__isset.schedulingPolicy && !(schedulingPolicy == rhs.schedulingPolicy))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMPool::WMPool(const WMPool& other1462) {
   resourcePlanName = other1462.resourcePlanName;
   poolPath = other1462.poolPath;
@@ -39853,6 +44771,15 @@ void WMPool::printTo(std::ostream& out) const {
 WMNullablePool::~WMNullablePool() noexcept {
 }
 
+WMNullablePool::WMNullablePool() noexcept
+   : resourcePlanName(),
+     poolPath(),
+     allocFraction(0),
+     queryParallelism(0),
+     schedulingPolicy(),
+     isSetSchedulingPolicy(0),
+     ns() {
+}
 
 void WMNullablePool::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -40031,7 +44958,7 @@ uint32_t WMNullablePool::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(WMNullablePool &a, WMNullablePool &b) {
+void swap(WMNullablePool &a, WMNullablePool &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.poolPath, b.poolPath);
@@ -40043,6 +44970,35 @@ void swap(WMNullablePool &a, WMNullablePool &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMNullablePool::operator==(const WMNullablePool & rhs) const
+{
+  if (!(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (!(poolPath == rhs.poolPath))
+    return false;
+  if (__isset.allocFraction != rhs.__isset.allocFraction)
+    return false;
+  else if (__isset.allocFraction && !(allocFraction == rhs.allocFraction))
+    return false;
+  if (__isset.queryParallelism != rhs.__isset.queryParallelism)
+    return false;
+  else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
+    return false;
+  if (__isset.schedulingPolicy != rhs.__isset.schedulingPolicy)
+    return false;
+  else if (__isset.schedulingPolicy && !(schedulingPolicy == rhs.schedulingPolicy))
+    return false;
+  if (__isset.isSetSchedulingPolicy != rhs.__isset.isSetSchedulingPolicy)
+    return false;
+  else if (__isset.isSetSchedulingPolicy && !(isSetSchedulingPolicy == rhs.isSetSchedulingPolicy))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMNullablePool::WMNullablePool(const WMNullablePool& other1464) {
   resourcePlanName = other1464.resourcePlanName;
   poolPath = other1464.poolPath;
@@ -40081,6 +45037,14 @@ void WMNullablePool::printTo(std::ostream& out) const {
 WMTrigger::~WMTrigger() noexcept {
 }
 
+WMTrigger::WMTrigger() noexcept
+   : resourcePlanName(),
+     triggerName(),
+     triggerExpression(),
+     actionExpression(),
+     isInUnmanaged(0),
+     ns() {
+}
 
 void WMTrigger::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -40241,7 +45205,7 @@ uint32_t WMTrigger::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(WMTrigger &a, WMTrigger &b) {
+void swap(WMTrigger &a, WMTrigger &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.triggerName, b.triggerName);
@@ -40252,6 +45216,31 @@ void swap(WMTrigger &a, WMTrigger &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMTrigger::operator==(const WMTrigger & rhs) const
+{
+  if (!(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (!(triggerName == rhs.triggerName))
+    return false;
+  if (__isset.triggerExpression != rhs.__isset.triggerExpression)
+    return false;
+  else if (__isset.triggerExpression && !(triggerExpression == rhs.triggerExpression))
+    return false;
+  if (__isset.actionExpression != rhs.__isset.actionExpression)
+    return false;
+  else if (__isset.actionExpression && !(actionExpression == rhs.actionExpression))
+    return false;
+  if (__isset.isInUnmanaged != rhs.__isset.isInUnmanaged)
+    return false;
+  else if (__isset.isInUnmanaged && !(isInUnmanaged == rhs.isInUnmanaged))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMTrigger::WMTrigger(const WMTrigger& other1466) {
   resourcePlanName = other1466.resourcePlanName;
   triggerName = other1466.triggerName;
@@ -40287,6 +45276,14 @@ void WMTrigger::printTo(std::ostream& out) const {
 WMMapping::~WMMapping() noexcept {
 }
 
+WMMapping::WMMapping() noexcept
+   : resourcePlanName(),
+     entityType(),
+     entityName(),
+     poolPath(),
+     ordering(0),
+     ns() {
+}
 
 void WMMapping::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -40448,7 +45445,7 @@ uint32_t WMMapping::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(WMMapping &a, WMMapping &b) {
+void swap(WMMapping &a, WMMapping &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.entityType, b.entityType);
@@ -40459,6 +45456,29 @@ void swap(WMMapping &a, WMMapping &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMMapping::operator==(const WMMapping & rhs) const
+{
+  if (!(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (!(entityType == rhs.entityType))
+    return false;
+  if (!(entityName == rhs.entityName))
+    return false;
+  if (__isset.poolPath != rhs.__isset.poolPath)
+    return false;
+  else if (__isset.poolPath && !(poolPath == rhs.poolPath))
+    return false;
+  if (__isset.ordering != rhs.__isset.ordering)
+    return false;
+  else if (__isset.ordering && !(ordering == rhs.ordering))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMMapping::WMMapping(const WMMapping& other1468) {
   resourcePlanName = other1468.resourcePlanName;
   entityType = other1468.entityType;
@@ -40494,6 +45514,11 @@ void WMMapping::printTo(std::ostream& out) const {
 WMPoolTrigger::~WMPoolTrigger() noexcept {
 }
 
+WMPoolTrigger::WMPoolTrigger() noexcept
+   : pool(),
+     trigger(),
+     ns() {
+}
 
 void WMPoolTrigger::__set_pool(const std::string& val) {
   this->pool = val;
@@ -40600,7 +45625,7 @@ uint32_t WMPoolTrigger::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(WMPoolTrigger &a, WMPoolTrigger &b) {
+void swap(WMPoolTrigger &a, WMPoolTrigger &b) noexcept {
   using ::std::swap;
   swap(a.pool, b.pool);
   swap(a.trigger, b.trigger);
@@ -40608,6 +45633,19 @@ void swap(WMPoolTrigger &a, WMPoolTrigger &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMPoolTrigger::operator==(const WMPoolTrigger & rhs) const
+{
+  if (!(pool == rhs.pool))
+    return false;
+  if (!(trigger == rhs.trigger))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMPoolTrigger::WMPoolTrigger(const WMPoolTrigger& other1470) {
   pool = other1470.pool;
   trigger = other1470.trigger;
@@ -40634,6 +45672,8 @@ void WMPoolTrigger::printTo(std::ostream& out) const {
 WMFullResourcePlan::~WMFullResourcePlan() noexcept {
 }
 
+WMFullResourcePlan::WMFullResourcePlan() noexcept {
+}
 
 void WMFullResourcePlan::__set_plan(const WMResourcePlan& val) {
   this->plan = val;
@@ -40856,7 +45896,7 @@ uint32_t WMFullResourcePlan::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(WMFullResourcePlan &a, WMFullResourcePlan &b) {
+void swap(WMFullResourcePlan &a, WMFullResourcePlan &b) noexcept {
   using ::std::swap;
   swap(a.plan, b.plan);
   swap(a.pools, b.pools);
@@ -40866,6 +45906,27 @@ void swap(WMFullResourcePlan &a, WMFullResourcePlan &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMFullResourcePlan::operator==(const WMFullResourcePlan & rhs) const
+{
+  if (!(plan == rhs.plan))
+    return false;
+  if (!(pools == rhs.pools))
+    return false;
+  if (__isset.mappings != rhs.__isset.mappings)
+    return false;
+  else if (__isset.mappings && !(mappings == rhs.mappings))
+    return false;
+  if (__isset.triggers != rhs.__isset.triggers)
+    return false;
+  else if (__isset.triggers && !(triggers == rhs.triggers))
+    return false;
+  if (__isset.poolTriggers != rhs.__isset.poolTriggers)
+    return false;
+  else if (__isset.poolTriggers && !(poolTriggers == rhs.poolTriggers))
+    return false;
+  return true;
+}
+
 WMFullResourcePlan::WMFullResourcePlan(const WMFullResourcePlan& other1496) {
   plan = other1496.plan;
   pools = other1496.pools;
@@ -40898,6 +45959,9 @@ void WMFullResourcePlan::printTo(std::ostream& out) const {
 WMCreateResourcePlanRequest::~WMCreateResourcePlanRequest() noexcept {
 }
 
+WMCreateResourcePlanRequest::WMCreateResourcePlanRequest() noexcept
+   : copyFrom() {
+}
 
 void WMCreateResourcePlanRequest::__set_resourcePlan(const WMResourcePlan& val) {
   this->resourcePlan = val;
@@ -40984,13 +46048,26 @@ uint32_t WMCreateResourcePlanRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(WMCreateResourcePlanRequest &a, WMCreateResourcePlanRequest &b) {
+void swap(WMCreateResourcePlanRequest &a, WMCreateResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlan, b.resourcePlan);
   swap(a.copyFrom, b.copyFrom);
   swap(a.__isset, b.__isset);
 }
 
+bool WMCreateResourcePlanRequest::operator==(const WMCreateResourcePlanRequest & rhs) const
+{
+  if (__isset.resourcePlan != rhs.__isset.resourcePlan)
+    return false;
+  else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
+    return false;
+  if (__isset.copyFrom != rhs.__isset.copyFrom)
+    return false;
+  else if (__isset.copyFrom && !(copyFrom == rhs.copyFrom))
+    return false;
+  return true;
+}
+
 WMCreateResourcePlanRequest::WMCreateResourcePlanRequest(const WMCreateResourcePlanRequest& other1498) {
   resourcePlan = other1498.resourcePlan;
   copyFrom = other1498.copyFrom;
@@ -41014,6 +46091,8 @@ void WMCreateResourcePlanRequest::printTo(std::ostream& out) const {
 WMCreateResourcePlanResponse::~WMCreateResourcePlanResponse() noexcept {
 }
 
+WMCreateResourcePlanResponse::WMCreateResourcePlanResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMCreateResourcePlanResponse& obj)
 {
   obj.printTo(out);
@@ -41059,12 +46138,17 @@ uint32_t WMCreateResourcePlanResponse::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(WMCreateResourcePlanResponse &a, WMCreateResourcePlanResponse &b) {
+void swap(WMCreateResourcePlanResponse &a, WMCreateResourcePlanResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMCreateResourcePlanResponse::operator==(const WMCreateResourcePlanResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMCreateResourcePlanResponse::WMCreateResourcePlanResponse(const WMCreateResourcePlanResponse& other1500) noexcept {
   (void) other1500;
 }
@@ -41082,6 +46166,9 @@ void WMCreateResourcePlanResponse::printTo(std::ostream& out) const {
 WMGetActiveResourcePlanRequest::~WMGetActiveResourcePlanRequest() noexcept {
 }
 
+WMGetActiveResourcePlanRequest::WMGetActiveResourcePlanRequest() noexcept
+   : ns() {
+}
 
 void WMGetActiveResourcePlanRequest::__set_ns(const std::string& val) {
   this->ns = val;
@@ -41150,12 +46237,21 @@ uint32_t WMGetActiveResourcePlanRequest::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(WMGetActiveResourcePlanRequest &a, WMGetActiveResourcePlanRequest &b) {
+void swap(WMGetActiveResourcePlanRequest &a, WMGetActiveResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.ns, b.ns);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetActiveResourcePlanRequest::operator==(const WMGetActiveResourcePlanRequest & rhs) const
+{
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMGetActiveResourcePlanRequest::WMGetActiveResourcePlanRequest(const WMGetActiveResourcePlanRequest& other1502) {
   ns = other1502.ns;
   __isset = other1502.__isset;
@@ -41176,6 +46272,8 @@ void WMGetActiveResourcePlanRequest::printTo(std::ostream& out) const {
 WMGetActiveResourcePlanResponse::~WMGetActiveResourcePlanResponse() noexcept {
 }
 
+WMGetActiveResourcePlanResponse::WMGetActiveResourcePlanResponse() noexcept {
+}
 
 void WMGetActiveResourcePlanResponse::__set_resourcePlan(const WMFullResourcePlan& val) {
   this->resourcePlan = val;
@@ -41244,12 +46342,21 @@ uint32_t WMGetActiveResourcePlanResponse::write(::apache::thrift::protocol::TPro
   return xfer;
 }
 
-void swap(WMGetActiveResourcePlanResponse &a, WMGetActiveResourcePlanResponse &b) {
+void swap(WMGetActiveResourcePlanResponse &a, WMGetActiveResourcePlanResponse &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlan, b.resourcePlan);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetActiveResourcePlanResponse::operator==(const WMGetActiveResourcePlanResponse & rhs) const
+{
+  if (__isset.resourcePlan != rhs.__isset.resourcePlan)
+    return false;
+  else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
+    return false;
+  return true;
+}
+
 WMGetActiveResourcePlanResponse::WMGetActiveResourcePlanResponse(const WMGetActiveResourcePlanResponse& other1504) {
   resourcePlan = other1504.resourcePlan;
   __isset = other1504.__isset;
@@ -41270,6 +46377,10 @@ void WMGetActiveResourcePlanResponse::printTo(std::ostream& out) const {
 WMGetResourcePlanRequest::~WMGetResourcePlanRequest() noexcept {
 }
 
+WMGetResourcePlanRequest::WMGetResourcePlanRequest() noexcept
+   : resourcePlanName(),
+     ns() {
+}
 
 void WMGetResourcePlanRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -41356,13 +46467,26 @@ uint32_t WMGetResourcePlanRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(WMGetResourcePlanRequest &a, WMGetResourcePlanRequest &b) {
+void swap(WMGetResourcePlanRequest &a, WMGetResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.ns, b.ns);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetResourcePlanRequest::operator==(const WMGetResourcePlanRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMGetResourcePlanRequest::WMGetResourcePlanRequest(const WMGetResourcePlanRequest& other1506) {
   resourcePlanName = other1506.resourcePlanName;
   ns = other1506.ns;
@@ -41386,6 +46510,8 @@ void WMGetResourcePlanRequest::printTo(std::ostream& out) const {
 WMGetResourcePlanResponse::~WMGetResourcePlanResponse() noexcept {
 }
 
+WMGetResourcePlanResponse::WMGetResourcePlanResponse() noexcept {
+}
 
 void WMGetResourcePlanResponse::__set_resourcePlan(const WMFullResourcePlan& val) {
   this->resourcePlan = val;
@@ -41454,12 +46580,21 @@ uint32_t WMGetResourcePlanResponse::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(WMGetResourcePlanResponse &a, WMGetResourcePlanResponse &b) {
+void swap(WMGetResourcePlanResponse &a, WMGetResourcePlanResponse &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlan, b.resourcePlan);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetResourcePlanResponse::operator==(const WMGetResourcePlanResponse & rhs) const
+{
+  if (__isset.resourcePlan != rhs.__isset.resourcePlan)
+    return false;
+  else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
+    return false;
+  return true;
+}
+
 WMGetResourcePlanResponse::WMGetResourcePlanResponse(const WMGetResourcePlanResponse& other1508) {
   resourcePlan = other1508.resourcePlan;
   __isset = other1508.__isset;
@@ -41480,6 +46615,9 @@ void WMGetResourcePlanResponse::printTo(std::ostream& out) const {
 WMGetAllResourcePlanRequest::~WMGetAllResourcePlanRequest() noexcept {
 }
 
+WMGetAllResourcePlanRequest::WMGetAllResourcePlanRequest() noexcept
+   : ns() {
+}
 
 void WMGetAllResourcePlanRequest::__set_ns(const std::string& val) {
   this->ns = val;
@@ -41548,12 +46686,21 @@ uint32_t WMGetAllResourcePlanRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(WMGetAllResourcePlanRequest &a, WMGetAllResourcePlanRequest &b) {
+void swap(WMGetAllResourcePlanRequest &a, WMGetAllResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.ns, b.ns);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetAllResourcePlanRequest::operator==(const WMGetAllResourcePlanRequest & rhs) const
+{
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMGetAllResourcePlanRequest::WMGetAllResourcePlanRequest(const WMGetAllResourcePlanRequest& other1510) {
   ns = other1510.ns;
   __isset = other1510.__isset;
@@ -41574,6 +46721,8 @@ void WMGetAllResourcePlanRequest::printTo(std::ostream& out) const {
 WMGetAllResourcePlanResponse::~WMGetAllResourcePlanResponse() noexcept {
 }
 
+WMGetAllResourcePlanResponse::WMGetAllResourcePlanResponse() noexcept {
+}
 
 void WMGetAllResourcePlanResponse::__set_resourcePlans(const std::vector<WMResourcePlan> & val) {
   this->resourcePlans = val;
@@ -41662,12 +46811,21 @@ uint32_t WMGetAllResourcePlanResponse::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(WMGetAllResourcePlanResponse &a, WMGetAllResourcePlanResponse &b) {
+void swap(WMGetAllResourcePlanResponse &a, WMGetAllResourcePlanResponse &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlans, b.resourcePlans);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetAllResourcePlanResponse::operator==(const WMGetAllResourcePlanResponse & rhs) const
+{
+  if (__isset.resourcePlans != rhs.__isset.resourcePlans)
+    return false;
+  else if (__isset.resourcePlans && !(resourcePlans == rhs.resourcePlans))
+    return false;
+  return true;
+}
+
 WMGetAllResourcePlanResponse::WMGetAllResourcePlanResponse(const WMGetAllResourcePlanResponse& other1518) {
   resourcePlans = other1518.resourcePlans;
   __isset = other1518.__isset;
@@ -41688,6 +46846,13 @@ void WMGetAllResourcePlanResponse::printTo(std::ostream& out) const {
 WMAlterResourcePlanRequest::~WMAlterResourcePlanRequest() noexcept {
 }
 
+WMAlterResourcePlanRequest::WMAlterResourcePlanRequest() noexcept
+   : resourcePlanName(),
+     isEnableAndActivate(0),
+     isForceDeactivate(0),
+     isReplace(0),
+     ns() {
+}
 
 void WMAlterResourcePlanRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -41846,7 +47011,7 @@ uint32_t WMAlterResourcePlanRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(WMAlterResourcePlanRequest &a, WMAlterResourcePlanRequest &b) {
+void swap(WMAlterResourcePlanRequest &a, WMAlterResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.resourcePlan, b.resourcePlan);
@@ -41857,6 +47022,35 @@ void swap(WMAlterResourcePlanRequest &a, WMAlterResourcePlanRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMAlterResourcePlanRequest::operator==(const WMAlterResourcePlanRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.resourcePlan != rhs.__isset.resourcePlan)
+    return false;
+  else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
+    return false;
+  if (__isset.isEnableAndActivate != rhs.__isset.isEnableAndActivate)
+    return false;
+  else if (__isset.isEnableAndActivate && !(isEnableAndActivate == rhs.isEnableAndActivate))
+    return false;
+  if (__isset.isForceDeactivate != rhs.__isset.isForceDeactivate)
+    return false;
+  else if (__isset.isForceDeactivate && !(isForceDeactivate == rhs.isForceDeactivate))
+    return false;
+  if (__isset.isReplace != rhs.__isset.isReplace)
+    return false;
+  else if (__isset.isReplace && !(isReplace == rhs.isReplace))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMAlterResourcePlanRequest::WMAlterResourcePlanRequest(const WMAlterResourcePlanRequest& other1520) {
   resourcePlanName = other1520.resourcePlanName;
   resourcePlan = other1520.resourcePlan;
@@ -41892,6 +47086,8 @@ void WMAlterResourcePlanRequest::printTo(std::ostream& out) const {
 WMAlterResourcePlanResponse::~WMAlterResourcePlanResponse() noexcept {
 }
 
+WMAlterResourcePlanResponse::WMAlterResourcePlanResponse() noexcept {
+}
 
 void WMAlterResourcePlanResponse::__set_fullResourcePlan(const WMFullResourcePlan& val) {
   this->fullResourcePlan = val;
@@ -41960,12 +47156,21 @@ uint32_t WMAlterResourcePlanResponse::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(WMAlterResourcePlanResponse &a, WMAlterResourcePlanResponse &b) {
+void swap(WMAlterResourcePlanResponse &a, WMAlterResourcePlanResponse &b) noexcept {
   using ::std::swap;
   swap(a.fullResourcePlan, b.fullResourcePlan);
   swap(a.__isset, b.__isset);
 }
 
+bool WMAlterResourcePlanResponse::operator==(const WMAlterResourcePlanResponse & rhs) const
+{
+  if (__isset.fullResourcePlan != rhs.__isset.fullResourcePlan)
+    return false;
+  else if (__isset.fullResourcePlan && !(fullResourcePlan == rhs.fullResourcePlan))
+    return false;
+  return true;
+}
+
 WMAlterResourcePlanResponse::WMAlterResourcePlanResponse(const WMAlterResourcePlanResponse& other1522) {
   fullResourcePlan = other1522.fullResourcePlan;
   __isset = other1522.__isset;
@@ -41986,6 +47191,10 @@ void WMAlterResourcePlanResponse::printTo(std::ostream& out) const {
 WMValidateResourcePlanRequest::~WMValidateResourcePlanRequest() noexcept {
 }
 
+WMValidateResourcePlanRequest::WMValidateResourcePlanRequest() noexcept
+   : resourcePlanName(),
+     ns() {
+}
 
 void WMValidateResourcePlanRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -42072,13 +47281,26 @@ uint32_t WMValidateResourcePlanRequest::write(::apache::thrift::protocol::TProto
   return xfer;
 }
 
-void swap(WMValidateResourcePlanRequest &a, WMValidateResourcePlanRequest &b) {
+void swap(WMValidateResourcePlanRequest &a, WMValidateResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.ns, b.ns);
   swap(a.__isset, b.__isset);
 }
 
+bool WMValidateResourcePlanRequest::operator==(const WMValidateResourcePlanRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMValidateResourcePlanRequest::WMValidateResourcePlanRequest(const WMValidateResourcePlanRequest& other1524) {
   resourcePlanName = other1524.resourcePlanName;
   ns = other1524.ns;
@@ -42102,6 +47324,8 @@ void WMValidateResourcePlanRequest::printTo(std::ostream& out) const {
 WMValidateResourcePlanResponse::~WMValidateResourcePlanResponse() noexcept {
 }
 
+WMValidateResourcePlanResponse::WMValidateResourcePlanResponse() noexcept {
+}
 
 void WMValidateResourcePlanResponse::__set_errors(const std::vector<std::string> & val) {
   this->errors = val;
@@ -42228,13 +47452,26 @@ uint32_t WMValidateResourcePlanResponse::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(WMValidateResourcePlanResponse &a, WMValidateResourcePlanResponse &b) {
+void swap(WMValidateResourcePlanResponse &a, WMValidateResourcePlanResponse &b) noexcept {
   using ::std::swap;
   swap(a.errors, b.errors);
   swap(a.warnings, b.warnings);
   swap(a.__isset, b.__isset);
 }
 
+bool WMValidateResourcePlanResponse::operator==(const WMValidateResourcePlanResponse & rhs) const
+{
+  if (__isset.errors != rhs.__isset.errors)
+    return false;
+  else if (__isset.errors && !(errors == rhs.errors))
+    return false;
+  if (__isset.warnings != rhs.__isset.warnings)
+    return false;
+  else if (__isset.warnings && !(warnings == rhs.warnings))
+    return false;
+  return true;
+}
+
 WMValidateResourcePlanResponse::WMValidateResourcePlanResponse(const WMValidateResourcePlanResponse& other1538) {
   errors = other1538.errors;
   warnings = other1538.warnings;
@@ -42258,6 +47495,10 @@ void WMValidateResourcePlanResponse::printTo(std::ostream& out) const {
 WMDropResourcePlanRequest::~WMDropResourcePlanRequest() noexcept {
 }
 
+WMDropResourcePlanRequest::WMDropResourcePlanRequest() noexcept
+   : resourcePlanName(),
+     ns() {
+}
 
 void WMDropResourcePlanRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -42344,13 +47585,26 @@ uint32_t WMDropResourcePlanRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(WMDropResourcePlanRequest &a, WMDropResourcePlanRequest &b) {
+void swap(WMDropResourcePlanRequest &a, WMDropResourcePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.ns, b.ns);
   swap(a.__isset, b.__isset);
 }
 
+bool WMDropResourcePlanRequest::operator==(const WMDropResourcePlanRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMDropResourcePlanRequest::WMDropResourcePlanRequest(const WMDropResourcePlanRequest& other1540) {
   resourcePlanName = other1540.resourcePlanName;
   ns = other1540.ns;
@@ -42374,6 +47628,8 @@ void WMDropResourcePlanRequest::printTo(std::ostream& out) const {
 WMDropResourcePlanResponse::~WMDropResourcePlanResponse() noexcept {
 }
 
+WMDropResourcePlanResponse::WMDropResourcePlanResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMDropResourcePlanResponse& obj)
 {
   obj.printTo(out);
@@ -42419,12 +47675,17 @@ uint32_t WMDropResourcePlanResponse::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(WMDropResourcePlanResponse &a, WMDropResourcePlanResponse &b) {
+void swap(WMDropResourcePlanResponse &a, WMDropResourcePlanResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMDropResourcePlanResponse::operator==(const WMDropResourcePlanResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMDropResourcePlanResponse::WMDropResourcePlanResponse(const WMDropResourcePlanResponse& other1542) noexcept {
   (void) other1542;
 }
@@ -42442,6 +47703,8 @@ void WMDropResourcePlanResponse::printTo(std::ostream& out) const {
 WMCreateTriggerRequest::~WMCreateTriggerRequest() noexcept {
 }
 
+WMCreateTriggerRequest::WMCreateTriggerRequest() noexcept {
+}
 
 void WMCreateTriggerRequest::__set_trigger(const WMTrigger& val) {
   this->trigger = val;
@@ -42510,12 +47773,21 @@ uint32_t WMCreateTriggerRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(WMCreateTriggerRequest &a, WMCreateTriggerRequest &b) {
+void swap(WMCreateTriggerRequest &a, WMCreateTriggerRequest &b) noexcept {
   using ::std::swap;
   swap(a.trigger, b.trigger);
   swap(a.__isset, b.__isset);
 }
 
+bool WMCreateTriggerRequest::operator==(const WMCreateTriggerRequest & rhs) const
+{
+  if (__isset.trigger != rhs.__isset.trigger)
+    return false;
+  else if (__isset.trigger && !(trigger == rhs.trigger))
+    return false;
+  return true;
+}
+
 WMCreateTriggerRequest::WMCreateTriggerRequest(const WMCreateTriggerRequest& other1544) {
   trigger = other1544.trigger;
   __isset = other1544.__isset;
@@ -42536,6 +47808,8 @@ void WMCreateTriggerRequest::printTo(std::ostream& out) const {
 WMCreateTriggerResponse::~WMCreateTriggerResponse() noexcept {
 }
 
+WMCreateTriggerResponse::WMCreateTriggerResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMCreateTriggerResponse& obj)
 {
   obj.printTo(out);
@@ -42581,12 +47855,17 @@ uint32_t WMCreateTriggerResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(WMCreateTriggerResponse &a, WMCreateTriggerResponse &b) {
+void swap(WMCreateTriggerResponse &a, WMCreateTriggerResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMCreateTriggerResponse::operator==(const WMCreateTriggerResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMCreateTriggerResponse::WMCreateTriggerResponse(const WMCreateTriggerResponse& other1546) noexcept {
   (void) other1546;
 }
@@ -42604,6 +47883,8 @@ void WMCreateTriggerResponse::printTo(std::ostream& out) const {
 WMAlterTriggerRequest::~WMAlterTriggerRequest() noexcept {
 }
 
+WMAlterTriggerRequest::WMAlterTriggerRequest() noexcept {
+}
 
 void WMAlterTriggerRequest::__set_trigger(const WMTrigger& val) {
   this->trigger = val;
@@ -42672,12 +47953,21 @@ uint32_t WMAlterTriggerRequest::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(WMAlterTriggerRequest &a, WMAlterTriggerRequest &b) {
+void swap(WMAlterTriggerRequest &a, WMAlterTriggerRequest &b) noexcept {
   using ::std::swap;
   swap(a.trigger, b.trigger);
   swap(a.__isset, b.__isset);
 }
 
+bool WMAlterTriggerRequest::operator==(const WMAlterTriggerRequest & rhs) const
+{
+  if (__isset.trigger != rhs.__isset.trigger)
+    return false;
+  else if (__isset.trigger && !(trigger == rhs.trigger))
+    return false;
+  return true;
+}
+
 WMAlterTriggerRequest::WMAlterTriggerRequest(const WMAlterTriggerRequest& other1548) {
   trigger = other1548.trigger;
   __isset = other1548.__isset;
@@ -42698,6 +47988,8 @@ void WMAlterTriggerRequest::printTo(std::ostream& out) const {
 WMAlterTriggerResponse::~WMAlterTriggerResponse() noexcept {
 }
 
+WMAlterTriggerResponse::WMAlterTriggerResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMAlterTriggerResponse& obj)
 {
   obj.printTo(out);
@@ -42743,12 +48035,17 @@ uint32_t WMAlterTriggerResponse::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(WMAlterTriggerResponse &a, WMAlterTriggerResponse &b) {
+void swap(WMAlterTriggerResponse &a, WMAlterTriggerResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMAlterTriggerResponse::operator==(const WMAlterTriggerResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMAlterTriggerResponse::WMAlterTriggerResponse(const WMAlterTriggerResponse& other1550) noexcept {
   (void) other1550;
 }
@@ -42766,6 +48063,11 @@ void WMAlterTriggerResponse::printTo(std::ostream& out) const {
 WMDropTriggerRequest::~WMDropTriggerRequest() noexcept {
 }
 
+WMDropTriggerRequest::WMDropTriggerRequest() noexcept
+   : resourcePlanName(),
+     triggerName(),
+     ns() {
+}
 
 void WMDropTriggerRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -42870,7 +48172,7 @@ uint32_t WMDropTriggerRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(WMDropTriggerRequest &a, WMDropTriggerRequest &b) {
+void swap(WMDropTriggerRequest &a, WMDropTriggerRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.triggerName, b.triggerName);
@@ -42878,6 +48180,23 @@ void swap(WMDropTriggerRequest &a, WMDropTriggerRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMDropTriggerRequest::operator==(const WMDropTriggerRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.triggerName != rhs.__isset.triggerName)
+    return false;
+  else if (__isset.triggerName && !(triggerName == rhs.triggerName))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMDropTriggerRequest::WMDropTriggerRequest(const WMDropTriggerRequest& other1552) {
   resourcePlanName = other1552.resourcePlanName;
   triggerName = other1552.triggerName;
@@ -42904,6 +48223,8 @@ void WMDropTriggerRequest::printTo(std::ostream& out) const {
 WMDropTriggerResponse::~WMDropTriggerResponse() noexcept {
 }
 
+WMDropTriggerResponse::WMDropTriggerResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMDropTriggerResponse& obj)
 {
   obj.printTo(out);
@@ -42949,12 +48270,17 @@ uint32_t WMDropTriggerResponse::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(WMDropTriggerResponse &a, WMDropTriggerResponse &b) {
+void swap(WMDropTriggerResponse &a, WMDropTriggerResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMDropTriggerResponse::operator==(const WMDropTriggerResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMDropTriggerResponse::WMDropTriggerResponse(const WMDropTriggerResponse& other1554) noexcept {
   (void) other1554;
 }
@@ -42972,6 +48298,10 @@ void WMDropTriggerResponse::printTo(std::ostream& out) const {
 WMGetTriggersForResourePlanRequest::~WMGetTriggersForResourePlanRequest() noexcept {
 }
 
+WMGetTriggersForResourePlanRequest::WMGetTriggersForResourePlanRequest() noexcept
+   : resourcePlanName(),
+     ns() {
+}
 
 void WMGetTriggersForResourePlanRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -43058,13 +48388,26 @@ uint32_t WMGetTriggersForResourePlanRequest::write(::apache::thrift::protocol::T
   return xfer;
 }
 
-void swap(WMGetTriggersForResourePlanRequest &a, WMGetTriggersForResourePlanRequest &b) {
+void swap(WMGetTriggersForResourePlanRequest &a, WMGetTriggersForResourePlanRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.ns, b.ns);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetTriggersForResourePlanRequest::operator==(const WMGetTriggersForResourePlanRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMGetTriggersForResourePlanRequest::WMGetTriggersForResourePlanRequest(const WMGetTriggersForResourePlanRequest& other1556) {
   resourcePlanName = other1556.resourcePlanName;
   ns = other1556.ns;
@@ -43088,6 +48431,8 @@ void WMGetTriggersForResourePlanRequest::printTo(std::ostream& out) const {
 WMGetTriggersForResourePlanResponse::~WMGetTriggersForResourePlanResponse() noexcept {
 }
 
+WMGetTriggersForResourePlanResponse::WMGetTriggersForResourePlanResponse() noexcept {
+}
 
 void WMGetTriggersForResourePlanResponse::__set_triggers(const std::vector<WMTrigger> & val) {
   this->triggers = val;
@@ -43176,12 +48521,21 @@ uint32_t WMGetTriggersForResourePlanResponse::write(::apache::thrift::protocol::
   return xfer;
 }
 
-void swap(WMGetTriggersForResourePlanResponse &a, WMGetTriggersForResourePlanResponse &b) {
+void swap(WMGetTriggersForResourePlanResponse &a, WMGetTriggersForResourePlanResponse &b) noexcept {
   using ::std::swap;
   swap(a.triggers, b.triggers);
   swap(a.__isset, b.__isset);
 }
 
+bool WMGetTriggersForResourePlanResponse::operator==(const WMGetTriggersForResourePlanResponse & rhs) const
+{
+  if (__isset.triggers != rhs.__isset.triggers)
+    return false;
+  else if (__isset.triggers && !(triggers == rhs.triggers))
+    return false;
+  return true;
+}
+
 WMGetTriggersForResourePlanResponse::WMGetTriggersForResourePlanResponse(const WMGetTriggersForResourePlanResponse& other1564) {
   triggers = other1564.triggers;
   __isset = other1564.__isset;
@@ -43202,6 +48556,8 @@ void WMGetTriggersForResourePlanResponse::printTo(std::ostream& out) const {
 WMCreatePoolRequest::~WMCreatePoolRequest() noexcept {
 }
 
+WMCreatePoolRequest::WMCreatePoolRequest() noexcept {
+}
 
 void WMCreatePoolRequest::__set_pool(const WMPool& val) {
   this->pool = val;
@@ -43270,12 +48626,21 @@ uint32_t WMCreatePoolRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(WMCreatePoolRequest &a, WMCreatePoolRequest &b) {
+void swap(WMCreatePoolRequest &a, WMCreatePoolRequest &b) noexcept {
   using ::std::swap;
   swap(a.pool, b.pool);
   swap(a.__isset, b.__isset);
 }
 
+bool WMCreatePoolRequest::operator==(const WMCreatePoolRequest & rhs) const
+{
+  if (__isset.pool != rhs.__isset.pool)
+    return false;
+  else if (__isset.pool && !(pool == rhs.pool))
+    return false;
+  return true;
+}
+
 WMCreatePoolRequest::WMCreatePoolRequest(const WMCreatePoolRequest& other1566) {
   pool = other1566.pool;
   __isset = other1566.__isset;
@@ -43296,6 +48661,8 @@ void WMCreatePoolRequest::printTo(std::ostream& out) const {
 WMCreatePoolResponse::~WMCreatePoolResponse() noexcept {
 }
 
+WMCreatePoolResponse::WMCreatePoolResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMCreatePoolResponse& obj)
 {
   obj.printTo(out);
@@ -43341,12 +48708,17 @@ uint32_t WMCreatePoolResponse::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(WMCreatePoolResponse &a, WMCreatePoolResponse &b) {
+void swap(WMCreatePoolResponse &a, WMCreatePoolResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMCreatePoolResponse::operator==(const WMCreatePoolResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMCreatePoolResponse::WMCreatePoolResponse(const WMCreatePoolResponse& other1568) noexcept {
   (void) other1568;
 }
@@ -43364,6 +48736,9 @@ void WMCreatePoolResponse::printTo(std::ostream& out) const {
 WMAlterPoolRequest::~WMAlterPoolRequest() noexcept {
 }
 
+WMAlterPoolRequest::WMAlterPoolRequest() noexcept
+   : poolPath() {
+}
 
 void WMAlterPoolRequest::__set_pool(const WMNullablePool& val) {
   this->pool = val;
@@ -43450,13 +48825,26 @@ uint32_t WMAlterPoolRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(WMAlterPoolRequest &a, WMAlterPoolRequest &b) {
+void swap(WMAlterPoolRequest &a, WMAlterPoolRequest &b) noexcept {
   using ::std::swap;
   swap(a.pool, b.pool);
   swap(a.poolPath, b.poolPath);
   swap(a.__isset, b.__isset);
 }
 
+bool WMAlterPoolRequest::operator==(const WMAlterPoolRequest & rhs) const
+{
+  if (__isset.pool != rhs.__isset.pool)
+    return false;
+  else if (__isset.pool && !(pool == rhs.pool))
+    return false;
+  if (__isset.poolPath != rhs.__isset.poolPath)
+    return false;
+  else if (__isset.poolPath && !(poolPath == rhs.poolPath))
+    return false;
+  return true;
+}
+
 WMAlterPoolRequest::WMAlterPoolRequest(const WMAlterPoolRequest& other1570) {
   pool = other1570.pool;
   poolPath = other1570.poolPath;
@@ -43480,6 +48868,8 @@ void WMAlterPoolRequest::printTo(std::ostream& out) const {
 WMAlterPoolResponse::~WMAlterPoolResponse() noexcept {
 }
 
+WMAlterPoolResponse::WMAlterPoolResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMAlterPoolResponse& obj)
 {
   obj.printTo(out);
@@ -43525,12 +48915,17 @@ uint32_t WMAlterPoolResponse::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(WMAlterPoolResponse &a, WMAlterPoolResponse &b) {
+void swap(WMAlterPoolResponse &a, WMAlterPoolResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMAlterPoolResponse::operator==(const WMAlterPoolResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMAlterPoolResponse::WMAlterPoolResponse(const WMAlterPoolResponse& other1572) noexcept {
   (void) other1572;
 }
@@ -43548,6 +48943,11 @@ void WMAlterPoolResponse::printTo(std::ostream& out) const {
 WMDropPoolRequest::~WMDropPoolRequest() noexcept {
 }
 
+WMDropPoolRequest::WMDropPoolRequest() noexcept
+   : resourcePlanName(),
+     poolPath(),
+     ns() {
+}
 
 void WMDropPoolRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -43652,7 +49052,7 @@ uint32_t WMDropPoolRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(WMDropPoolRequest &a, WMDropPoolRequest &b) {
+void swap(WMDropPoolRequest &a, WMDropPoolRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.poolPath, b.poolPath);
@@ -43660,6 +49060,23 @@ void swap(WMDropPoolRequest &a, WMDropPoolRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool WMDropPoolRequest::operator==(const WMDropPoolRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.poolPath != rhs.__isset.poolPath)
+    return false;
+  else if (__isset.poolPath && !(poolPath == rhs.poolPath))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMDropPoolRequest::WMDropPoolRequest(const WMDropPoolRequest& other1574) {
   resourcePlanName = other1574.resourcePlanName;
   poolPath = other1574.poolPath;
@@ -43686,6 +49103,8 @@ void WMDropPoolRequest::printTo(std::ostream& out) const {
 WMDropPoolResponse::~WMDropPoolResponse() noexcept {
 }
 
+WMDropPoolResponse::WMDropPoolResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMDropPoolResponse& obj)
 {
   obj.printTo(out);
@@ -43731,12 +49150,17 @@ uint32_t WMDropPoolResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(WMDropPoolResponse &a, WMDropPoolResponse &b) {
+void swap(WMDropPoolResponse &a, WMDropPoolResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMDropPoolResponse::operator==(const WMDropPoolResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMDropPoolResponse::WMDropPoolResponse(const WMDropPoolResponse& other1576) noexcept {
   (void) other1576;
 }
@@ -43754,6 +49178,9 @@ void WMDropPoolResponse::printTo(std::ostream& out) const {
 WMCreateOrUpdateMappingRequest::~WMCreateOrUpdateMappingRequest() noexcept {
 }
 
+WMCreateOrUpdateMappingRequest::WMCreateOrUpdateMappingRequest() noexcept
+   : update(0) {
+}
 
 void WMCreateOrUpdateMappingRequest::__set_mapping(const WMMapping& val) {
   this->mapping = val;
@@ -43840,13 +49267,26 @@ uint32_t WMCreateOrUpdateMappingRequest::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(WMCreateOrUpdateMappingRequest &a, WMCreateOrUpdateMappingRequest &b) {
+void swap(WMCreateOrUpdateMappingRequest &a, WMCreateOrUpdateMappingRequest &b) noexcept {
   using ::std::swap;
   swap(a.mapping, b.mapping);
   swap(a.update, b.update);
   swap(a.__isset, b.__isset);
 }
 
+bool WMCreateOrUpdateMappingRequest::operator==(const WMCreateOrUpdateMappingRequest & rhs) const
+{
+  if (__isset.mapping != rhs.__isset.mapping)
+    return false;
+  else if (__isset.mapping && !(mapping == rhs.mapping))
+    return false;
+  if (__isset.update != rhs.__isset.update)
+    return false;
+  else if (__isset.update && !(update == rhs.update))
+    return false;
+  return true;
+}
+
 WMCreateOrUpdateMappingRequest::WMCreateOrUpdateMappingRequest(const WMCreateOrUpdateMappingRequest& other1578) {
   mapping = other1578.mapping;
   update = other1578.update;
@@ -43870,6 +49310,8 @@ void WMCreateOrUpdateMappingRequest::printTo(std::ostream& out) const {
 WMCreateOrUpdateMappingResponse::~WMCreateOrUpdateMappingResponse() noexcept {
 }
 
+WMCreateOrUpdateMappingResponse::WMCreateOrUpdateMappingResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMCreateOrUpdateMappingResponse& obj)
 {
   obj.printTo(out);
@@ -43915,12 +49357,17 @@ uint32_t WMCreateOrUpdateMappingResponse::write(::apache::thrift::protocol::TPro
   return xfer;
 }
 
-void swap(WMCreateOrUpdateMappingResponse &a, WMCreateOrUpdateMappingResponse &b) {
+void swap(WMCreateOrUpdateMappingResponse &a, WMCreateOrUpdateMappingResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMCreateOrUpdateMappingResponse::operator==(const WMCreateOrUpdateMappingResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMCreateOrUpdateMappingResponse::WMCreateOrUpdateMappingResponse(const WMCreateOrUpdateMappingResponse& other1580) noexcept {
   (void) other1580;
 }
@@ -43938,6 +49385,8 @@ void WMCreateOrUpdateMappingResponse::printTo(std::ostream& out) const {
 WMDropMappingRequest::~WMDropMappingRequest() noexcept {
 }
 
+WMDropMappingRequest::WMDropMappingRequest() noexcept {
+}
 
 void WMDropMappingRequest::__set_mapping(const WMMapping& val) {
   this->mapping = val;
@@ -44006,12 +49455,21 @@ uint32_t WMDropMappingRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(WMDropMappingRequest &a, WMDropMappingRequest &b) {
+void swap(WMDropMappingRequest &a, WMDropMappingRequest &b) noexcept {
   using ::std::swap;
   swap(a.mapping, b.mapping);
   swap(a.__isset, b.__isset);
 }
 
+bool WMDropMappingRequest::operator==(const WMDropMappingRequest & rhs) const
+{
+  if (__isset.mapping != rhs.__isset.mapping)
+    return false;
+  else if (__isset.mapping && !(mapping == rhs.mapping))
+    return false;
+  return true;
+}
+
 WMDropMappingRequest::WMDropMappingRequest(const WMDropMappingRequest& other1582) {
   mapping = other1582.mapping;
   __isset = other1582.__isset;
@@ -44032,6 +49490,8 @@ void WMDropMappingRequest::printTo(std::ostream& out) const {
 WMDropMappingResponse::~WMDropMappingResponse() noexcept {
 }
 
+WMDropMappingResponse::WMDropMappingResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMDropMappingResponse& obj)
 {
   obj.printTo(out);
@@ -44077,12 +49537,17 @@ uint32_t WMDropMappingResponse::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(WMDropMappingResponse &a, WMDropMappingResponse &b) {
+void swap(WMDropMappingResponse &a, WMDropMappingResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMDropMappingResponse::operator==(const WMDropMappingResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMDropMappingResponse::WMDropMappingResponse(const WMDropMappingResponse& other1584) noexcept {
   (void) other1584;
 }
@@ -44100,6 +49565,13 @@ void WMDropMappingResponse::printTo(std::ostream& out) const {
 WMCreateOrDropTriggerToPoolMappingRequest::~WMCreateOrDropTriggerToPoolMappingRequest() noexcept {
 }
 
+WMCreateOrDropTriggerToPoolMappingRequest::WMCreateOrDropTriggerToPoolMappingRequest() noexcept
+   : resourcePlanName(),
+     triggerName(),
+     poolPath(),
+     drop(0),
+     ns() {
+}
 
 void WMCreateOrDropTriggerToPoolMappingRequest::__set_resourcePlanName(const std::string& val) {
   this->resourcePlanName = val;
@@ -44240,7 +49712,7 @@ uint32_t WMCreateOrDropTriggerToPoolMappingRequest::write(::apache::thrift::prot
   return xfer;
 }
 
-void swap(WMCreateOrDropTriggerToPoolMappingRequest &a, WMCreateOrDropTriggerToPoolMappingRequest &b) {
+void swap(WMCreateOrDropTriggerToPoolMappingRequest &a, WMCreateOrDropTriggerToPoolMappingRequest &b) noexcept {
   using ::std::swap;
   swap(a.resourcePlanName, b.resourcePlanName);
   swap(a.triggerName, b.triggerName);
@@ -44250,6 +49722,31 @@ void swap(WMCreateOrDropTriggerToPoolMappingRequest &a, WMCreateOrDropTriggerToP
   swap(a.__isset, b.__isset);
 }
 
+bool WMCreateOrDropTriggerToPoolMappingRequest::operator==(const WMCreateOrDropTriggerToPoolMappingRequest & rhs) const
+{
+  if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
+    return false;
+  else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
+    return false;
+  if (__isset.triggerName != rhs.__isset.triggerName)
+    return false;
+  else if (__isset.triggerName && !(triggerName == rhs.triggerName))
+    return false;
+  if (__isset.poolPath != rhs.__isset.poolPath)
+    return false;
+  else if (__isset.poolPath && !(poolPath == rhs.poolPath))
+    return false;
+  if (__isset.drop != rhs.__isset.drop)
+    return false;
+  else if (__isset.drop && !(drop == rhs.drop))
+    return false;
+  if (__isset.ns != rhs.__isset.ns)
+    return false;
+  else if (__isset.ns && !(ns == rhs.ns))
+    return false;
+  return true;
+}
+
 WMCreateOrDropTriggerToPoolMappingRequest::WMCreateOrDropTriggerToPoolMappingRequest(const WMCreateOrDropTriggerToPoolMappingRequest& other1586) {
   resourcePlanName = other1586.resourcePlanName;
   triggerName = other1586.triggerName;
@@ -44282,6 +49779,8 @@ void WMCreateOrDropTriggerToPoolMappingRequest::printTo(std::ostream& out) const
 WMCreateOrDropTriggerToPoolMappingResponse::~WMCreateOrDropTriggerToPoolMappingResponse() noexcept {
 }
 
+WMCreateOrDropTriggerToPoolMappingResponse::WMCreateOrDropTriggerToPoolMappingResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const WMCreateOrDropTriggerToPoolMappingResponse& obj)
 {
   obj.printTo(out);
@@ -44327,12 +49826,17 @@ uint32_t WMCreateOrDropTriggerToPoolMappingResponse::write(::apache::thrift::pro
   return xfer;
 }
 
-void swap(WMCreateOrDropTriggerToPoolMappingResponse &a, WMCreateOrDropTriggerToPoolMappingResponse &b) {
+void swap(WMCreateOrDropTriggerToPoolMappingResponse &a, WMCreateOrDropTriggerToPoolMappingResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool WMCreateOrDropTriggerToPoolMappingResponse::operator==(const WMCreateOrDropTriggerToPoolMappingResponse & /* rhs */) const
+{
+  return true;
+}
+
 WMCreateOrDropTriggerToPoolMappingResponse::WMCreateOrDropTriggerToPoolMappingResponse(const WMCreateOrDropTriggerToPoolMappingResponse& other1588) noexcept {
   (void) other1588;
 }
@@ -44350,6 +49854,17 @@ void WMCreateOrDropTriggerToPoolMappingResponse::printTo(std::ostream& out) cons
 ISchema::~ISchema() noexcept {
 }
 
+ISchema::ISchema() noexcept
+   : schemaType(static_cast<SchemaType::type>(0)),
+     name(),
+     catName(),
+     dbName(),
+     compatibility(static_cast<SchemaCompatibility::type>(0)),
+     validationLevel(static_cast<SchemaValidation::type>(0)),
+     canEvolve(0),
+     schemaGroup(),
+     description() {
+}
 
 void ISchema::__set_schemaType(const SchemaType::type val) {
   this->schemaType = val;
@@ -44554,7 +50069,7 @@ uint32_t ISchema::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(ISchema &a, ISchema &b) {
+void swap(ISchema &a, ISchema &b) noexcept {
   using ::std::swap;
   swap(a.schemaType, b.schemaType);
   swap(a.name, b.name);
@@ -44568,6 +50083,33 @@ void swap(ISchema &a, ISchema &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ISchema::operator==(const ISchema & rhs) const
+{
+  if (!(schemaType == rhs.schemaType))
+    return false;
+  if (!(name == rhs.name))
+    return false;
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(compatibility == rhs.compatibility))
+    return false;
+  if (!(validationLevel == rhs.validationLevel))
+    return false;
+  if (!(canEvolve == rhs.canEvolve))
+    return false;
+  if (__isset.schemaGroup != rhs.__isset.schemaGroup)
+    return false;
+  else if (__isset.schemaGroup && !(schemaGroup == rhs.schemaGroup))
+    return false;
+  if (__isset.description != rhs.__isset.description)
+    return false;
+  else if (__isset.description && !(description == rhs.description))
+    return false;
+  return true;
+}
+
 ISchema::ISchema(const ISchema& other1593) {
   schemaType = other1593.schemaType;
   name = other1593.name;
@@ -44612,6 +50154,11 @@ void ISchema::printTo(std::ostream& out) const {
 ISchemaName::~ISchemaName() noexcept {
 }
 
+ISchemaName::ISchemaName() noexcept
+   : catName(),
+     dbName(),
+     schemaName() {
+}
 
 void ISchemaName::__set_catName(const std::string& val) {
   this->catName = val;
@@ -44710,7 +50257,7 @@ uint32_t ISchemaName::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(ISchemaName &a, ISchemaName &b) {
+void swap(ISchemaName &a, ISchemaName &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -44718,6 +50265,17 @@ void swap(ISchemaName &a, ISchemaName &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ISchemaName::operator==(const ISchemaName & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(schemaName == rhs.schemaName))
+    return false;
+  return true;
+}
+
 ISchemaName::ISchemaName(const ISchemaName& other1595) {
   catName = other1595.catName;
   dbName = other1595.dbName;
@@ -44744,6 +50302,8 @@ void ISchemaName::printTo(std::ostream& out) const {
 AlterISchemaRequest::~AlterISchemaRequest() noexcept {
 }
 
+AlterISchemaRequest::AlterISchemaRequest() noexcept {
+}
 
 void AlterISchemaRequest::__set_name(const ISchemaName& val) {
   this->name = val;
@@ -44826,13 +50386,22 @@ uint32_t AlterISchemaRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(AlterISchemaRequest &a, AlterISchemaRequest &b) {
+void swap(AlterISchemaRequest &a, AlterISchemaRequest &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.newSchema, b.newSchema);
   swap(a.__isset, b.__isset);
 }
 
+bool AlterISchemaRequest::operator==(const AlterISchemaRequest & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(newSchema == rhs.newSchema))
+    return false;
+  return true;
+}
+
 AlterISchemaRequest::AlterISchemaRequest(const AlterISchemaRequest& other1597) {
   name = other1597.name;
   newSchema = other1597.newSchema;
@@ -44856,6 +50425,15 @@ void AlterISchemaRequest::printTo(std::ostream& out) const {
 SchemaVersion::~SchemaVersion() noexcept {
 }
 
+SchemaVersion::SchemaVersion() noexcept
+   : version(0),
+     createdAt(0),
+     state(static_cast<SchemaVersionState::type>(0)),
+     description(),
+     schemaText(),
+     fingerprint(),
+     name() {
+}
 
 void SchemaVersion::__set_schema(const ISchemaName& val) {
   this->schema = val;
@@ -45100,7 +50678,7 @@ uint32_t SchemaVersion::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(SchemaVersion &a, SchemaVersion &b) {
+void swap(SchemaVersion &a, SchemaVersion &b) noexcept {
   using ::std::swap;
   swap(a.schema, b.schema);
   swap(a.version, b.version);
@@ -45115,6 +50693,43 @@ void swap(SchemaVersion &a, SchemaVersion &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool SchemaVersion::operator==(const SchemaVersion & rhs) const
+{
+  if (!(schema == rhs.schema))
+    return false;
+  if (!(version == rhs.version))
+    return false;
+  if (!(createdAt == rhs.createdAt))
+    return false;
+  if (!(cols == rhs.cols))
+    return false;
+  if (__isset.state != rhs.__isset.state)
+    return false;
+  else if (__isset.state && !(state == rhs.state))
+    return false;
+  if (__isset.description != rhs.__isset.description)
+    return false;
+  else if (__isset.description && !(description == rhs.description))
+    return false;
+  if (__isset.schemaText != rhs.__isset.schemaText)
+    return false;
+  else if (__isset.schemaText && !(schemaText == rhs.schemaText))
+    return false;
+  if (__isset.fingerprint != rhs.__isset.fingerprint)
+    return false;
+  else if (__isset.fingerprint && !(fingerprint == rhs.fingerprint))
+    return false;
+  if (__isset.name != rhs.__isset.name)
+    return false;
+  else if (__isset.name && !(name == rhs.name))
+    return false;
+  if (__isset.serDe != rhs.__isset.serDe)
+    return false;
+  else if (__isset.serDe && !(serDe == rhs.serDe))
+    return false;
+  return true;
+}
+
 SchemaVersion::SchemaVersion(const SchemaVersion& other1606) {
   schema = other1606.schema;
   version = other1606.version;
@@ -45162,6 +50777,9 @@ void SchemaVersion::printTo(std::ostream& out) const {
 SchemaVersionDescriptor::~SchemaVersionDescriptor() noexcept {
 }
 
+SchemaVersionDescriptor::SchemaVersionDescriptor() noexcept
+   : version(0) {
+}
 
 void SchemaVersionDescriptor::__set_schema(const ISchemaName& val) {
   this->schema = val;
@@ -45244,13 +50862,22 @@ uint32_t SchemaVersionDescriptor::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(SchemaVersionDescriptor &a, SchemaVersionDescriptor &b) {
+void swap(SchemaVersionDescriptor &a, SchemaVersionDescriptor &b) noexcept {
   using ::std::swap;
   swap(a.schema, b.schema);
   swap(a.version, b.version);
   swap(a.__isset, b.__isset);
 }
 
+bool SchemaVersionDescriptor::operator==(const SchemaVersionDescriptor & rhs) const
+{
+  if (!(schema == rhs.schema))
+    return false;
+  if (!(version == rhs.version))
+    return false;
+  return true;
+}
+
 SchemaVersionDescriptor::SchemaVersionDescriptor(const SchemaVersionDescriptor& other1608) {
   schema = other1608.schema;
   version = other1608.version;
@@ -45274,6 +50901,11 @@ void SchemaVersionDescriptor::printTo(std::ostream& out) const {
 FindSchemasByColsRqst::~FindSchemasByColsRqst() noexcept {
 }
 
+FindSchemasByColsRqst::FindSchemasByColsRqst() noexcept
+   : colName(),
+     colNamespace(),
+     type() {
+}
 
 void FindSchemasByColsRqst::__set_colName(const std::string& val) {
   this->colName = val;
@@ -45378,7 +51010,7 @@ uint32_t FindSchemasByColsRqst::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(FindSchemasByColsRqst &a, FindSchemasByColsRqst &b) {
+void swap(FindSchemasByColsRqst &a, FindSchemasByColsRqst &b) noexcept {
   using ::std::swap;
   swap(a.colName, b.colName);
   swap(a.colNamespace, b.colNamespace);
@@ -45386,6 +51018,23 @@ void swap(FindSchemasByColsRqst &a, FindSchemasByColsRqst &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool FindSchemasByColsRqst::operator==(const FindSchemasByColsRqst & rhs) const
+{
+  if (__isset.colName != rhs.__isset.colName)
+    return false;
+  else if (__isset.colName && !(colName == rhs.colName))
+    return false;
+  if (__isset.colNamespace != rhs.__isset.colNamespace)
+    return false;
+  else if (__isset.colNamespace && !(colNamespace == rhs.colNamespace))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  return true;
+}
+
 FindSchemasByColsRqst::FindSchemasByColsRqst(const FindSchemasByColsRqst& other1610) {
   colName = other1610.colName;
   colNamespace = other1610.colNamespace;
@@ -45412,6 +51061,8 @@ void FindSchemasByColsRqst::printTo(std::ostream& out) const {
 FindSchemasByColsResp::~FindSchemasByColsResp() noexcept {
 }
 
+FindSchemasByColsResp::FindSchemasByColsResp() noexcept {
+}
 
 void FindSchemasByColsResp::__set_schemaVersions(const std::vector<SchemaVersionDescriptor> & val) {
   this->schemaVersions = val;
@@ -45498,12 +51149,19 @@ uint32_t FindSchemasByColsResp::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(FindSchemasByColsResp &a, FindSchemasByColsResp &b) {
+void swap(FindSchemasByColsResp &a, FindSchemasByColsResp &b) noexcept {
   using ::std::swap;
   swap(a.schemaVersions, b.schemaVersions);
   swap(a.__isset, b.__isset);
 }
 
+bool FindSchemasByColsResp::operator==(const FindSchemasByColsResp & rhs) const
+{
+  if (!(schemaVersions == rhs.schemaVersions))
+    return false;
+  return true;
+}
+
 FindSchemasByColsResp::FindSchemasByColsResp(const FindSchemasByColsResp& other1618) {
   schemaVersions = other1618.schemaVersions;
   __isset = other1618.__isset;
@@ -45524,6 +51182,9 @@ void FindSchemasByColsResp::printTo(std::ostream& out) const {
 MapSchemaVersionToSerdeRequest::~MapSchemaVersionToSerdeRequest() noexcept {
 }
 
+MapSchemaVersionToSerdeRequest::MapSchemaVersionToSerdeRequest() noexcept
+   : serdeName() {
+}
 
 void MapSchemaVersionToSerdeRequest::__set_schemaVersion(const SchemaVersionDescriptor& val) {
   this->schemaVersion = val;
@@ -45606,13 +51267,22 @@ uint32_t MapSchemaVersionToSerdeRequest::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(MapSchemaVersionToSerdeRequest &a, MapSchemaVersionToSerdeRequest &b) {
+void swap(MapSchemaVersionToSerdeRequest &a, MapSchemaVersionToSerdeRequest &b) noexcept {
   using ::std::swap;
   swap(a.schemaVersion, b.schemaVersion);
   swap(a.serdeName, b.serdeName);
   swap(a.__isset, b.__isset);
 }
 
+bool MapSchemaVersionToSerdeRequest::operator==(const MapSchemaVersionToSerdeRequest & rhs) const
+{
+  if (!(schemaVersion == rhs.schemaVersion))
+    return false;
+  if (!(serdeName == rhs.serdeName))
+    return false;
+  return true;
+}
+
 MapSchemaVersionToSerdeRequest::MapSchemaVersionToSerdeRequest(const MapSchemaVersionToSerdeRequest& other1620) {
   schemaVersion = other1620.schemaVersion;
   serdeName = other1620.serdeName;
@@ -45636,6 +51306,9 @@ void MapSchemaVersionToSerdeRequest::printTo(std::ostream& out) const {
 SetSchemaVersionStateRequest::~SetSchemaVersionStateRequest() noexcept {
 }
 
+SetSchemaVersionStateRequest::SetSchemaVersionStateRequest() noexcept
+   : state(static_cast<SchemaVersionState::type>(0)) {
+}
 
 void SetSchemaVersionStateRequest::__set_schemaVersion(const SchemaVersionDescriptor& val) {
   this->schemaVersion = val;
@@ -45720,13 +51393,22 @@ uint32_t SetSchemaVersionStateRequest::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(SetSchemaVersionStateRequest &a, SetSchemaVersionStateRequest &b) {
+void swap(SetSchemaVersionStateRequest &a, SetSchemaVersionStateRequest &b) noexcept {
   using ::std::swap;
   swap(a.schemaVersion, b.schemaVersion);
   swap(a.state, b.state);
   swap(a.__isset, b.__isset);
 }
 
+bool SetSchemaVersionStateRequest::operator==(const SetSchemaVersionStateRequest & rhs) const
+{
+  if (!(schemaVersion == rhs.schemaVersion))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  return true;
+}
+
 SetSchemaVersionStateRequest::SetSchemaVersionStateRequest(const SetSchemaVersionStateRequest& other1623) {
   schemaVersion = other1623.schemaVersion;
   state = other1623.state;
@@ -45750,6 +51432,9 @@ void SetSchemaVersionStateRequest::printTo(std::ostream& out) const {
 GetSerdeRequest::~GetSerdeRequest() noexcept {
 }
 
+GetSerdeRequest::GetSerdeRequest() noexcept
+   : serdeName() {
+}
 
 void GetSerdeRequest::__set_serdeName(const std::string& val) {
   this->serdeName = val;
@@ -45816,12 +51501,19 @@ uint32_t GetSerdeRequest::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(GetSerdeRequest &a, GetSerdeRequest &b) {
+void swap(GetSerdeRequest &a, GetSerdeRequest &b) noexcept {
   using ::std::swap;
   swap(a.serdeName, b.serdeName);
   swap(a.__isset, b.__isset);
 }
 
+bool GetSerdeRequest::operator==(const GetSerdeRequest & rhs) const
+{
+  if (!(serdeName == rhs.serdeName))
+    return false;
+  return true;
+}
+
 GetSerdeRequest::GetSerdeRequest(const GetSerdeRequest& other1625) {
   serdeName = other1625.serdeName;
   __isset = other1625.__isset;
@@ -45842,6 +51534,11 @@ void GetSerdeRequest::printTo(std::ostream& out) const {
 RuntimeStat::~RuntimeStat() noexcept {
 }
 
+RuntimeStat::RuntimeStat() noexcept
+   : createTime(0),
+     weight(0),
+     payload() {
+}
 
 void RuntimeStat::__set_createTime(const int32_t val) {
   this->createTime = val;
@@ -45948,7 +51645,7 @@ uint32_t RuntimeStat::write(::apache::thrift::protocol::TProtocol* oprot) const
   return xfer;
 }
 
-void swap(RuntimeStat &a, RuntimeStat &b) {
+void swap(RuntimeStat &a, RuntimeStat &b) noexcept {
   using ::std::swap;
   swap(a.createTime, b.createTime);
   swap(a.weight, b.weight);
@@ -45956,6 +51653,19 @@ void swap(RuntimeStat &a, RuntimeStat &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool RuntimeStat::operator==(const RuntimeStat & rhs) const
+{
+  if (__isset.createTime != rhs.__isset.createTime)
+    return false;
+  else if (__isset.createTime && !(createTime == rhs.createTime))
+    return false;
+  if (!(weight == rhs.weight))
+    return false;
+  if (!(payload == rhs.payload))
+    return false;
+  return true;
+}
+
 RuntimeStat::RuntimeStat(const RuntimeStat& other1627) {
   createTime = other1627.createTime;
   weight = other1627.weight;
@@ -45982,6 +51692,10 @@ void RuntimeStat::printTo(std::ostream& out) const {
 GetRuntimeStatsRequest::~GetRuntimeStatsRequest() noexcept {
 }
 
+GetRuntimeStatsRequest::GetRuntimeStatsRequest() noexcept
+   : maxWeight(0),
+     maxCreateTime(0) {
+}
 
 void GetRuntimeStatsRequest::__set_maxWeight(const int32_t val) {
   this->maxWeight = val;
@@ -46070,12 +51784,21 @@ uint32_t GetRuntimeStatsRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(GetRuntimeStatsRequest &a, GetRuntimeStatsRequest &b) {
+void swap(GetRuntimeStatsRequest &a, GetRuntimeStatsRequest &b) noexcept {
   using ::std::swap;
   swap(a.maxWeight, b.maxWeight);
   swap(a.maxCreateTime, b.maxCreateTime);
 }
 
+bool GetRuntimeStatsRequest::operator==(const GetRuntimeStatsRequest & rhs) const
+{
+  if (!(maxWeight == rhs.maxWeight))
+    return false;
+  if (!(maxCreateTime == rhs.maxCreateTime))
+    return false;
+  return true;
+}
+
 GetRuntimeStatsRequest::GetRuntimeStatsRequest(const GetRuntimeStatsRequest& other1629) noexcept {
   maxWeight = other1629.maxWeight;
   maxCreateTime = other1629.maxCreateTime;
@@ -46097,6 +51820,9 @@ void GetRuntimeStatsRequest::printTo(std::ostream& out) const {
 CreateTableRequest::~CreateTableRequest() noexcept {
 }
 
+CreateTableRequest::CreateTableRequest() noexcept
+   : processorIdentifier() {
+}
 
 void CreateTableRequest::__set_table(const Table& val) {
   this->table = val;
@@ -46468,7 +52194,7 @@ uint32_t CreateTableRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(CreateTableRequest &a, CreateTableRequest &b) {
+void swap(CreateTableRequest &a, CreateTableRequest &b) noexcept {
   using ::std::swap;
   swap(a.table, b.table);
   swap(a.envContext, b.envContext);
@@ -46483,6 +52209,49 @@ void swap(CreateTableRequest &a, CreateTableRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CreateTableRequest::operator==(const CreateTableRequest & rhs) const
+{
+  if (!(table == rhs.table))
+    return false;
+  if (__isset.envContext != rhs.__isset.envContext)
+    return false;
+  else if (__isset.envContext && !(envContext == rhs.envContext))
+    return false;
+  if (__isset.primaryKeys != rhs.__isset.primaryKeys)
+    return false;
+  else if (__isset.primaryKeys && !(primaryKeys == rhs.primaryKeys))
+    return false;
+  if (__isset.foreignKeys != rhs.__isset.foreignKeys)
+    return false;
+  else if (__isset.foreignKeys && !(foreignKeys == rhs.foreignKeys))
+    return false;
+  if (__isset.uniqueConstraints != rhs.__isset.uniqueConstraints)
+    return false;
+  else if (__isset.uniqueConstraints && !(uniqueConstraints == rhs.uniqueConstraints))
+    return false;
+  if (__isset.notNullConstraints != rhs.__isset.notNullConstraints)
+    return false;
+  else if (__isset.notNullConstraints && !(notNullConstraints == rhs.notNullConstraints))
+    return false;
+  if (__isset.defaultConstraints != rhs.__isset.defaultConstraints)
+    return false;
+  else if (__isset.defaultConstraints && !(defaultConstraints == rhs.defaultConstraints))
+    return false;
+  if (__isset.checkConstraints != rhs.__isset.checkConstraints)
+    return false;
+  else if (__isset.checkConstraints && !(checkConstraints == rhs.checkConstraints))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  return true;
+}
+
 CreateTableRequest::CreateTableRequest(const CreateTableRequest& other1673) {
   table = other1673.table;
   envContext = other1673.envContext;
@@ -46530,6 +52299,19 @@ void CreateTableRequest::printTo(std::ostream& out) const {
 CreateDatabaseRequest::~CreateDatabaseRequest() noexcept {
 }
 
+CreateDatabaseRequest::CreateDatabaseRequest() noexcept
+   : databaseName(),
+     description(),
+     locationUri(),
+     ownerName(),
+     ownerType(static_cast<PrincipalType::type>(0)),
+     catalogName(),
+     createTime(0),
+     managedLocationUri(),
+     type(static_cast<DatabaseType::type>(0)),
+     dataConnectorName(),
+     remote_dbname() {
+}
 
 void CreateDatabaseRequest::__set_databaseName(const std::string& val) {
   this->databaseName = val;
@@ -46843,7 +52625,7 @@ uint32_t CreateDatabaseRequest::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(CreateDatabaseRequest &a, CreateDatabaseRequest &b) {
+void swap(CreateDatabaseRequest &a, CreateDatabaseRequest &b) noexcept {
   using ::std::swap;
   swap(a.databaseName, b.databaseName);
   swap(a.description, b.description);
@@ -46861,6 +52643,61 @@ void swap(CreateDatabaseRequest &a, CreateDatabaseRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool CreateDatabaseRequest::operator==(const CreateDatabaseRequest & rhs) const
+{
+  if (!(databaseName == rhs.databaseName))
+    return false;
+  if (__isset.description != rhs.__isset.description)
+    return false;
+  else if (__isset.description && !(description == rhs.description))
+    return false;
+  if (__isset.locationUri != rhs.__isset.locationUri)
+    return false;
+  else if (__isset.locationUri && !(locationUri == rhs.locationUri))
+    return false;
+  if (__isset.parameters != rhs.__isset.parameters)
+    return false;
+  else if (__isset.parameters && !(parameters == rhs.parameters))
+    return false;
+  if (__isset.privileges != rhs.__isset.privileges)
+    return false;
+  else if (__isset.privileges && !(privileges == rhs.privileges))
+    return false;
+  if (__isset.ownerName != rhs.__isset.ownerName)
+    return false;
+  else if (__isset.ownerName && !(ownerName == rhs.ownerName))
+    return false;
+  if (__isset.ownerType != rhs.__isset.ownerType)
+    return false;
+  else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+    return false;
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (__isset.createTime != rhs.__isset.createTime)
+    return false;
+  else if (__isset.createTime && !(createTime == rhs.createTime))
+    return false;
+  if (__isset.managedLocationUri != rhs.__isset.managedLocationUri)
+    return false;
+  else if (__isset.managedLocationUri && !(managedLocationUri == rhs.managedLocationUri))
+    return false;
+  if (__isset.type != rhs.__isset.type)
+    return false;
+  else if (__isset.type && !(type == rhs.type))
+    return false;
+  if (__isset.dataConnectorName != rhs.__isset.dataConnectorName)
+    return false;
+  else if (__isset.dataConnectorName && !(dataConnectorName == rhs.dataConnectorName))
+    return false;
+  if (__isset.remote_dbname != rhs.__isset.remote_dbname)
+    return false;
+  else if (__isset.remote_dbname && !(remote_dbname == rhs.remote_dbname))
+    return false;
+  return true;
+}
+
 CreateDatabaseRequest::CreateDatabaseRequest(const CreateDatabaseRequest& other1685) {
   databaseName = other1685.databaseName;
   description = other1685.description;
@@ -46917,6 +52754,8 @@ void CreateDatabaseRequest::printTo(std::ostream& out) const {
 CreateDataConnectorRequest::~CreateDataConnectorRequest() noexcept {
 }
 
+CreateDataConnectorRequest::CreateDataConnectorRequest() noexcept {
+}
 
 void CreateDataConnectorRequest::__set_connector(const DataConnector& val) {
   this->connector = val;
@@ -46986,11 +52825,18 @@ uint32_t CreateDataConnectorRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(CreateDataConnectorRequest &a, CreateDataConnectorRequest &b) {
+void swap(CreateDataConnectorRequest &a, CreateDataConnectorRequest &b) noexcept {
   using ::std::swap;
   swap(a.connector, b.connector);
 }
 
+bool CreateDataConnectorRequest::operator==(const CreateDataConnectorRequest & rhs) const
+{
+  if (!(connector == rhs.connector))
+    return false;
+  return true;
+}
+
 CreateDataConnectorRequest::CreateDataConnectorRequest(const CreateDataConnectorRequest& other1687) {
   connector = other1687.connector;
 }
@@ -47009,6 +52855,9 @@ void CreateDataConnectorRequest::printTo(std::ostream& out) const {
 GetDataConnectorRequest::~GetDataConnectorRequest() noexcept {
 }
 
+GetDataConnectorRequest::GetDataConnectorRequest() noexcept
+   : connectorName() {
+}
 
 void GetDataConnectorRequest::__set_connectorName(const std::string& val) {
   this->connectorName = val;
@@ -47078,11 +52927,18 @@ uint32_t GetDataConnectorRequest::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(GetDataConnectorRequest &a, GetDataConnectorRequest &b) {
+void swap(GetDataConnectorRequest &a, GetDataConnectorRequest &b) noexcept {
   using ::std::swap;
   swap(a.connectorName, b.connectorName);
 }
 
+bool GetDataConnectorRequest::operator==(const GetDataConnectorRequest & rhs) const
+{
+  if (!(connectorName == rhs.connectorName))
+    return false;
+  return true;
+}
+
 GetDataConnectorRequest::GetDataConnectorRequest(const GetDataConnectorRequest& other1689) {
   connectorName = other1689.connectorName;
 }
@@ -47101,6 +52957,9 @@ void GetDataConnectorRequest::printTo(std::ostream& out) const {
 AlterDataConnectorRequest::~AlterDataConnectorRequest() noexcept {
 }
 
+AlterDataConnectorRequest::AlterDataConnectorRequest() noexcept
+   : connectorName() {
+}
 
 void AlterDataConnectorRequest::__set_connectorName(const std::string& val) {
   this->connectorName = val;
@@ -47189,12 +53048,21 @@ uint32_t AlterDataConnectorRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(AlterDataConnectorRequest &a, AlterDataConnectorRequest &b) {
+void swap(AlterDataConnectorRequest &a, AlterDataConnectorRequest &b) noexcept {
   using ::std::swap;
   swap(a.connectorName, b.connectorName);
   swap(a.newConnector, b.newConnector);
 }
 
+bool AlterDataConnectorRequest::operator==(const AlterDataConnectorRequest & rhs) const
+{
+  if (!(connectorName == rhs.connectorName))
+    return false;
+  if (!(newConnector == rhs.newConnector))
+    return false;
+  return true;
+}
+
 AlterDataConnectorRequest::AlterDataConnectorRequest(const AlterDataConnectorRequest& other1691) {
   connectorName = other1691.connectorName;
   newConnector = other1691.newConnector;
@@ -47216,6 +53084,11 @@ void AlterDataConnectorRequest::printTo(std::ostream& out) const {
 DropDataConnectorRequest::~DropDataConnectorRequest() noexcept {
 }
 
+DropDataConnectorRequest::DropDataConnectorRequest() noexcept
+   : connectorName(),
+     ifNotExists(0),
+     checkReferences(0) {
+}
 
 void DropDataConnectorRequest::__set_connectorName(const std::string& val) {
   this->connectorName = val;
@@ -47321,7 +53194,7 @@ uint32_t DropDataConnectorRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(DropDataConnectorRequest &a, DropDataConnectorRequest &b) {
+void swap(DropDataConnectorRequest &a, DropDataConnectorRequest &b) noexcept {
   using ::std::swap;
   swap(a.connectorName, b.connectorName);
   swap(a.ifNotExists, b.ifNotExists);
@@ -47329,6 +53202,21 @@ void swap(DropDataConnectorRequest &a, DropDataConnectorRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DropDataConnectorRequest::operator==(const DropDataConnectorRequest & rhs) const
+{
+  if (!(connectorName == rhs.connectorName))
+    return false;
+  if (__isset.ifNotExists != rhs.__isset.ifNotExists)
+    return false;
+  else if (__isset.ifNotExists && !(ifNotExists == rhs.ifNotExists))
+    return false;
+  if (__isset.checkReferences != rhs.__isset.checkReferences)
+    return false;
+  else if (__isset.checkReferences && !(checkReferences == rhs.checkReferences))
+    return false;
+  return true;
+}
+
 DropDataConnectorRequest::DropDataConnectorRequest(const DropDataConnectorRequest& other1693) {
   connectorName = other1693.connectorName;
   ifNotExists = other1693.ifNotExists;
@@ -47355,6 +53243,9 @@ void DropDataConnectorRequest::printTo(std::ostream& out) const {
 ScheduledQueryPollRequest::~ScheduledQueryPollRequest() noexcept {
 }
 
+ScheduledQueryPollRequest::ScheduledQueryPollRequest() noexcept
+   : clusterNamespace() {
+}
 
 void ScheduledQueryPollRequest::__set_clusterNamespace(const std::string& val) {
   this->clusterNamespace = val;
@@ -47424,11 +53315,18 @@ uint32_t ScheduledQueryPollRequest::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(ScheduledQueryPollRequest &a, ScheduledQueryPollRequest &b) {
+void swap(ScheduledQueryPollRequest &a, ScheduledQueryPollRequest &b) noexcept {
   using ::std::swap;
   swap(a.clusterNamespace, b.clusterNamespace);
 }
 
+bool ScheduledQueryPollRequest::operator==(const ScheduledQueryPollRequest & rhs) const
+{
+  if (!(clusterNamespace == rhs.clusterNamespace))
+    return false;
+  return true;
+}
+
 ScheduledQueryPollRequest::ScheduledQueryPollRequest(const ScheduledQueryPollRequest& other1695) {
   clusterNamespace = other1695.clusterNamespace;
 }
@@ -47447,6 +53345,10 @@ void ScheduledQueryPollRequest::printTo(std::ostream& out) const {
 ScheduledQueryKey::~ScheduledQueryKey() noexcept {
 }
 
+ScheduledQueryKey::ScheduledQueryKey() noexcept
+   : scheduleName(),
+     clusterNamespace() {
+}
 
 void ScheduledQueryKey::__set_scheduleName(const std::string& val) {
   this->scheduleName = val;
@@ -47535,12 +53437,21 @@ uint32_t ScheduledQueryKey::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ScheduledQueryKey &a, ScheduledQueryKey &b) {
+void swap(ScheduledQueryKey &a, ScheduledQueryKey &b) noexcept {
   using ::std::swap;
   swap(a.scheduleName, b.scheduleName);
   swap(a.clusterNamespace, b.clusterNamespace);
 }
 
+bool ScheduledQueryKey::operator==(const ScheduledQueryKey & rhs) const
+{
+  if (!(scheduleName == rhs.scheduleName))
+    return false;
+  if (!(clusterNamespace == rhs.clusterNamespace))
+    return false;
+  return true;
+}
+
 ScheduledQueryKey::ScheduledQueryKey(const ScheduledQueryKey& other1697) {
   scheduleName = other1697.scheduleName;
   clusterNamespace = other1697.clusterNamespace;
@@ -47562,6 +53473,11 @@ void ScheduledQueryKey::printTo(std::ostream& out) const {
 ScheduledQueryPollResponse::~ScheduledQueryPollResponse() noexcept {
 }
 
+ScheduledQueryPollResponse::ScheduledQueryPollResponse() noexcept
+   : executionId(0),
+     query(),
+     user() {
+}
 
 void ScheduledQueryPollResponse::__set_scheduleKey(const ScheduledQueryKey& val) {
   this->scheduleKey = val;
@@ -47684,7 +53600,7 @@ uint32_t ScheduledQueryPollResponse::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(ScheduledQueryPollResponse &a, ScheduledQueryPollResponse &b) {
+void swap(ScheduledQueryPollResponse &a, ScheduledQueryPollResponse &b) noexcept {
   using ::std::swap;
   swap(a.scheduleKey, b.scheduleKey);
   swap(a.executionId, b.executionId);
@@ -47693,6 +53609,27 @@ void swap(ScheduledQueryPollResponse &a, ScheduledQueryPollResponse &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ScheduledQueryPollResponse::operator==(const ScheduledQueryPollResponse & rhs) const
+{
+  if (__isset.scheduleKey != rhs.__isset.scheduleKey)
+    return false;
+  else if (__isset.scheduleKey && !(scheduleKey == rhs.scheduleKey))
+    return false;
+  if (__isset.executionId != rhs.__isset.executionId)
+    return false;
+  else if (__isset.executionId && !(executionId == rhs.executionId))
+    return false;
+  if (__isset.query != rhs.__isset.query)
+    return false;
+  else if (__isset.query && !(query == rhs.query))
+    return false;
+  if (__isset.user != rhs.__isset.user)
+    return false;
+  else if (__isset.user && !(user == rhs.user))
+    return false;
+  return true;
+}
+
 ScheduledQueryPollResponse::ScheduledQueryPollResponse(const ScheduledQueryPollResponse& other1699) {
   scheduleKey = other1699.scheduleKey;
   executionId = other1699.executionId;
@@ -47722,6 +53659,13 @@ void ScheduledQueryPollResponse::printTo(std::ostream& out) const {
 ScheduledQuery::~ScheduledQuery() noexcept {
 }
 
+ScheduledQuery::ScheduledQuery() noexcept
+   : enabled(0),
+     schedule(),
+     user(),
+     query(),
+     nextExecution(0) {
+}
 
 void ScheduledQuery::__set_scheduleKey(const ScheduledQueryKey& val) {
   this->scheduleKey = val;
@@ -47881,7 +53825,7 @@ uint32_t ScheduledQuery::write(::apache::thrift::protocol::TProtocol* oprot) con
   return xfer;
 }
 
-void swap(ScheduledQuery &a, ScheduledQuery &b) {
+void swap(ScheduledQuery &a, ScheduledQuery &b) noexcept {
   using ::std::swap;
   swap(a.scheduleKey, b.scheduleKey);
   swap(a.enabled, b.enabled);
@@ -47892,6 +53836,33 @@ void swap(ScheduledQuery &a, ScheduledQuery &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ScheduledQuery::operator==(const ScheduledQuery & rhs) const
+{
+  if (!(scheduleKey == rhs.scheduleKey))
+    return false;
+  if (__isset.enabled != rhs.__isset.enabled)
+    return false;
+  else if (__isset.enabled && !(enabled == rhs.enabled))
+    return false;
+  if (__isset.schedule != rhs.__isset.schedule)
+    return false;
+  else if (__isset.schedule && !(schedule == rhs.schedule))
+    return false;
+  if (__isset.user != rhs.__isset.user)
+    return false;
+  else if (__isset.user && !(user == rhs.user))
+    return false;
+  if (__isset.query != rhs.__isset.query)
+    return false;
+  else if (__isset.query && !(query == rhs.query))
+    return false;
+  if (__isset.nextExecution != rhs.__isset.nextExecution)
+    return false;
+  else if (__isset.nextExecution && !(nextExecution == rhs.nextExecution))
+    return false;
+  return true;
+}
+
 ScheduledQuery::ScheduledQuery(const ScheduledQuery& other1701) {
   scheduleKey = other1701.scheduleKey;
   enabled = other1701.enabled;
@@ -47927,6 +53898,9 @@ void ScheduledQuery::printTo(std::ostream& out) const {
 ScheduledQueryMaintenanceRequest::~ScheduledQueryMaintenanceRequest() noexcept {
 }
 
+ScheduledQueryMaintenanceRequest::ScheduledQueryMaintenanceRequest() noexcept
+   : type(static_cast<ScheduledQueryMaintenanceRequestType::type>(0)) {
+}
 
 void ScheduledQueryMaintenanceRequest::__set_type(const ScheduledQueryMaintenanceRequestType::type val) {
   this->type = val;
@@ -48017,12 +53991,21 @@ uint32_t ScheduledQueryMaintenanceRequest::write(::apache::thrift::protocol::TPr
   return xfer;
 }
 
-void swap(ScheduledQueryMaintenanceRequest &a, ScheduledQueryMaintenanceRequest &b) {
+void swap(ScheduledQueryMaintenanceRequest &a, ScheduledQueryMaintenanceRequest &b) noexcept {
   using ::std::swap;
   swap(a.type, b.type);
   swap(a.scheduledQuery, b.scheduledQuery);
 }
 
+bool ScheduledQueryMaintenanceRequest::operator==(const ScheduledQueryMaintenanceRequest & rhs) const
+{
+  if (!(type == rhs.type))
+    return false;
+  if (!(scheduledQuery == rhs.scheduledQuery))
+    return false;
+  return true;
+}
+
 ScheduledQueryMaintenanceRequest::ScheduledQueryMaintenanceRequest(const ScheduledQueryMaintenanceRequest& other1704) {
   type = other1704.type;
   scheduledQuery = other1704.scheduledQuery;
@@ -48044,6 +54027,12 @@ void ScheduledQueryMaintenanceRequest::printTo(std::ostream& out) const {
 ScheduledQueryProgressInfo::~ScheduledQueryProgressInfo() noexcept {
 }
 
+ScheduledQueryProgressInfo::ScheduledQueryProgressInfo() noexcept
+   : scheduledExecutionId(0),
+     state(static_cast<QueryState::type>(0)),
+     executorQueryId(),
+     errorMessage() {
+}
 
 void ScheduledQueryProgressInfo::__set_scheduledExecutionId(const int64_t val) {
   this->scheduledExecutionId = val;
@@ -48171,7 +54160,7 @@ uint32_t ScheduledQueryProgressInfo::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(ScheduledQueryProgressInfo &a, ScheduledQueryProgressInfo &b) {
+void swap(ScheduledQueryProgressInfo &a, ScheduledQueryProgressInfo &b) noexcept {
   using ::std::swap;
   swap(a.scheduledExecutionId, b.scheduledExecutionId);
   swap(a.state, b.state);
@@ -48180,6 +54169,21 @@ void swap(ScheduledQueryProgressInfo &a, ScheduledQueryProgressInfo &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ScheduledQueryProgressInfo::operator==(const ScheduledQueryProgressInfo & rhs) const
+{
+  if (!(scheduledExecutionId == rhs.scheduledExecutionId))
+    return false;
+  if (!(state == rhs.state))
+    return false;
+  if (!(executorQueryId == rhs.executorQueryId))
+    return false;
+  if (__isset.errorMessage != rhs.__isset.errorMessage)
+    return false;
+  else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
+    return false;
+  return true;
+}
+
 ScheduledQueryProgressInfo::ScheduledQueryProgressInfo(const ScheduledQueryProgressInfo& other1707) {
   scheduledExecutionId = other1707.scheduledExecutionId;
   state = other1707.state;
@@ -48209,6 +54213,14 @@ void ScheduledQueryProgressInfo::printTo(std::ostream& out) const {
 AlterPartitionsRequest::~AlterPartitionsRequest() noexcept {
 }
 
+AlterPartitionsRequest::AlterPartitionsRequest() noexcept
+   : catName(),
+     dbName(),
+     tableName(),
+     writeId(-1LL),
+     validWriteIdList(),
+     skipColumnSchemaForPartition(0) {
+}
 
 void AlterPartitionsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -48464,7 +54476,7 @@ uint32_t AlterPartitionsRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(AlterPartitionsRequest &a, AlterPartitionsRequest &b) {
+void swap(AlterPartitionsRequest &a, AlterPartitionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -48478,6 +54490,41 @@ void swap(AlterPartitionsRequest &a, AlterPartitionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AlterPartitionsRequest::operator==(const AlterPartitionsRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(partitions == rhs.partitions))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.partitionColSchema != rhs.__isset.partitionColSchema)
+    return false;
+  else if (__isset.partitionColSchema && !(partitionColSchema == rhs.partitionColSchema))
+    return false;
+  return true;
+}
+
 AlterPartitionsRequest::AlterPartitionsRequest(const AlterPartitionsRequest& other1721) {
   catName = other1721.catName;
   dbName = other1721.dbName;
@@ -48522,6 +54569,12 @@ void AlterPartitionsRequest::printTo(std::ostream& out) const {
 AppendPartitionsRequest::~AppendPartitionsRequest() noexcept {
 }
 
+AppendPartitionsRequest::AppendPartitionsRequest() noexcept
+   : catalogName(),
+     dbName(),
+     tableName(),
+     name() {
+}
 
 void AppendPartitionsRequest::__set_catalogName(const std::string& val) {
   this->catalogName = val;
@@ -48702,7 +54755,7 @@ uint32_t AppendPartitionsRequest::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(AppendPartitionsRequest &a, AppendPartitionsRequest &b) {
+void swap(AppendPartitionsRequest &a, AppendPartitionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catalogName, b.catalogName);
   swap(a.dbName, b.dbName);
@@ -48713,6 +54766,31 @@ void swap(AppendPartitionsRequest &a, AppendPartitionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AppendPartitionsRequest::operator==(const AppendPartitionsRequest & rhs) const
+{
+  if (__isset.catalogName != rhs.__isset.catalogName)
+    return false;
+  else if (__isset.catalogName && !(catalogName == rhs.catalogName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (__isset.name != rhs.__isset.name)
+    return false;
+  else if (__isset.name && !(name == rhs.name))
+    return false;
+  if (__isset.partVals != rhs.__isset.partVals)
+    return false;
+  else if (__isset.partVals && !(partVals == rhs.partVals))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  return true;
+}
+
 AppendPartitionsRequest::AppendPartitionsRequest(const AppendPartitionsRequest& other1729) {
   catalogName = other1729.catalogName;
   dbName = other1729.dbName;
@@ -48748,6 +54826,8 @@ void AppendPartitionsRequest::printTo(std::ostream& out) const {
 AlterPartitionsResponse::~AlterPartitionsResponse() noexcept {
 }
 
+AlterPartitionsResponse::AlterPartitionsResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const AlterPartitionsResponse& obj)
 {
   obj.printTo(out);
@@ -48793,12 +54873,17 @@ uint32_t AlterPartitionsResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(AlterPartitionsResponse &a, AlterPartitionsResponse &b) {
+void swap(AlterPartitionsResponse &a, AlterPartitionsResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool AlterPartitionsResponse::operator==(const AlterPartitionsResponse & /* rhs */) const
+{
+  return true;
+}
+
 AlterPartitionsResponse::AlterPartitionsResponse(const AlterPartitionsResponse& other1731) noexcept {
   (void) other1731;
 }
@@ -48816,6 +54901,14 @@ void AlterPartitionsResponse::printTo(std::ostream& out) const {
 RenamePartitionRequest::~RenamePartitionRequest() noexcept {
 }
 
+RenamePartitionRequest::RenamePartitionRequest() noexcept
+   : catName(),
+     dbName(),
+     tableName(),
+     validWriteIdList(),
+     txnId(0),
+     clonePart(0) {
+}
 
 void RenamePartitionRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -49034,7 +55127,7 @@ uint32_t RenamePartitionRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(RenamePartitionRequest &a, RenamePartitionRequest &b) {
+void swap(RenamePartitionRequest &a, RenamePartitionRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -49047,6 +55140,35 @@ void swap(RenamePartitionRequest &a, RenamePartitionRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool RenamePartitionRequest::operator==(const RenamePartitionRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(partVals == rhs.partVals))
+    return false;
+  if (!(newPart == rhs.newPart))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.txnId != rhs.__isset.txnId)
+    return false;
+  else if (__isset.txnId && !(txnId == rhs.txnId))
+    return false;
+  if (__isset.clonePart != rhs.__isset.clonePart)
+    return false;
+  else if (__isset.clonePart && !(clonePart == rhs.clonePart))
+    return false;
+  return true;
+}
+
 RenamePartitionRequest::RenamePartitionRequest(const RenamePartitionRequest& other1739) {
   catName = other1739.catName;
   dbName = other1739.dbName;
@@ -49088,6 +55210,8 @@ void RenamePartitionRequest::printTo(std::ostream& out) const {
 RenamePartitionResponse::~RenamePartitionResponse() noexcept {
 }
 
+RenamePartitionResponse::RenamePartitionResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const RenamePartitionResponse& obj)
 {
   obj.printTo(out);
@@ -49133,12 +55257,17 @@ uint32_t RenamePartitionResponse::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(RenamePartitionResponse &a, RenamePartitionResponse &b) {
+void swap(RenamePartitionResponse &a, RenamePartitionResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool RenamePartitionResponse::operator==(const RenamePartitionResponse & /* rhs */) const
+{
+  return true;
+}
+
 RenamePartitionResponse::RenamePartitionResponse(const RenamePartitionResponse& other1741) noexcept {
   (void) other1741;
 }
@@ -49156,6 +55285,16 @@ void RenamePartitionResponse::printTo(std::ostream& out) const {
 AlterTableRequest::~AlterTableRequest() noexcept {
 }
 
+AlterTableRequest::AlterTableRequest() noexcept
+   : catName(),
+     dbName(),
+     tableName(),
+     writeId(-1LL),
+     validWriteIdList(),
+     processorIdentifier(),
+     expectedParameterKey(),
+     expectedParameterValue() {
+}
 
 void AlterTableRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -49427,7 +55566,7 @@ uint32_t AlterTableRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(AlterTableRequest &a, AlterTableRequest &b) {
+void swap(AlterTableRequest &a, AlterTableRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -49443,6 +55582,49 @@ void swap(AlterTableRequest &a, AlterTableRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AlterTableRequest::operator==(const AlterTableRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tableName == rhs.tableName))
+    return false;
+  if (!(table == rhs.table))
+    return false;
+  if (__isset.environmentContext != rhs.__isset.environmentContext)
+    return false;
+  else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
+    return false;
+  if (__isset.writeId != rhs.__isset.writeId)
+    return false;
+  else if (__isset.writeId && !(writeId == rhs.writeId))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  if (__isset.expectedParameterKey != rhs.__isset.expectedParameterKey)
+    return false;
+  else if (__isset.expectedParameterKey && !(expectedParameterKey == rhs.expectedParameterKey))
+    return false;
+  if (__isset.expectedParameterValue != rhs.__isset.expectedParameterValue)
+    return false;
+  else if (__isset.expectedParameterValue && !(expectedParameterValue == rhs.expectedParameterValue))
+    return false;
+  return true;
+}
+
 AlterTableRequest::AlterTableRequest(const AlterTableRequest& other1749) {
   catName = other1749.catName;
   dbName = other1749.dbName;
@@ -49493,6 +55675,8 @@ void AlterTableRequest::printTo(std::ostream& out) const {
 AlterTableResponse::~AlterTableResponse() noexcept {
 }
 
+AlterTableResponse::AlterTableResponse() noexcept {
+}
 std::ostream& operator<<(std::ostream& out, const AlterTableResponse& obj)
 {
   obj.printTo(out);
@@ -49538,12 +55722,17 @@ uint32_t AlterTableResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(AlterTableResponse &a, AlterTableResponse &b) {
+void swap(AlterTableResponse &a, AlterTableResponse &b) noexcept {
   using ::std::swap;
   (void) a;
   (void) b;
 }
 
+bool AlterTableResponse::operator==(const AlterTableResponse & /* rhs */) const
+{
+  return true;
+}
+
 AlterTableResponse::AlterTableResponse(const AlterTableResponse& other1751) noexcept {
   (void) other1751;
 }
@@ -49561,6 +55750,13 @@ void AlterTableResponse::printTo(std::ostream& out) const {
 TableParamsUpdate::~TableParamsUpdate() noexcept {
 }
 
+TableParamsUpdate::TableParamsUpdate() noexcept
+   : cat_name(),
+     db_name(),
+     table_name(),
+     expected_param_key(),
+     expected_param_value() {
+}
 
 void TableParamsUpdate::__set_cat_name(const std::string& val) {
   this->cat_name = val;
@@ -49746,7 +55942,7 @@ uint32_t TableParamsUpdate::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(TableParamsUpdate &a, TableParamsUpdate &b) {
+void swap(TableParamsUpdate &a, TableParamsUpdate &b) noexcept {
   using ::std::swap;
   swap(a.cat_name, b.cat_name);
   swap(a.db_name, b.db_name);
@@ -49757,6 +55953,29 @@ void swap(TableParamsUpdate &a, TableParamsUpdate &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool TableParamsUpdate::operator==(const TableParamsUpdate & rhs) const
+{
+  if (__isset.cat_name != rhs.__isset.cat_name)
+    return false;
+  else if (__isset.cat_name && !(cat_name == rhs.cat_name))
+    return false;
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(table_name == rhs.table_name))
+    return false;
+  if (!(params == rhs.params))
+    return false;
+  if (__isset.expected_param_key != rhs.__isset.expected_param_key)
+    return false;
+  else if (__isset.expected_param_key && !(expected_param_key == rhs.expected_param_key))
+    return false;
+  if (__isset.expected_param_value != rhs.__isset.expected_param_value)
+    return false;
+  else if (__isset.expected_param_value && !(expected_param_value == rhs.expected_param_value))
+    return false;
+  return true;
+}
+
 TableParamsUpdate::TableParamsUpdate(const TableParamsUpdate& other1761) {
   cat_name = other1761.cat_name;
   db_name = other1761.db_name;
@@ -49792,6 +56011,9 @@ void TableParamsUpdate::printTo(std::ostream& out) const {
 GetPartitionsFilterSpec::~GetPartitionsFilterSpec() noexcept {
 }
 
+GetPartitionsFilterSpec::GetPartitionsFilterSpec() noexcept
+   : filterMode(static_cast<PartitionFilterMode::type>(0)) {
+}
 
 void GetPartitionsFilterSpec::__set_filterMode(const PartitionFilterMode::type val) {
   this->filterMode = val;
@@ -49900,13 +56122,26 @@ uint32_t GetPartitionsFilterSpec::write(::apache::thrift::protocol::TProtocol* o
   return xfer;
 }
 
-void swap(GetPartitionsFilterSpec &a, GetPartitionsFilterSpec &b) {
+void swap(GetPartitionsFilterSpec &a, GetPartitionsFilterSpec &b) noexcept {
   using ::std::swap;
   swap(a.filterMode, b.filterMode);
   swap(a.filters, b.filters);
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsFilterSpec::operator==(const GetPartitionsFilterSpec & rhs) const
+{
+  if (__isset.filterMode != rhs.__isset.filterMode)
+    return false;
+  else if (__isset.filterMode && !(filterMode == rhs.filterMode))
+    return false;
+  if (__isset.filters != rhs.__isset.filters)
+    return false;
+  else if (__isset.filters && !(filters == rhs.filters))
+    return false;
+  return true;
+}
+
 GetPartitionsFilterSpec::GetPartitionsFilterSpec(const GetPartitionsFilterSpec& other1770) {
   filterMode = other1770.filterMode;
   filters = other1770.filters;
@@ -49930,6 +56165,8 @@ void GetPartitionsFilterSpec::printTo(std::ostream& out) const {
 GetPartitionsResponse::~GetPartitionsResponse() noexcept {
 }
 
+GetPartitionsResponse::GetPartitionsResponse() noexcept {
+}
 
 void GetPartitionsResponse::__set_partitionSpec(const std::vector<PartitionSpec> & val) {
   this->partitionSpec = val;
@@ -50016,12 +56253,19 @@ uint32_t GetPartitionsResponse::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(GetPartitionsResponse &a, GetPartitionsResponse &b) {
+void swap(GetPartitionsResponse &a, GetPartitionsResponse &b) noexcept {
   using ::std::swap;
   swap(a.partitionSpec, b.partitionSpec);
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsResponse::operator==(const GetPartitionsResponse & rhs) const
+{
+  if (!(partitionSpec == rhs.partitionSpec))
+    return false;
+  return true;
+}
+
 GetPartitionsResponse::GetPartitionsResponse(const GetPartitionsResponse& other1778) {
   partitionSpec = other1778.partitionSpec;
   __isset = other1778.__isset;
@@ -50042,6 +56286,15 @@ void GetPartitionsResponse::printTo(std::ostream& out) const {
 GetPartitionsRequest::~GetPartitionsRequest() noexcept {
 }
 
+GetPartitionsRequest::GetPartitionsRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     withAuth(0),
+     user(),
+     processorIdentifier(),
+     validWriteIdList() {
+}
 
 void GetPartitionsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -50322,7 +56575,7 @@ uint32_t GetPartitionsRequest::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(GetPartitionsRequest &a, GetPartitionsRequest &b) {
+void swap(GetPartitionsRequest &a, GetPartitionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -50338,6 +56591,47 @@ void swap(GetPartitionsRequest &a, GetPartitionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsRequest::operator==(const GetPartitionsRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.withAuth != rhs.__isset.withAuth)
+    return false;
+  else if (__isset.withAuth && !(withAuth == rhs.withAuth))
+    return false;
+  if (__isset.user != rhs.__isset.user)
+    return false;
+  else if (__isset.user && !(user == rhs.user))
+    return false;
+  if (__isset.groupNames != rhs.__isset.groupNames)
+    return false;
+  else if (__isset.groupNames && !(groupNames == rhs.groupNames))
+    return false;
+  if (!(projectionSpec == rhs.projectionSpec))
+    return false;
+  if (!(filterSpec == rhs.filterSpec))
+    return false;
+  if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
+    return false;
+  else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
+    return false;
+  if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
+    return false;
+  else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  return true;
+}
+
 GetPartitionsRequest::GetPartitionsRequest(const GetPartitionsRequest& other1792) {
   catName = other1792.catName;
   dbName = other1792.dbName;
@@ -50388,6 +56682,13 @@ void GetPartitionsRequest::printTo(std::ostream& out) const {
 GetFieldsRequest::~GetFieldsRequest() noexcept {
 }
 
+GetFieldsRequest::GetFieldsRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     validWriteIdList(),
+     id(-1LL) {
+}
 
 void GetFieldsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -50548,7 +56849,7 @@ uint32_t GetFieldsRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(GetFieldsRequest &a, GetFieldsRequest &b) {
+void swap(GetFieldsRequest &a, GetFieldsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -50559,6 +56860,31 @@ void swap(GetFieldsRequest &a, GetFieldsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetFieldsRequest::operator==(const GetFieldsRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.envContext != rhs.__isset.envContext)
+    return false;
+  else if (__isset.envContext && !(envContext == rhs.envContext))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  return true;
+}
+
 GetFieldsRequest::GetFieldsRequest(const GetFieldsRequest& other1794) {
   catName = other1794.catName;
   dbName = other1794.dbName;
@@ -50594,6 +56920,8 @@ void GetFieldsRequest::printTo(std::ostream& out) const {
 GetFieldsResponse::~GetFieldsResponse() noexcept {
 }
 
+GetFieldsResponse::GetFieldsResponse() noexcept {
+}
 
 void GetFieldsResponse::__set_fields(const std::vector<FieldSchema> & val) {
   this->fields = val;
@@ -50683,11 +57011,18 @@ uint32_t GetFieldsResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetFieldsResponse &a, GetFieldsResponse &b) {
+void swap(GetFieldsResponse &a, GetFieldsResponse &b) noexcept {
   using ::std::swap;
   swap(a.fields, b.fields);
 }
 
+bool GetFieldsResponse::operator==(const GetFieldsResponse & rhs) const
+{
+  if (!(fields == rhs.fields))
+    return false;
+  return true;
+}
+
 GetFieldsResponse::GetFieldsResponse(const GetFieldsResponse& other1802) {
   fields = other1802.fields;
 }
@@ -50706,6 +57041,13 @@ void GetFieldsResponse::printTo(std::ostream& out) const {
 GetSchemaRequest::~GetSchemaRequest() noexcept {
 }
 
+GetSchemaRequest::GetSchemaRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     validWriteIdList(),
+     id(-1LL) {
+}
 
 void GetSchemaRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -50866,7 +57208,7 @@ uint32_t GetSchemaRequest::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(GetSchemaRequest &a, GetSchemaRequest &b) {
+void swap(GetSchemaRequest &a, GetSchemaRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -50877,6 +57219,31 @@ void swap(GetSchemaRequest &a, GetSchemaRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetSchemaRequest::operator==(const GetSchemaRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.envContext != rhs.__isset.envContext)
+    return false;
+  else if (__isset.envContext && !(envContext == rhs.envContext))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  return true;
+}
+
 GetSchemaRequest::GetSchemaRequest(const GetSchemaRequest& other1804) {
   catName = other1804.catName;
   dbName = other1804.dbName;
@@ -50912,6 +57279,8 @@ void GetSchemaRequest::printTo(std::ostream& out) const {
 GetSchemaResponse::~GetSchemaResponse() noexcept {
 }
 
+GetSchemaResponse::GetSchemaResponse() noexcept {
+}
 
 void GetSchemaResponse::__set_fields(const std::vector<FieldSchema> & val) {
   this->fields = val;
@@ -51001,11 +57370,18 @@ uint32_t GetSchemaResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetSchemaResponse &a, GetSchemaResponse &b) {
+void swap(GetSchemaResponse &a, GetSchemaResponse &b) noexcept {
   using ::std::swap;
   swap(a.fields, b.fields);
 }
 
+bool GetSchemaResponse::operator==(const GetSchemaResponse & rhs) const
+{
+  if (!(fields == rhs.fields))
+    return false;
+  return true;
+}
+
 GetSchemaResponse::GetSchemaResponse(const GetSchemaResponse& other1812) {
   fields = other1812.fields;
 }
@@ -51024,6 +57400,13 @@ void GetSchemaResponse::printTo(std::ostream& out) const {
 GetPartitionRequest::~GetPartitionRequest() noexcept {
 }
 
+GetPartitionRequest::GetPartitionRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     validWriteIdList(),
+     id(-1LL) {
+}
 
 void GetPartitionRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -51205,7 +57588,7 @@ uint32_t GetPartitionRequest::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(GetPartitionRequest &a, GetPartitionRequest &b) {
+void swap(GetPartitionRequest &a, GetPartitionRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -51216,6 +57599,29 @@ void swap(GetPartitionRequest &a, GetPartitionRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionRequest::operator==(const GetPartitionRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(partVals == rhs.partVals))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  return true;
+}
+
 GetPartitionRequest::GetPartitionRequest(const GetPartitionRequest& other1820) {
   catName = other1820.catName;
   dbName = other1820.dbName;
@@ -51251,6 +57657,8 @@ void GetPartitionRequest::printTo(std::ostream& out) const {
 GetPartitionResponse::~GetPartitionResponse() noexcept {
 }
 
+GetPartitionResponse::GetPartitionResponse() noexcept {
+}
 
 void GetPartitionResponse::__set_partition(const Partition& val) {
   this->partition = val;
@@ -51320,11 +57728,18 @@ uint32_t GetPartitionResponse::write(::apache::thrift::protocol::TProtocol* opro
   return xfer;
 }
 
-void swap(GetPartitionResponse &a, GetPartitionResponse &b) {
+void swap(GetPartitionResponse &a, GetPartitionResponse &b) noexcept {
   using ::std::swap;
   swap(a.partition, b.partition);
 }
 
+bool GetPartitionResponse::operator==(const GetPartitionResponse & rhs) const
+{
+  if (!(partition == rhs.partition))
+    return false;
+  return true;
+}
+
 GetPartitionResponse::GetPartitionResponse(const GetPartitionResponse& other1822) {
   partition = other1822.partition;
 }
@@ -51343,6 +57758,17 @@ void GetPartitionResponse::printTo(std::ostream& out) const {
 PartitionsRequest::~PartitionsRequest() noexcept {
 }
 
+PartitionsRequest::PartitionsRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     maxParts(-1),
+     validWriteIdList(),
+     id(-1LL),
+     skipColumnSchemaForPartition(0),
+     includeParamKeyPattern(),
+     excludeParamKeyPattern() {
+}
 
 void PartitionsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -51557,7 +57983,7 @@ uint32_t PartitionsRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PartitionsRequest &a, PartitionsRequest &b) {
+void swap(PartitionsRequest &a, PartitionsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -51571,6 +57997,43 @@ void swap(PartitionsRequest &a, PartitionsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool PartitionsRequest::operator==(const PartitionsRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.maxParts != rhs.__isset.maxParts)
+    return false;
+  else if (__isset.maxParts && !(maxParts == rhs.maxParts))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
+    return false;
+  else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
+    return false;
+  if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
+    return false;
+  else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+    return false;
+  return true;
+}
+
 PartitionsRequest::PartitionsRequest(const PartitionsRequest& other1824) {
   catName = other1824.catName;
   dbName = other1824.dbName;
@@ -51615,6 +58078,8 @@ void PartitionsRequest::printTo(std::ostream& out) const {
 PartitionsResponse::~PartitionsResponse() noexcept {
 }
 
+PartitionsResponse::PartitionsResponse() noexcept {
+}
 
 void PartitionsResponse::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -51704,11 +58169,18 @@ uint32_t PartitionsResponse::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(PartitionsResponse &a, PartitionsResponse &b) {
+void swap(PartitionsResponse &a, PartitionsResponse &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
 }
 
+bool PartitionsResponse::operator==(const PartitionsResponse & rhs) const
+{
+  if (!(partitions == rhs.partitions))
+    return false;
+  return true;
+}
+
 PartitionsResponse::PartitionsResponse(const PartitionsResponse& other1832) {
   partitions = other1832.partitions;
 }
@@ -51727,6 +58199,16 @@ void PartitionsResponse::printTo(std::ostream& out) const {
 GetPartitionsByFilterRequest::~GetPartitionsByFilterRequest() noexcept {
 }
 
+GetPartitionsByFilterRequest::GetPartitionsByFilterRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     filter(),
+     maxParts(-1),
+     skipColumnSchemaForPartition(0),
+     includeParamKeyPattern(),
+     excludeParamKeyPattern() {
+}
 
 void GetPartitionsByFilterRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -51915,7 +58397,7 @@ uint32_t GetPartitionsByFilterRequest::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(GetPartitionsByFilterRequest &a, GetPartitionsByFilterRequest &b) {
+void swap(GetPartitionsByFilterRequest &a, GetPartitionsByFilterRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -51928,6 +58410,37 @@ void swap(GetPartitionsByFilterRequest &a, GetPartitionsByFilterRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsByFilterRequest::operator==(const GetPartitionsByFilterRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (!(filter == rhs.filter))
+    return false;
+  if (__isset.maxParts != rhs.__isset.maxParts)
+    return false;
+  else if (__isset.maxParts && !(maxParts == rhs.maxParts))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
+    return false;
+  else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
+    return false;
+  if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
+    return false;
+  else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+    return false;
+  return true;
+}
+
 GetPartitionsByFilterRequest::GetPartitionsByFilterRequest(const GetPartitionsByFilterRequest& other1834) {
   catName = other1834.catName;
   dbName = other1834.dbName;
@@ -51969,6 +58482,14 @@ void GetPartitionsByFilterRequest::printTo(std::ostream& out) const {
 GetPartitionNamesPsRequest::~GetPartitionNamesPsRequest() noexcept {
 }
 
+GetPartitionNamesPsRequest::GetPartitionNamesPsRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     maxParts(-1),
+     validWriteIdList(),
+     id(-1LL) {
+}
 
 void GetPartitionNamesPsRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -52167,7 +58688,7 @@ uint32_t GetPartitionNamesPsRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(GetPartitionNamesPsRequest &a, GetPartitionNamesPsRequest &b) {
+void swap(GetPartitionNamesPsRequest &a, GetPartitionNamesPsRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -52179,6 +58700,35 @@ void swap(GetPartitionNamesPsRequest &a, GetPartitionNamesPsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionNamesPsRequest::operator==(const GetPartitionNamesPsRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.partValues != rhs.__isset.partValues)
+    return false;
+  else if (__isset.partValues && !(partValues == rhs.partValues))
+    return false;
+  if (__isset.maxParts != rhs.__isset.maxParts)
+    return false;
+  else if (__isset.maxParts && !(maxParts == rhs.maxParts))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  return true;
+}
+
 GetPartitionNamesPsRequest::GetPartitionNamesPsRequest(const GetPartitionNamesPsRequest& other1842) {
   catName = other1842.catName;
   dbName = other1842.dbName;
@@ -52217,6 +58767,8 @@ void GetPartitionNamesPsRequest::printTo(std::ostream& out) const {
 GetPartitionNamesPsResponse::~GetPartitionNamesPsResponse() noexcept {
 }
 
+GetPartitionNamesPsResponse::GetPartitionNamesPsResponse() noexcept {
+}
 
 void GetPartitionNamesPsResponse::__set_names(const std::vector<std::string> & val) {
   this->names = val;
@@ -52306,11 +58858,18 @@ uint32_t GetPartitionNamesPsResponse::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(GetPartitionNamesPsResponse &a, GetPartitionNamesPsResponse &b) {
+void swap(GetPartitionNamesPsResponse &a, GetPartitionNamesPsResponse &b) noexcept {
   using ::std::swap;
   swap(a.names, b.names);
 }
 
+bool GetPartitionNamesPsResponse::operator==(const GetPartitionNamesPsResponse & rhs) const
+{
+  if (!(names == rhs.names))
+    return false;
+  return true;
+}
+
 GetPartitionNamesPsResponse::GetPartitionNamesPsResponse(const GetPartitionNamesPsResponse& other1850) {
   names = other1850.names;
 }
@@ -52329,6 +58888,18 @@ void GetPartitionNamesPsResponse::printTo(std::ostream& out) const {
 GetPartitionsPsWithAuthRequest::~GetPartitionsPsWithAuthRequest() noexcept {
 }
 
+GetPartitionsPsWithAuthRequest::GetPartitionsPsWithAuthRequest() noexcept
+   : catName(),
+     dbName(),
+     tblName(),
+     maxParts(-1),
+     userName(),
+     validWriteIdList(),
+     id(-1LL),
+     skipColumnSchemaForPartition(0),
+     includeParamKeyPattern(),
+     excludeParamKeyPattern() {
+}
 
 void GetPartitionsPsWithAuthRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -52675,7 +59246,7 @@ uint32_t GetPartitionsPsWithAuthRequest::write(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-void swap(GetPartitionsPsWithAuthRequest &a, GetPartitionsPsWithAuthRequest &b) {
+void swap(GetPartitionsPsWithAuthRequest &a, GetPartitionsPsWithAuthRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -52693,6 +59264,59 @@ void swap(GetPartitionsPsWithAuthRequest &a, GetPartitionsPsWithAuthRequest &b)
   swap(a.__isset, b.__isset);
 }
 
+bool GetPartitionsPsWithAuthRequest::operator==(const GetPartitionsPsWithAuthRequest & rhs) const
+{
+  if (__isset.catName != rhs.__isset.catName)
+    return false;
+  else if (__isset.catName && !(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(tblName == rhs.tblName))
+    return false;
+  if (__isset.partVals != rhs.__isset.partVals)
+    return false;
+  else if (__isset.partVals && !(partVals == rhs.partVals))
+    return false;
+  if (__isset.maxParts != rhs.__isset.maxParts)
+    return false;
+  else if (__isset.maxParts && !(maxParts == rhs.maxParts))
+    return false;
+  if (__isset.userName != rhs.__isset.userName)
+    return false;
+  else if (__isset.userName && !(userName == rhs.userName))
+    return false;
+  if (__isset.groupNames != rhs.__isset.groupNames)
+    return false;
+  else if (__isset.groupNames && !(groupNames == rhs.groupNames))
+    return false;
+  if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
+    return false;
+  else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
+    return false;
+  if (__isset.id != rhs.__isset.id)
+    return false;
+  else if (__isset.id && !(id == rhs.id))
+    return false;
+  if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
+    return false;
+  else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
+    return false;
+  if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
+    return false;
+  else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
+    return false;
+  if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
+    return false;
+  else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+    return false;
+  if (__isset.partNames != rhs.__isset.partNames)
+    return false;
+  else if (__isset.partNames && !(partNames == rhs.partNames))
+    return false;
+  return true;
+}
+
 GetPartitionsPsWithAuthRequest::GetPartitionsPsWithAuthRequest(const GetPartitionsPsWithAuthRequest& other1870) {
   catName = other1870.catName;
   dbName = other1870.dbName;
@@ -52749,6 +59373,8 @@ void GetPartitionsPsWithAuthRequest::printTo(std::ostream& out) const {
 GetPartitionsPsWithAuthResponse::~GetPartitionsPsWithAuthResponse() noexcept {
 }
 
+GetPartitionsPsWithAuthResponse::GetPartitionsPsWithAuthResponse() noexcept {
+}
 
 void GetPartitionsPsWithAuthResponse::__set_partitions(const std::vector<Partition> & val) {
   this->partitions = val;
@@ -52838,11 +59464,18 @@ uint32_t GetPartitionsPsWithAuthResponse::write(::apache::thrift::protocol::TPro
   return xfer;
 }
 
-void swap(GetPartitionsPsWithAuthResponse &a, GetPartitionsPsWithAuthResponse &b) {
+void swap(GetPartitionsPsWithAuthResponse &a, GetPartitionsPsWithAuthResponse &b) noexcept {
   using ::std::swap;
   swap(a.partitions, b.partitions);
 }
 
+bool GetPartitionsPsWithAuthResponse::operator==(const GetPartitionsPsWithAuthResponse & rhs) const
+{
+  if (!(partitions == rhs.partitions))
+    return false;
+  return true;
+}
+
 GetPartitionsPsWithAuthResponse::GetPartitionsPsWithAuthResponse(const GetPartitionsPsWithAuthResponse& other1878) {
   partitions = other1878.partitions;
 }
@@ -52861,6 +59494,14 @@ void GetPartitionsPsWithAuthResponse::printTo(std::ostream& out) const {
 ReplicationMetrics::~ReplicationMetrics() noexcept {
 }
 
+ReplicationMetrics::ReplicationMetrics() noexcept
+   : scheduledExecutionId(0),
+     policy(),
+     dumpExecutionId(0),
+     metadata(),
+     progress(),
+     messageFormat() {
+}
 
 void ReplicationMetrics::__set_scheduledExecutionId(const int64_t val) {
   this->scheduledExecutionId = val;
@@ -53022,7 +59663,7 @@ uint32_t ReplicationMetrics::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ReplicationMetrics &a, ReplicationMetrics &b) {
+void swap(ReplicationMetrics &a, ReplicationMetrics &b) noexcept {
   using ::std::swap;
   swap(a.scheduledExecutionId, b.scheduledExecutionId);
   swap(a.policy, b.policy);
@@ -53033,6 +59674,29 @@ void swap(ReplicationMetrics &a, ReplicationMetrics &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool ReplicationMetrics::operator==(const ReplicationMetrics & rhs) const
+{
+  if (!(scheduledExecutionId == rhs.scheduledExecutionId))
+    return false;
+  if (!(policy == rhs.policy))
+    return false;
+  if (!(dumpExecutionId == rhs.dumpExecutionId))
+    return false;
+  if (__isset.metadata != rhs.__isset.metadata)
+    return false;
+  else if (__isset.metadata && !(metadata == rhs.metadata))
+    return false;
+  if (__isset.progress != rhs.__isset.progress)
+    return false;
+  else if (__isset.progress && !(progress == rhs.progress))
+    return false;
+  if (__isset.messageFormat != rhs.__isset.messageFormat)
+    return false;
+  else if (__isset.messageFormat && !(messageFormat == rhs.messageFormat))
+    return false;
+  return true;
+}
+
 ReplicationMetrics::ReplicationMetrics(const ReplicationMetrics& other1880) {
   scheduledExecutionId = other1880.scheduledExecutionId;
   policy = other1880.policy;
@@ -53068,6 +59732,8 @@ void ReplicationMetrics::printTo(std::ostream& out) const {
 ReplicationMetricList::~ReplicationMetricList() noexcept {
 }
 
+ReplicationMetricList::ReplicationMetricList() noexcept {
+}
 
 void ReplicationMetricList::__set_replicationMetricList(const std::vector<ReplicationMetrics> & val) {
   this->replicationMetricList = val;
@@ -53157,11 +59823,18 @@ uint32_t ReplicationMetricList::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(ReplicationMetricList &a, ReplicationMetricList &b) {
+void swap(ReplicationMetricList &a, ReplicationMetricList &b) noexcept {
   using ::std::swap;
   swap(a.replicationMetricList, b.replicationMetricList);
 }
 
+bool ReplicationMetricList::operator==(const ReplicationMetricList & rhs) const
+{
+  if (!(replicationMetricList == rhs.replicationMetricList))
+    return false;
+  return true;
+}
+
 ReplicationMetricList::ReplicationMetricList(const ReplicationMetricList& other1888) {
   replicationMetricList = other1888.replicationMetricList;
 }
@@ -53180,6 +59853,11 @@ void ReplicationMetricList::printTo(std::ostream& out) const {
 GetReplicationMetricsRequest::~GetReplicationMetricsRequest() noexcept {
 }
 
+GetReplicationMetricsRequest::GetReplicationMetricsRequest() noexcept
+   : scheduledExecutionId(0),
+     policy(),
+     dumpExecutionId(0) {
+}
 
 void GetReplicationMetricsRequest::__set_scheduledExecutionId(const int64_t val) {
   this->scheduledExecutionId = val;
@@ -53284,7 +59962,7 @@ uint32_t GetReplicationMetricsRequest::write(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-void swap(GetReplicationMetricsRequest &a, GetReplicationMetricsRequest &b) {
+void swap(GetReplicationMetricsRequest &a, GetReplicationMetricsRequest &b) noexcept {
   using ::std::swap;
   swap(a.scheduledExecutionId, b.scheduledExecutionId);
   swap(a.policy, b.policy);
@@ -53292,6 +59970,23 @@ void swap(GetReplicationMetricsRequest &a, GetReplicationMetricsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetReplicationMetricsRequest::operator==(const GetReplicationMetricsRequest & rhs) const
+{
+  if (__isset.scheduledExecutionId != rhs.__isset.scheduledExecutionId)
+    return false;
+  else if (__isset.scheduledExecutionId && !(scheduledExecutionId == rhs.scheduledExecutionId))
+    return false;
+  if (__isset.policy != rhs.__isset.policy)
+    return false;
+  else if (__isset.policy && !(policy == rhs.policy))
+    return false;
+  if (__isset.dumpExecutionId != rhs.__isset.dumpExecutionId)
+    return false;
+  else if (__isset.dumpExecutionId && !(dumpExecutionId == rhs.dumpExecutionId))
+    return false;
+  return true;
+}
+
 GetReplicationMetricsRequest::GetReplicationMetricsRequest(const GetReplicationMetricsRequest& other1890) {
   scheduledExecutionId = other1890.scheduledExecutionId;
   policy = other1890.policy;
@@ -53318,6 +60013,8 @@ void GetReplicationMetricsRequest::printTo(std::ostream& out) const {
 GetOpenTxnsRequest::~GetOpenTxnsRequest() noexcept {
 }
 
+GetOpenTxnsRequest::GetOpenTxnsRequest() noexcept {
+}
 
 void GetOpenTxnsRequest::__set_excludeTxnTypes(const std::vector<TxnType::type> & val) {
   this->excludeTxnTypes = val;
@@ -53408,12 +60105,21 @@ uint32_t GetOpenTxnsRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetOpenTxnsRequest &a, GetOpenTxnsRequest &b) {
+void swap(GetOpenTxnsRequest &a, GetOpenTxnsRequest &b) noexcept {
   using ::std::swap;
   swap(a.excludeTxnTypes, b.excludeTxnTypes);
   swap(a.__isset, b.__isset);
 }
 
+bool GetOpenTxnsRequest::operator==(const GetOpenTxnsRequest & rhs) const
+{
+  if (__isset.excludeTxnTypes != rhs.__isset.excludeTxnTypes)
+    return false;
+  else if (__isset.excludeTxnTypes && !(excludeTxnTypes == rhs.excludeTxnTypes))
+    return false;
+  return true;
+}
+
 GetOpenTxnsRequest::GetOpenTxnsRequest(const GetOpenTxnsRequest& other1899) {
   excludeTxnTypes = other1899.excludeTxnTypes;
   __isset = other1899.__isset;
@@ -53434,6 +60140,11 @@ void GetOpenTxnsRequest::printTo(std::ostream& out) const {
 StoredProcedureRequest::~StoredProcedureRequest() noexcept {
 }
 
+StoredProcedureRequest::StoredProcedureRequest() noexcept
+   : catName(),
+     dbName(),
+     procName() {
+}
 
 void StoredProcedureRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -53541,13 +60252,24 @@ uint32_t StoredProcedureRequest::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(StoredProcedureRequest &a, StoredProcedureRequest &b) {
+void swap(StoredProcedureRequest &a, StoredProcedureRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
   swap(a.procName, b.procName);
 }
 
+bool StoredProcedureRequest::operator==(const StoredProcedureRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(procName == rhs.procName))
+    return false;
+  return true;
+}
+
 StoredProcedureRequest::StoredProcedureRequest(const StoredProcedureRequest& other1901) {
   catName = other1901.catName;
   dbName = other1901.dbName;
@@ -53572,6 +60294,10 @@ void StoredProcedureRequest::printTo(std::ostream& out) const {
 ListStoredProcedureRequest::~ListStoredProcedureRequest() noexcept {
 }
 
+ListStoredProcedureRequest::ListStoredProcedureRequest() noexcept
+   : catName(),
+     dbName() {
+}
 
 void ListStoredProcedureRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -53659,13 +60385,24 @@ uint32_t ListStoredProcedureRequest::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(ListStoredProcedureRequest &a, ListStoredProcedureRequest &b) {
+void swap(ListStoredProcedureRequest &a, ListStoredProcedureRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
   swap(a.__isset, b.__isset);
 }
 
+bool ListStoredProcedureRequest::operator==(const ListStoredProcedureRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  return true;
+}
+
 ListStoredProcedureRequest::ListStoredProcedureRequest(const ListStoredProcedureRequest& other1903) {
   catName = other1903.catName;
   dbName = other1903.dbName;
@@ -53689,6 +60426,13 @@ void ListStoredProcedureRequest::printTo(std::ostream& out) const {
 StoredProcedure::~StoredProcedure() noexcept {
 }
 
+StoredProcedure::StoredProcedure() noexcept
+   : name(),
+     dbName(),
+     catName(),
+     ownerName(),
+     source() {
+}
 
 void StoredProcedure::__set_name(const std::string& val) {
   this->name = val;
@@ -53819,7 +60563,7 @@ uint32_t StoredProcedure::write(::apache::thrift::protocol::TProtocol* oprot) co
   return xfer;
 }
 
-void swap(StoredProcedure &a, StoredProcedure &b) {
+void swap(StoredProcedure &a, StoredProcedure &b) noexcept {
   using ::std::swap;
   swap(a.name, b.name);
   swap(a.dbName, b.dbName);
@@ -53829,6 +60573,21 @@ void swap(StoredProcedure &a, StoredProcedure &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool StoredProcedure::operator==(const StoredProcedure & rhs) const
+{
+  if (!(name == rhs.name))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(ownerName == rhs.ownerName))
+    return false;
+  if (!(source == rhs.source))
+    return false;
+  return true;
+}
+
 StoredProcedure::StoredProcedure(const StoredProcedure& other1905) {
   name = other1905.name;
   dbName = other1905.dbName;
@@ -53861,6 +60620,14 @@ void StoredProcedure::printTo(std::ostream& out) const {
 AddPackageRequest::~AddPackageRequest() noexcept {
 }
 
+AddPackageRequest::AddPackageRequest() noexcept
+   : catName(),
+     dbName(),
+     packageName(),
+     ownerName(),
+     header(),
+     body() {
+}
 
 void AddPackageRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -54007,7 +60774,7 @@ uint32_t AddPackageRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(AddPackageRequest &a, AddPackageRequest &b) {
+void swap(AddPackageRequest &a, AddPackageRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -54018,6 +60785,23 @@ void swap(AddPackageRequest &a, AddPackageRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool AddPackageRequest::operator==(const AddPackageRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(packageName == rhs.packageName))
+    return false;
+  if (!(ownerName == rhs.ownerName))
+    return false;
+  if (!(header == rhs.header))
+    return false;
+  if (!(body == rhs.body))
+    return false;
+  return true;
+}
+
 AddPackageRequest::AddPackageRequest(const AddPackageRequest& other1907) {
   catName = other1907.catName;
   dbName = other1907.dbName;
@@ -54053,6 +60837,11 @@ void AddPackageRequest::printTo(std::ostream& out) const {
 GetPackageRequest::~GetPackageRequest() noexcept {
 }
 
+GetPackageRequest::GetPackageRequest() noexcept
+   : catName(),
+     dbName(),
+     packageName() {
+}
 
 void GetPackageRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -54160,13 +60949,24 @@ uint32_t GetPackageRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(GetPackageRequest &a, GetPackageRequest &b) {
+void swap(GetPackageRequest &a, GetPackageRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
   swap(a.packageName, b.packageName);
 }
 
+bool GetPackageRequest::operator==(const GetPackageRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(packageName == rhs.packageName))
+    return false;
+  return true;
+}
+
 GetPackageRequest::GetPackageRequest(const GetPackageRequest& other1909) {
   catName = other1909.catName;
   dbName = other1909.dbName;
@@ -54191,6 +60991,11 @@ void GetPackageRequest::printTo(std::ostream& out) const {
 DropPackageRequest::~DropPackageRequest() noexcept {
 }
 
+DropPackageRequest::DropPackageRequest() noexcept
+   : catName(),
+     dbName(),
+     packageName() {
+}
 
 void DropPackageRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -54298,13 +61103,24 @@ uint32_t DropPackageRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(DropPackageRequest &a, DropPackageRequest &b) {
+void swap(DropPackageRequest &a, DropPackageRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
   swap(a.packageName, b.packageName);
 }
 
+bool DropPackageRequest::operator==(const DropPackageRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(packageName == rhs.packageName))
+    return false;
+  return true;
+}
+
 DropPackageRequest::DropPackageRequest(const DropPackageRequest& other1911) {
   catName = other1911.catName;
   dbName = other1911.dbName;
@@ -54329,6 +61145,10 @@ void DropPackageRequest::printTo(std::ostream& out) const {
 ListPackageRequest::~ListPackageRequest() noexcept {
 }
 
+ListPackageRequest::ListPackageRequest() noexcept
+   : catName(),
+     dbName() {
+}
 
 void ListPackageRequest::__set_catName(const std::string& val) {
   this->catName = val;
@@ -54416,13 +61236,24 @@ uint32_t ListPackageRequest::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(ListPackageRequest &a, ListPackageRequest &b) {
+void swap(ListPackageRequest &a, ListPackageRequest &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
   swap(a.__isset, b.__isset);
 }
 
+bool ListPackageRequest::operator==(const ListPackageRequest & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  return true;
+}
+
 ListPackageRequest::ListPackageRequest(const ListPackageRequest& other1913) {
   catName = other1913.catName;
   dbName = other1913.dbName;
@@ -54446,6 +61277,14 @@ void ListPackageRequest::printTo(std::ostream& out) const {
 Package::~Package() noexcept {
 }
 
+Package::Package() noexcept
+   : catName(),
+     dbName(),
+     packageName(),
+     ownerName(),
+     header(),
+     body() {
+}
 
 void Package::__set_catName(const std::string& val) {
   this->catName = val;
@@ -54592,7 +61431,7 @@ uint32_t Package::write(::apache::thrift::protocol::TProtocol* oprot) const {
   return xfer;
 }
 
-void swap(Package &a, Package &b) {
+void swap(Package &a, Package &b) noexcept {
   using ::std::swap;
   swap(a.catName, b.catName);
   swap(a.dbName, b.dbName);
@@ -54603,6 +61442,23 @@ void swap(Package &a, Package &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool Package::operator==(const Package & rhs) const
+{
+  if (!(catName == rhs.catName))
+    return false;
+  if (!(dbName == rhs.dbName))
+    return false;
+  if (!(packageName == rhs.packageName))
+    return false;
+  if (!(ownerName == rhs.ownerName))
+    return false;
+  if (!(header == rhs.header))
+    return false;
+  if (!(body == rhs.body))
+    return false;
+  return true;
+}
+
 Package::Package(const Package& other1915) {
   catName = other1915.catName;
   dbName = other1915.dbName;
@@ -54638,6 +61494,11 @@ void Package::printTo(std::ostream& out) const {
 GetAllWriteEventInfoRequest::~GetAllWriteEventInfoRequest() noexcept {
 }
 
+GetAllWriteEventInfoRequest::GetAllWriteEventInfoRequest() noexcept
+   : txnId(0),
+     dbName(),
+     tableName() {
+}
 
 void GetAllWriteEventInfoRequest::__set_txnId(const int64_t val) {
   this->txnId = val;
@@ -54743,7 +61604,7 @@ uint32_t GetAllWriteEventInfoRequest::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(GetAllWriteEventInfoRequest &a, GetAllWriteEventInfoRequest &b) {
+void swap(GetAllWriteEventInfoRequest &a, GetAllWriteEventInfoRequest &b) noexcept {
   using ::std::swap;
   swap(a.txnId, b.txnId);
   swap(a.dbName, b.dbName);
@@ -54751,6 +61612,21 @@ void swap(GetAllWriteEventInfoRequest &a, GetAllWriteEventInfoRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool GetAllWriteEventInfoRequest::operator==(const GetAllWriteEventInfoRequest & rhs) const
+{
+  if (!(txnId == rhs.txnId))
+    return false;
+  if (__isset.dbName != rhs.__isset.dbName)
+    return false;
+  else if (__isset.dbName && !(dbName == rhs.dbName))
+    return false;
+  if (__isset.tableName != rhs.__isset.tableName)
+    return false;
+  else if (__isset.tableName && !(tableName == rhs.tableName))
+    return false;
+  return true;
+}
+
 GetAllWriteEventInfoRequest::GetAllWriteEventInfoRequest(const GetAllWriteEventInfoRequest& other1917) {
   txnId = other1917.txnId;
   dbName = other1917.dbName;
@@ -54777,6 +61653,12 @@ void GetAllWriteEventInfoRequest::printTo(std::ostream& out) const {
 DeleteColumnStatisticsRequest::~DeleteColumnStatisticsRequest() noexcept {
 }
 
+DeleteColumnStatisticsRequest::DeleteColumnStatisticsRequest() : cat_name(),
+   db_name(),
+   tbl_name(),
+   engine("hive"),
+   tableLevel(false) {
+}
 
 void DeleteColumnStatisticsRequest::__set_cat_name(const std::string& val) {
   this->cat_name = val;
@@ -54995,7 +61877,7 @@ uint32_t DeleteColumnStatisticsRequest::write(::apache::thrift::protocol::TProto
   return xfer;
 }
 
-void swap(DeleteColumnStatisticsRequest &a, DeleteColumnStatisticsRequest &b) {
+void swap(DeleteColumnStatisticsRequest &a, DeleteColumnStatisticsRequest &b) noexcept {
   using ::std::swap;
   swap(a.cat_name, b.cat_name);
   swap(a.db_name, b.db_name);
@@ -55007,6 +61889,35 @@ void swap(DeleteColumnStatisticsRequest &a, DeleteColumnStatisticsRequest &b) {
   swap(a.__isset, b.__isset);
 }
 
+bool DeleteColumnStatisticsRequest::operator==(const DeleteColumnStatisticsRequest & rhs) const
+{
+  if (__isset.cat_name != rhs.__isset.cat_name)
+    return false;
+  else if (__isset.cat_name && !(cat_name == rhs.cat_name))
+    return false;
+  if (!(db_name == rhs.db_name))
+    return false;
+  if (!(tbl_name == rhs.tbl_name))
+    return false;
+  if (__isset.part_names != rhs.__isset.part_names)
+    return false;
+  else if (__isset.part_names && !(part_names == rhs.part_names))
+    return false;
+  if (__isset.col_names != rhs.__isset.col_names)
+    return false;
+  else if (__isset.col_names && !(col_names == rhs.col_names))
+    return false;
+  if (__isset.engine != rhs.__isset.engine)
+    return false;
+  else if (__isset.engine && !(engine == rhs.engine))
+    return false;
+  if (__isset.tableLevel != rhs.__isset.tableLevel)
+    return false;
+  else if (__isset.tableLevel && !(tableLevel == rhs.tableLevel))
+    return false;
+  return true;
+}
+
 DeleteColumnStatisticsRequest::DeleteColumnStatisticsRequest(const DeleteColumnStatisticsRequest& other1931) {
   cat_name = other1931.cat_name;
   db_name = other1931.db_name;
@@ -55045,6 +61956,8 @@ void DeleteColumnStatisticsRequest::printTo(std::ostream& out) const {
 ReplayedTxnsForPolicyResult::~ReplayedTxnsForPolicyResult() noexcept {
 }
 
+ReplayedTxnsForPolicyResult::ReplayedTxnsForPolicyResult() noexcept {
+}
 
 void ReplayedTxnsForPolicyResult::__set_replTxnMapEntry(const std::map<std::string, std::string> & val) {
   this->replTxnMapEntry = val;
@@ -55135,12 +62048,19 @@ uint32_t ReplayedTxnsForPolicyResult::write(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-void swap(ReplayedTxnsForPolicyResult &a, ReplayedTxnsForPolicyResult &b) {
+void swap(ReplayedTxnsForPolicyResult &a, ReplayedTxnsForPolicyResult &b) noexcept {
   using ::std::swap;
   swap(a.replTxnMapEntry, b.replTxnMapEntry);
   swap(a.__isset, b.__isset);
 }
 
+bool ReplayedTxnsForPolicyResult::operator==(const ReplayedTxnsForPolicyResult & rhs) const
+{
+  if (!(replTxnMapEntry == rhs.replTxnMapEntry))
+    return false;
+  return true;
+}
+
 ReplayedTxnsForPolicyResult::ReplayedTxnsForPolicyResult(const ReplayedTxnsForPolicyResult& other1941) {
   replTxnMapEntry = other1941.replTxnMapEntry;
   __isset = other1941.__isset;
@@ -55161,6 +62081,9 @@ void ReplayedTxnsForPolicyResult::printTo(std::ostream& out) const {
 MetaException::~MetaException() noexcept {
 }
 
+MetaException::MetaException() noexcept
+   : message() {
+}
 
 void MetaException::__set_message(const std::string& val) {
   this->message = val;
@@ -55227,12 +62150,19 @@ uint32_t MetaException::write(::apache::thrift::protocol::TProtocol* oprot) cons
   return xfer;
 }
 
-void swap(MetaException &a, MetaException &b) {
+void swap(MetaException &a, MetaException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool MetaException::operator==(const MetaException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 MetaException::MetaException(const MetaException& other1943) : TException() {
   message = other1943.message;
   __isset = other1943.__isset;
@@ -55264,6 +62194,9 @@ const char* MetaException::what() const noexcept {
 UnknownTableException::~UnknownTableException() noexcept {
 }
 
+UnknownTableException::UnknownTableException() noexcept
+   : message() {
+}
 
 void UnknownTableException::__set_message(const std::string& val) {
   this->message = val;
@@ -55330,12 +62263,19 @@ uint32_t UnknownTableException::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(UnknownTableException &a, UnknownTableException &b) {
+void swap(UnknownTableException &a, UnknownTableException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool UnknownTableException::operator==(const UnknownTableException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 UnknownTableException::UnknownTableException(const UnknownTableException& other1945) : TException() {
   message = other1945.message;
   __isset = other1945.__isset;
@@ -55367,6 +62307,9 @@ const char* UnknownTableException::what() const noexcept {
 UnknownDBException::~UnknownDBException() noexcept {
 }
 
+UnknownDBException::UnknownDBException() noexcept
+   : message() {
+}
 
 void UnknownDBException::__set_message(const std::string& val) {
   this->message = val;
@@ -55433,12 +62376,19 @@ uint32_t UnknownDBException::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(UnknownDBException &a, UnknownDBException &b) {
+void swap(UnknownDBException &a, UnknownDBException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool UnknownDBException::operator==(const UnknownDBException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 UnknownDBException::UnknownDBException(const UnknownDBException& other1947) : TException() {
   message = other1947.message;
   __isset = other1947.__isset;
@@ -55470,6 +62420,9 @@ const char* UnknownDBException::what() const noexcept {
 AlreadyExistsException::~AlreadyExistsException() noexcept {
 }
 
+AlreadyExistsException::AlreadyExistsException() noexcept
+   : message() {
+}
 
 void AlreadyExistsException::__set_message(const std::string& val) {
   this->message = val;
@@ -55536,12 +62489,19 @@ uint32_t AlreadyExistsException::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(AlreadyExistsException &a, AlreadyExistsException &b) {
+void swap(AlreadyExistsException &a, AlreadyExistsException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool AlreadyExistsException::operator==(const AlreadyExistsException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 AlreadyExistsException::AlreadyExistsException(const AlreadyExistsException& other1949) : TException() {
   message = other1949.message;
   __isset = other1949.__isset;
@@ -55573,6 +62533,9 @@ const char* AlreadyExistsException::what() const noexcept {
 InvalidPartitionException::~InvalidPartitionException() noexcept {
 }
 
+InvalidPartitionException::InvalidPartitionException() noexcept
+   : message() {
+}
 
 void InvalidPartitionException::__set_message(const std::string& val) {
   this->message = val;
@@ -55639,12 +62602,19 @@ uint32_t InvalidPartitionException::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(InvalidPartitionException &a, InvalidPartitionException &b) {
+void swap(InvalidPartitionException &a, InvalidPartitionException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool InvalidPartitionException::operator==(const InvalidPartitionException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 InvalidPartitionException::InvalidPartitionException(const InvalidPartitionException& other1951) : TException() {
   message = other1951.message;
   __isset = other1951.__isset;
@@ -55676,6 +62646,9 @@ const char* InvalidPartitionException::what() const noexcept {
 UnknownPartitionException::~UnknownPartitionException() noexcept {
 }
 
+UnknownPartitionException::UnknownPartitionException() noexcept
+   : message() {
+}
 
 void UnknownPartitionException::__set_message(const std::string& val) {
   this->message = val;
@@ -55742,12 +62715,19 @@ uint32_t UnknownPartitionException::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(UnknownPartitionException &a, UnknownPartitionException &b) {
+void swap(UnknownPartitionException &a, UnknownPartitionException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool UnknownPartitionException::operator==(const UnknownPartitionException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 UnknownPartitionException::UnknownPartitionException(const UnknownPartitionException& other1953) : TException() {
   message = other1953.message;
   __isset = other1953.__isset;
@@ -55779,6 +62759,9 @@ const char* UnknownPartitionException::what() const noexcept {
 InvalidObjectException::~InvalidObjectException() noexcept {
 }
 
+InvalidObjectException::InvalidObjectException() noexcept
+   : message() {
+}
 
 void InvalidObjectException::__set_message(const std::string& val) {
   this->message = val;
@@ -55845,12 +62828,19 @@ uint32_t InvalidObjectException::write(::apache::thrift::protocol::TProtocol* op
   return xfer;
 }
 
-void swap(InvalidObjectException &a, InvalidObjectException &b) {
+void swap(InvalidObjectException &a, InvalidObjectException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool InvalidObjectException::operator==(const InvalidObjectException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 InvalidObjectException::InvalidObjectException(const InvalidObjectException& other1955) : TException() {
   message = other1955.message;
   __isset = other1955.__isset;
@@ -55882,6 +62872,9 @@ const char* InvalidObjectException::what() const noexcept {
 NoSuchObjectException::~NoSuchObjectException() noexcept {
 }
 
+NoSuchObjectException::NoSuchObjectException() noexcept
+   : message() {
+}
 
 void NoSuchObjectException::__set_message(const std::string& val) {
   this->message = val;
@@ -55948,12 +62941,19 @@ uint32_t NoSuchObjectException::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(NoSuchObjectException &a, NoSuchObjectException &b) {
+void swap(NoSuchObjectException &a, NoSuchObjectException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool NoSuchObjectException::operator==(const NoSuchObjectException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 NoSuchObjectException::NoSuchObjectException(const NoSuchObjectException& other1957) : TException() {
   message = other1957.message;
   __isset = other1957.__isset;
@@ -55985,6 +62985,9 @@ const char* NoSuchObjectException::what() const noexcept {
 InvalidOperationException::~InvalidOperationException() noexcept {
 }
 
+InvalidOperationException::InvalidOperationException() noexcept
+   : message() {
+}
 
 void InvalidOperationException::__set_message(const std::string& val) {
   this->message = val;
@@ -56051,12 +63054,19 @@ uint32_t InvalidOperationException::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(InvalidOperationException &a, InvalidOperationException &b) {
+void swap(InvalidOperationException &a, InvalidOperationException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool InvalidOperationException::operator==(const InvalidOperationException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 InvalidOperationException::InvalidOperationException(const InvalidOperationException& other1959) : TException() {
   message = other1959.message;
   __isset = other1959.__isset;
@@ -56088,6 +63098,9 @@ const char* InvalidOperationException::what() const noexcept {
 ConfigValSecurityException::~ConfigValSecurityException() noexcept {
 }
 
+ConfigValSecurityException::ConfigValSecurityException() noexcept
+   : message() {
+}
 
 void ConfigValSecurityException::__set_message(const std::string& val) {
   this->message = val;
@@ -56154,12 +63167,19 @@ uint32_t ConfigValSecurityException::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(ConfigValSecurityException &a, ConfigValSecurityException &b) {
+void swap(ConfigValSecurityException &a, ConfigValSecurityException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool ConfigValSecurityException::operator==(const ConfigValSecurityException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 ConfigValSecurityException::ConfigValSecurityException(const ConfigValSecurityException& other1961) : TException() {
   message = other1961.message;
   __isset = other1961.__isset;
@@ -56191,6 +63211,9 @@ const char* ConfigValSecurityException::what() const noexcept {
 InvalidInputException::~InvalidInputException() noexcept {
 }
 
+InvalidInputException::InvalidInputException() noexcept
+   : message() {
+}
 
 void InvalidInputException::__set_message(const std::string& val) {
   this->message = val;
@@ -56257,12 +63280,19 @@ uint32_t InvalidInputException::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(InvalidInputException &a, InvalidInputException &b) {
+void swap(InvalidInputException &a, InvalidInputException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool InvalidInputException::operator==(const InvalidInputException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 InvalidInputException::InvalidInputException(const InvalidInputException& other1963) : TException() {
   message = other1963.message;
   __isset = other1963.__isset;
@@ -56294,6 +63324,9 @@ const char* InvalidInputException::what() const noexcept {
 NoSuchTxnException::~NoSuchTxnException() noexcept {
 }
 
+NoSuchTxnException::NoSuchTxnException() noexcept
+   : message() {
+}
 
 void NoSuchTxnException::__set_message(const std::string& val) {
   this->message = val;
@@ -56360,12 +63393,19 @@ uint32_t NoSuchTxnException::write(::apache::thrift::protocol::TProtocol* oprot)
   return xfer;
 }
 
-void swap(NoSuchTxnException &a, NoSuchTxnException &b) {
+void swap(NoSuchTxnException &a, NoSuchTxnException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool NoSuchTxnException::operator==(const NoSuchTxnException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 NoSuchTxnException::NoSuchTxnException(const NoSuchTxnException& other1965) : TException() {
   message = other1965.message;
   __isset = other1965.__isset;
@@ -56397,6 +63437,9 @@ const char* NoSuchTxnException::what() const noexcept {
 TxnAbortedException::~TxnAbortedException() noexcept {
 }
 
+TxnAbortedException::TxnAbortedException() noexcept
+   : message() {
+}
 
 void TxnAbortedException::__set_message(const std::string& val) {
   this->message = val;
@@ -56463,12 +63506,19 @@ uint32_t TxnAbortedException::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(TxnAbortedException &a, TxnAbortedException &b) {
+void swap(TxnAbortedException &a, TxnAbortedException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool TxnAbortedException::operator==(const TxnAbortedException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 TxnAbortedException::TxnAbortedException(const TxnAbortedException& other1967) : TException() {
   message = other1967.message;
   __isset = other1967.__isset;
@@ -56500,6 +63550,9 @@ const char* TxnAbortedException::what() const noexcept {
 TxnOpenException::~TxnOpenException() noexcept {
 }
 
+TxnOpenException::TxnOpenException() noexcept
+   : message() {
+}
 
 void TxnOpenException::__set_message(const std::string& val) {
   this->message = val;
@@ -56566,12 +63619,19 @@ uint32_t TxnOpenException::write(::apache::thrift::protocol::TProtocol* oprot) c
   return xfer;
 }
 
-void swap(TxnOpenException &a, TxnOpenException &b) {
+void swap(TxnOpenException &a, TxnOpenException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool TxnOpenException::operator==(const TxnOpenException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 TxnOpenException::TxnOpenException(const TxnOpenException& other1969) : TException() {
   message = other1969.message;
   __isset = other1969.__isset;
@@ -56603,6 +63663,9 @@ const char* TxnOpenException::what() const noexcept {
 NoSuchLockException::~NoSuchLockException() noexcept {
 }
 
+NoSuchLockException::NoSuchLockException() noexcept
+   : message() {
+}
 
 void NoSuchLockException::__set_message(const std::string& val) {
   this->message = val;
@@ -56669,12 +63732,19 @@ uint32_t NoSuchLockException::write(::apache::thrift::protocol::TProtocol* oprot
   return xfer;
 }
 
-void swap(NoSuchLockException &a, NoSuchLockException &b) {
+void swap(NoSuchLockException &a, NoSuchLockException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool NoSuchLockException::operator==(const NoSuchLockException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 NoSuchLockException::NoSuchLockException(const NoSuchLockException& other1971) : TException() {
   message = other1971.message;
   __isset = other1971.__isset;
@@ -56706,6 +63776,9 @@ const char* NoSuchLockException::what() const noexcept {
 CompactionAbortedException::~CompactionAbortedException() noexcept {
 }
 
+CompactionAbortedException::CompactionAbortedException() noexcept
+   : message() {
+}
 
 void CompactionAbortedException::__set_message(const std::string& val) {
   this->message = val;
@@ -56772,12 +63845,19 @@ uint32_t CompactionAbortedException::write(::apache::thrift::protocol::TProtocol
   return xfer;
 }
 
-void swap(CompactionAbortedException &a, CompactionAbortedException &b) {
+void swap(CompactionAbortedException &a, CompactionAbortedException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool CompactionAbortedException::operator==(const CompactionAbortedException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 CompactionAbortedException::CompactionAbortedException(const CompactionAbortedException& other1973) : TException() {
   message = other1973.message;
   __isset = other1973.__isset;
@@ -56809,6 +63889,9 @@ const char* CompactionAbortedException::what() const noexcept {
 NoSuchCompactionException::~NoSuchCompactionException() noexcept {
 }
 
+NoSuchCompactionException::NoSuchCompactionException() noexcept
+   : message() {
+}
 
 void NoSuchCompactionException::__set_message(const std::string& val) {
   this->message = val;
@@ -56875,12 +63958,19 @@ uint32_t NoSuchCompactionException::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-void swap(NoSuchCompactionException &a, NoSuchCompactionException &b) {
+void swap(NoSuchCompactionException &a, NoSuchCompactionException &b) noexcept {
   using ::std::swap;
   swap(a.message, b.message);
   swap(a.__isset, b.__isset);
 }
 
+bool NoSuchCompactionException::operator==(const NoSuchCompactionException & rhs) const
+{
+  if (!(message == rhs.message))
+    return false;
+  return true;
+}
+
 NoSuchCompactionException::NoSuchCompactionException(const NoSuchCompactionException& other1975) : TException() {
   message = other1975.message;
   __isset = other1975.__isset;
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h
index 02f6720de00a..479b7f395e4b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -1124,10 +1124,7 @@ class Version : public virtual ::apache::thrift::TBase {
 
   Version(const Version&);
   Version& operator=(const Version&);
-  Version() noexcept
-          : version(),
-            comments() {
-  }
+  Version() noexcept;
 
   virtual ~Version() noexcept;
   std::string version;
@@ -1139,14 +1136,7 @@ class Version : public virtual ::apache::thrift::TBase {
 
   void __set_comments(const std::string& val);
 
-  bool operator == (const Version & rhs) const
-  {
-    if (!(version == rhs.version))
-      return false;
-    if (!(comments == rhs.comments))
-      return false;
-    return true;
-  }
+  bool operator == (const Version & rhs) const;
   bool operator != (const Version &rhs) const {
     return !(*this == rhs);
   }
@@ -1159,7 +1149,7 @@ class Version : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Version &a, Version &b);
+void swap(Version &a, Version &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Version& obj);
 
@@ -1175,11 +1165,7 @@ class FieldSchema : public virtual ::apache::thrift::TBase {
 
   FieldSchema(const FieldSchema&);
   FieldSchema& operator=(const FieldSchema&);
-  FieldSchema() noexcept
-              : name(),
-                type(),
-                comment() {
-  }
+  FieldSchema() noexcept;
 
   virtual ~FieldSchema() noexcept;
   std::string name;
@@ -1194,16 +1180,7 @@ class FieldSchema : public virtual ::apache::thrift::TBase {
 
   void __set_comment(const std::string& val);
 
-  bool operator == (const FieldSchema & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (!(comment == rhs.comment))
-      return false;
-    return true;
-  }
+  bool operator == (const FieldSchema & rhs) const;
   bool operator != (const FieldSchema &rhs) const {
     return !(*this == rhs);
   }
@@ -1216,7 +1193,7 @@ class FieldSchema : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FieldSchema &a, FieldSchema &b);
+void swap(FieldSchema &a, FieldSchema &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FieldSchema& obj);
 
@@ -1230,8 +1207,7 @@ class EnvironmentContext : public virtual ::apache::thrift::TBase {
 
   EnvironmentContext(const EnvironmentContext&);
   EnvironmentContext& operator=(const EnvironmentContext&);
-  EnvironmentContext() noexcept {
-  }
+  EnvironmentContext() noexcept;
 
   virtual ~EnvironmentContext() noexcept;
   std::map<std::string, std::string>  properties;
@@ -1240,12 +1216,7 @@ class EnvironmentContext : public virtual ::apache::thrift::TBase {
 
   void __set_properties(const std::map<std::string, std::string> & val);
 
-  bool operator == (const EnvironmentContext & rhs) const
-  {
-    if (!(properties == rhs.properties))
-      return false;
-    return true;
-  }
+  bool operator == (const EnvironmentContext & rhs) const;
   bool operator != (const EnvironmentContext &rhs) const {
     return !(*this == rhs);
   }
@@ -1258,7 +1229,7 @@ class EnvironmentContext : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(EnvironmentContext &a, EnvironmentContext &b);
+void swap(EnvironmentContext &a, EnvironmentContext &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const EnvironmentContext& obj);
 
@@ -1280,17 +1251,7 @@ class SQLPrimaryKey : public virtual ::apache::thrift::TBase {
 
   SQLPrimaryKey(const SQLPrimaryKey&);
   SQLPrimaryKey& operator=(const SQLPrimaryKey&);
-  SQLPrimaryKey() noexcept
-                : table_db(),
-                  table_name(),
-                  column_name(),
-                  key_seq(0),
-                  pk_name(),
-                  enable_cstr(0),
-                  validate_cstr(0),
-                  rely_cstr(0),
-                  catName() {
-  }
+  SQLPrimaryKey() noexcept;
 
   virtual ~SQLPrimaryKey() noexcept;
   std::string table_db;
@@ -1323,30 +1284,7 @@ class SQLPrimaryKey : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const SQLPrimaryKey & rhs) const
-  {
-    if (!(table_db == rhs.table_db))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(column_name == rhs.column_name))
-      return false;
-    if (!(key_seq == rhs.key_seq))
-      return false;
-    if (!(pk_name == rhs.pk_name))
-      return false;
-    if (!(enable_cstr == rhs.enable_cstr))
-      return false;
-    if (!(validate_cstr == rhs.validate_cstr))
-      return false;
-    if (!(rely_cstr == rhs.rely_cstr))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLPrimaryKey & rhs) const;
   bool operator != (const SQLPrimaryKey &rhs) const {
     return !(*this == rhs);
   }
@@ -1359,7 +1297,7 @@ class SQLPrimaryKey : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLPrimaryKey &a, SQLPrimaryKey &b);
+void swap(SQLPrimaryKey &a, SQLPrimaryKey &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLPrimaryKey& obj);
 
@@ -1387,23 +1325,7 @@ class SQLForeignKey : public virtual ::apache::thrift::TBase {
 
   SQLForeignKey(const SQLForeignKey&);
   SQLForeignKey& operator=(const SQLForeignKey&);
-  SQLForeignKey() noexcept
-                : pktable_db(),
-                  pktable_name(),
-                  pkcolumn_name(),
-                  fktable_db(),
-                  fktable_name(),
-                  fkcolumn_name(),
-                  key_seq(0),
-                  update_rule(0),
-                  delete_rule(0),
-                  fk_name(),
-                  pk_name(),
-                  enable_cstr(0),
-                  validate_cstr(0),
-                  rely_cstr(0),
-                  catName() {
-  }
+  SQLForeignKey() noexcept;
 
   virtual ~SQLForeignKey() noexcept;
   std::string pktable_db;
@@ -1454,42 +1376,7 @@ class SQLForeignKey : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const SQLForeignKey & rhs) const
-  {
-    if (!(pktable_db == rhs.pktable_db))
-      return false;
-    if (!(pktable_name == rhs.pktable_name))
-      return false;
-    if (!(pkcolumn_name == rhs.pkcolumn_name))
-      return false;
-    if (!(fktable_db == rhs.fktable_db))
-      return false;
-    if (!(fktable_name == rhs.fktable_name))
-      return false;
-    if (!(fkcolumn_name == rhs.fkcolumn_name))
-      return false;
-    if (!(key_seq == rhs.key_seq))
-      return false;
-    if (!(update_rule == rhs.update_rule))
-      return false;
-    if (!(delete_rule == rhs.delete_rule))
-      return false;
-    if (!(fk_name == rhs.fk_name))
-      return false;
-    if (!(pk_name == rhs.pk_name))
-      return false;
-    if (!(enable_cstr == rhs.enable_cstr))
-      return false;
-    if (!(validate_cstr == rhs.validate_cstr))
-      return false;
-    if (!(rely_cstr == rhs.rely_cstr))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLForeignKey & rhs) const;
   bool operator != (const SQLForeignKey &rhs) const {
     return !(*this == rhs);
   }
@@ -1502,7 +1389,7 @@ class SQLForeignKey : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLForeignKey &a, SQLForeignKey &b);
+void swap(SQLForeignKey &a, SQLForeignKey &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLForeignKey& obj);
 
@@ -1524,17 +1411,7 @@ class SQLUniqueConstraint : public virtual ::apache::thrift::TBase {
 
   SQLUniqueConstraint(const SQLUniqueConstraint&);
   SQLUniqueConstraint& operator=(const SQLUniqueConstraint&);
-  SQLUniqueConstraint() noexcept
-                      : catName(),
-                        table_db(),
-                        table_name(),
-                        column_name(),
-                        key_seq(0),
-                        uk_name(),
-                        enable_cstr(0),
-                        validate_cstr(0),
-                        rely_cstr(0) {
-  }
+  SQLUniqueConstraint() noexcept;
 
   virtual ~SQLUniqueConstraint() noexcept;
   std::string catName;
@@ -1567,28 +1444,7 @@ class SQLUniqueConstraint : public virtual ::apache::thrift::TBase {
 
   void __set_rely_cstr(const bool val);
 
-  bool operator == (const SQLUniqueConstraint & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(table_db == rhs.table_db))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(column_name == rhs.column_name))
-      return false;
-    if (!(key_seq == rhs.key_seq))
-      return false;
-    if (!(uk_name == rhs.uk_name))
-      return false;
-    if (!(enable_cstr == rhs.enable_cstr))
-      return false;
-    if (!(validate_cstr == rhs.validate_cstr))
-      return false;
-    if (!(rely_cstr == rhs.rely_cstr))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLUniqueConstraint & rhs) const;
   bool operator != (const SQLUniqueConstraint &rhs) const {
     return !(*this == rhs);
   }
@@ -1601,7 +1457,7 @@ class SQLUniqueConstraint : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLUniqueConstraint &a, SQLUniqueConstraint &b);
+void swap(SQLUniqueConstraint &a, SQLUniqueConstraint &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLUniqueConstraint& obj);
 
@@ -1622,16 +1478,7 @@ class SQLNotNullConstraint : public virtual ::apache::thrift::TBase {
 
   SQLNotNullConstraint(const SQLNotNullConstraint&);
   SQLNotNullConstraint& operator=(const SQLNotNullConstraint&);
-  SQLNotNullConstraint() noexcept
-                       : catName(),
-                         table_db(),
-                         table_name(),
-                         column_name(),
-                         nn_name(),
-                         enable_cstr(0),
-                         validate_cstr(0),
-                         rely_cstr(0) {
-  }
+  SQLNotNullConstraint() noexcept;
 
   virtual ~SQLNotNullConstraint() noexcept;
   std::string catName;
@@ -1661,26 +1508,7 @@ class SQLNotNullConstraint : public virtual ::apache::thrift::TBase {
 
   void __set_rely_cstr(const bool val);
 
-  bool operator == (const SQLNotNullConstraint & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(table_db == rhs.table_db))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(column_name == rhs.column_name))
-      return false;
-    if (!(nn_name == rhs.nn_name))
-      return false;
-    if (!(enable_cstr == rhs.enable_cstr))
-      return false;
-    if (!(validate_cstr == rhs.validate_cstr))
-      return false;
-    if (!(rely_cstr == rhs.rely_cstr))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLNotNullConstraint & rhs) const;
   bool operator != (const SQLNotNullConstraint &rhs) const {
     return !(*this == rhs);
   }
@@ -1693,7 +1521,7 @@ class SQLNotNullConstraint : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLNotNullConstraint &a, SQLNotNullConstraint &b);
+void swap(SQLNotNullConstraint &a, SQLNotNullConstraint &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLNotNullConstraint& obj);
 
@@ -1715,17 +1543,7 @@ class SQLDefaultConstraint : public virtual ::apache::thrift::TBase {
 
   SQLDefaultConstraint(const SQLDefaultConstraint&);
   SQLDefaultConstraint& operator=(const SQLDefaultConstraint&);
-  SQLDefaultConstraint() noexcept
-                       : catName(),
-                         table_db(),
-                         table_name(),
-                         column_name(),
-                         default_value(),
-                         dc_name(),
-                         enable_cstr(0),
-                         validate_cstr(0),
-                         rely_cstr(0) {
-  }
+  SQLDefaultConstraint() noexcept;
 
   virtual ~SQLDefaultConstraint() noexcept;
   std::string catName;
@@ -1758,28 +1576,7 @@ class SQLDefaultConstraint : public virtual ::apache::thrift::TBase {
 
   void __set_rely_cstr(const bool val);
 
-  bool operator == (const SQLDefaultConstraint & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(table_db == rhs.table_db))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(column_name == rhs.column_name))
-      return false;
-    if (!(default_value == rhs.default_value))
-      return false;
-    if (!(dc_name == rhs.dc_name))
-      return false;
-    if (!(enable_cstr == rhs.enable_cstr))
-      return false;
-    if (!(validate_cstr == rhs.validate_cstr))
-      return false;
-    if (!(rely_cstr == rhs.rely_cstr))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLDefaultConstraint & rhs) const;
   bool operator != (const SQLDefaultConstraint &rhs) const {
     return !(*this == rhs);
   }
@@ -1792,7 +1589,7 @@ class SQLDefaultConstraint : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLDefaultConstraint &a, SQLDefaultConstraint &b);
+void swap(SQLDefaultConstraint &a, SQLDefaultConstraint &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLDefaultConstraint& obj);
 
@@ -1814,17 +1611,7 @@ class SQLCheckConstraint : public virtual ::apache::thrift::TBase {
 
   SQLCheckConstraint(const SQLCheckConstraint&);
   SQLCheckConstraint& operator=(const SQLCheckConstraint&);
-  SQLCheckConstraint() noexcept
-                     : catName(),
-                       table_db(),
-                       table_name(),
-                       column_name(),
-                       check_expression(),
-                       dc_name(),
-                       enable_cstr(0),
-                       validate_cstr(0),
-                       rely_cstr(0) {
-  }
+  SQLCheckConstraint() noexcept;
 
   virtual ~SQLCheckConstraint() noexcept;
   std::string catName;
@@ -1857,28 +1644,7 @@ class SQLCheckConstraint : public virtual ::apache::thrift::TBase {
 
   void __set_rely_cstr(const bool val);
 
-  bool operator == (const SQLCheckConstraint & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(table_db == rhs.table_db))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(column_name == rhs.column_name))
-      return false;
-    if (!(check_expression == rhs.check_expression))
-      return false;
-    if (!(dc_name == rhs.dc_name))
-      return false;
-    if (!(enable_cstr == rhs.enable_cstr))
-      return false;
-    if (!(validate_cstr == rhs.validate_cstr))
-      return false;
-    if (!(rely_cstr == rhs.rely_cstr))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLCheckConstraint & rhs) const;
   bool operator != (const SQLCheckConstraint &rhs) const {
     return !(*this == rhs);
   }
@@ -1891,7 +1657,7 @@ class SQLCheckConstraint : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLCheckConstraint &a, SQLCheckConstraint &b);
+void swap(SQLCheckConstraint &a, SQLCheckConstraint &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLCheckConstraint& obj);
 
@@ -1910,8 +1676,7 @@ class SQLAllTableConstraints : public virtual ::apache::thrift::TBase {
 
   SQLAllTableConstraints(const SQLAllTableConstraints&);
   SQLAllTableConstraints& operator=(const SQLAllTableConstraints&);
-  SQLAllTableConstraints() noexcept {
-  }
+  SQLAllTableConstraints() noexcept;
 
   virtual ~SQLAllTableConstraints() noexcept;
   std::vector<SQLPrimaryKey>  primaryKeys;
@@ -1935,34 +1700,7 @@ class SQLAllTableConstraints : public virtual ::apache::thrift::TBase {
 
   void __set_checkConstraints(const std::vector<SQLCheckConstraint> & val);
 
-  bool operator == (const SQLAllTableConstraints & rhs) const
-  {
-    if (__isset.primaryKeys != rhs.__isset.primaryKeys)
-      return false;
-    else if (__isset.primaryKeys && !(primaryKeys == rhs.primaryKeys))
-      return false;
-    if (__isset.foreignKeys != rhs.__isset.foreignKeys)
-      return false;
-    else if (__isset.foreignKeys && !(foreignKeys == rhs.foreignKeys))
-      return false;
-    if (__isset.uniqueConstraints != rhs.__isset.uniqueConstraints)
-      return false;
-    else if (__isset.uniqueConstraints && !(uniqueConstraints == rhs.uniqueConstraints))
-      return false;
-    if (__isset.notNullConstraints != rhs.__isset.notNullConstraints)
-      return false;
-    else if (__isset.notNullConstraints && !(notNullConstraints == rhs.notNullConstraints))
-      return false;
-    if (__isset.defaultConstraints != rhs.__isset.defaultConstraints)
-      return false;
-    else if (__isset.defaultConstraints && !(defaultConstraints == rhs.defaultConstraints))
-      return false;
-    if (__isset.checkConstraints != rhs.__isset.checkConstraints)
-      return false;
-    else if (__isset.checkConstraints && !(checkConstraints == rhs.checkConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const SQLAllTableConstraints & rhs) const;
   bool operator != (const SQLAllTableConstraints &rhs) const {
     return !(*this == rhs);
   }
@@ -1975,7 +1713,7 @@ class SQLAllTableConstraints : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SQLAllTableConstraints &a, SQLAllTableConstraints &b);
+void swap(SQLAllTableConstraints &a, SQLAllTableConstraints &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SQLAllTableConstraints& obj);
 
@@ -1992,11 +1730,7 @@ class Type : public virtual ::apache::thrift::TBase {
 
   Type(const Type&);
   Type& operator=(const Type&);
-  Type() noexcept
-       : name(),
-         type1(),
-         type2() {
-  }
+  Type() noexcept;
 
   virtual ~Type() noexcept;
   std::string name;
@@ -2014,24 +1748,7 @@ class Type : public virtual ::apache::thrift::TBase {
 
   void __set_fields(const std::vector<FieldSchema> & val);
 
-  bool operator == (const Type & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (__isset.type1 != rhs.__isset.type1)
-      return false;
-    else if (__isset.type1 && !(type1 == rhs.type1))
-      return false;
-    if (__isset.type2 != rhs.__isset.type2)
-      return false;
-    else if (__isset.type2 && !(type2 == rhs.type2))
-      return false;
-    if (__isset.fields != rhs.__isset.fields)
-      return false;
-    else if (__isset.fields && !(fields == rhs.fields))
-      return false;
-    return true;
-  }
+  bool operator == (const Type & rhs) const;
   bool operator != (const Type &rhs) const {
     return !(*this == rhs);
   }
@@ -2044,7 +1761,7 @@ class Type : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Type &a, Type &b);
+void swap(Type &a, Type &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Type& obj);
 
@@ -2058,9 +1775,7 @@ class PropertySetRequest : public virtual ::apache::thrift::TBase {
 
   PropertySetRequest(const PropertySetRequest&);
   PropertySetRequest& operator=(const PropertySetRequest&);
-  PropertySetRequest() noexcept
-                     : nameSpace() {
-  }
+  PropertySetRequest() noexcept;
 
   virtual ~PropertySetRequest() noexcept;
   std::string nameSpace;
@@ -2072,14 +1787,7 @@ class PropertySetRequest : public virtual ::apache::thrift::TBase {
 
   void __set_propertyMap(const std::map<std::string, std::string> & val);
 
-  bool operator == (const PropertySetRequest & rhs) const
-  {
-    if (!(nameSpace == rhs.nameSpace))
-      return false;
-    if (!(propertyMap == rhs.propertyMap))
-      return false;
-    return true;
-  }
+  bool operator == (const PropertySetRequest & rhs) const;
   bool operator != (const PropertySetRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -2092,7 +1800,7 @@ class PropertySetRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PropertySetRequest &a, PropertySetRequest &b);
+void swap(PropertySetRequest &a, PropertySetRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PropertySetRequest& obj);
 
@@ -2108,11 +1816,7 @@ class PropertyGetRequest : public virtual ::apache::thrift::TBase {
 
   PropertyGetRequest(const PropertyGetRequest&);
   PropertyGetRequest& operator=(const PropertyGetRequest&);
-  PropertyGetRequest() noexcept
-                     : nameSpace(),
-                       mapPrefix(),
-                       mapPredicate() {
-  }
+  PropertyGetRequest() noexcept;
 
   virtual ~PropertyGetRequest() noexcept;
   std::string nameSpace;
@@ -2130,22 +1834,7 @@ class PropertyGetRequest : public virtual ::apache::thrift::TBase {
 
   void __set_mapSelection(const std::vector<std::string> & val);
 
-  bool operator == (const PropertyGetRequest & rhs) const
-  {
-    if (!(nameSpace == rhs.nameSpace))
-      return false;
-    if (!(mapPrefix == rhs.mapPrefix))
-      return false;
-    if (__isset.mapPredicate != rhs.__isset.mapPredicate)
-      return false;
-    else if (__isset.mapPredicate && !(mapPredicate == rhs.mapPredicate))
-      return false;
-    if (__isset.mapSelection != rhs.__isset.mapSelection)
-      return false;
-    else if (__isset.mapSelection && !(mapSelection == rhs.mapSelection))
-      return false;
-    return true;
-  }
+  bool operator == (const PropertyGetRequest & rhs) const;
   bool operator != (const PropertyGetRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -2158,7 +1847,7 @@ class PropertyGetRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PropertyGetRequest &a, PropertyGetRequest &b);
+void swap(PropertyGetRequest &a, PropertyGetRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PropertyGetRequest& obj);
 
@@ -2172,8 +1861,7 @@ class PropertyGetResponse : public virtual ::apache::thrift::TBase {
 
   PropertyGetResponse(const PropertyGetResponse&);
   PropertyGetResponse& operator=(const PropertyGetResponse&);
-  PropertyGetResponse() noexcept {
-  }
+  PropertyGetResponse() noexcept;
 
   virtual ~PropertyGetResponse() noexcept;
   std::map<std::string, std::map<std::string, std::string> >  properties;
@@ -2182,12 +1870,7 @@ class PropertyGetResponse : public virtual ::apache::thrift::TBase {
 
   void __set_properties(const std::map<std::string, std::map<std::string, std::string> > & val);
 
-  bool operator == (const PropertyGetResponse & rhs) const
-  {
-    if (!(properties == rhs.properties))
-      return false;
-    return true;
-  }
+  bool operator == (const PropertyGetResponse & rhs) const;
   bool operator != (const PropertyGetResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -2200,7 +1883,7 @@ class PropertyGetResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PropertyGetResponse &a, PropertyGetResponse &b);
+void swap(PropertyGetResponse &a, PropertyGetResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PropertyGetResponse& obj);
 
@@ -2219,13 +1902,7 @@ class HiveObjectRef : public virtual ::apache::thrift::TBase {
 
   HiveObjectRef(const HiveObjectRef&);
   HiveObjectRef& operator=(const HiveObjectRef&);
-  HiveObjectRef() noexcept
-                : objectType(static_cast<HiveObjectType::type>(0)),
-                  dbName(),
-                  objectName(),
-                  columnName(),
-                  catName() {
-  }
+  HiveObjectRef() noexcept;
 
   virtual ~HiveObjectRef() noexcept;
   /**
@@ -2253,24 +1930,7 @@ class HiveObjectRef : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const HiveObjectRef & rhs) const
-  {
-    if (!(objectType == rhs.objectType))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(objectName == rhs.objectName))
-      return false;
-    if (!(partValues == rhs.partValues))
-      return false;
-    if (!(columnName == rhs.columnName))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const HiveObjectRef & rhs) const;
   bool operator != (const HiveObjectRef &rhs) const {
     return !(*this == rhs);
   }
@@ -2283,7 +1943,7 @@ class HiveObjectRef : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(HiveObjectRef &a, HiveObjectRef &b);
+void swap(HiveObjectRef &a, HiveObjectRef &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const HiveObjectRef& obj);
 
@@ -2301,13 +1961,7 @@ class PrivilegeGrantInfo : public virtual ::apache::thrift::TBase {
 
   PrivilegeGrantInfo(const PrivilegeGrantInfo&);
   PrivilegeGrantInfo& operator=(const PrivilegeGrantInfo&);
-  PrivilegeGrantInfo() noexcept
-                     : privilege(),
-                       createTime(0),
-                       grantor(),
-                       grantorType(static_cast<PrincipalType::type>(0)),
-                       grantOption(0) {
-  }
+  PrivilegeGrantInfo() noexcept;
 
   virtual ~PrivilegeGrantInfo() noexcept;
   std::string privilege;
@@ -2332,20 +1986,7 @@ class PrivilegeGrantInfo : public virtual ::apache::thrift::TBase {
 
   void __set_grantOption(const bool val);
 
-  bool operator == (const PrivilegeGrantInfo & rhs) const
-  {
-    if (!(privilege == rhs.privilege))
-      return false;
-    if (!(createTime == rhs.createTime))
-      return false;
-    if (!(grantor == rhs.grantor))
-      return false;
-    if (!(grantorType == rhs.grantorType))
-      return false;
-    if (!(grantOption == rhs.grantOption))
-      return false;
-    return true;
-  }
+  bool operator == (const PrivilegeGrantInfo & rhs) const;
   bool operator != (const PrivilegeGrantInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -2358,7 +1999,7 @@ class PrivilegeGrantInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PrivilegeGrantInfo &a, PrivilegeGrantInfo &b);
+void swap(PrivilegeGrantInfo &a, PrivilegeGrantInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PrivilegeGrantInfo& obj);
 
@@ -2376,11 +2017,7 @@ class HiveObjectPrivilege : public virtual ::apache::thrift::TBase {
 
   HiveObjectPrivilege(const HiveObjectPrivilege&);
   HiveObjectPrivilege& operator=(const HiveObjectPrivilege&);
-  HiveObjectPrivilege() noexcept
-                      : principalName(),
-                        principalType(static_cast<PrincipalType::type>(0)),
-                        authorizer() {
-  }
+  HiveObjectPrivilege() noexcept;
 
   virtual ~HiveObjectPrivilege() noexcept;
   HiveObjectRef hiveObject;
@@ -2405,20 +2042,7 @@ class HiveObjectPrivilege : public virtual ::apache::thrift::TBase {
 
   void __set_authorizer(const std::string& val);
 
-  bool operator == (const HiveObjectPrivilege & rhs) const
-  {
-    if (!(hiveObject == rhs.hiveObject))
-      return false;
-    if (!(principalName == rhs.principalName))
-      return false;
-    if (!(principalType == rhs.principalType))
-      return false;
-    if (!(grantInfo == rhs.grantInfo))
-      return false;
-    if (!(authorizer == rhs.authorizer))
-      return false;
-    return true;
-  }
+  bool operator == (const HiveObjectPrivilege & rhs) const;
   bool operator != (const HiveObjectPrivilege &rhs) const {
     return !(*this == rhs);
   }
@@ -2431,7 +2055,7 @@ class HiveObjectPrivilege : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(HiveObjectPrivilege &a, HiveObjectPrivilege &b);
+void swap(HiveObjectPrivilege &a, HiveObjectPrivilege &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const HiveObjectPrivilege& obj);
 
@@ -2445,8 +2069,7 @@ class PrivilegeBag : public virtual ::apache::thrift::TBase {
 
   PrivilegeBag(const PrivilegeBag&);
   PrivilegeBag& operator=(const PrivilegeBag&);
-  PrivilegeBag() noexcept {
-  }
+  PrivilegeBag() noexcept;
 
   virtual ~PrivilegeBag() noexcept;
   std::vector<HiveObjectPrivilege>  privileges;
@@ -2455,12 +2078,7 @@ class PrivilegeBag : public virtual ::apache::thrift::TBase {
 
   void __set_privileges(const std::vector<HiveObjectPrivilege> & val);
 
-  bool operator == (const PrivilegeBag & rhs) const
-  {
-    if (!(privileges == rhs.privileges))
-      return false;
-    return true;
-  }
+  bool operator == (const PrivilegeBag & rhs) const;
   bool operator != (const PrivilegeBag &rhs) const {
     return !(*this == rhs);
   }
@@ -2473,7 +2091,7 @@ class PrivilegeBag : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PrivilegeBag &a, PrivilegeBag &b);
+void swap(PrivilegeBag &a, PrivilegeBag &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PrivilegeBag& obj);
 
@@ -2489,8 +2107,7 @@ class PrincipalPrivilegeSet : public virtual ::apache::thrift::TBase {
 
   PrincipalPrivilegeSet(const PrincipalPrivilegeSet&);
   PrincipalPrivilegeSet& operator=(const PrincipalPrivilegeSet&);
-  PrincipalPrivilegeSet() noexcept {
-  }
+  PrincipalPrivilegeSet() noexcept;
 
   virtual ~PrincipalPrivilegeSet() noexcept;
   std::map<std::string, std::vector<PrivilegeGrantInfo> >  userPrivileges;
@@ -2505,16 +2122,7 @@ class PrincipalPrivilegeSet : public virtual ::apache::thrift::TBase {
 
   void __set_rolePrivileges(const std::map<std::string, std::vector<PrivilegeGrantInfo> > & val);
 
-  bool operator == (const PrincipalPrivilegeSet & rhs) const
-  {
-    if (!(userPrivileges == rhs.userPrivileges))
-      return false;
-    if (!(groupPrivileges == rhs.groupPrivileges))
-      return false;
-    if (!(rolePrivileges == rhs.rolePrivileges))
-      return false;
-    return true;
-  }
+  bool operator == (const PrincipalPrivilegeSet & rhs) const;
   bool operator != (const PrincipalPrivilegeSet &rhs) const {
     return !(*this == rhs);
   }
@@ -2527,7 +2135,7 @@ class PrincipalPrivilegeSet : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PrincipalPrivilegeSet &a, PrincipalPrivilegeSet &b);
+void swap(PrincipalPrivilegeSet &a, PrincipalPrivilegeSet &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PrincipalPrivilegeSet& obj);
 
@@ -2543,10 +2151,7 @@ class GrantRevokePrivilegeRequest : public virtual ::apache::thrift::TBase {
 
   GrantRevokePrivilegeRequest(const GrantRevokePrivilegeRequest&);
   GrantRevokePrivilegeRequest& operator=(const GrantRevokePrivilegeRequest&);
-  GrantRevokePrivilegeRequest() noexcept
-                              : requestType(static_cast<GrantRevokeType::type>(0)),
-                                revokeGrantOption(0) {
-  }
+  GrantRevokePrivilegeRequest() noexcept;
 
   virtual ~GrantRevokePrivilegeRequest() noexcept;
   /**
@@ -2565,18 +2170,7 @@ class GrantRevokePrivilegeRequest : public virtual ::apache::thrift::TBase {
 
   void __set_revokeGrantOption(const bool val);
 
-  bool operator == (const GrantRevokePrivilegeRequest & rhs) const
-  {
-    if (!(requestType == rhs.requestType))
-      return false;
-    if (!(privileges == rhs.privileges))
-      return false;
-    if (__isset.revokeGrantOption != rhs.__isset.revokeGrantOption)
-      return false;
-    else if (__isset.revokeGrantOption && !(revokeGrantOption == rhs.revokeGrantOption))
-      return false;
-    return true;
-  }
+  bool operator == (const GrantRevokePrivilegeRequest & rhs) const;
   bool operator != (const GrantRevokePrivilegeRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -2589,7 +2183,7 @@ class GrantRevokePrivilegeRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GrantRevokePrivilegeRequest &a, GrantRevokePrivilegeRequest &b);
+void swap(GrantRevokePrivilegeRequest &a, GrantRevokePrivilegeRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GrantRevokePrivilegeRequest& obj);
 
@@ -2603,9 +2197,7 @@ class GrantRevokePrivilegeResponse : public virtual ::apache::thrift::TBase {
 
   GrantRevokePrivilegeResponse(const GrantRevokePrivilegeResponse&) noexcept;
   GrantRevokePrivilegeResponse& operator=(const GrantRevokePrivilegeResponse&) noexcept;
-  GrantRevokePrivilegeResponse() noexcept
-                               : success(0) {
-  }
+  GrantRevokePrivilegeResponse() noexcept;
 
   virtual ~GrantRevokePrivilegeResponse() noexcept;
   bool success;
@@ -2614,14 +2206,7 @@ class GrantRevokePrivilegeResponse : public virtual ::apache::thrift::TBase {
 
   void __set_success(const bool val);
 
-  bool operator == (const GrantRevokePrivilegeResponse & rhs) const
-  {
-    if (__isset.success != rhs.__isset.success)
-      return false;
-    else if (__isset.success && !(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const GrantRevokePrivilegeResponse & rhs) const;
   bool operator != (const GrantRevokePrivilegeResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -2634,7 +2219,7 @@ class GrantRevokePrivilegeResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GrantRevokePrivilegeResponse &a, GrantRevokePrivilegeResponse &b);
+void swap(GrantRevokePrivilegeResponse &a, GrantRevokePrivilegeResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GrantRevokePrivilegeResponse& obj);
 
@@ -2651,12 +2236,7 @@ class TruncateTableRequest : public virtual ::apache::thrift::TBase {
 
   TruncateTableRequest(const TruncateTableRequest&);
   TruncateTableRequest& operator=(const TruncateTableRequest&);
-  TruncateTableRequest() noexcept
-                       : dbName(),
-                         tableName(),
-                         writeId(-1LL),
-                         validWriteIdList() {
-  }
+  TruncateTableRequest() noexcept;
 
   virtual ~TruncateTableRequest() noexcept;
   std::string dbName;
@@ -2680,30 +2260,7 @@ class TruncateTableRequest : public virtual ::apache::thrift::TBase {
 
   void __set_environmentContext(const EnvironmentContext& val);
 
-  bool operator == (const TruncateTableRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (__isset.partNames != rhs.__isset.partNames)
-      return false;
-    else if (__isset.partNames && !(partNames == rhs.partNames))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    return true;
-  }
+  bool operator == (const TruncateTableRequest & rhs) const;
   bool operator != (const TruncateTableRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -2716,7 +2273,7 @@ class TruncateTableRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TruncateTableRequest &a, TruncateTableRequest &b);
+void swap(TruncateTableRequest &a, TruncateTableRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TruncateTableRequest& obj);
 
@@ -2726,15 +2283,11 @@ class TruncateTableResponse : public virtual ::apache::thrift::TBase {
 
   TruncateTableResponse(const TruncateTableResponse&) noexcept;
   TruncateTableResponse& operator=(const TruncateTableResponse&) noexcept;
-  TruncateTableResponse() noexcept {
-  }
+  TruncateTableResponse() noexcept;
 
   virtual ~TruncateTableResponse() noexcept;
 
-  bool operator == (const TruncateTableResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const TruncateTableResponse & /* rhs */) const;
   bool operator != (const TruncateTableResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -2747,7 +2300,7 @@ class TruncateTableResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TruncateTableResponse &a, TruncateTableResponse &b);
+void swap(TruncateTableResponse &a, TruncateTableResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TruncateTableResponse& obj);
 
@@ -2763,11 +2316,7 @@ class Role : public virtual ::apache::thrift::TBase {
 
   Role(const Role&);
   Role& operator=(const Role&);
-  Role() noexcept
-       : roleName(),
-         createTime(0),
-         ownerName() {
-  }
+  Role() noexcept;
 
   virtual ~Role() noexcept;
   std::string roleName;
@@ -2782,16 +2331,7 @@ class Role : public virtual ::apache::thrift::TBase {
 
   void __set_ownerName(const std::string& val);
 
-  bool operator == (const Role & rhs) const
-  {
-    if (!(roleName == rhs.roleName))
-      return false;
-    if (!(createTime == rhs.createTime))
-      return false;
-    if (!(ownerName == rhs.ownerName))
-      return false;
-    return true;
-  }
+  bool operator == (const Role & rhs) const;
   bool operator != (const Role &rhs) const {
     return !(*this == rhs);
   }
@@ -2804,7 +2344,7 @@ class Role : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Role &a, Role &b);
+void swap(Role &a, Role &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Role& obj);
 
@@ -2824,15 +2364,7 @@ class RolePrincipalGrant : public virtual ::apache::thrift::TBase {
 
   RolePrincipalGrant(const RolePrincipalGrant&);
   RolePrincipalGrant& operator=(const RolePrincipalGrant&);
-  RolePrincipalGrant() noexcept
-                     : roleName(),
-                       principalName(),
-                       principalType(static_cast<PrincipalType::type>(0)),
-                       grantOption(0),
-                       grantTime(0),
-                       grantorName(),
-                       grantorPrincipalType(static_cast<PrincipalType::type>(0)) {
-  }
+  RolePrincipalGrant() noexcept;
 
   virtual ~RolePrincipalGrant() noexcept;
   std::string roleName;
@@ -2867,24 +2399,7 @@ class RolePrincipalGrant : public virtual ::apache::thrift::TBase {
 
   void __set_grantorPrincipalType(const PrincipalType::type val);
 
-  bool operator == (const RolePrincipalGrant & rhs) const
-  {
-    if (!(roleName == rhs.roleName))
-      return false;
-    if (!(principalName == rhs.principalName))
-      return false;
-    if (!(principalType == rhs.principalType))
-      return false;
-    if (!(grantOption == rhs.grantOption))
-      return false;
-    if (!(grantTime == rhs.grantTime))
-      return false;
-    if (!(grantorName == rhs.grantorName))
-      return false;
-    if (!(grantorPrincipalType == rhs.grantorPrincipalType))
-      return false;
-    return true;
-  }
+  bool operator == (const RolePrincipalGrant & rhs) const;
   bool operator != (const RolePrincipalGrant &rhs) const {
     return !(*this == rhs);
   }
@@ -2897,7 +2412,7 @@ class RolePrincipalGrant : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(RolePrincipalGrant &a, RolePrincipalGrant &b);
+void swap(RolePrincipalGrant &a, RolePrincipalGrant &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const RolePrincipalGrant& obj);
 
@@ -2907,10 +2422,7 @@ class GetRoleGrantsForPrincipalRequest : public virtual ::apache::thrift::TBase
 
   GetRoleGrantsForPrincipalRequest(const GetRoleGrantsForPrincipalRequest&);
   GetRoleGrantsForPrincipalRequest& operator=(const GetRoleGrantsForPrincipalRequest&);
-  GetRoleGrantsForPrincipalRequest() noexcept
-                                   : principal_name(),
-                                     principal_type(static_cast<PrincipalType::type>(0)) {
-  }
+  GetRoleGrantsForPrincipalRequest() noexcept;
 
   virtual ~GetRoleGrantsForPrincipalRequest() noexcept;
   std::string principal_name;
@@ -2924,14 +2436,7 @@ class GetRoleGrantsForPrincipalRequest : public virtual ::apache::thrift::TBase
 
   void __set_principal_type(const PrincipalType::type val);
 
-  bool operator == (const GetRoleGrantsForPrincipalRequest & rhs) const
-  {
-    if (!(principal_name == rhs.principal_name))
-      return false;
-    if (!(principal_type == rhs.principal_type))
-      return false;
-    return true;
-  }
+  bool operator == (const GetRoleGrantsForPrincipalRequest & rhs) const;
   bool operator != (const GetRoleGrantsForPrincipalRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -2944,7 +2449,7 @@ class GetRoleGrantsForPrincipalRequest : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetRoleGrantsForPrincipalRequest &a, GetRoleGrantsForPrincipalRequest &b);
+void swap(GetRoleGrantsForPrincipalRequest &a, GetRoleGrantsForPrincipalRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetRoleGrantsForPrincipalRequest& obj);
 
@@ -2954,20 +2459,14 @@ class GetRoleGrantsForPrincipalResponse : public virtual ::apache::thrift::TBase
 
   GetRoleGrantsForPrincipalResponse(const GetRoleGrantsForPrincipalResponse&);
   GetRoleGrantsForPrincipalResponse& operator=(const GetRoleGrantsForPrincipalResponse&);
-  GetRoleGrantsForPrincipalResponse() noexcept {
-  }
+  GetRoleGrantsForPrincipalResponse() noexcept;
 
   virtual ~GetRoleGrantsForPrincipalResponse() noexcept;
   std::vector<RolePrincipalGrant>  principalGrants;
 
   void __set_principalGrants(const std::vector<RolePrincipalGrant> & val);
 
-  bool operator == (const GetRoleGrantsForPrincipalResponse & rhs) const
-  {
-    if (!(principalGrants == rhs.principalGrants))
-      return false;
-    return true;
-  }
+  bool operator == (const GetRoleGrantsForPrincipalResponse & rhs) const;
   bool operator != (const GetRoleGrantsForPrincipalResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -2980,7 +2479,7 @@ class GetRoleGrantsForPrincipalResponse : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetRoleGrantsForPrincipalResponse &a, GetRoleGrantsForPrincipalResponse &b);
+void swap(GetRoleGrantsForPrincipalResponse &a, GetRoleGrantsForPrincipalResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetRoleGrantsForPrincipalResponse& obj);
 
@@ -2990,21 +2489,14 @@ class GetPrincipalsInRoleRequest : public virtual ::apache::thrift::TBase {
 
   GetPrincipalsInRoleRequest(const GetPrincipalsInRoleRequest&);
   GetPrincipalsInRoleRequest& operator=(const GetPrincipalsInRoleRequest&);
-  GetPrincipalsInRoleRequest() noexcept
-                             : roleName() {
-  }
+  GetPrincipalsInRoleRequest() noexcept;
 
   virtual ~GetPrincipalsInRoleRequest() noexcept;
   std::string roleName;
 
   void __set_roleName(const std::string& val);
 
-  bool operator == (const GetPrincipalsInRoleRequest & rhs) const
-  {
-    if (!(roleName == rhs.roleName))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPrincipalsInRoleRequest & rhs) const;
   bool operator != (const GetPrincipalsInRoleRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3017,7 +2509,7 @@ class GetPrincipalsInRoleRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPrincipalsInRoleRequest &a, GetPrincipalsInRoleRequest &b);
+void swap(GetPrincipalsInRoleRequest &a, GetPrincipalsInRoleRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPrincipalsInRoleRequest& obj);
 
@@ -3027,20 +2519,14 @@ class GetPrincipalsInRoleResponse : public virtual ::apache::thrift::TBase {
 
   GetPrincipalsInRoleResponse(const GetPrincipalsInRoleResponse&);
   GetPrincipalsInRoleResponse& operator=(const GetPrincipalsInRoleResponse&);
-  GetPrincipalsInRoleResponse() noexcept {
-  }
+  GetPrincipalsInRoleResponse() noexcept;
 
   virtual ~GetPrincipalsInRoleResponse() noexcept;
   std::vector<RolePrincipalGrant>  principalGrants;
 
   void __set_principalGrants(const std::vector<RolePrincipalGrant> & val);
 
-  bool operator == (const GetPrincipalsInRoleResponse & rhs) const
-  {
-    if (!(principalGrants == rhs.principalGrants))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPrincipalsInRoleResponse & rhs) const;
   bool operator != (const GetPrincipalsInRoleResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -3053,7 +2539,7 @@ class GetPrincipalsInRoleResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPrincipalsInRoleResponse &a, GetPrincipalsInRoleResponse &b);
+void swap(GetPrincipalsInRoleResponse &a, GetPrincipalsInRoleResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPrincipalsInRoleResponse& obj);
 
@@ -3073,15 +2559,7 @@ class GrantRevokeRoleRequest : public virtual ::apache::thrift::TBase {
 
   GrantRevokeRoleRequest(const GrantRevokeRoleRequest&);
   GrantRevokeRoleRequest& operator=(const GrantRevokeRoleRequest&);
-  GrantRevokeRoleRequest() noexcept
-                         : requestType(static_cast<GrantRevokeType::type>(0)),
-                           roleName(),
-                           principalName(),
-                           principalType(static_cast<PrincipalType::type>(0)),
-                           grantor(),
-                           grantorType(static_cast<PrincipalType::type>(0)),
-                           grantOption(0) {
-  }
+  GrantRevokeRoleRequest() noexcept;
 
   virtual ~GrantRevokeRoleRequest() noexcept;
   /**
@@ -3120,30 +2598,7 @@ class GrantRevokeRoleRequest : public virtual ::apache::thrift::TBase {
 
   void __set_grantOption(const bool val);
 
-  bool operator == (const GrantRevokeRoleRequest & rhs) const
-  {
-    if (!(requestType == rhs.requestType))
-      return false;
-    if (!(roleName == rhs.roleName))
-      return false;
-    if (!(principalName == rhs.principalName))
-      return false;
-    if (!(principalType == rhs.principalType))
-      return false;
-    if (__isset.grantor != rhs.__isset.grantor)
-      return false;
-    else if (__isset.grantor && !(grantor == rhs.grantor))
-      return false;
-    if (__isset.grantorType != rhs.__isset.grantorType)
-      return false;
-    else if (__isset.grantorType && !(grantorType == rhs.grantorType))
-      return false;
-    if (__isset.grantOption != rhs.__isset.grantOption)
-      return false;
-    else if (__isset.grantOption && !(grantOption == rhs.grantOption))
-      return false;
-    return true;
-  }
+  bool operator == (const GrantRevokeRoleRequest & rhs) const;
   bool operator != (const GrantRevokeRoleRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3156,7 +2611,7 @@ class GrantRevokeRoleRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GrantRevokeRoleRequest &a, GrantRevokeRoleRequest &b);
+void swap(GrantRevokeRoleRequest &a, GrantRevokeRoleRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GrantRevokeRoleRequest& obj);
 
@@ -3170,9 +2625,7 @@ class GrantRevokeRoleResponse : public virtual ::apache::thrift::TBase {
 
   GrantRevokeRoleResponse(const GrantRevokeRoleResponse&) noexcept;
   GrantRevokeRoleResponse& operator=(const GrantRevokeRoleResponse&) noexcept;
-  GrantRevokeRoleResponse() noexcept
-                          : success(0) {
-  }
+  GrantRevokeRoleResponse() noexcept;
 
   virtual ~GrantRevokeRoleResponse() noexcept;
   bool success;
@@ -3181,14 +2634,7 @@ class GrantRevokeRoleResponse : public virtual ::apache::thrift::TBase {
 
   void __set_success(const bool val);
 
-  bool operator == (const GrantRevokeRoleResponse & rhs) const
-  {
-    if (__isset.success != rhs.__isset.success)
-      return false;
-    else if (__isset.success && !(success == rhs.success))
-      return false;
-    return true;
-  }
+  bool operator == (const GrantRevokeRoleResponse & rhs) const;
   bool operator != (const GrantRevokeRoleResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -3201,7 +2647,7 @@ class GrantRevokeRoleResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GrantRevokeRoleResponse &a, GrantRevokeRoleResponse &b);
+void swap(GrantRevokeRoleResponse &a, GrantRevokeRoleResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GrantRevokeRoleResponse& obj);
 
@@ -3219,12 +2665,7 @@ class Catalog : public virtual ::apache::thrift::TBase {
 
   Catalog(const Catalog&);
   Catalog& operator=(const Catalog&);
-  Catalog() noexcept
-          : name(),
-            description(),
-            locationUri(),
-            createTime(0) {
-  }
+  Catalog() noexcept;
 
   virtual ~Catalog() noexcept;
   std::string name;
@@ -3245,26 +2686,7 @@ class Catalog : public virtual ::apache::thrift::TBase {
 
   void __set_parameters(const std::map<std::string, std::string> & val);
 
-  bool operator == (const Catalog & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (__isset.description != rhs.__isset.description)
-      return false;
-    else if (__isset.description && !(description == rhs.description))
-      return false;
-    if (!(locationUri == rhs.locationUri))
-      return false;
-    if (__isset.createTime != rhs.__isset.createTime)
-      return false;
-    else if (__isset.createTime && !(createTime == rhs.createTime))
-      return false;
-    if (__isset.parameters != rhs.__isset.parameters)
-      return false;
-    else if (__isset.parameters && !(parameters == rhs.parameters))
-      return false;
-    return true;
-  }
+  bool operator == (const Catalog & rhs) const;
   bool operator != (const Catalog &rhs) const {
     return !(*this == rhs);
   }
@@ -3277,7 +2699,7 @@ class Catalog : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Catalog &a, Catalog &b);
+void swap(Catalog &a, Catalog &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Catalog& obj);
 
@@ -3291,8 +2713,7 @@ class CreateCatalogRequest : public virtual ::apache::thrift::TBase {
 
   CreateCatalogRequest(const CreateCatalogRequest&);
   CreateCatalogRequest& operator=(const CreateCatalogRequest&);
-  CreateCatalogRequest() noexcept {
-  }
+  CreateCatalogRequest() noexcept;
 
   virtual ~CreateCatalogRequest() noexcept;
   Catalog catalog;
@@ -3301,12 +2722,7 @@ class CreateCatalogRequest : public virtual ::apache::thrift::TBase {
 
   void __set_catalog(const Catalog& val);
 
-  bool operator == (const CreateCatalogRequest & rhs) const
-  {
-    if (!(catalog == rhs.catalog))
-      return false;
-    return true;
-  }
+  bool operator == (const CreateCatalogRequest & rhs) const;
   bool operator != (const CreateCatalogRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3319,7 +2735,7 @@ class CreateCatalogRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CreateCatalogRequest &a, CreateCatalogRequest &b);
+void swap(CreateCatalogRequest &a, CreateCatalogRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CreateCatalogRequest& obj);
 
@@ -3334,9 +2750,7 @@ class AlterCatalogRequest : public virtual ::apache::thrift::TBase {
 
   AlterCatalogRequest(const AlterCatalogRequest&);
   AlterCatalogRequest& operator=(const AlterCatalogRequest&);
-  AlterCatalogRequest() noexcept
-                      : name() {
-  }
+  AlterCatalogRequest() noexcept;
 
   virtual ~AlterCatalogRequest() noexcept;
   std::string name;
@@ -3348,14 +2762,7 @@ class AlterCatalogRequest : public virtual ::apache::thrift::TBase {
 
   void __set_newCat(const Catalog& val);
 
-  bool operator == (const AlterCatalogRequest & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(newCat == rhs.newCat))
-      return false;
-    return true;
-  }
+  bool operator == (const AlterCatalogRequest & rhs) const;
   bool operator != (const AlterCatalogRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3368,7 +2775,7 @@ class AlterCatalogRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterCatalogRequest &a, AlterCatalogRequest &b);
+void swap(AlterCatalogRequest &a, AlterCatalogRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterCatalogRequest& obj);
 
@@ -3382,9 +2789,7 @@ class GetCatalogRequest : public virtual ::apache::thrift::TBase {
 
   GetCatalogRequest(const GetCatalogRequest&);
   GetCatalogRequest& operator=(const GetCatalogRequest&);
-  GetCatalogRequest() noexcept
-                    : name() {
-  }
+  GetCatalogRequest() noexcept;
 
   virtual ~GetCatalogRequest() noexcept;
   std::string name;
@@ -3393,12 +2798,7 @@ class GetCatalogRequest : public virtual ::apache::thrift::TBase {
 
   void __set_name(const std::string& val);
 
-  bool operator == (const GetCatalogRequest & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    return true;
-  }
+  bool operator == (const GetCatalogRequest & rhs) const;
   bool operator != (const GetCatalogRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3411,7 +2811,7 @@ class GetCatalogRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetCatalogRequest &a, GetCatalogRequest &b);
+void swap(GetCatalogRequest &a, GetCatalogRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetCatalogRequest& obj);
 
@@ -3425,8 +2825,7 @@ class GetCatalogResponse : public virtual ::apache::thrift::TBase {
 
   GetCatalogResponse(const GetCatalogResponse&);
   GetCatalogResponse& operator=(const GetCatalogResponse&);
-  GetCatalogResponse() noexcept {
-  }
+  GetCatalogResponse() noexcept;
 
   virtual ~GetCatalogResponse() noexcept;
   Catalog catalog;
@@ -3435,12 +2834,7 @@ class GetCatalogResponse : public virtual ::apache::thrift::TBase {
 
   void __set_catalog(const Catalog& val);
 
-  bool operator == (const GetCatalogResponse & rhs) const
-  {
-    if (!(catalog == rhs.catalog))
-      return false;
-    return true;
-  }
+  bool operator == (const GetCatalogResponse & rhs) const;
   bool operator != (const GetCatalogResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -3453,7 +2847,7 @@ class GetCatalogResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetCatalogResponse &a, GetCatalogResponse &b);
+void swap(GetCatalogResponse &a, GetCatalogResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetCatalogResponse& obj);
 
@@ -3467,8 +2861,7 @@ class GetCatalogsResponse : public virtual ::apache::thrift::TBase {
 
   GetCatalogsResponse(const GetCatalogsResponse&);
   GetCatalogsResponse& operator=(const GetCatalogsResponse&);
-  GetCatalogsResponse() noexcept {
-  }
+  GetCatalogsResponse() noexcept;
 
   virtual ~GetCatalogsResponse() noexcept;
   std::vector<std::string>  names;
@@ -3477,12 +2870,7 @@ class GetCatalogsResponse : public virtual ::apache::thrift::TBase {
 
   void __set_names(const std::vector<std::string> & val);
 
-  bool operator == (const GetCatalogsResponse & rhs) const
-  {
-    if (!(names == rhs.names))
-      return false;
-    return true;
-  }
+  bool operator == (const GetCatalogsResponse & rhs) const;
   bool operator != (const GetCatalogsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -3495,7 +2883,7 @@ class GetCatalogsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetCatalogsResponse &a, GetCatalogsResponse &b);
+void swap(GetCatalogsResponse &a, GetCatalogsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetCatalogsResponse& obj);
 
@@ -3510,10 +2898,7 @@ class DropCatalogRequest : public virtual ::apache::thrift::TBase {
 
   DropCatalogRequest(const DropCatalogRequest&);
   DropCatalogRequest& operator=(const DropCatalogRequest&);
-  DropCatalogRequest() noexcept
-                     : name(),
-                       ifExists(true) {
-  }
+  DropCatalogRequest() noexcept;
 
   virtual ~DropCatalogRequest() noexcept;
   std::string name;
@@ -3525,16 +2910,7 @@ class DropCatalogRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ifExists(const bool val);
 
-  bool operator == (const DropCatalogRequest & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (__isset.ifExists != rhs.__isset.ifExists)
-      return false;
-    else if (__isset.ifExists && !(ifExists == rhs.ifExists))
-      return false;
-    return true;
-  }
+  bool operator == (const DropCatalogRequest & rhs) const;
   bool operator != (const DropCatalogRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3547,7 +2923,7 @@ class DropCatalogRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropCatalogRequest &a, DropCatalogRequest &b);
+void swap(DropCatalogRequest &a, DropCatalogRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropCatalogRequest& obj);
 
@@ -3573,19 +2949,7 @@ class Database : public virtual ::apache::thrift::TBase {
 
   Database(const Database&);
   Database& operator=(const Database&);
-  Database() noexcept
-           : name(),
-             description(),
-             locationUri(),
-             ownerName(),
-             ownerType(static_cast<PrincipalType::type>(0)),
-             catalogName(),
-             createTime(0),
-             managedLocationUri(),
-             type(static_cast<DatabaseType::type>(0)),
-             connector_name(),
-             remote_dbname() {
-  }
+  Database() noexcept;
 
   virtual ~Database() noexcept;
   std::string name;
@@ -3638,54 +3002,7 @@ class Database : public virtual ::apache::thrift::TBase {
 
   void __set_remote_dbname(const std::string& val);
 
-  bool operator == (const Database & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(description == rhs.description))
-      return false;
-    if (!(locationUri == rhs.locationUri))
-      return false;
-    if (!(parameters == rhs.parameters))
-      return false;
-    if (__isset.privileges != rhs.__isset.privileges)
-      return false;
-    else if (__isset.privileges && !(privileges == rhs.privileges))
-      return false;
-    if (__isset.ownerName != rhs.__isset.ownerName)
-      return false;
-    else if (__isset.ownerName && !(ownerName == rhs.ownerName))
-      return false;
-    if (__isset.ownerType != rhs.__isset.ownerType)
-      return false;
-    else if (__isset.ownerType && !(ownerType == rhs.ownerType))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.createTime != rhs.__isset.createTime)
-      return false;
-    else if (__isset.createTime && !(createTime == rhs.createTime))
-      return false;
-    if (__isset.managedLocationUri != rhs.__isset.managedLocationUri)
-      return false;
-    else if (__isset.managedLocationUri && !(managedLocationUri == rhs.managedLocationUri))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    if (__isset.connector_name != rhs.__isset.connector_name)
-      return false;
-    else if (__isset.connector_name && !(connector_name == rhs.connector_name))
-      return false;
-    if (__isset.remote_dbname != rhs.__isset.remote_dbname)
-      return false;
-    else if (__isset.remote_dbname && !(remote_dbname == rhs.remote_dbname))
-      return false;
-    return true;
-  }
+  bool operator == (const Database & rhs) const;
   bool operator != (const Database &rhs) const {
     return !(*this == rhs);
   }
@@ -3698,7 +3015,7 @@ class Database : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Database &a, Database &b);
+void swap(Database &a, Database &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Database& obj);
 
@@ -3713,10 +3030,7 @@ class GetDatabaseObjectsRequest : public virtual ::apache::thrift::TBase {
 
   GetDatabaseObjectsRequest(const GetDatabaseObjectsRequest&);
   GetDatabaseObjectsRequest& operator=(const GetDatabaseObjectsRequest&);
-  GetDatabaseObjectsRequest() noexcept
-                            : catalogName(),
-                              pattern() {
-  }
+  GetDatabaseObjectsRequest() noexcept;
 
   virtual ~GetDatabaseObjectsRequest() noexcept;
   std::string catalogName;
@@ -3728,18 +3042,7 @@ class GetDatabaseObjectsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_pattern(const std::string& val);
 
-  bool operator == (const GetDatabaseObjectsRequest & rhs) const
-  {
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.pattern != rhs.__isset.pattern)
-      return false;
-    else if (__isset.pattern && !(pattern == rhs.pattern))
-      return false;
-    return true;
-  }
+  bool operator == (const GetDatabaseObjectsRequest & rhs) const;
   bool operator != (const GetDatabaseObjectsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -3752,7 +3055,7 @@ class GetDatabaseObjectsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetDatabaseObjectsRequest &a, GetDatabaseObjectsRequest &b);
+void swap(GetDatabaseObjectsRequest &a, GetDatabaseObjectsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetDatabaseObjectsRequest& obj);
 
@@ -3762,20 +3065,14 @@ class GetDatabaseObjectsResponse : public virtual ::apache::thrift::TBase {
 
   GetDatabaseObjectsResponse(const GetDatabaseObjectsResponse&);
   GetDatabaseObjectsResponse& operator=(const GetDatabaseObjectsResponse&);
-  GetDatabaseObjectsResponse() noexcept {
-  }
+  GetDatabaseObjectsResponse() noexcept;
 
   virtual ~GetDatabaseObjectsResponse() noexcept;
   std::vector<Database>  databases;
 
   void __set_databases(const std::vector<Database> & val);
 
-  bool operator == (const GetDatabaseObjectsResponse & rhs) const
-  {
-    if (!(databases == rhs.databases))
-      return false;
-    return true;
-  }
+  bool operator == (const GetDatabaseObjectsResponse & rhs) const;
   bool operator != (const GetDatabaseObjectsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -3788,7 +3085,7 @@ class GetDatabaseObjectsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetDatabaseObjectsResponse &a, GetDatabaseObjectsResponse &b);
+void swap(GetDatabaseObjectsResponse &a, GetDatabaseObjectsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetDatabaseObjectsResponse& obj);
 
@@ -3808,14 +3105,7 @@ class SerDeInfo : public virtual ::apache::thrift::TBase {
 
   SerDeInfo(const SerDeInfo&);
   SerDeInfo& operator=(const SerDeInfo&);
-  SerDeInfo() noexcept
-            : name(),
-              serializationLib(),
-              description(),
-              serializerClass(),
-              deserializerClass(),
-              serdeType(static_cast<SerdeType::type>(0)) {
-  }
+  SerDeInfo() noexcept;
 
   virtual ~SerDeInfo() noexcept;
   std::string name;
@@ -3846,32 +3136,7 @@ class SerDeInfo : public virtual ::apache::thrift::TBase {
 
   void __set_serdeType(const SerdeType::type val);
 
-  bool operator == (const SerDeInfo & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(serializationLib == rhs.serializationLib))
-      return false;
-    if (!(parameters == rhs.parameters))
-      return false;
-    if (__isset.description != rhs.__isset.description)
-      return false;
-    else if (__isset.description && !(description == rhs.description))
-      return false;
-    if (__isset.serializerClass != rhs.__isset.serializerClass)
-      return false;
-    else if (__isset.serializerClass && !(serializerClass == rhs.serializerClass))
-      return false;
-    if (__isset.deserializerClass != rhs.__isset.deserializerClass)
-      return false;
-    else if (__isset.deserializerClass && !(deserializerClass == rhs.deserializerClass))
-      return false;
-    if (__isset.serdeType != rhs.__isset.serdeType)
-      return false;
-    else if (__isset.serdeType && !(serdeType == rhs.serdeType))
-      return false;
-    return true;
-  }
+  bool operator == (const SerDeInfo & rhs) const;
   bool operator != (const SerDeInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -3884,7 +3149,7 @@ class SerDeInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SerDeInfo &a, SerDeInfo &b);
+void swap(SerDeInfo &a, SerDeInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SerDeInfo& obj);
 
@@ -3899,10 +3164,7 @@ class Order : public virtual ::apache::thrift::TBase {
 
   Order(const Order&);
   Order& operator=(const Order&);
-  Order() noexcept
-        : col(),
-          order(0) {
-  }
+  Order() noexcept;
 
   virtual ~Order() noexcept;
   std::string col;
@@ -3914,14 +3176,7 @@ class Order : public virtual ::apache::thrift::TBase {
 
   void __set_order(const int32_t val);
 
-  bool operator == (const Order & rhs) const
-  {
-    if (!(col == rhs.col))
-      return false;
-    if (!(order == rhs.order))
-      return false;
-    return true;
-  }
+  bool operator == (const Order & rhs) const;
   bool operator != (const Order &rhs) const {
     return !(*this == rhs);
   }
@@ -3934,7 +3189,7 @@ class Order : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Order &a, Order &b);
+void swap(Order &a, Order &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Order& obj);
 
@@ -3950,8 +3205,7 @@ class SkewedInfo : public virtual ::apache::thrift::TBase {
 
   SkewedInfo(const SkewedInfo&);
   SkewedInfo& operator=(const SkewedInfo&);
-  SkewedInfo() noexcept {
-  }
+  SkewedInfo() noexcept;
 
   virtual ~SkewedInfo() noexcept;
   std::vector<std::string>  skewedColNames;
@@ -3966,16 +3220,7 @@ class SkewedInfo : public virtual ::apache::thrift::TBase {
 
   void __set_skewedColValueLocationMaps(const std::map<std::vector<std::string> , std::string> & val);
 
-  bool operator == (const SkewedInfo & rhs) const
-  {
-    if (!(skewedColNames == rhs.skewedColNames))
-      return false;
-    if (!(skewedColValues == rhs.skewedColValues))
-      return false;
-    if (!(skewedColValueLocationMaps == rhs.skewedColValueLocationMaps))
-      return false;
-    return true;
-  }
+  bool operator == (const SkewedInfo & rhs) const;
   bool operator != (const SkewedInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -3988,7 +3233,7 @@ class SkewedInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SkewedInfo &a, SkewedInfo &b);
+void swap(SkewedInfo &a, SkewedInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SkewedInfo& obj);
 
@@ -4013,14 +3258,7 @@ class StorageDescriptor : public virtual ::apache::thrift::TBase {
 
   StorageDescriptor(const StorageDescriptor&);
   StorageDescriptor& operator=(const StorageDescriptor&);
-  StorageDescriptor() noexcept
-                    : location(),
-                      inputFormat(),
-                      outputFormat(),
-                      compressed(0),
-                      numBuckets(0),
-                      storedAsSubDirectories(0) {
-  }
+  StorageDescriptor() noexcept;
 
   virtual ~StorageDescriptor() noexcept;
   std::vector<FieldSchema>  cols;
@@ -4062,38 +3300,7 @@ class StorageDescriptor : public virtual ::apache::thrift::TBase {
 
   void __set_storedAsSubDirectories(const bool val);
 
-  bool operator == (const StorageDescriptor & rhs) const
-  {
-    if (!(cols == rhs.cols))
-      return false;
-    if (!(location == rhs.location))
-      return false;
-    if (!(inputFormat == rhs.inputFormat))
-      return false;
-    if (!(outputFormat == rhs.outputFormat))
-      return false;
-    if (!(compressed == rhs.compressed))
-      return false;
-    if (!(numBuckets == rhs.numBuckets))
-      return false;
-    if (!(serdeInfo == rhs.serdeInfo))
-      return false;
-    if (!(bucketCols == rhs.bucketCols))
-      return false;
-    if (!(sortCols == rhs.sortCols))
-      return false;
-    if (!(parameters == rhs.parameters))
-      return false;
-    if (__isset.skewedInfo != rhs.__isset.skewedInfo)
-      return false;
-    else if (__isset.skewedInfo && !(skewedInfo == rhs.skewedInfo))
-      return false;
-    if (__isset.storedAsSubDirectories != rhs.__isset.storedAsSubDirectories)
-      return false;
-    else if (__isset.storedAsSubDirectories && !(storedAsSubDirectories == rhs.storedAsSubDirectories))
-      return false;
-    return true;
-  }
+  bool operator == (const StorageDescriptor & rhs) const;
   bool operator != (const StorageDescriptor &rhs) const {
     return !(*this == rhs);
   }
@@ -4106,7 +3313,7 @@ class StorageDescriptor : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(StorageDescriptor &a, StorageDescriptor &b);
+void swap(StorageDescriptor &a, StorageDescriptor &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const StorageDescriptor& obj);
 
@@ -4122,13 +3329,7 @@ class CreationMetadata : public virtual ::apache::thrift::TBase {
 
   CreationMetadata(const CreationMetadata&);
   CreationMetadata& operator=(const CreationMetadata&);
-  CreationMetadata() noexcept
-                   : catName(),
-                     dbName(),
-                     tblName(),
-                     validTxnList(),
-                     materializationTime(0) {
-  }
+  CreationMetadata() noexcept;
 
   virtual ~CreationMetadata() noexcept;
   std::string catName;
@@ -4155,30 +3356,7 @@ class CreationMetadata : public virtual ::apache::thrift::TBase {
 
   void __set_sourceTables(const std::vector<SourceTable> & val);
 
-  bool operator == (const CreationMetadata & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(tablesUsed == rhs.tablesUsed))
-      return false;
-    if (__isset.validTxnList != rhs.__isset.validTxnList)
-      return false;
-    else if (__isset.validTxnList && !(validTxnList == rhs.validTxnList))
-      return false;
-    if (__isset.materializationTime != rhs.__isset.materializationTime)
-      return false;
-    else if (__isset.materializationTime && !(materializationTime == rhs.materializationTime))
-      return false;
-    if (__isset.sourceTables != rhs.__isset.sourceTables)
-      return false;
-    else if (__isset.sourceTables && !(sourceTables == rhs.sourceTables))
-      return false;
-    return true;
-  }
+  bool operator == (const CreationMetadata & rhs) const;
   bool operator != (const CreationMetadata &rhs) const {
     return !(*this == rhs);
   }
@@ -4191,7 +3369,7 @@ class CreationMetadata : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CreationMetadata &a, CreationMetadata &b);
+void swap(CreationMetadata &a, CreationMetadata &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CreationMetadata& obj);
 
@@ -4205,12 +3383,7 @@ class BooleanColumnStatsData : public virtual ::apache::thrift::TBase {
 
   BooleanColumnStatsData(const BooleanColumnStatsData&);
   BooleanColumnStatsData& operator=(const BooleanColumnStatsData&);
-  BooleanColumnStatsData() noexcept
-                         : numTrues(0),
-                           numFalses(0),
-                           numNulls(0),
-                           bitVectors() {
-  }
+  BooleanColumnStatsData() noexcept;
 
   virtual ~BooleanColumnStatsData() noexcept;
   int64_t numTrues;
@@ -4228,20 +3401,7 @@ class BooleanColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_bitVectors(const std::string& val);
 
-  bool operator == (const BooleanColumnStatsData & rhs) const
-  {
-    if (!(numTrues == rhs.numTrues))
-      return false;
-    if (!(numFalses == rhs.numFalses))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    return true;
-  }
+  bool operator == (const BooleanColumnStatsData & rhs) const;
   bool operator != (const BooleanColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4254,7 +3414,7 @@ class BooleanColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(BooleanColumnStatsData &a, BooleanColumnStatsData &b);
+void swap(BooleanColumnStatsData &a, BooleanColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const BooleanColumnStatsData& obj);
 
@@ -4271,14 +3431,7 @@ class DoubleColumnStatsData : public virtual ::apache::thrift::TBase {
 
   DoubleColumnStatsData(const DoubleColumnStatsData&);
   DoubleColumnStatsData& operator=(const DoubleColumnStatsData&);
-  DoubleColumnStatsData() noexcept
-                        : lowValue(0),
-                          highValue(0),
-                          numNulls(0),
-                          numDVs(0),
-                          bitVectors(),
-                          histogram() {
-  }
+  DoubleColumnStatsData() noexcept;
 
   virtual ~DoubleColumnStatsData() noexcept;
   double lowValue;
@@ -4302,30 +3455,7 @@ class DoubleColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_histogram(const std::string& val);
 
-  bool operator == (const DoubleColumnStatsData & rhs) const
-  {
-    if (__isset.lowValue != rhs.__isset.lowValue)
-      return false;
-    else if (__isset.lowValue && !(lowValue == rhs.lowValue))
-      return false;
-    if (__isset.highValue != rhs.__isset.highValue)
-      return false;
-    else if (__isset.highValue && !(highValue == rhs.highValue))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (!(numDVs == rhs.numDVs))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    if (__isset.histogram != rhs.__isset.histogram)
-      return false;
-    else if (__isset.histogram && !(histogram == rhs.histogram))
-      return false;
-    return true;
-  }
+  bool operator == (const DoubleColumnStatsData & rhs) const;
   bool operator != (const DoubleColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4338,7 +3468,7 @@ class DoubleColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DoubleColumnStatsData &a, DoubleColumnStatsData &b);
+void swap(DoubleColumnStatsData &a, DoubleColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DoubleColumnStatsData& obj);
 
@@ -4355,14 +3485,7 @@ class LongColumnStatsData : public virtual ::apache::thrift::TBase {
 
   LongColumnStatsData(const LongColumnStatsData&);
   LongColumnStatsData& operator=(const LongColumnStatsData&);
-  LongColumnStatsData() noexcept
-                      : lowValue(0),
-                        highValue(0),
-                        numNulls(0),
-                        numDVs(0),
-                        bitVectors(),
-                        histogram() {
-  }
+  LongColumnStatsData() noexcept;
 
   virtual ~LongColumnStatsData() noexcept;
   int64_t lowValue;
@@ -4386,30 +3509,7 @@ class LongColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_histogram(const std::string& val);
 
-  bool operator == (const LongColumnStatsData & rhs) const
-  {
-    if (__isset.lowValue != rhs.__isset.lowValue)
-      return false;
-    else if (__isset.lowValue && !(lowValue == rhs.lowValue))
-      return false;
-    if (__isset.highValue != rhs.__isset.highValue)
-      return false;
-    else if (__isset.highValue && !(highValue == rhs.highValue))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (!(numDVs == rhs.numDVs))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    if (__isset.histogram != rhs.__isset.histogram)
-      return false;
-    else if (__isset.histogram && !(histogram == rhs.histogram))
-      return false;
-    return true;
-  }
+  bool operator == (const LongColumnStatsData & rhs) const;
   bool operator != (const LongColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4422,7 +3522,7 @@ class LongColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(LongColumnStatsData &a, LongColumnStatsData &b);
+void swap(LongColumnStatsData &a, LongColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const LongColumnStatsData& obj);
 
@@ -4436,13 +3536,7 @@ class StringColumnStatsData : public virtual ::apache::thrift::TBase {
 
   StringColumnStatsData(const StringColumnStatsData&);
   StringColumnStatsData& operator=(const StringColumnStatsData&);
-  StringColumnStatsData() noexcept
-                        : maxColLen(0),
-                          avgColLen(0),
-                          numNulls(0),
-                          numDVs(0),
-                          bitVectors() {
-  }
+  StringColumnStatsData() noexcept;
 
   virtual ~StringColumnStatsData() noexcept;
   int64_t maxColLen;
@@ -4463,22 +3557,7 @@ class StringColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_bitVectors(const std::string& val);
 
-  bool operator == (const StringColumnStatsData & rhs) const
-  {
-    if (!(maxColLen == rhs.maxColLen))
-      return false;
-    if (!(avgColLen == rhs.avgColLen))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (!(numDVs == rhs.numDVs))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    return true;
-  }
+  bool operator == (const StringColumnStatsData & rhs) const;
   bool operator != (const StringColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4491,7 +3570,7 @@ class StringColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(StringColumnStatsData &a, StringColumnStatsData &b);
+void swap(StringColumnStatsData &a, StringColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const StringColumnStatsData& obj);
 
@@ -4505,12 +3584,7 @@ class BinaryColumnStatsData : public virtual ::apache::thrift::TBase {
 
   BinaryColumnStatsData(const BinaryColumnStatsData&);
   BinaryColumnStatsData& operator=(const BinaryColumnStatsData&);
-  BinaryColumnStatsData() noexcept
-                        : maxColLen(0),
-                          avgColLen(0),
-                          numNulls(0),
-                          bitVectors() {
-  }
+  BinaryColumnStatsData() noexcept;
 
   virtual ~BinaryColumnStatsData() noexcept;
   int64_t maxColLen;
@@ -4528,20 +3602,7 @@ class BinaryColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_bitVectors(const std::string& val);
 
-  bool operator == (const BinaryColumnStatsData & rhs) const
-  {
-    if (!(maxColLen == rhs.maxColLen))
-      return false;
-    if (!(avgColLen == rhs.avgColLen))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    return true;
-  }
+  bool operator == (const BinaryColumnStatsData & rhs) const;
   bool operator != (const BinaryColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4554,7 +3615,7 @@ class BinaryColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(BinaryColumnStatsData &a, BinaryColumnStatsData &b);
+void swap(BinaryColumnStatsData &a, BinaryColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const BinaryColumnStatsData& obj);
 
@@ -4564,10 +3625,7 @@ class Decimal : public virtual ::apache::thrift::TBase {
 
   Decimal(const Decimal&);
   Decimal& operator=(const Decimal&);
-  Decimal() noexcept
-          : scale(0),
-            unscaled() {
-  }
+  Decimal() noexcept;
 
   virtual ~Decimal() noexcept;
   int16_t scale;
@@ -4577,14 +3635,7 @@ class Decimal : public virtual ::apache::thrift::TBase {
 
   void __set_unscaled(const std::string& val);
 
-  bool operator == (const Decimal & rhs) const
-  {
-    if (!(scale == rhs.scale))
-      return false;
-    if (!(unscaled == rhs.unscaled))
-      return false;
-    return true;
-  }
+  bool operator == (const Decimal & rhs) const;
   bool operator != (const Decimal &rhs) const {
     return !(*this == rhs);
   }
@@ -4597,7 +3648,7 @@ class Decimal : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Decimal &a, Decimal &b);
+void swap(Decimal &a, Decimal &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Decimal& obj);
 
@@ -4614,12 +3665,7 @@ class DecimalColumnStatsData : public virtual ::apache::thrift::TBase {
 
   DecimalColumnStatsData(const DecimalColumnStatsData&);
   DecimalColumnStatsData& operator=(const DecimalColumnStatsData&);
-  DecimalColumnStatsData() noexcept
-                         : numNulls(0),
-                           numDVs(0),
-                           bitVectors(),
-                           histogram() {
-  }
+  DecimalColumnStatsData() noexcept;
 
   virtual ~DecimalColumnStatsData() noexcept;
   Decimal lowValue;
@@ -4643,30 +3689,7 @@ class DecimalColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_histogram(const std::string& val);
 
-  bool operator == (const DecimalColumnStatsData & rhs) const
-  {
-    if (__isset.lowValue != rhs.__isset.lowValue)
-      return false;
-    else if (__isset.lowValue && !(lowValue == rhs.lowValue))
-      return false;
-    if (__isset.highValue != rhs.__isset.highValue)
-      return false;
-    else if (__isset.highValue && !(highValue == rhs.highValue))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (!(numDVs == rhs.numDVs))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    if (__isset.histogram != rhs.__isset.histogram)
-      return false;
-    else if (__isset.histogram && !(histogram == rhs.histogram))
-      return false;
-    return true;
-  }
+  bool operator == (const DecimalColumnStatsData & rhs) const;
   bool operator != (const DecimalColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4679,7 +3702,7 @@ class DecimalColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DecimalColumnStatsData &a, DecimalColumnStatsData &b);
+void swap(DecimalColumnStatsData &a, DecimalColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DecimalColumnStatsData& obj);
 
@@ -4689,21 +3712,14 @@ class Date : public virtual ::apache::thrift::TBase {
 
   Date(const Date&) noexcept;
   Date& operator=(const Date&) noexcept;
-  Date() noexcept
-       : daysSinceEpoch(0) {
-  }
+  Date() noexcept;
 
   virtual ~Date() noexcept;
   int64_t daysSinceEpoch;
 
   void __set_daysSinceEpoch(const int64_t val);
 
-  bool operator == (const Date & rhs) const
-  {
-    if (!(daysSinceEpoch == rhs.daysSinceEpoch))
-      return false;
-    return true;
-  }
+  bool operator == (const Date & rhs) const;
   bool operator != (const Date &rhs) const {
     return !(*this == rhs);
   }
@@ -4716,7 +3732,7 @@ class Date : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Date &a, Date &b);
+void swap(Date &a, Date &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Date& obj);
 
@@ -4733,12 +3749,7 @@ class DateColumnStatsData : public virtual ::apache::thrift::TBase {
 
   DateColumnStatsData(const DateColumnStatsData&);
   DateColumnStatsData& operator=(const DateColumnStatsData&);
-  DateColumnStatsData() noexcept
-                      : numNulls(0),
-                        numDVs(0),
-                        bitVectors(),
-                        histogram() {
-  }
+  DateColumnStatsData() noexcept;
 
   virtual ~DateColumnStatsData() noexcept;
   Date lowValue;
@@ -4762,30 +3773,7 @@ class DateColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_histogram(const std::string& val);
 
-  bool operator == (const DateColumnStatsData & rhs) const
-  {
-    if (__isset.lowValue != rhs.__isset.lowValue)
-      return false;
-    else if (__isset.lowValue && !(lowValue == rhs.lowValue))
-      return false;
-    if (__isset.highValue != rhs.__isset.highValue)
-      return false;
-    else if (__isset.highValue && !(highValue == rhs.highValue))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (!(numDVs == rhs.numDVs))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    if (__isset.histogram != rhs.__isset.histogram)
-      return false;
-    else if (__isset.histogram && !(histogram == rhs.histogram))
-      return false;
-    return true;
-  }
+  bool operator == (const DateColumnStatsData & rhs) const;
   bool operator != (const DateColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4798,7 +3786,7 @@ class DateColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DateColumnStatsData &a, DateColumnStatsData &b);
+void swap(DateColumnStatsData &a, DateColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DateColumnStatsData& obj);
 
@@ -4808,21 +3796,14 @@ class Timestamp : public virtual ::apache::thrift::TBase {
 
   Timestamp(const Timestamp&) noexcept;
   Timestamp& operator=(const Timestamp&) noexcept;
-  Timestamp() noexcept
-            : secondsSinceEpoch(0) {
-  }
+  Timestamp() noexcept;
 
   virtual ~Timestamp() noexcept;
   int64_t secondsSinceEpoch;
 
   void __set_secondsSinceEpoch(const int64_t val);
 
-  bool operator == (const Timestamp & rhs) const
-  {
-    if (!(secondsSinceEpoch == rhs.secondsSinceEpoch))
-      return false;
-    return true;
-  }
+  bool operator == (const Timestamp & rhs) const;
   bool operator != (const Timestamp &rhs) const {
     return !(*this == rhs);
   }
@@ -4835,7 +3816,7 @@ class Timestamp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Timestamp &a, Timestamp &b);
+void swap(Timestamp &a, Timestamp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Timestamp& obj);
 
@@ -4852,12 +3833,7 @@ class TimestampColumnStatsData : public virtual ::apache::thrift::TBase {
 
   TimestampColumnStatsData(const TimestampColumnStatsData&);
   TimestampColumnStatsData& operator=(const TimestampColumnStatsData&);
-  TimestampColumnStatsData() noexcept
-                           : numNulls(0),
-                             numDVs(0),
-                             bitVectors(),
-                             histogram() {
-  }
+  TimestampColumnStatsData() noexcept;
 
   virtual ~TimestampColumnStatsData() noexcept;
   Timestamp lowValue;
@@ -4881,30 +3857,7 @@ class TimestampColumnStatsData : public virtual ::apache::thrift::TBase {
 
   void __set_histogram(const std::string& val);
 
-  bool operator == (const TimestampColumnStatsData & rhs) const
-  {
-    if (__isset.lowValue != rhs.__isset.lowValue)
-      return false;
-    else if (__isset.lowValue && !(lowValue == rhs.lowValue))
-      return false;
-    if (__isset.highValue != rhs.__isset.highValue)
-      return false;
-    else if (__isset.highValue && !(highValue == rhs.highValue))
-      return false;
-    if (!(numNulls == rhs.numNulls))
-      return false;
-    if (!(numDVs == rhs.numDVs))
-      return false;
-    if (__isset.bitVectors != rhs.__isset.bitVectors)
-      return false;
-    else if (__isset.bitVectors && !(bitVectors == rhs.bitVectors))
-      return false;
-    if (__isset.histogram != rhs.__isset.histogram)
-      return false;
-    else if (__isset.histogram && !(histogram == rhs.histogram))
-      return false;
-    return true;
-  }
+  bool operator == (const TimestampColumnStatsData & rhs) const;
   bool operator != (const TimestampColumnStatsData &rhs) const {
     return !(*this == rhs);
   }
@@ -4917,7 +3870,7 @@ class TimestampColumnStatsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TimestampColumnStatsData &a, TimestampColumnStatsData &b);
+void swap(TimestampColumnStatsData &a, TimestampColumnStatsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TimestampColumnStatsData& obj);
 
@@ -4938,8 +3891,7 @@ class ColumnStatisticsData : public virtual ::apache::thrift::TBase {
 
   ColumnStatisticsData(const ColumnStatisticsData&);
   ColumnStatisticsData& operator=(const ColumnStatisticsData&);
-  ColumnStatisticsData() noexcept {
-  }
+  ColumnStatisticsData() noexcept;
 
   virtual ~ColumnStatisticsData() noexcept;
   BooleanColumnStatsData booleanStats;
@@ -4969,42 +3921,7 @@ class ColumnStatisticsData : public virtual ::apache::thrift::TBase {
 
   void __set_timestampStats(const TimestampColumnStatsData& val);
 
-  bool operator == (const ColumnStatisticsData & rhs) const
-  {
-    if (__isset.booleanStats != rhs.__isset.booleanStats)
-      return false;
-    else if (__isset.booleanStats && !(booleanStats == rhs.booleanStats))
-      return false;
-    if (__isset.longStats != rhs.__isset.longStats)
-      return false;
-    else if (__isset.longStats && !(longStats == rhs.longStats))
-      return false;
-    if (__isset.doubleStats != rhs.__isset.doubleStats)
-      return false;
-    else if (__isset.doubleStats && !(doubleStats == rhs.doubleStats))
-      return false;
-    if (__isset.stringStats != rhs.__isset.stringStats)
-      return false;
-    else if (__isset.stringStats && !(stringStats == rhs.stringStats))
-      return false;
-    if (__isset.binaryStats != rhs.__isset.binaryStats)
-      return false;
-    else if (__isset.binaryStats && !(binaryStats == rhs.binaryStats))
-      return false;
-    if (__isset.decimalStats != rhs.__isset.decimalStats)
-      return false;
-    else if (__isset.decimalStats && !(decimalStats == rhs.decimalStats))
-      return false;
-    if (__isset.dateStats != rhs.__isset.dateStats)
-      return false;
-    else if (__isset.dateStats && !(dateStats == rhs.dateStats))
-      return false;
-    if (__isset.timestampStats != rhs.__isset.timestampStats)
-      return false;
-    else if (__isset.timestampStats && !(timestampStats == rhs.timestampStats))
-      return false;
-    return true;
-  }
+  bool operator == (const ColumnStatisticsData & rhs) const;
   bool operator != (const ColumnStatisticsData &rhs) const {
     return !(*this == rhs);
   }
@@ -5017,7 +3934,7 @@ class ColumnStatisticsData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ColumnStatisticsData &a, ColumnStatisticsData &b);
+void swap(ColumnStatisticsData &a, ColumnStatisticsData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ColumnStatisticsData& obj);
 
@@ -5027,10 +3944,7 @@ class ColumnStatisticsObj : public virtual ::apache::thrift::TBase {
 
   ColumnStatisticsObj(const ColumnStatisticsObj&);
   ColumnStatisticsObj& operator=(const ColumnStatisticsObj&);
-  ColumnStatisticsObj() noexcept
-                      : colName(),
-                        colType() {
-  }
+  ColumnStatisticsObj() noexcept;
 
   virtual ~ColumnStatisticsObj() noexcept;
   std::string colName;
@@ -5043,16 +3957,7 @@ class ColumnStatisticsObj : public virtual ::apache::thrift::TBase {
 
   void __set_statsData(const ColumnStatisticsData& val);
 
-  bool operator == (const ColumnStatisticsObj & rhs) const
-  {
-    if (!(colName == rhs.colName))
-      return false;
-    if (!(colType == rhs.colType))
-      return false;
-    if (!(statsData == rhs.statsData))
-      return false;
-    return true;
-  }
+  bool operator == (const ColumnStatisticsObj & rhs) const;
   bool operator != (const ColumnStatisticsObj &rhs) const {
     return !(*this == rhs);
   }
@@ -5065,7 +3970,7 @@ class ColumnStatisticsObj : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ColumnStatisticsObj &a, ColumnStatisticsObj &b);
+void swap(ColumnStatisticsObj &a, ColumnStatisticsObj &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ColumnStatisticsObj& obj);
 
@@ -5081,14 +3986,7 @@ class ColumnStatisticsDesc : public virtual ::apache::thrift::TBase {
 
   ColumnStatisticsDesc(const ColumnStatisticsDesc&);
   ColumnStatisticsDesc& operator=(const ColumnStatisticsDesc&);
-  ColumnStatisticsDesc() noexcept
-                       : isTblLevel(0),
-                         dbName(),
-                         tableName(),
-                         partName(),
-                         lastAnalyzed(0),
-                         catName() {
-  }
+  ColumnStatisticsDesc() noexcept;
 
   virtual ~ColumnStatisticsDesc() noexcept;
   bool isTblLevel;
@@ -5112,28 +4010,7 @@ class ColumnStatisticsDesc : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const ColumnStatisticsDesc & rhs) const
-  {
-    if (!(isTblLevel == rhs.isTblLevel))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (__isset.partName != rhs.__isset.partName)
-      return false;
-    else if (__isset.partName && !(partName == rhs.partName))
-      return false;
-    if (__isset.lastAnalyzed != rhs.__isset.lastAnalyzed)
-      return false;
-    else if (__isset.lastAnalyzed && !(lastAnalyzed == rhs.lastAnalyzed))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const ColumnStatisticsDesc & rhs) const;
   bool operator != (const ColumnStatisticsDesc &rhs) const {
     return !(*this == rhs);
   }
@@ -5146,7 +4023,7 @@ class ColumnStatisticsDesc : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ColumnStatisticsDesc &a, ColumnStatisticsDesc &b);
+void swap(ColumnStatisticsDesc &a, ColumnStatisticsDesc &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ColumnStatisticsDesc& obj);
 
@@ -5161,9 +4038,7 @@ class ColumnStatistics : public virtual ::apache::thrift::TBase {
 
   ColumnStatistics(const ColumnStatistics&);
   ColumnStatistics& operator=(const ColumnStatistics&);
-  ColumnStatistics() : isStatsCompliant(0),
-                       engine("hive") {
-  }
+  ColumnStatistics();
 
   virtual ~ColumnStatistics() noexcept;
   ColumnStatisticsDesc statsDesc;
@@ -5181,22 +4056,7 @@ class ColumnStatistics : public virtual ::apache::thrift::TBase {
 
   void __set_engine(const std::string& val);
 
-  bool operator == (const ColumnStatistics & rhs) const
-  {
-    if (!(statsDesc == rhs.statsDesc))
-      return false;
-    if (!(statsObj == rhs.statsObj))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    return true;
-  }
+  bool operator == (const ColumnStatistics & rhs) const;
   bool operator != (const ColumnStatistics &rhs) const {
     return !(*this == rhs);
   }
@@ -5209,7 +4069,7 @@ class ColumnStatistics : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ColumnStatistics &a, ColumnStatistics &b);
+void swap(ColumnStatistics &a, ColumnStatistics &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ColumnStatistics& obj);
 
@@ -5225,10 +4085,7 @@ class FileMetadata : public virtual ::apache::thrift::TBase {
 
   FileMetadata(const FileMetadata&);
   FileMetadata& operator=(const FileMetadata&);
-  FileMetadata() noexcept
-               : type(1),
-                 version(1) {
-  }
+  FileMetadata() noexcept;
 
   virtual ~FileMetadata() noexcept;
   int8_t type;
@@ -5243,16 +4100,7 @@ class FileMetadata : public virtual ::apache::thrift::TBase {
 
   void __set_data(const std::vector<std::string> & val);
 
-  bool operator == (const FileMetadata & rhs) const
-  {
-    if (!(type == rhs.type))
-      return false;
-    if (!(version == rhs.version))
-      return false;
-    if (!(data == rhs.data))
-      return false;
-    return true;
-  }
+  bool operator == (const FileMetadata & rhs) const;
   bool operator != (const FileMetadata &rhs) const {
     return !(*this == rhs);
   }
@@ -5265,7 +4113,7 @@ class FileMetadata : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FileMetadata &a, FileMetadata &b);
+void swap(FileMetadata &a, FileMetadata &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FileMetadata& obj);
 
@@ -5275,20 +4123,14 @@ class ObjectDictionary : public virtual ::apache::thrift::TBase {
 
   ObjectDictionary(const ObjectDictionary&);
   ObjectDictionary& operator=(const ObjectDictionary&);
-  ObjectDictionary() noexcept {
-  }
+  ObjectDictionary() noexcept;
 
   virtual ~ObjectDictionary() noexcept;
   std::map<std::string, std::vector<std::string> >  values;
 
   void __set_values(const std::map<std::string, std::vector<std::string> > & val);
 
-  bool operator == (const ObjectDictionary & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    return true;
-  }
+  bool operator == (const ObjectDictionary & rhs) const;
   bool operator != (const ObjectDictionary &rhs) const {
     return !(*this == rhs);
   }
@@ -5301,7 +4143,7 @@ class ObjectDictionary : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ObjectDictionary &a, ObjectDictionary &b);
+void swap(ObjectDictionary &a, ObjectDictionary &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ObjectDictionary& obj);
 
@@ -5342,28 +4184,7 @@ class Table : public virtual ::apache::thrift::TBase {
 
   Table(const Table&);
   Table& operator=(const Table&);
-  Table() noexcept
-        : tableName(),
-          dbName(),
-          owner(),
-          createTime(0),
-          lastAccessTime(0),
-          retention(0),
-          viewOriginalText(),
-          viewExpandedText(),
-          tableType(),
-          temporary(false),
-          rewriteEnabled(0),
-          catName(),
-          ownerType((PrincipalType::type)1),
-          writeId(-1LL),
-          isStatsCompliant(0),
-          accessType(0),
-          id(0),
-          txnId(0) {
-    ownerType = (PrincipalType::type)1;
-
-  }
+  Table() noexcept;
 
   virtual ~Table() noexcept;
   std::string tableName;
@@ -5457,98 +4278,7 @@ class Table : public virtual ::apache::thrift::TBase {
 
   void __set_txnId(const int64_t val);
 
-  bool operator == (const Table & rhs) const
-  {
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(owner == rhs.owner))
-      return false;
-    if (!(createTime == rhs.createTime))
-      return false;
-    if (!(lastAccessTime == rhs.lastAccessTime))
-      return false;
-    if (!(retention == rhs.retention))
-      return false;
-    if (!(sd == rhs.sd))
-      return false;
-    if (!(partitionKeys == rhs.partitionKeys))
-      return false;
-    if (!(parameters == rhs.parameters))
-      return false;
-    if (!(viewOriginalText == rhs.viewOriginalText))
-      return false;
-    if (!(viewExpandedText == rhs.viewExpandedText))
-      return false;
-    if (!(tableType == rhs.tableType))
-      return false;
-    if (__isset.privileges != rhs.__isset.privileges)
-      return false;
-    else if (__isset.privileges && !(privileges == rhs.privileges))
-      return false;
-    if (__isset.temporary != rhs.__isset.temporary)
-      return false;
-    else if (__isset.temporary && !(temporary == rhs.temporary))
-      return false;
-    if (__isset.rewriteEnabled != rhs.__isset.rewriteEnabled)
-      return false;
-    else if (__isset.rewriteEnabled && !(rewriteEnabled == rhs.rewriteEnabled))
-      return false;
-    if (__isset.creationMetadata != rhs.__isset.creationMetadata)
-      return false;
-    else if (__isset.creationMetadata && !(creationMetadata == rhs.creationMetadata))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.ownerType != rhs.__isset.ownerType)
-      return false;
-    else if (__isset.ownerType && !(ownerType == rhs.ownerType))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    if (__isset.colStats != rhs.__isset.colStats)
-      return false;
-    else if (__isset.colStats && !(colStats == rhs.colStats))
-      return false;
-    if (__isset.accessType != rhs.__isset.accessType)
-      return false;
-    else if (__isset.accessType && !(accessType == rhs.accessType))
-      return false;
-    if (__isset.requiredReadCapabilities != rhs.__isset.requiredReadCapabilities)
-      return false;
-    else if (__isset.requiredReadCapabilities && !(requiredReadCapabilities == rhs.requiredReadCapabilities))
-      return false;
-    if (__isset.requiredWriteCapabilities != rhs.__isset.requiredWriteCapabilities)
-      return false;
-    else if (__isset.requiredWriteCapabilities && !(requiredWriteCapabilities == rhs.requiredWriteCapabilities))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.fileMetadata != rhs.__isset.fileMetadata)
-      return false;
-    else if (__isset.fileMetadata && !(fileMetadata == rhs.fileMetadata))
-      return false;
-    if (__isset.dictionary != rhs.__isset.dictionary)
-      return false;
-    else if (__isset.dictionary && !(dictionary == rhs.dictionary))
-      return false;
-    if (__isset.txnId != rhs.__isset.txnId)
-      return false;
-    else if (__isset.txnId && !(txnId == rhs.txnId))
-      return false;
-    return true;
-  }
+  bool operator == (const Table & rhs) const;
   bool operator != (const Table &rhs) const {
     return !(*this == rhs);
   }
@@ -5561,7 +4291,7 @@ class Table : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Table &a, Table &b);
+void swap(Table &a, Table &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Table& obj);
 
@@ -5571,11 +4301,7 @@ class SourceTable : public virtual ::apache::thrift::TBase {
 
   SourceTable(const SourceTable&);
   SourceTable& operator=(const SourceTable&);
-  SourceTable() noexcept
-              : insertedCount(0),
-                updatedCount(0),
-                deletedCount(0) {
-  }
+  SourceTable() noexcept;
 
   virtual ~SourceTable() noexcept;
   Table table;
@@ -5591,18 +4317,7 @@ class SourceTable : public virtual ::apache::thrift::TBase {
 
   void __set_deletedCount(const int64_t val);
 
-  bool operator == (const SourceTable & rhs) const
-  {
-    if (!(table == rhs.table))
-      return false;
-    if (!(insertedCount == rhs.insertedCount))
-      return false;
-    if (!(updatedCount == rhs.updatedCount))
-      return false;
-    if (!(deletedCount == rhs.deletedCount))
-      return false;
-    return true;
-  }
+  bool operator == (const SourceTable & rhs) const;
   bool operator != (const SourceTable &rhs) const {
     return !(*this == rhs);
   }
@@ -5615,7 +4330,7 @@ class SourceTable : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SourceTable &a, SourceTable &b);
+void swap(SourceTable &a, SourceTable &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SourceTable& obj);
 
@@ -5641,15 +4356,7 @@ class Partition : public virtual ::apache::thrift::TBase {
 
   Partition(const Partition&);
   Partition& operator=(const Partition&);
-  Partition() noexcept
-            : dbName(),
-              tableName(),
-              createTime(0),
-              lastAccessTime(0),
-              catName(),
-              writeId(-1LL),
-              isStatsCompliant(0) {
-  }
+  Partition() noexcept;
 
   virtual ~Partition() noexcept;
   std::vector<std::string>  values;
@@ -5694,48 +4401,7 @@ class Partition : public virtual ::apache::thrift::TBase {
 
   void __set_fileMetadata(const FileMetadata& val);
 
-  bool operator == (const Partition & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(createTime == rhs.createTime))
-      return false;
-    if (!(lastAccessTime == rhs.lastAccessTime))
-      return false;
-    if (!(sd == rhs.sd))
-      return false;
-    if (!(parameters == rhs.parameters))
-      return false;
-    if (__isset.privileges != rhs.__isset.privileges)
-      return false;
-    else if (__isset.privileges && !(privileges == rhs.privileges))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    if (__isset.colStats != rhs.__isset.colStats)
-      return false;
-    else if (__isset.colStats && !(colStats == rhs.colStats))
-      return false;
-    if (__isset.fileMetadata != rhs.__isset.fileMetadata)
-      return false;
-    else if (__isset.fileMetadata && !(fileMetadata == rhs.fileMetadata))
-      return false;
-    return true;
-  }
+  bool operator == (const Partition & rhs) const;
   bool operator != (const Partition &rhs) const {
     return !(*this == rhs);
   }
@@ -5748,7 +4414,7 @@ class Partition : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Partition &a, Partition &b);
+void swap(Partition &a, Partition &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Partition& obj);
 
@@ -5767,11 +4433,7 @@ class PartitionWithoutSD : public virtual ::apache::thrift::TBase {
 
   PartitionWithoutSD(const PartitionWithoutSD&);
   PartitionWithoutSD& operator=(const PartitionWithoutSD&);
-  PartitionWithoutSD() noexcept
-                     : createTime(0),
-                       lastAccessTime(0),
-                       relativePath() {
-  }
+  PartitionWithoutSD() noexcept;
 
   virtual ~PartitionWithoutSD() noexcept;
   std::vector<std::string>  values;
@@ -5795,24 +4457,7 @@ class PartitionWithoutSD : public virtual ::apache::thrift::TBase {
 
   void __set_privileges(const PrincipalPrivilegeSet& val);
 
-  bool operator == (const PartitionWithoutSD & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    if (!(createTime == rhs.createTime))
-      return false;
-    if (!(lastAccessTime == rhs.lastAccessTime))
-      return false;
-    if (!(relativePath == rhs.relativePath))
-      return false;
-    if (!(parameters == rhs.parameters))
-      return false;
-    if (__isset.privileges != rhs.__isset.privileges)
-      return false;
-    else if (__isset.privileges && !(privileges == rhs.privileges))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionWithoutSD & rhs) const;
   bool operator != (const PartitionWithoutSD &rhs) const {
     return !(*this == rhs);
   }
@@ -5825,7 +4470,7 @@ class PartitionWithoutSD : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionWithoutSD &a, PartitionWithoutSD &b);
+void swap(PartitionWithoutSD &a, PartitionWithoutSD &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionWithoutSD& obj);
 
@@ -5840,8 +4485,7 @@ class PartitionSpecWithSharedSD : public virtual ::apache::thrift::TBase {
 
   PartitionSpecWithSharedSD(const PartitionSpecWithSharedSD&);
   PartitionSpecWithSharedSD& operator=(const PartitionSpecWithSharedSD&);
-  PartitionSpecWithSharedSD() noexcept {
-  }
+  PartitionSpecWithSharedSD() noexcept;
 
   virtual ~PartitionSpecWithSharedSD() noexcept;
   std::vector<PartitionWithoutSD>  partitions;
@@ -5853,14 +4497,7 @@ class PartitionSpecWithSharedSD : public virtual ::apache::thrift::TBase {
 
   void __set_sd(const StorageDescriptor& val);
 
-  bool operator == (const PartitionSpecWithSharedSD & rhs) const
-  {
-    if (!(partitions == rhs.partitions))
-      return false;
-    if (!(sd == rhs.sd))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionSpecWithSharedSD & rhs) const;
   bool operator != (const PartitionSpecWithSharedSD &rhs) const {
     return !(*this == rhs);
   }
@@ -5873,7 +4510,7 @@ class PartitionSpecWithSharedSD : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionSpecWithSharedSD &a, PartitionSpecWithSharedSD &b);
+void swap(PartitionSpecWithSharedSD &a, PartitionSpecWithSharedSD &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionSpecWithSharedSD& obj);
 
@@ -5887,8 +4524,7 @@ class PartitionListComposingSpec : public virtual ::apache::thrift::TBase {
 
   PartitionListComposingSpec(const PartitionListComposingSpec&);
   PartitionListComposingSpec& operator=(const PartitionListComposingSpec&);
-  PartitionListComposingSpec() noexcept {
-  }
+  PartitionListComposingSpec() noexcept;
 
   virtual ~PartitionListComposingSpec() noexcept;
   std::vector<Partition>  partitions;
@@ -5897,12 +4533,7 @@ class PartitionListComposingSpec : public virtual ::apache::thrift::TBase {
 
   void __set_partitions(const std::vector<Partition> & val);
 
-  bool operator == (const PartitionListComposingSpec & rhs) const
-  {
-    if (!(partitions == rhs.partitions))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionListComposingSpec & rhs) const;
   bool operator != (const PartitionListComposingSpec &rhs) const {
     return !(*this == rhs);
   }
@@ -5915,7 +4546,7 @@ class PartitionListComposingSpec : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionListComposingSpec &a, PartitionListComposingSpec &b);
+void swap(PartitionListComposingSpec &a, PartitionListComposingSpec &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionListComposingSpec& obj);
 
@@ -5936,14 +4567,7 @@ class PartitionSpec : public virtual ::apache::thrift::TBase {
 
   PartitionSpec(const PartitionSpec&);
   PartitionSpec& operator=(const PartitionSpec&);
-  PartitionSpec() noexcept
-                : dbName(),
-                  tableName(),
-                  rootPath(),
-                  catName(),
-                  writeId(-1LL),
-                  isStatsCompliant(0) {
-  }
+  PartitionSpec() noexcept;
 
   virtual ~PartitionSpec() noexcept;
   std::string dbName;
@@ -5973,36 +4597,7 @@ class PartitionSpec : public virtual ::apache::thrift::TBase {
 
   void __set_isStatsCompliant(const bool val);
 
-  bool operator == (const PartitionSpec & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(rootPath == rhs.rootPath))
-      return false;
-    if (__isset.sharedSDPartitionSpec != rhs.__isset.sharedSDPartitionSpec)
-      return false;
-    else if (__isset.sharedSDPartitionSpec && !(sharedSDPartitionSpec == rhs.sharedSDPartitionSpec))
-      return false;
-    if (__isset.partitionList != rhs.__isset.partitionList)
-      return false;
-    else if (__isset.partitionList && !(partitionList == rhs.partitionList))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionSpec & rhs) const;
   bool operator != (const PartitionSpec &rhs) const {
     return !(*this == rhs);
   }
@@ -6015,7 +4610,7 @@ class PartitionSpec : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionSpec &a, PartitionSpec &b);
+void swap(PartitionSpec &a, PartitionSpec &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionSpec& obj);
 
@@ -6029,10 +4624,7 @@ class AggrStats : public virtual ::apache::thrift::TBase {
 
   AggrStats(const AggrStats&);
   AggrStats& operator=(const AggrStats&);
-  AggrStats() noexcept
-            : partsFound(0),
-              isStatsCompliant(0) {
-  }
+  AggrStats() noexcept;
 
   virtual ~AggrStats() noexcept;
   std::vector<ColumnStatisticsObj>  colStats;
@@ -6047,18 +4639,7 @@ class AggrStats : public virtual ::apache::thrift::TBase {
 
   void __set_isStatsCompliant(const bool val);
 
-  bool operator == (const AggrStats & rhs) const
-  {
-    if (!(colStats == rhs.colStats))
-      return false;
-    if (!(partsFound == rhs.partsFound))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    return true;
-  }
+  bool operator == (const AggrStats & rhs) const;
   bool operator != (const AggrStats &rhs) const {
     return !(*this == rhs);
   }
@@ -6071,7 +4652,7 @@ class AggrStats : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AggrStats &a, AggrStats &b);
+void swap(AggrStats &a, AggrStats &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AggrStats& obj);
 
@@ -6088,11 +4669,7 @@ class SetPartitionsStatsRequest : public virtual ::apache::thrift::TBase {
 
   SetPartitionsStatsRequest(const SetPartitionsStatsRequest&);
   SetPartitionsStatsRequest& operator=(const SetPartitionsStatsRequest&);
-  SetPartitionsStatsRequest() : needMerge(0),
-                                writeId(-1LL),
-                                validWriteIdList(),
-                                engine("hive") {
-  }
+  SetPartitionsStatsRequest();
 
   virtual ~SetPartitionsStatsRequest() noexcept;
   std::vector<ColumnStatistics>  colStats;
@@ -6113,28 +4690,7 @@ class SetPartitionsStatsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_engine(const std::string& val);
 
-  bool operator == (const SetPartitionsStatsRequest & rhs) const
-  {
-    if (!(colStats == rhs.colStats))
-      return false;
-    if (__isset.needMerge != rhs.__isset.needMerge)
-      return false;
-    else if (__isset.needMerge && !(needMerge == rhs.needMerge))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    return true;
-  }
+  bool operator == (const SetPartitionsStatsRequest & rhs) const;
   bool operator != (const SetPartitionsStatsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6147,7 +4703,7 @@ class SetPartitionsStatsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SetPartitionsStatsRequest &a, SetPartitionsStatsRequest &b);
+void swap(SetPartitionsStatsRequest &a, SetPartitionsStatsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SetPartitionsStatsRequest& obj);
 
@@ -6157,21 +4713,14 @@ class SetPartitionsStatsResponse : public virtual ::apache::thrift::TBase {
 
   SetPartitionsStatsResponse(const SetPartitionsStatsResponse&) noexcept;
   SetPartitionsStatsResponse& operator=(const SetPartitionsStatsResponse&) noexcept;
-  SetPartitionsStatsResponse() noexcept
-                             : result(0) {
-  }
+  SetPartitionsStatsResponse() noexcept;
 
   virtual ~SetPartitionsStatsResponse() noexcept;
   bool result;
 
   void __set_result(const bool val);
 
-  bool operator == (const SetPartitionsStatsResponse & rhs) const
-  {
-    if (!(result == rhs.result))
-      return false;
-    return true;
-  }
+  bool operator == (const SetPartitionsStatsResponse & rhs) const;
   bool operator != (const SetPartitionsStatsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6184,7 +4733,7 @@ class SetPartitionsStatsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SetPartitionsStatsResponse &a, SetPartitionsStatsResponse &b);
+void swap(SetPartitionsStatsResponse &a, SetPartitionsStatsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SetPartitionsStatsResponse& obj);
 
@@ -6199,8 +4748,7 @@ class Schema : public virtual ::apache::thrift::TBase {
 
   Schema(const Schema&);
   Schema& operator=(const Schema&);
-  Schema() noexcept {
-  }
+  Schema() noexcept;
 
   virtual ~Schema() noexcept;
   std::vector<FieldSchema>  fieldSchemas;
@@ -6212,14 +4760,7 @@ class Schema : public virtual ::apache::thrift::TBase {
 
   void __set_properties(const std::map<std::string, std::string> & val);
 
-  bool operator == (const Schema & rhs) const
-  {
-    if (!(fieldSchemas == rhs.fieldSchemas))
-      return false;
-    if (!(properties == rhs.properties))
-      return false;
-    return true;
-  }
+  bool operator == (const Schema & rhs) const;
   bool operator != (const Schema &rhs) const {
     return !(*this == rhs);
   }
@@ -6232,7 +4773,7 @@ class Schema : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Schema &a, Schema &b);
+void swap(Schema &a, Schema &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Schema& obj);
 
@@ -6246,11 +4787,7 @@ class PrimaryKeysRequest : public virtual ::apache::thrift::TBase {
 
   PrimaryKeysRequest(const PrimaryKeysRequest&);
   PrimaryKeysRequest& operator=(const PrimaryKeysRequest&);
-  PrimaryKeysRequest() noexcept
-                     : db_name(),
-                       tbl_name(),
-                       catName() {
-  }
+  PrimaryKeysRequest() noexcept;
 
   virtual ~PrimaryKeysRequest() noexcept;
   std::string db_name;
@@ -6265,18 +4802,7 @@ class PrimaryKeysRequest : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const PrimaryKeysRequest & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const PrimaryKeysRequest & rhs) const;
   bool operator != (const PrimaryKeysRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6289,7 +4815,7 @@ class PrimaryKeysRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PrimaryKeysRequest &a, PrimaryKeysRequest &b);
+void swap(PrimaryKeysRequest &a, PrimaryKeysRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PrimaryKeysRequest& obj);
 
@@ -6299,20 +4825,14 @@ class PrimaryKeysResponse : public virtual ::apache::thrift::TBase {
 
   PrimaryKeysResponse(const PrimaryKeysResponse&);
   PrimaryKeysResponse& operator=(const PrimaryKeysResponse&);
-  PrimaryKeysResponse() noexcept {
-  }
+  PrimaryKeysResponse() noexcept;
 
   virtual ~PrimaryKeysResponse() noexcept;
   std::vector<SQLPrimaryKey>  primaryKeys;
 
   void __set_primaryKeys(const std::vector<SQLPrimaryKey> & val);
 
-  bool operator == (const PrimaryKeysResponse & rhs) const
-  {
-    if (!(primaryKeys == rhs.primaryKeys))
-      return false;
-    return true;
-  }
+  bool operator == (const PrimaryKeysResponse & rhs) const;
   bool operator != (const PrimaryKeysResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6325,7 +4845,7 @@ class PrimaryKeysResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PrimaryKeysResponse &a, PrimaryKeysResponse &b);
+void swap(PrimaryKeysResponse &a, PrimaryKeysResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PrimaryKeysResponse& obj);
 
@@ -6343,13 +4863,7 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase {
 
   ForeignKeysRequest(const ForeignKeysRequest&);
   ForeignKeysRequest& operator=(const ForeignKeysRequest&);
-  ForeignKeysRequest() noexcept
-                     : parent_db_name(),
-                       parent_tbl_name(),
-                       foreign_db_name(),
-                       foreign_tbl_name(),
-                       catName() {
-  }
+  ForeignKeysRequest() noexcept;
 
   virtual ~ForeignKeysRequest() noexcept;
   std::string parent_db_name;
@@ -6370,22 +4884,7 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const ForeignKeysRequest & rhs) const
-  {
-    if (!(parent_db_name == rhs.parent_db_name))
-      return false;
-    if (!(parent_tbl_name == rhs.parent_tbl_name))
-      return false;
-    if (!(foreign_db_name == rhs.foreign_db_name))
-      return false;
-    if (!(foreign_tbl_name == rhs.foreign_tbl_name))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const ForeignKeysRequest & rhs) const;
   bool operator != (const ForeignKeysRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6398,7 +4897,7 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ForeignKeysRequest &a, ForeignKeysRequest &b);
+void swap(ForeignKeysRequest &a, ForeignKeysRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ForeignKeysRequest& obj);
 
@@ -6408,20 +4907,14 @@ class ForeignKeysResponse : public virtual ::apache::thrift::TBase {
 
   ForeignKeysResponse(const ForeignKeysResponse&);
   ForeignKeysResponse& operator=(const ForeignKeysResponse&);
-  ForeignKeysResponse() noexcept {
-  }
+  ForeignKeysResponse() noexcept;
 
   virtual ~ForeignKeysResponse() noexcept;
   std::vector<SQLForeignKey>  foreignKeys;
 
   void __set_foreignKeys(const std::vector<SQLForeignKey> & val);
 
-  bool operator == (const ForeignKeysResponse & rhs) const
-  {
-    if (!(foreignKeys == rhs.foreignKeys))
-      return false;
-    return true;
-  }
+  bool operator == (const ForeignKeysResponse & rhs) const;
   bool operator != (const ForeignKeysResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6434,7 +4927,7 @@ class ForeignKeysResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ForeignKeysResponse &a, ForeignKeysResponse &b);
+void swap(ForeignKeysResponse &a, ForeignKeysResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ForeignKeysResponse& obj);
 
@@ -6444,11 +4937,7 @@ class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   UniqueConstraintsRequest(const UniqueConstraintsRequest&);
   UniqueConstraintsRequest& operator=(const UniqueConstraintsRequest&);
-  UniqueConstraintsRequest() noexcept
-                           : catName(),
-                             db_name(),
-                             tbl_name() {
-  }
+  UniqueConstraintsRequest() noexcept;
 
   virtual ~UniqueConstraintsRequest() noexcept;
   std::string catName;
@@ -6461,16 +4950,7 @@ class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tbl_name(const std::string& val);
 
-  bool operator == (const UniqueConstraintsRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    return true;
-  }
+  bool operator == (const UniqueConstraintsRequest & rhs) const;
   bool operator != (const UniqueConstraintsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6483,7 +4963,7 @@ class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(UniqueConstraintsRequest &a, UniqueConstraintsRequest &b);
+void swap(UniqueConstraintsRequest &a, UniqueConstraintsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UniqueConstraintsRequest& obj);
 
@@ -6493,20 +4973,14 @@ class UniqueConstraintsResponse : public virtual ::apache::thrift::TBase {
 
   UniqueConstraintsResponse(const UniqueConstraintsResponse&);
   UniqueConstraintsResponse& operator=(const UniqueConstraintsResponse&);
-  UniqueConstraintsResponse() noexcept {
-  }
+  UniqueConstraintsResponse() noexcept;
 
   virtual ~UniqueConstraintsResponse() noexcept;
   std::vector<SQLUniqueConstraint>  uniqueConstraints;
 
   void __set_uniqueConstraints(const std::vector<SQLUniqueConstraint> & val);
 
-  bool operator == (const UniqueConstraintsResponse & rhs) const
-  {
-    if (!(uniqueConstraints == rhs.uniqueConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const UniqueConstraintsResponse & rhs) const;
   bool operator != (const UniqueConstraintsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6519,7 +4993,7 @@ class UniqueConstraintsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(UniqueConstraintsResponse &a, UniqueConstraintsResponse &b);
+void swap(UniqueConstraintsResponse &a, UniqueConstraintsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UniqueConstraintsResponse& obj);
 
@@ -6529,11 +5003,7 @@ class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   NotNullConstraintsRequest(const NotNullConstraintsRequest&);
   NotNullConstraintsRequest& operator=(const NotNullConstraintsRequest&);
-  NotNullConstraintsRequest() noexcept
-                            : catName(),
-                              db_name(),
-                              tbl_name() {
-  }
+  NotNullConstraintsRequest() noexcept;
 
   virtual ~NotNullConstraintsRequest() noexcept;
   std::string catName;
@@ -6546,16 +5016,7 @@ class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tbl_name(const std::string& val);
 
-  bool operator == (const NotNullConstraintsRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    return true;
-  }
+  bool operator == (const NotNullConstraintsRequest & rhs) const;
   bool operator != (const NotNullConstraintsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6568,7 +5029,7 @@ class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotNullConstraintsRequest &a, NotNullConstraintsRequest &b);
+void swap(NotNullConstraintsRequest &a, NotNullConstraintsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotNullConstraintsRequest& obj);
 
@@ -6578,20 +5039,14 @@ class NotNullConstraintsResponse : public virtual ::apache::thrift::TBase {
 
   NotNullConstraintsResponse(const NotNullConstraintsResponse&);
   NotNullConstraintsResponse& operator=(const NotNullConstraintsResponse&);
-  NotNullConstraintsResponse() noexcept {
-  }
+  NotNullConstraintsResponse() noexcept;
 
   virtual ~NotNullConstraintsResponse() noexcept;
   std::vector<SQLNotNullConstraint>  notNullConstraints;
 
   void __set_notNullConstraints(const std::vector<SQLNotNullConstraint> & val);
 
-  bool operator == (const NotNullConstraintsResponse & rhs) const
-  {
-    if (!(notNullConstraints == rhs.notNullConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const NotNullConstraintsResponse & rhs) const;
   bool operator != (const NotNullConstraintsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6604,7 +5059,7 @@ class NotNullConstraintsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotNullConstraintsResponse &a, NotNullConstraintsResponse &b);
+void swap(NotNullConstraintsResponse &a, NotNullConstraintsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotNullConstraintsResponse& obj);
 
@@ -6614,11 +5069,7 @@ class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   DefaultConstraintsRequest(const DefaultConstraintsRequest&);
   DefaultConstraintsRequest& operator=(const DefaultConstraintsRequest&);
-  DefaultConstraintsRequest() noexcept
-                            : catName(),
-                              db_name(),
-                              tbl_name() {
-  }
+  DefaultConstraintsRequest() noexcept;
 
   virtual ~DefaultConstraintsRequest() noexcept;
   std::string catName;
@@ -6631,16 +5082,7 @@ class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tbl_name(const std::string& val);
 
-  bool operator == (const DefaultConstraintsRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    return true;
-  }
+  bool operator == (const DefaultConstraintsRequest & rhs) const;
   bool operator != (const DefaultConstraintsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6653,7 +5095,7 @@ class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DefaultConstraintsRequest &a, DefaultConstraintsRequest &b);
+void swap(DefaultConstraintsRequest &a, DefaultConstraintsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DefaultConstraintsRequest& obj);
 
@@ -6663,20 +5105,14 @@ class DefaultConstraintsResponse : public virtual ::apache::thrift::TBase {
 
   DefaultConstraintsResponse(const DefaultConstraintsResponse&);
   DefaultConstraintsResponse& operator=(const DefaultConstraintsResponse&);
-  DefaultConstraintsResponse() noexcept {
-  }
+  DefaultConstraintsResponse() noexcept;
 
   virtual ~DefaultConstraintsResponse() noexcept;
   std::vector<SQLDefaultConstraint>  defaultConstraints;
 
   void __set_defaultConstraints(const std::vector<SQLDefaultConstraint> & val);
 
-  bool operator == (const DefaultConstraintsResponse & rhs) const
-  {
-    if (!(defaultConstraints == rhs.defaultConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const DefaultConstraintsResponse & rhs) const;
   bool operator != (const DefaultConstraintsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6689,7 +5125,7 @@ class DefaultConstraintsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DefaultConstraintsResponse &a, DefaultConstraintsResponse &b);
+void swap(DefaultConstraintsResponse &a, DefaultConstraintsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DefaultConstraintsResponse& obj);
 
@@ -6699,11 +5135,7 @@ class CheckConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   CheckConstraintsRequest(const CheckConstraintsRequest&);
   CheckConstraintsRequest& operator=(const CheckConstraintsRequest&);
-  CheckConstraintsRequest() noexcept
-                          : catName(),
-                            db_name(),
-                            tbl_name() {
-  }
+  CheckConstraintsRequest() noexcept;
 
   virtual ~CheckConstraintsRequest() noexcept;
   std::string catName;
@@ -6716,16 +5148,7 @@ class CheckConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tbl_name(const std::string& val);
 
-  bool operator == (const CheckConstraintsRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    return true;
-  }
+  bool operator == (const CheckConstraintsRequest & rhs) const;
   bool operator != (const CheckConstraintsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6738,7 +5161,7 @@ class CheckConstraintsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CheckConstraintsRequest &a, CheckConstraintsRequest &b);
+void swap(CheckConstraintsRequest &a, CheckConstraintsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CheckConstraintsRequest& obj);
 
@@ -6748,20 +5171,14 @@ class CheckConstraintsResponse : public virtual ::apache::thrift::TBase {
 
   CheckConstraintsResponse(const CheckConstraintsResponse&);
   CheckConstraintsResponse& operator=(const CheckConstraintsResponse&);
-  CheckConstraintsResponse() noexcept {
-  }
+  CheckConstraintsResponse() noexcept;
 
   virtual ~CheckConstraintsResponse() noexcept;
   std::vector<SQLCheckConstraint>  checkConstraints;
 
   void __set_checkConstraints(const std::vector<SQLCheckConstraint> & val);
 
-  bool operator == (const CheckConstraintsResponse & rhs) const
-  {
-    if (!(checkConstraints == rhs.checkConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const CheckConstraintsResponse & rhs) const;
   bool operator != (const CheckConstraintsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6774,7 +5191,7 @@ class CheckConstraintsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CheckConstraintsResponse &a, CheckConstraintsResponse &b);
+void swap(CheckConstraintsResponse &a, CheckConstraintsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CheckConstraintsResponse& obj);
 
@@ -6784,11 +5201,7 @@ class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   AllTableConstraintsRequest(const AllTableConstraintsRequest&);
   AllTableConstraintsRequest& operator=(const AllTableConstraintsRequest&);
-  AllTableConstraintsRequest() noexcept
-                             : dbName(),
-                               tblName(),
-                               catName() {
-  }
+  AllTableConstraintsRequest() noexcept;
 
   virtual ~AllTableConstraintsRequest() noexcept;
   std::string dbName;
@@ -6801,16 +5214,7 @@ class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const AllTableConstraintsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const AllTableConstraintsRequest & rhs) const;
   bool operator != (const AllTableConstraintsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6823,7 +5227,7 @@ class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AllTableConstraintsRequest &a, AllTableConstraintsRequest &b);
+void swap(AllTableConstraintsRequest &a, AllTableConstraintsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AllTableConstraintsRequest& obj);
 
@@ -6833,20 +5237,14 @@ class AllTableConstraintsResponse : public virtual ::apache::thrift::TBase {
 
   AllTableConstraintsResponse(const AllTableConstraintsResponse&);
   AllTableConstraintsResponse& operator=(const AllTableConstraintsResponse&);
-  AllTableConstraintsResponse() noexcept {
-  }
+  AllTableConstraintsResponse() noexcept;
 
   virtual ~AllTableConstraintsResponse() noexcept;
   SQLAllTableConstraints allTableConstraints;
 
   void __set_allTableConstraints(const SQLAllTableConstraints& val);
 
-  bool operator == (const AllTableConstraintsResponse & rhs) const
-  {
-    if (!(allTableConstraints == rhs.allTableConstraints))
-      return false;
-    return true;
-  }
+  bool operator == (const AllTableConstraintsResponse & rhs) const;
   bool operator != (const AllTableConstraintsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -6859,7 +5257,7 @@ class AllTableConstraintsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AllTableConstraintsResponse &a, AllTableConstraintsResponse &b);
+void swap(AllTableConstraintsResponse &a, AllTableConstraintsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AllTableConstraintsResponse& obj);
 
@@ -6873,12 +5271,7 @@ class DropConstraintRequest : public virtual ::apache::thrift::TBase {
 
   DropConstraintRequest(const DropConstraintRequest&);
   DropConstraintRequest& operator=(const DropConstraintRequest&);
-  DropConstraintRequest() noexcept
-                        : dbname(),
-                          tablename(),
-                          constraintname(),
-                          catName() {
-  }
+  DropConstraintRequest() noexcept;
 
   virtual ~DropConstraintRequest() noexcept;
   std::string dbname;
@@ -6896,20 +5289,7 @@ class DropConstraintRequest : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const DropConstraintRequest & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tablename == rhs.tablename))
-      return false;
-    if (!(constraintname == rhs.constraintname))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const DropConstraintRequest & rhs) const;
   bool operator != (const DropConstraintRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6922,7 +5302,7 @@ class DropConstraintRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropConstraintRequest &a, DropConstraintRequest &b);
+void swap(DropConstraintRequest &a, DropConstraintRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropConstraintRequest& obj);
 
@@ -6932,20 +5312,14 @@ class AddPrimaryKeyRequest : public virtual ::apache::thrift::TBase {
 
   AddPrimaryKeyRequest(const AddPrimaryKeyRequest&);
   AddPrimaryKeyRequest& operator=(const AddPrimaryKeyRequest&);
-  AddPrimaryKeyRequest() noexcept {
-  }
+  AddPrimaryKeyRequest() noexcept;
 
   virtual ~AddPrimaryKeyRequest() noexcept;
   std::vector<SQLPrimaryKey>  primaryKeyCols;
 
   void __set_primaryKeyCols(const std::vector<SQLPrimaryKey> & val);
 
-  bool operator == (const AddPrimaryKeyRequest & rhs) const
-  {
-    if (!(primaryKeyCols == rhs.primaryKeyCols))
-      return false;
-    return true;
-  }
+  bool operator == (const AddPrimaryKeyRequest & rhs) const;
   bool operator != (const AddPrimaryKeyRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6958,7 +5332,7 @@ class AddPrimaryKeyRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddPrimaryKeyRequest &a, AddPrimaryKeyRequest &b);
+void swap(AddPrimaryKeyRequest &a, AddPrimaryKeyRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddPrimaryKeyRequest& obj);
 
@@ -6968,20 +5342,14 @@ class AddForeignKeyRequest : public virtual ::apache::thrift::TBase {
 
   AddForeignKeyRequest(const AddForeignKeyRequest&);
   AddForeignKeyRequest& operator=(const AddForeignKeyRequest&);
-  AddForeignKeyRequest() noexcept {
-  }
+  AddForeignKeyRequest() noexcept;
 
   virtual ~AddForeignKeyRequest() noexcept;
   std::vector<SQLForeignKey>  foreignKeyCols;
 
   void __set_foreignKeyCols(const std::vector<SQLForeignKey> & val);
 
-  bool operator == (const AddForeignKeyRequest & rhs) const
-  {
-    if (!(foreignKeyCols == rhs.foreignKeyCols))
-      return false;
-    return true;
-  }
+  bool operator == (const AddForeignKeyRequest & rhs) const;
   bool operator != (const AddForeignKeyRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -6994,7 +5362,7 @@ class AddForeignKeyRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddForeignKeyRequest &a, AddForeignKeyRequest &b);
+void swap(AddForeignKeyRequest &a, AddForeignKeyRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddForeignKeyRequest& obj);
 
@@ -7004,20 +5372,14 @@ class AddUniqueConstraintRequest : public virtual ::apache::thrift::TBase {
 
   AddUniqueConstraintRequest(const AddUniqueConstraintRequest&);
   AddUniqueConstraintRequest& operator=(const AddUniqueConstraintRequest&);
-  AddUniqueConstraintRequest() noexcept {
-  }
+  AddUniqueConstraintRequest() noexcept;
 
   virtual ~AddUniqueConstraintRequest() noexcept;
   std::vector<SQLUniqueConstraint>  uniqueConstraintCols;
 
   void __set_uniqueConstraintCols(const std::vector<SQLUniqueConstraint> & val);
 
-  bool operator == (const AddUniqueConstraintRequest & rhs) const
-  {
-    if (!(uniqueConstraintCols == rhs.uniqueConstraintCols))
-      return false;
-    return true;
-  }
+  bool operator == (const AddUniqueConstraintRequest & rhs) const;
   bool operator != (const AddUniqueConstraintRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7030,7 +5392,7 @@ class AddUniqueConstraintRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddUniqueConstraintRequest &a, AddUniqueConstraintRequest &b);
+void swap(AddUniqueConstraintRequest &a, AddUniqueConstraintRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddUniqueConstraintRequest& obj);
 
@@ -7040,20 +5402,14 @@ class AddNotNullConstraintRequest : public virtual ::apache::thrift::TBase {
 
   AddNotNullConstraintRequest(const AddNotNullConstraintRequest&);
   AddNotNullConstraintRequest& operator=(const AddNotNullConstraintRequest&);
-  AddNotNullConstraintRequest() noexcept {
-  }
+  AddNotNullConstraintRequest() noexcept;
 
   virtual ~AddNotNullConstraintRequest() noexcept;
   std::vector<SQLNotNullConstraint>  notNullConstraintCols;
 
   void __set_notNullConstraintCols(const std::vector<SQLNotNullConstraint> & val);
 
-  bool operator == (const AddNotNullConstraintRequest & rhs) const
-  {
-    if (!(notNullConstraintCols == rhs.notNullConstraintCols))
-      return false;
-    return true;
-  }
+  bool operator == (const AddNotNullConstraintRequest & rhs) const;
   bool operator != (const AddNotNullConstraintRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7066,7 +5422,7 @@ class AddNotNullConstraintRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddNotNullConstraintRequest &a, AddNotNullConstraintRequest &b);
+void swap(AddNotNullConstraintRequest &a, AddNotNullConstraintRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddNotNullConstraintRequest& obj);
 
@@ -7076,20 +5432,14 @@ class AddDefaultConstraintRequest : public virtual ::apache::thrift::TBase {
 
   AddDefaultConstraintRequest(const AddDefaultConstraintRequest&);
   AddDefaultConstraintRequest& operator=(const AddDefaultConstraintRequest&);
-  AddDefaultConstraintRequest() noexcept {
-  }
+  AddDefaultConstraintRequest() noexcept;
 
   virtual ~AddDefaultConstraintRequest() noexcept;
   std::vector<SQLDefaultConstraint>  defaultConstraintCols;
 
   void __set_defaultConstraintCols(const std::vector<SQLDefaultConstraint> & val);
 
-  bool operator == (const AddDefaultConstraintRequest & rhs) const
-  {
-    if (!(defaultConstraintCols == rhs.defaultConstraintCols))
-      return false;
-    return true;
-  }
+  bool operator == (const AddDefaultConstraintRequest & rhs) const;
   bool operator != (const AddDefaultConstraintRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7102,7 +5452,7 @@ class AddDefaultConstraintRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddDefaultConstraintRequest &a, AddDefaultConstraintRequest &b);
+void swap(AddDefaultConstraintRequest &a, AddDefaultConstraintRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddDefaultConstraintRequest& obj);
 
@@ -7112,20 +5462,14 @@ class AddCheckConstraintRequest : public virtual ::apache::thrift::TBase {
 
   AddCheckConstraintRequest(const AddCheckConstraintRequest&);
   AddCheckConstraintRequest& operator=(const AddCheckConstraintRequest&);
-  AddCheckConstraintRequest() noexcept {
-  }
+  AddCheckConstraintRequest() noexcept;
 
   virtual ~AddCheckConstraintRequest() noexcept;
   std::vector<SQLCheckConstraint>  checkConstraintCols;
 
   void __set_checkConstraintCols(const std::vector<SQLCheckConstraint> & val);
 
-  bool operator == (const AddCheckConstraintRequest & rhs) const
-  {
-    if (!(checkConstraintCols == rhs.checkConstraintCols))
-      return false;
-    return true;
-  }
+  bool operator == (const AddCheckConstraintRequest & rhs) const;
   bool operator != (const AddCheckConstraintRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7138,7 +5482,7 @@ class AddCheckConstraintRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddCheckConstraintRequest &a, AddCheckConstraintRequest &b);
+void swap(AddCheckConstraintRequest &a, AddCheckConstraintRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddCheckConstraintRequest& obj);
 
@@ -7148,9 +5492,7 @@ class PartitionsByExprResult : public virtual ::apache::thrift::TBase {
 
   PartitionsByExprResult(const PartitionsByExprResult&);
   PartitionsByExprResult& operator=(const PartitionsByExprResult&);
-  PartitionsByExprResult() noexcept
-                         : hasUnknownPartitions(0) {
-  }
+  PartitionsByExprResult() noexcept;
 
   virtual ~PartitionsByExprResult() noexcept;
   std::vector<Partition>  partitions;
@@ -7160,14 +5502,7 @@ class PartitionsByExprResult : public virtual ::apache::thrift::TBase {
 
   void __set_hasUnknownPartitions(const bool val);
 
-  bool operator == (const PartitionsByExprResult & rhs) const
-  {
-    if (!(partitions == rhs.partitions))
-      return false;
-    if (!(hasUnknownPartitions == rhs.hasUnknownPartitions))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsByExprResult & rhs) const;
   bool operator != (const PartitionsByExprResult &rhs) const {
     return !(*this == rhs);
   }
@@ -7180,7 +5515,7 @@ class PartitionsByExprResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsByExprResult &a, PartitionsByExprResult &b);
+void swap(PartitionsByExprResult &a, PartitionsByExprResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsByExprResult& obj);
 
@@ -7190,9 +5525,7 @@ class PartitionsSpecByExprResult : public virtual ::apache::thrift::TBase {
 
   PartitionsSpecByExprResult(const PartitionsSpecByExprResult&);
   PartitionsSpecByExprResult& operator=(const PartitionsSpecByExprResult&);
-  PartitionsSpecByExprResult() noexcept
-                             : hasUnknownPartitions(0) {
-  }
+  PartitionsSpecByExprResult() noexcept;
 
   virtual ~PartitionsSpecByExprResult() noexcept;
   std::vector<PartitionSpec>  partitionsSpec;
@@ -7202,14 +5535,7 @@ class PartitionsSpecByExprResult : public virtual ::apache::thrift::TBase {
 
   void __set_hasUnknownPartitions(const bool val);
 
-  bool operator == (const PartitionsSpecByExprResult & rhs) const
-  {
-    if (!(partitionsSpec == rhs.partitionsSpec))
-      return false;
-    if (!(hasUnknownPartitions == rhs.hasUnknownPartitions))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsSpecByExprResult & rhs) const;
   bool operator != (const PartitionsSpecByExprResult &rhs) const {
     return !(*this == rhs);
   }
@@ -7222,7 +5548,7 @@ class PartitionsSpecByExprResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsSpecByExprResult &a, PartitionsSpecByExprResult &b);
+void swap(PartitionsSpecByExprResult &a, PartitionsSpecByExprResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsSpecByExprResult& obj);
 
@@ -7244,20 +5570,7 @@ class PartitionsByExprRequest : public virtual ::apache::thrift::TBase {
 
   PartitionsByExprRequest(const PartitionsByExprRequest&);
   PartitionsByExprRequest& operator=(const PartitionsByExprRequest&);
-  PartitionsByExprRequest() noexcept
-                          : dbName(),
-                            tblName(),
-                            expr(),
-                            defaultPartitionName(),
-                            maxParts(-1),
-                            catName(),
-                            order(),
-                            validWriteIdList(),
-                            id(-1LL),
-                            skipColumnSchemaForPartition(0),
-                            includeParamKeyPattern(),
-                            excludeParamKeyPattern() {
-  }
+  PartitionsByExprRequest() noexcept;
 
   virtual ~PartitionsByExprRequest() noexcept;
   std::string dbName;
@@ -7299,52 +5612,7 @@ class PartitionsByExprRequest : public virtual ::apache::thrift::TBase {
 
   void __set_excludeParamKeyPattern(const std::string& val);
 
-  bool operator == (const PartitionsByExprRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(expr == rhs.expr))
-      return false;
-    if (__isset.defaultPartitionName != rhs.__isset.defaultPartitionName)
-      return false;
-    else if (__isset.defaultPartitionName && !(defaultPartitionName == rhs.defaultPartitionName))
-      return false;
-    if (__isset.maxParts != rhs.__isset.maxParts)
-      return false;
-    else if (__isset.maxParts && !(maxParts == rhs.maxParts))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.order != rhs.__isset.order)
-      return false;
-    else if (__isset.order && !(order == rhs.order))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
-      return false;
-    else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
-      return false;
-    else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsByExprRequest & rhs) const;
   bool operator != (const PartitionsByExprRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7357,7 +5625,7 @@ class PartitionsByExprRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsByExprRequest &a, PartitionsByExprRequest &b);
+void swap(PartitionsByExprRequest &a, PartitionsByExprRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsByExprRequest& obj);
 
@@ -7371,9 +5639,7 @@ class TableStatsResult : public virtual ::apache::thrift::TBase {
 
   TableStatsResult(const TableStatsResult&);
   TableStatsResult& operator=(const TableStatsResult&);
-  TableStatsResult() noexcept
-                   : isStatsCompliant(0) {
-  }
+  TableStatsResult() noexcept;
 
   virtual ~TableStatsResult() noexcept;
   std::vector<ColumnStatisticsObj>  tableStats;
@@ -7385,16 +5651,7 @@ class TableStatsResult : public virtual ::apache::thrift::TBase {
 
   void __set_isStatsCompliant(const bool val);
 
-  bool operator == (const TableStatsResult & rhs) const
-  {
-    if (!(tableStats == rhs.tableStats))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    return true;
-  }
+  bool operator == (const TableStatsResult & rhs) const;
   bool operator != (const TableStatsResult &rhs) const {
     return !(*this == rhs);
   }
@@ -7407,7 +5664,7 @@ class TableStatsResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TableStatsResult &a, TableStatsResult &b);
+void swap(TableStatsResult &a, TableStatsResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TableStatsResult& obj);
 
@@ -7421,9 +5678,7 @@ class PartitionsStatsResult : public virtual ::apache::thrift::TBase {
 
   PartitionsStatsResult(const PartitionsStatsResult&);
   PartitionsStatsResult& operator=(const PartitionsStatsResult&);
-  PartitionsStatsResult() noexcept
-                        : isStatsCompliant(0) {
-  }
+  PartitionsStatsResult() noexcept;
 
   virtual ~PartitionsStatsResult() noexcept;
   std::map<std::string, std::vector<ColumnStatisticsObj> >  partStats;
@@ -7435,16 +5690,7 @@ class PartitionsStatsResult : public virtual ::apache::thrift::TBase {
 
   void __set_isStatsCompliant(const bool val);
 
-  bool operator == (const PartitionsStatsResult & rhs) const
-  {
-    if (!(partStats == rhs.partStats))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsStatsResult & rhs) const;
   bool operator != (const PartitionsStatsResult &rhs) const {
     return !(*this == rhs);
   }
@@ -7457,7 +5703,7 @@ class PartitionsStatsResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsStatsResult &a, PartitionsStatsResult &b);
+void swap(PartitionsStatsResult &a, PartitionsStatsResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsStatsResult& obj);
 
@@ -7474,13 +5720,7 @@ class TableStatsRequest : public virtual ::apache::thrift::TBase {
 
   TableStatsRequest(const TableStatsRequest&);
   TableStatsRequest& operator=(const TableStatsRequest&);
-  TableStatsRequest() : dbName(),
-                        tblName(),
-                        catName(),
-                        validWriteIdList(),
-                        engine("hive"),
-                        id(-1LL) {
-  }
+  TableStatsRequest();
 
   virtual ~TableStatsRequest() noexcept;
   std::string dbName;
@@ -7507,32 +5747,7 @@ class TableStatsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_id(const int64_t val);
 
-  bool operator == (const TableStatsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(colNames == rhs.colNames))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    return true;
-  }
+  bool operator == (const TableStatsRequest & rhs) const;
   bool operator != (const TableStatsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7545,7 +5760,7 @@ class TableStatsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TableStatsRequest &a, TableStatsRequest &b);
+void swap(TableStatsRequest &a, TableStatsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TableStatsRequest& obj);
 
@@ -7561,12 +5776,7 @@ class PartitionsStatsRequest : public virtual ::apache::thrift::TBase {
 
   PartitionsStatsRequest(const PartitionsStatsRequest&);
   PartitionsStatsRequest& operator=(const PartitionsStatsRequest&);
-  PartitionsStatsRequest() : dbName(),
-                             tblName(),
-                             catName(),
-                             validWriteIdList(),
-                             engine("hive") {
-  }
+  PartitionsStatsRequest();
 
   virtual ~PartitionsStatsRequest() noexcept;
   std::string dbName;
@@ -7593,30 +5803,7 @@ class PartitionsStatsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_engine(const std::string& val);
 
-  bool operator == (const PartitionsStatsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(colNames == rhs.colNames))
-      return false;
-    if (!(partNames == rhs.partNames))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsStatsRequest & rhs) const;
   bool operator != (const PartitionsStatsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7629,7 +5816,7 @@ class PartitionsStatsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsStatsRequest &a, PartitionsStatsRequest &b);
+void swap(PartitionsStatsRequest &a, PartitionsStatsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsStatsRequest& obj);
 
@@ -7645,9 +5832,7 @@ class AddPartitionsResult : public virtual ::apache::thrift::TBase {
 
   AddPartitionsResult(const AddPartitionsResult&);
   AddPartitionsResult& operator=(const AddPartitionsResult&);
-  AddPartitionsResult() noexcept
-                      : isStatsCompliant(0) {
-  }
+  AddPartitionsResult() noexcept;
 
   virtual ~AddPartitionsResult() noexcept;
   std::vector<Partition>  partitions;
@@ -7662,22 +5847,7 @@ class AddPartitionsResult : public virtual ::apache::thrift::TBase {
 
   void __set_partitionColSchema(const std::vector<FieldSchema> & val);
 
-  bool operator == (const AddPartitionsResult & rhs) const
-  {
-    if (__isset.partitions != rhs.__isset.partitions)
-      return false;
-    else if (__isset.partitions && !(partitions == rhs.partitions))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    if (__isset.partitionColSchema != rhs.__isset.partitionColSchema)
-      return false;
-    else if (__isset.partitionColSchema && !(partitionColSchema == rhs.partitionColSchema))
-      return false;
-    return true;
-  }
+  bool operator == (const AddPartitionsResult & rhs) const;
   bool operator != (const AddPartitionsResult &rhs) const {
     return !(*this == rhs);
   }
@@ -7690,7 +5860,7 @@ class AddPartitionsResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddPartitionsResult &a, AddPartitionsResult &b);
+void swap(AddPartitionsResult &a, AddPartitionsResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddPartitionsResult& obj);
 
@@ -7709,15 +5879,7 @@ class AddPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   AddPartitionsRequest(const AddPartitionsRequest&);
   AddPartitionsRequest& operator=(const AddPartitionsRequest&);
-  AddPartitionsRequest() noexcept
-                       : dbName(),
-                         tblName(),
-                         ifNotExists(0),
-                         needResult(true),
-                         catName(),
-                         validWriteIdList(),
-                         skipColumnSchemaForPartition(0) {
-  }
+  AddPartitionsRequest() noexcept;
 
   virtual ~AddPartitionsRequest() noexcept;
   std::string dbName;
@@ -7753,42 +5915,7 @@ class AddPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_environmentContext(const EnvironmentContext& val);
 
-  bool operator == (const AddPartitionsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(parts == rhs.parts))
-      return false;
-    if (!(ifNotExists == rhs.ifNotExists))
-      return false;
-    if (__isset.needResult != rhs.__isset.needResult)
-      return false;
-    else if (__isset.needResult && !(needResult == rhs.needResult))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.partitionColSchema != rhs.__isset.partitionColSchema)
-      return false;
-    else if (__isset.partitionColSchema && !(partitionColSchema == rhs.partitionColSchema))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    return true;
-  }
+  bool operator == (const AddPartitionsRequest & rhs) const;
   bool operator != (const AddPartitionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -7801,7 +5928,7 @@ class AddPartitionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddPartitionsRequest &a, AddPartitionsRequest &b);
+void swap(AddPartitionsRequest &a, AddPartitionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddPartitionsRequest& obj);
 
@@ -7815,8 +5942,7 @@ class DropPartitionsResult : public virtual ::apache::thrift::TBase {
 
   DropPartitionsResult(const DropPartitionsResult&);
   DropPartitionsResult& operator=(const DropPartitionsResult&);
-  DropPartitionsResult() noexcept {
-  }
+  DropPartitionsResult() noexcept;
 
   virtual ~DropPartitionsResult() noexcept;
   std::vector<Partition>  partitions;
@@ -7825,14 +5951,7 @@ class DropPartitionsResult : public virtual ::apache::thrift::TBase {
 
   void __set_partitions(const std::vector<Partition> & val);
 
-  bool operator == (const DropPartitionsResult & rhs) const
-  {
-    if (__isset.partitions != rhs.__isset.partitions)
-      return false;
-    else if (__isset.partitions && !(partitions == rhs.partitions))
-      return false;
-    return true;
-  }
+  bool operator == (const DropPartitionsResult & rhs) const;
   bool operator != (const DropPartitionsResult &rhs) const {
     return !(*this == rhs);
   }
@@ -7845,7 +5964,7 @@ class DropPartitionsResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropPartitionsResult &a, DropPartitionsResult &b);
+void swap(DropPartitionsResult &a, DropPartitionsResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropPartitionsResult& obj);
 
@@ -7859,10 +5978,7 @@ class DropPartitionsExpr : public virtual ::apache::thrift::TBase {
 
   DropPartitionsExpr(const DropPartitionsExpr&);
   DropPartitionsExpr& operator=(const DropPartitionsExpr&);
-  DropPartitionsExpr() noexcept
-                     : expr(),
-                       partArchiveLevel(0) {
-  }
+  DropPartitionsExpr() noexcept;
 
   virtual ~DropPartitionsExpr() noexcept;
   std::string expr;
@@ -7874,16 +5990,7 @@ class DropPartitionsExpr : public virtual ::apache::thrift::TBase {
 
   void __set_partArchiveLevel(const int32_t val);
 
-  bool operator == (const DropPartitionsExpr & rhs) const
-  {
-    if (!(expr == rhs.expr))
-      return false;
-    if (__isset.partArchiveLevel != rhs.__isset.partArchiveLevel)
-      return false;
-    else if (__isset.partArchiveLevel && !(partArchiveLevel == rhs.partArchiveLevel))
-      return false;
-    return true;
-  }
+  bool operator == (const DropPartitionsExpr & rhs) const;
   bool operator != (const DropPartitionsExpr &rhs) const {
     return !(*this == rhs);
   }
@@ -7896,7 +6003,7 @@ class DropPartitionsExpr : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropPartitionsExpr &a, DropPartitionsExpr &b);
+void swap(DropPartitionsExpr &a, DropPartitionsExpr &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropPartitionsExpr& obj);
 
@@ -7911,8 +6018,7 @@ class RequestPartsSpec : public virtual ::apache::thrift::TBase {
 
   RequestPartsSpec(const RequestPartsSpec&);
   RequestPartsSpec& operator=(const RequestPartsSpec&);
-  RequestPartsSpec() noexcept {
-  }
+  RequestPartsSpec() noexcept;
 
   virtual ~RequestPartsSpec() noexcept;
   std::vector<std::string>  names;
@@ -7924,18 +6030,7 @@ class RequestPartsSpec : public virtual ::apache::thrift::TBase {
 
   void __set_exprs(const std::vector<DropPartitionsExpr> & val);
 
-  bool operator == (const RequestPartsSpec & rhs) const
-  {
-    if (__isset.names != rhs.__isset.names)
-      return false;
-    else if (__isset.names && !(names == rhs.names))
-      return false;
-    if (__isset.exprs != rhs.__isset.exprs)
-      return false;
-    else if (__isset.exprs && !(exprs == rhs.exprs))
-      return false;
-    return true;
-  }
+  bool operator == (const RequestPartsSpec & rhs) const;
   bool operator != (const RequestPartsSpec &rhs) const {
     return !(*this == rhs);
   }
@@ -7948,7 +6043,7 @@ class RequestPartsSpec : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(RequestPartsSpec &a, RequestPartsSpec &b);
+void swap(RequestPartsSpec &a, RequestPartsSpec &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const RequestPartsSpec& obj);
 
@@ -7968,16 +6063,7 @@ class DropPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   DropPartitionsRequest(const DropPartitionsRequest&);
   DropPartitionsRequest& operator=(const DropPartitionsRequest&);
-  DropPartitionsRequest() noexcept
-                        : dbName(),
-                          tblName(),
-                          deleteData(0),
-                          ifExists(true),
-                          ignoreProtection(0),
-                          needResult(true),
-                          catName(),
-                          skipColumnSchemaForPartition(0) {
-  }
+  DropPartitionsRequest() noexcept;
 
   virtual ~DropPartitionsRequest() noexcept;
   std::string dbName;
@@ -8013,44 +6099,7 @@ class DropPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_skipColumnSchemaForPartition(const bool val);
 
-  bool operator == (const DropPartitionsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(parts == rhs.parts))
-      return false;
-    if (__isset.deleteData != rhs.__isset.deleteData)
-      return false;
-    else if (__isset.deleteData && !(deleteData == rhs.deleteData))
-      return false;
-    if (__isset.ifExists != rhs.__isset.ifExists)
-      return false;
-    else if (__isset.ifExists && !(ifExists == rhs.ifExists))
-      return false;
-    if (__isset.ignoreProtection != rhs.__isset.ignoreProtection)
-      return false;
-    else if (__isset.ignoreProtection && !(ignoreProtection == rhs.ignoreProtection))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    if (__isset.needResult != rhs.__isset.needResult)
-      return false;
-    else if (__isset.needResult && !(needResult == rhs.needResult))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    return true;
-  }
+  bool operator == (const DropPartitionsRequest & rhs) const;
   bool operator != (const DropPartitionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -8063,7 +6112,7 @@ class DropPartitionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropPartitionsRequest &a, DropPartitionsRequest &b);
+void swap(DropPartitionsRequest &a, DropPartitionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropPartitionsRequest& obj);
 
@@ -8081,13 +6130,7 @@ class DropPartitionRequest : public virtual ::apache::thrift::TBase {
 
   DropPartitionRequest(const DropPartitionRequest&);
   DropPartitionRequest& operator=(const DropPartitionRequest&);
-  DropPartitionRequest() noexcept
-                       : catName(),
-                         dbName(),
-                         tblName(),
-                         partName(),
-                         deleteData(0) {
-  }
+  DropPartitionRequest() noexcept;
 
   virtual ~DropPartitionRequest() noexcept;
   std::string catName;
@@ -8114,34 +6157,7 @@ class DropPartitionRequest : public virtual ::apache::thrift::TBase {
 
   void __set_environmentContext(const EnvironmentContext& val);
 
-  bool operator == (const DropPartitionRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.partName != rhs.__isset.partName)
-      return false;
-    else if (__isset.partName && !(partName == rhs.partName))
-      return false;
-    if (__isset.partVals != rhs.__isset.partVals)
-      return false;
-    else if (__isset.partVals && !(partVals == rhs.partVals))
-      return false;
-    if (__isset.deleteData != rhs.__isset.deleteData)
-      return false;
-    else if (__isset.deleteData && !(deleteData == rhs.deleteData))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    return true;
-  }
+  bool operator == (const DropPartitionRequest & rhs) const;
   bool operator != (const DropPartitionRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -8154,7 +6170,7 @@ class DropPartitionRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropPartitionRequest &a, DropPartitionRequest &b);
+void swap(DropPartitionRequest &a, DropPartitionRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropPartitionRequest& obj);
 
@@ -8174,16 +6190,7 @@ class PartitionValuesRequest : public virtual ::apache::thrift::TBase {
 
   PartitionValuesRequest(const PartitionValuesRequest&);
   PartitionValuesRequest& operator=(const PartitionValuesRequest&);
-  PartitionValuesRequest() noexcept
-                         : dbName(),
-                           tblName(),
-                           applyDistinct(true),
-                           filter(),
-                           ascending(true),
-                           maxParts(-1LL),
-                           catName(),
-                           validWriteIdList() {
-  }
+  PartitionValuesRequest() noexcept;
 
   virtual ~PartitionValuesRequest() noexcept;
   std::string dbName;
@@ -8219,44 +6226,7 @@ class PartitionValuesRequest : public virtual ::apache::thrift::TBase {
 
   void __set_validWriteIdList(const std::string& val);
 
-  bool operator == (const PartitionValuesRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(partitionKeys == rhs.partitionKeys))
-      return false;
-    if (__isset.applyDistinct != rhs.__isset.applyDistinct)
-      return false;
-    else if (__isset.applyDistinct && !(applyDistinct == rhs.applyDistinct))
-      return false;
-    if (__isset.filter != rhs.__isset.filter)
-      return false;
-    else if (__isset.filter && !(filter == rhs.filter))
-      return false;
-    if (__isset.partitionOrder != rhs.__isset.partitionOrder)
-      return false;
-    else if (__isset.partitionOrder && !(partitionOrder == rhs.partitionOrder))
-      return false;
-    if (__isset.ascending != rhs.__isset.ascending)
-      return false;
-    else if (__isset.ascending && !(ascending == rhs.ascending))
-      return false;
-    if (__isset.maxParts != rhs.__isset.maxParts)
-      return false;
-    else if (__isset.maxParts && !(maxParts == rhs.maxParts))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionValuesRequest & rhs) const;
   bool operator != (const PartitionValuesRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -8269,7 +6239,7 @@ class PartitionValuesRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionValuesRequest &a, PartitionValuesRequest &b);
+void swap(PartitionValuesRequest &a, PartitionValuesRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionValuesRequest& obj);
 
@@ -8279,20 +6249,14 @@ class PartitionValuesRow : public virtual ::apache::thrift::TBase {
 
   PartitionValuesRow(const PartitionValuesRow&);
   PartitionValuesRow& operator=(const PartitionValuesRow&);
-  PartitionValuesRow() noexcept {
-  }
+  PartitionValuesRow() noexcept;
 
   virtual ~PartitionValuesRow() noexcept;
   std::vector<std::string>  row;
 
   void __set_row(const std::vector<std::string> & val);
 
-  bool operator == (const PartitionValuesRow & rhs) const
-  {
-    if (!(row == rhs.row))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionValuesRow & rhs) const;
   bool operator != (const PartitionValuesRow &rhs) const {
     return !(*this == rhs);
   }
@@ -8305,7 +6269,7 @@ class PartitionValuesRow : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionValuesRow &a, PartitionValuesRow &b);
+void swap(PartitionValuesRow &a, PartitionValuesRow &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionValuesRow& obj);
 
@@ -8315,20 +6279,14 @@ class PartitionValuesResponse : public virtual ::apache::thrift::TBase {
 
   PartitionValuesResponse(const PartitionValuesResponse&);
   PartitionValuesResponse& operator=(const PartitionValuesResponse&);
-  PartitionValuesResponse() noexcept {
-  }
+  PartitionValuesResponse() noexcept;
 
   virtual ~PartitionValuesResponse() noexcept;
   std::vector<PartitionValuesRow>  partitionValues;
 
   void __set_partitionValues(const std::vector<PartitionValuesRow> & val);
 
-  bool operator == (const PartitionValuesResponse & rhs) const
-  {
-    if (!(partitionValues == rhs.partitionValues))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionValuesResponse & rhs) const;
   bool operator != (const PartitionValuesResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -8341,7 +6299,7 @@ class PartitionValuesResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionValuesResponse &a, PartitionValuesResponse &b);
+void swap(PartitionValuesResponse &a, PartitionValuesResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionValuesResponse& obj);
 
@@ -8365,18 +6323,7 @@ class GetPartitionsByNamesRequest : public virtual ::apache::thrift::TBase {
 
   GetPartitionsByNamesRequest(const GetPartitionsByNamesRequest&);
   GetPartitionsByNamesRequest& operator=(const GetPartitionsByNamesRequest&);
-  GetPartitionsByNamesRequest() : db_name(),
-                                  tbl_name(),
-                                  get_col_stats(0),
-                                  processorIdentifier(),
-                                  engine("hive"),
-                                  validWriteIdList(),
-                                  getFileMetadata(0),
-                                  id(-1LL),
-                                  skipColumnSchemaForPartition(0),
-                                  includeParamKeyPattern(),
-                                  excludeParamKeyPattern() {
-  }
+  GetPartitionsByNamesRequest();
 
   virtual ~GetPartitionsByNamesRequest() noexcept;
   std::string db_name;
@@ -8421,58 +6368,7 @@ class GetPartitionsByNamesRequest : public virtual ::apache::thrift::TBase {
 
   void __set_excludeParamKeyPattern(const std::string& val);
 
-  bool operator == (const GetPartitionsByNamesRequest & rhs) const
-  {
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (__isset.names != rhs.__isset.names)
-      return false;
-    else if (__isset.names && !(names == rhs.names))
-      return false;
-    if (__isset.get_col_stats != rhs.__isset.get_col_stats)
-      return false;
-    else if (__isset.get_col_stats && !(get_col_stats == rhs.get_col_stats))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.getFileMetadata != rhs.__isset.getFileMetadata)
-      return false;
-    else if (__isset.getFileMetadata && !(getFileMetadata == rhs.getFileMetadata))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
-      return false;
-    else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
-      return false;
-    else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsByNamesRequest & rhs) const;
   bool operator != (const GetPartitionsByNamesRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -8485,7 +6381,7 @@ class GetPartitionsByNamesRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsByNamesRequest &a, GetPartitionsByNamesRequest &b);
+void swap(GetPartitionsByNamesRequest &a, GetPartitionsByNamesRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsByNamesRequest& obj);
 
@@ -8499,8 +6395,7 @@ class GetPartitionsByNamesResult : public virtual ::apache::thrift::TBase {
 
   GetPartitionsByNamesResult(const GetPartitionsByNamesResult&);
   GetPartitionsByNamesResult& operator=(const GetPartitionsByNamesResult&);
-  GetPartitionsByNamesResult() noexcept {
-  }
+  GetPartitionsByNamesResult() noexcept;
 
   virtual ~GetPartitionsByNamesResult() noexcept;
   std::vector<Partition>  partitions;
@@ -8512,16 +6407,7 @@ class GetPartitionsByNamesResult : public virtual ::apache::thrift::TBase {
 
   void __set_dictionary(const ObjectDictionary& val);
 
-  bool operator == (const GetPartitionsByNamesResult & rhs) const
-  {
-    if (!(partitions == rhs.partitions))
-      return false;
-    if (__isset.dictionary != rhs.__isset.dictionary)
-      return false;
-    else if (__isset.dictionary && !(dictionary == rhs.dictionary))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsByNamesResult & rhs) const;
   bool operator != (const GetPartitionsByNamesResult &rhs) const {
     return !(*this == rhs);
   }
@@ -8534,7 +6420,7 @@ class GetPartitionsByNamesResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsByNamesResult &a, GetPartitionsByNamesResult &b);
+void swap(GetPartitionsByNamesResult &a, GetPartitionsByNamesResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsByNamesResult& obj);
 
@@ -8555,15 +6441,7 @@ class DataConnector : public virtual ::apache::thrift::TBase {
 
   DataConnector(const DataConnector&);
   DataConnector& operator=(const DataConnector&);
-  DataConnector() noexcept
-                : name(),
-                  type(),
-                  url(),
-                  description(),
-                  ownerName(),
-                  ownerType(static_cast<PrincipalType::type>(0)),
-                  createTime(0) {
-  }
+  DataConnector() noexcept;
 
   virtual ~DataConnector() noexcept;
   std::string name;
@@ -8597,36 +6475,7 @@ class DataConnector : public virtual ::apache::thrift::TBase {
 
   void __set_createTime(const int32_t val);
 
-  bool operator == (const DataConnector & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (!(url == rhs.url))
-      return false;
-    if (__isset.description != rhs.__isset.description)
-      return false;
-    else if (__isset.description && !(description == rhs.description))
-      return false;
-    if (__isset.parameters != rhs.__isset.parameters)
-      return false;
-    else if (__isset.parameters && !(parameters == rhs.parameters))
-      return false;
-    if (__isset.ownerName != rhs.__isset.ownerName)
-      return false;
-    else if (__isset.ownerName && !(ownerName == rhs.ownerName))
-      return false;
-    if (__isset.ownerType != rhs.__isset.ownerType)
-      return false;
-    else if (__isset.ownerType && !(ownerType == rhs.ownerType))
-      return false;
-    if (__isset.createTime != rhs.__isset.createTime)
-      return false;
-    else if (__isset.createTime && !(createTime == rhs.createTime))
-      return false;
-    return true;
-  }
+  bool operator == (const DataConnector & rhs) const;
   bool operator != (const DataConnector &rhs) const {
     return !(*this == rhs);
   }
@@ -8639,7 +6488,7 @@ class DataConnector : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DataConnector &a, DataConnector &b);
+void swap(DataConnector &a, DataConnector &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DataConnector& obj);
 
@@ -8654,10 +6503,7 @@ class ResourceUri : public virtual ::apache::thrift::TBase {
 
   ResourceUri(const ResourceUri&);
   ResourceUri& operator=(const ResourceUri&);
-  ResourceUri() noexcept
-              : resourceType(static_cast<ResourceType::type>(0)),
-                uri() {
-  }
+  ResourceUri() noexcept;
 
   virtual ~ResourceUri() noexcept;
   /**
@@ -8673,14 +6519,7 @@ class ResourceUri : public virtual ::apache::thrift::TBase {
 
   void __set_uri(const std::string& val);
 
-  bool operator == (const ResourceUri & rhs) const
-  {
-    if (!(resourceType == rhs.resourceType))
-      return false;
-    if (!(uri == rhs.uri))
-      return false;
-    return true;
-  }
+  bool operator == (const ResourceUri & rhs) const;
   bool operator != (const ResourceUri &rhs) const {
     return !(*this == rhs);
   }
@@ -8693,7 +6532,7 @@ class ResourceUri : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ResourceUri &a, ResourceUri &b);
+void swap(ResourceUri &a, ResourceUri &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ResourceUri& obj);
 
@@ -8715,16 +6554,7 @@ class Function : public virtual ::apache::thrift::TBase {
 
   Function(const Function&);
   Function& operator=(const Function&);
-  Function() noexcept
-           : functionName(),
-             dbName(),
-             className(),
-             ownerName(),
-             ownerType(static_cast<PrincipalType::type>(0)),
-             createTime(0),
-             functionType(static_cast<FunctionType::type>(0)),
-             catName() {
-  }
+  Function() noexcept;
 
   virtual ~Function() noexcept;
   std::string functionName;
@@ -8765,30 +6595,7 @@ class Function : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const Function & rhs) const
-  {
-    if (!(functionName == rhs.functionName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(className == rhs.className))
-      return false;
-    if (!(ownerName == rhs.ownerName))
-      return false;
-    if (!(ownerType == rhs.ownerType))
-      return false;
-    if (!(createTime == rhs.createTime))
-      return false;
-    if (!(functionType == rhs.functionType))
-      return false;
-    if (!(resourceUris == rhs.resourceUris))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const Function & rhs) const;
   bool operator != (const Function &rhs) const {
     return !(*this == rhs);
   }
@@ -8801,7 +6608,7 @@ class Function : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Function &a, Function &b);
+void swap(Function &a, Function &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Function& obj);
 
@@ -8819,16 +6626,7 @@ class TxnInfo : public virtual ::apache::thrift::TBase {
 
   TxnInfo(const TxnInfo&);
   TxnInfo& operator=(const TxnInfo&);
-  TxnInfo() : id(0),
-              state(static_cast<TxnState::type>(0)),
-              user(),
-              hostname(),
-              agentInfo("Unknown"),
-              heartbeatCount(0),
-              metaInfo(),
-              startedTime(0),
-              lastHeartbeatTime(0) {
-  }
+  TxnInfo();
 
   virtual ~TxnInfo() noexcept;
   int64_t id;
@@ -8865,38 +6663,7 @@ class TxnInfo : public virtual ::apache::thrift::TBase {
 
   void __set_lastHeartbeatTime(const int64_t val);
 
-  bool operator == (const TxnInfo & rhs) const
-  {
-    if (!(id == rhs.id))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    if (!(user == rhs.user))
-      return false;
-    if (!(hostname == rhs.hostname))
-      return false;
-    if (__isset.agentInfo != rhs.__isset.agentInfo)
-      return false;
-    else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
-      return false;
-    if (__isset.heartbeatCount != rhs.__isset.heartbeatCount)
-      return false;
-    else if (__isset.heartbeatCount && !(heartbeatCount == rhs.heartbeatCount))
-      return false;
-    if (__isset.metaInfo != rhs.__isset.metaInfo)
-      return false;
-    else if (__isset.metaInfo && !(metaInfo == rhs.metaInfo))
-      return false;
-    if (__isset.startedTime != rhs.__isset.startedTime)
-      return false;
-    else if (__isset.startedTime && !(startedTime == rhs.startedTime))
-      return false;
-    if (__isset.lastHeartbeatTime != rhs.__isset.lastHeartbeatTime)
-      return false;
-    else if (__isset.lastHeartbeatTime && !(lastHeartbeatTime == rhs.lastHeartbeatTime))
-      return false;
-    return true;
-  }
+  bool operator == (const TxnInfo & rhs) const;
   bool operator != (const TxnInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -8909,7 +6676,7 @@ class TxnInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TxnInfo &a, TxnInfo &b);
+void swap(TxnInfo &a, TxnInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TxnInfo& obj);
 
@@ -8919,9 +6686,7 @@ class GetOpenTxnsInfoResponse : public virtual ::apache::thrift::TBase {
 
   GetOpenTxnsInfoResponse(const GetOpenTxnsInfoResponse&);
   GetOpenTxnsInfoResponse& operator=(const GetOpenTxnsInfoResponse&);
-  GetOpenTxnsInfoResponse() noexcept
-                          : txn_high_water_mark(0) {
-  }
+  GetOpenTxnsInfoResponse() noexcept;
 
   virtual ~GetOpenTxnsInfoResponse() noexcept;
   int64_t txn_high_water_mark;
@@ -8931,14 +6696,7 @@ class GetOpenTxnsInfoResponse : public virtual ::apache::thrift::TBase {
 
   void __set_open_txns(const std::vector<TxnInfo> & val);
 
-  bool operator == (const GetOpenTxnsInfoResponse & rhs) const
-  {
-    if (!(txn_high_water_mark == rhs.txn_high_water_mark))
-      return false;
-    if (!(open_txns == rhs.open_txns))
-      return false;
-    return true;
-  }
+  bool operator == (const GetOpenTxnsInfoResponse & rhs) const;
   bool operator != (const GetOpenTxnsInfoResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -8951,7 +6709,7 @@ class GetOpenTxnsInfoResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetOpenTxnsInfoResponse &a, GetOpenTxnsInfoResponse &b);
+void swap(GetOpenTxnsInfoResponse &a, GetOpenTxnsInfoResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetOpenTxnsInfoResponse& obj);
 
@@ -8965,11 +6723,7 @@ class GetOpenTxnsResponse : public virtual ::apache::thrift::TBase {
 
   GetOpenTxnsResponse(const GetOpenTxnsResponse&);
   GetOpenTxnsResponse& operator=(const GetOpenTxnsResponse&);
-  GetOpenTxnsResponse() noexcept
-                      : txn_high_water_mark(0),
-                        min_open_txn(0),
-                        abortedBits() {
-  }
+  GetOpenTxnsResponse() noexcept;
 
   virtual ~GetOpenTxnsResponse() noexcept;
   int64_t txn_high_water_mark;
@@ -8987,20 +6741,7 @@ class GetOpenTxnsResponse : public virtual ::apache::thrift::TBase {
 
   void __set_abortedBits(const std::string& val);
 
-  bool operator == (const GetOpenTxnsResponse & rhs) const
-  {
-    if (!(txn_high_water_mark == rhs.txn_high_water_mark))
-      return false;
-    if (!(open_txns == rhs.open_txns))
-      return false;
-    if (__isset.min_open_txn != rhs.__isset.min_open_txn)
-      return false;
-    else if (__isset.min_open_txn && !(min_open_txn == rhs.min_open_txn))
-      return false;
-    if (!(abortedBits == rhs.abortedBits))
-      return false;
-    return true;
-  }
+  bool operator == (const GetOpenTxnsResponse & rhs) const;
   bool operator != (const GetOpenTxnsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -9013,7 +6754,7 @@ class GetOpenTxnsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetOpenTxnsResponse &a, GetOpenTxnsResponse &b);
+void swap(GetOpenTxnsResponse &a, GetOpenTxnsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetOpenTxnsResponse& obj);
 
@@ -9030,15 +6771,7 @@ class OpenTxnRequest : public virtual ::apache::thrift::TBase {
 
   OpenTxnRequest(const OpenTxnRequest&);
   OpenTxnRequest& operator=(const OpenTxnRequest&);
-  OpenTxnRequest() : num_txns(0),
-                     user(),
-                     hostname(),
-                     agentInfo("Unknown"),
-                     replPolicy(),
-                     txn_type((TxnType::type)0) {
-    txn_type = (TxnType::type)0;
-
-  }
+  OpenTxnRequest();
 
   virtual ~OpenTxnRequest() noexcept;
   int32_t num_txns;
@@ -9069,32 +6802,7 @@ class OpenTxnRequest : public virtual ::apache::thrift::TBase {
 
   void __set_txn_type(const TxnType::type val);
 
-  bool operator == (const OpenTxnRequest & rhs) const
-  {
-    if (!(num_txns == rhs.num_txns))
-      return false;
-    if (!(user == rhs.user))
-      return false;
-    if (!(hostname == rhs.hostname))
-      return false;
-    if (__isset.agentInfo != rhs.__isset.agentInfo)
-      return false;
-    else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
-      return false;
-    if (__isset.replPolicy != rhs.__isset.replPolicy)
-      return false;
-    else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
-      return false;
-    if (__isset.replSrcTxnIds != rhs.__isset.replSrcTxnIds)
-      return false;
-    else if (__isset.replSrcTxnIds && !(replSrcTxnIds == rhs.replSrcTxnIds))
-      return false;
-    if (__isset.txn_type != rhs.__isset.txn_type)
-      return false;
-    else if (__isset.txn_type && !(txn_type == rhs.txn_type))
-      return false;
-    return true;
-  }
+  bool operator == (const OpenTxnRequest & rhs) const;
   bool operator != (const OpenTxnRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9107,7 +6815,7 @@ class OpenTxnRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(OpenTxnRequest &a, OpenTxnRequest &b);
+void swap(OpenTxnRequest &a, OpenTxnRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const OpenTxnRequest& obj);
 
@@ -9117,20 +6825,14 @@ class OpenTxnsResponse : public virtual ::apache::thrift::TBase {
 
   OpenTxnsResponse(const OpenTxnsResponse&);
   OpenTxnsResponse& operator=(const OpenTxnsResponse&);
-  OpenTxnsResponse() noexcept {
-  }
+  OpenTxnsResponse() noexcept;
 
   virtual ~OpenTxnsResponse() noexcept;
   std::vector<int64_t>  txn_ids;
 
   void __set_txn_ids(const std::vector<int64_t> & val);
 
-  bool operator == (const OpenTxnsResponse & rhs) const
-  {
-    if (!(txn_ids == rhs.txn_ids))
-      return false;
-    return true;
-  }
+  bool operator == (const OpenTxnsResponse & rhs) const;
   bool operator != (const OpenTxnsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -9143,7 +6845,7 @@ class OpenTxnsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(OpenTxnsResponse &a, OpenTxnsResponse &b);
+void swap(OpenTxnsResponse &a, OpenTxnsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const OpenTxnsResponse& obj);
 
@@ -9159,12 +6861,7 @@ class AbortTxnRequest : public virtual ::apache::thrift::TBase {
 
   AbortTxnRequest(const AbortTxnRequest&);
   AbortTxnRequest& operator=(const AbortTxnRequest&);
-  AbortTxnRequest() noexcept
-                  : txnid(0),
-                    replPolicy(),
-                    txn_type(static_cast<TxnType::type>(0)),
-                    errorCode(0) {
-  }
+  AbortTxnRequest() noexcept;
 
   virtual ~AbortTxnRequest() noexcept;
   int64_t txnid;
@@ -9186,24 +6883,7 @@ class AbortTxnRequest : public virtual ::apache::thrift::TBase {
 
   void __set_errorCode(const int64_t val);
 
-  bool operator == (const AbortTxnRequest & rhs) const
-  {
-    if (!(txnid == rhs.txnid))
-      return false;
-    if (__isset.replPolicy != rhs.__isset.replPolicy)
-      return false;
-    else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
-      return false;
-    if (__isset.txn_type != rhs.__isset.txn_type)
-      return false;
-    else if (__isset.txn_type && !(txn_type == rhs.txn_type))
-      return false;
-    if (__isset.errorCode != rhs.__isset.errorCode)
-      return false;
-    else if (__isset.errorCode && !(errorCode == rhs.errorCode))
-      return false;
-    return true;
-  }
+  bool operator == (const AbortTxnRequest & rhs) const;
   bool operator != (const AbortTxnRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9216,7 +6896,7 @@ class AbortTxnRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AbortTxnRequest &a, AbortTxnRequest &b);
+void swap(AbortTxnRequest &a, AbortTxnRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AbortTxnRequest& obj);
 
@@ -9230,9 +6910,7 @@ class AbortTxnsRequest : public virtual ::apache::thrift::TBase {
 
   AbortTxnsRequest(const AbortTxnsRequest&);
   AbortTxnsRequest& operator=(const AbortTxnsRequest&);
-  AbortTxnsRequest() noexcept
-                   : errorCode(0) {
-  }
+  AbortTxnsRequest() noexcept;
 
   virtual ~AbortTxnsRequest() noexcept;
   std::vector<int64_t>  txn_ids;
@@ -9244,16 +6922,7 @@ class AbortTxnsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_errorCode(const int64_t val);
 
-  bool operator == (const AbortTxnsRequest & rhs) const
-  {
-    if (!(txn_ids == rhs.txn_ids))
-      return false;
-    if (__isset.errorCode != rhs.__isset.errorCode)
-      return false;
-    else if (__isset.errorCode && !(errorCode == rhs.errorCode))
-      return false;
-    return true;
-  }
+  bool operator == (const AbortTxnsRequest & rhs) const;
   bool operator != (const AbortTxnsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9266,7 +6935,7 @@ class AbortTxnsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AbortTxnsRequest &a, AbortTxnsRequest &b);
+void swap(AbortTxnsRequest &a, AbortTxnsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AbortTxnsRequest& obj);
 
@@ -9276,11 +6945,7 @@ class CommitTxnKeyValue : public virtual ::apache::thrift::TBase {
 
   CommitTxnKeyValue(const CommitTxnKeyValue&);
   CommitTxnKeyValue& operator=(const CommitTxnKeyValue&);
-  CommitTxnKeyValue() noexcept
-                    : tableId(0),
-                      key(),
-                      value() {
-  }
+  CommitTxnKeyValue() noexcept;
 
   virtual ~CommitTxnKeyValue() noexcept;
   int64_t tableId;
@@ -9293,16 +6958,7 @@ class CommitTxnKeyValue : public virtual ::apache::thrift::TBase {
 
   void __set_value(const std::string& val);
 
-  bool operator == (const CommitTxnKeyValue & rhs) const
-  {
-    if (!(tableId == rhs.tableId))
-      return false;
-    if (!(key == rhs.key))
-      return false;
-    if (!(value == rhs.value))
-      return false;
-    return true;
-  }
+  bool operator == (const CommitTxnKeyValue & rhs) const;
   bool operator != (const CommitTxnKeyValue &rhs) const {
     return !(*this == rhs);
   }
@@ -9315,7 +6971,7 @@ class CommitTxnKeyValue : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CommitTxnKeyValue &a, CommitTxnKeyValue &b);
+void swap(CommitTxnKeyValue &a, CommitTxnKeyValue &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CommitTxnKeyValue& obj);
 
@@ -9331,15 +6987,7 @@ class WriteEventInfo : public virtual ::apache::thrift::TBase {
 
   WriteEventInfo(const WriteEventInfo&);
   WriteEventInfo& operator=(const WriteEventInfo&);
-  WriteEventInfo() noexcept
-                 : writeId(0),
-                   database(),
-                   table(),
-                   files(),
-                   partition(),
-                   tableObj(),
-                   partitionObj() {
-  }
+  WriteEventInfo() noexcept;
 
   virtual ~WriteEventInfo() noexcept;
   int64_t writeId;
@@ -9366,30 +7014,7 @@ class WriteEventInfo : public virtual ::apache::thrift::TBase {
 
   void __set_partitionObj(const std::string& val);
 
-  bool operator == (const WriteEventInfo & rhs) const
-  {
-    if (!(writeId == rhs.writeId))
-      return false;
-    if (!(database == rhs.database))
-      return false;
-    if (!(table == rhs.table))
-      return false;
-    if (!(files == rhs.files))
-      return false;
-    if (__isset.partition != rhs.__isset.partition)
-      return false;
-    else if (__isset.partition && !(partition == rhs.partition))
-      return false;
-    if (__isset.tableObj != rhs.__isset.tableObj)
-      return false;
-    else if (__isset.tableObj && !(tableObj == rhs.tableObj))
-      return false;
-    if (__isset.partitionObj != rhs.__isset.partitionObj)
-      return false;
-    else if (__isset.partitionObj && !(partitionObj == rhs.partitionObj))
-      return false;
-    return true;
-  }
+  bool operator == (const WriteEventInfo & rhs) const;
   bool operator != (const WriteEventInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -9402,7 +7027,7 @@ class WriteEventInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WriteEventInfo &a, WriteEventInfo &b);
+void swap(WriteEventInfo &a, WriteEventInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WriteEventInfo& obj);
 
@@ -9418,12 +7043,7 @@ class ReplLastIdInfo : public virtual ::apache::thrift::TBase {
 
   ReplLastIdInfo(const ReplLastIdInfo&);
   ReplLastIdInfo& operator=(const ReplLastIdInfo&);
-  ReplLastIdInfo() noexcept
-                 : database(),
-                   lastReplId(0),
-                   table(),
-                   catalog() {
-  }
+  ReplLastIdInfo() noexcept;
 
   virtual ~ReplLastIdInfo() noexcept;
   std::string database;
@@ -9444,26 +7064,7 @@ class ReplLastIdInfo : public virtual ::apache::thrift::TBase {
 
   void __set_partitionList(const std::vector<std::string> & val);
 
-  bool operator == (const ReplLastIdInfo & rhs) const
-  {
-    if (!(database == rhs.database))
-      return false;
-    if (!(lastReplId == rhs.lastReplId))
-      return false;
-    if (__isset.table != rhs.__isset.table)
-      return false;
-    else if (__isset.table && !(table == rhs.table))
-      return false;
-    if (__isset.catalog != rhs.__isset.catalog)
-      return false;
-    else if (__isset.catalog && !(catalog == rhs.catalog))
-      return false;
-    if (__isset.partitionList != rhs.__isset.partitionList)
-      return false;
-    else if (__isset.partitionList && !(partitionList == rhs.partitionList))
-      return false;
-    return true;
-  }
+  bool operator == (const ReplLastIdInfo & rhs) const;
   bool operator != (const ReplLastIdInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -9476,7 +7077,7 @@ class ReplLastIdInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ReplLastIdInfo &a, ReplLastIdInfo &b);
+void swap(ReplLastIdInfo &a, ReplLastIdInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ReplLastIdInfo& obj);
 
@@ -9486,12 +7087,7 @@ class UpdateTransactionalStatsRequest : public virtual ::apache::thrift::TBase {
 
   UpdateTransactionalStatsRequest(const UpdateTransactionalStatsRequest&) noexcept;
   UpdateTransactionalStatsRequest& operator=(const UpdateTransactionalStatsRequest&) noexcept;
-  UpdateTransactionalStatsRequest() noexcept
-                                  : tableId(0),
-                                    insertCount(0),
-                                    updatedCount(0),
-                                    deletedCount(0) {
-  }
+  UpdateTransactionalStatsRequest() noexcept;
 
   virtual ~UpdateTransactionalStatsRequest() noexcept;
   int64_t tableId;
@@ -9507,18 +7103,7 @@ class UpdateTransactionalStatsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_deletedCount(const int64_t val);
 
-  bool operator == (const UpdateTransactionalStatsRequest & rhs) const
-  {
-    if (!(tableId == rhs.tableId))
-      return false;
-    if (!(insertCount == rhs.insertCount))
-      return false;
-    if (!(updatedCount == rhs.updatedCount))
-      return false;
-    if (!(deletedCount == rhs.deletedCount))
-      return false;
-    return true;
-  }
+  bool operator == (const UpdateTransactionalStatsRequest & rhs) const;
   bool operator != (const UpdateTransactionalStatsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9531,7 +7116,7 @@ class UpdateTransactionalStatsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(UpdateTransactionalStatsRequest &a, UpdateTransactionalStatsRequest &b);
+void swap(UpdateTransactionalStatsRequest &a, UpdateTransactionalStatsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UpdateTransactionalStatsRequest& obj);
 
@@ -9550,12 +7135,7 @@ class CommitTxnRequest : public virtual ::apache::thrift::TBase {
 
   CommitTxnRequest(const CommitTxnRequest&);
   CommitTxnRequest& operator=(const CommitTxnRequest&);
-  CommitTxnRequest() noexcept
-                   : txnid(0),
-                     replPolicy(),
-                     exclWriteEnabled(true),
-                     txn_type(static_cast<TxnType::type>(0)) {
-  }
+  CommitTxnRequest() noexcept;
 
   virtual ~CommitTxnRequest() noexcept;
   int64_t txnid;
@@ -9586,36 +7166,7 @@ class CommitTxnRequest : public virtual ::apache::thrift::TBase {
 
   void __set_txn_type(const TxnType::type val);
 
-  bool operator == (const CommitTxnRequest & rhs) const
-  {
-    if (!(txnid == rhs.txnid))
-      return false;
-    if (__isset.replPolicy != rhs.__isset.replPolicy)
-      return false;
-    else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
-      return false;
-    if (__isset.writeEventInfos != rhs.__isset.writeEventInfos)
-      return false;
-    else if (__isset.writeEventInfos && !(writeEventInfos == rhs.writeEventInfos))
-      return false;
-    if (__isset.replLastIdInfo != rhs.__isset.replLastIdInfo)
-      return false;
-    else if (__isset.replLastIdInfo && !(replLastIdInfo == rhs.replLastIdInfo))
-      return false;
-    if (__isset.keyValue != rhs.__isset.keyValue)
-      return false;
-    else if (__isset.keyValue && !(keyValue == rhs.keyValue))
-      return false;
-    if (__isset.exclWriteEnabled != rhs.__isset.exclWriteEnabled)
-      return false;
-    else if (__isset.exclWriteEnabled && !(exclWriteEnabled == rhs.exclWriteEnabled))
-      return false;
-    if (__isset.txn_type != rhs.__isset.txn_type)
-      return false;
-    else if (__isset.txn_type && !(txn_type == rhs.txn_type))
-      return false;
-    return true;
-  }
+  bool operator == (const CommitTxnRequest & rhs) const;
   bool operator != (const CommitTxnRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9628,7 +7179,7 @@ class CommitTxnRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CommitTxnRequest &a, CommitTxnRequest &b);
+void swap(CommitTxnRequest &a, CommitTxnRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CommitTxnRequest& obj);
 
@@ -9642,13 +7193,7 @@ class ReplTblWriteIdStateRequest : public virtual ::apache::thrift::TBase {
 
   ReplTblWriteIdStateRequest(const ReplTblWriteIdStateRequest&);
   ReplTblWriteIdStateRequest& operator=(const ReplTblWriteIdStateRequest&);
-  ReplTblWriteIdStateRequest() noexcept
-                             : validWriteIdlist(),
-                               user(),
-                               hostName(),
-                               dbName(),
-                               tableName() {
-  }
+  ReplTblWriteIdStateRequest() noexcept;
 
   virtual ~ReplTblWriteIdStateRequest() noexcept;
   std::string validWriteIdlist;
@@ -9672,24 +7217,7 @@ class ReplTblWriteIdStateRequest : public virtual ::apache::thrift::TBase {
 
   void __set_partNames(const std::vector<std::string> & val);
 
-  bool operator == (const ReplTblWriteIdStateRequest & rhs) const
-  {
-    if (!(validWriteIdlist == rhs.validWriteIdlist))
-      return false;
-    if (!(user == rhs.user))
-      return false;
-    if (!(hostName == rhs.hostName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (__isset.partNames != rhs.__isset.partNames)
-      return false;
-    else if (__isset.partNames && !(partNames == rhs.partNames))
-      return false;
-    return true;
-  }
+  bool operator == (const ReplTblWriteIdStateRequest & rhs) const;
   bool operator != (const ReplTblWriteIdStateRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9702,7 +7230,7 @@ class ReplTblWriteIdStateRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ReplTblWriteIdStateRequest &a, ReplTblWriteIdStateRequest &b);
+void swap(ReplTblWriteIdStateRequest &a, ReplTblWriteIdStateRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ReplTblWriteIdStateRequest& obj);
 
@@ -9717,10 +7245,7 @@ class GetValidWriteIdsRequest : public virtual ::apache::thrift::TBase {
 
   GetValidWriteIdsRequest(const GetValidWriteIdsRequest&);
   GetValidWriteIdsRequest& operator=(const GetValidWriteIdsRequest&);
-  GetValidWriteIdsRequest() noexcept
-                          : validTxnList(),
-                            writeId(0) {
-  }
+  GetValidWriteIdsRequest() noexcept;
 
   virtual ~GetValidWriteIdsRequest() noexcept;
   std::vector<std::string>  fullTableNames;
@@ -9735,20 +7260,7 @@ class GetValidWriteIdsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_writeId(const int64_t val);
 
-  bool operator == (const GetValidWriteIdsRequest & rhs) const
-  {
-    if (!(fullTableNames == rhs.fullTableNames))
-      return false;
-    if (__isset.validTxnList != rhs.__isset.validTxnList)
-      return false;
-    else if (__isset.validTxnList && !(validTxnList == rhs.validTxnList))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    return true;
-  }
+  bool operator == (const GetValidWriteIdsRequest & rhs) const;
   bool operator != (const GetValidWriteIdsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9761,7 +7273,7 @@ class GetValidWriteIdsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetValidWriteIdsRequest &a, GetValidWriteIdsRequest &b);
+void swap(GetValidWriteIdsRequest &a, GetValidWriteIdsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetValidWriteIdsRequest& obj);
 
@@ -9775,12 +7287,7 @@ class TableValidWriteIds : public virtual ::apache::thrift::TBase {
 
   TableValidWriteIds(const TableValidWriteIds&);
   TableValidWriteIds& operator=(const TableValidWriteIds&);
-  TableValidWriteIds() noexcept
-                     : fullTableName(),
-                       writeIdHighWaterMark(0),
-                       minOpenWriteId(0),
-                       abortedBits() {
-  }
+  TableValidWriteIds() noexcept;
 
   virtual ~TableValidWriteIds() noexcept;
   std::string fullTableName;
@@ -9801,22 +7308,7 @@ class TableValidWriteIds : public virtual ::apache::thrift::TBase {
 
   void __set_abortedBits(const std::string& val);
 
-  bool operator == (const TableValidWriteIds & rhs) const
-  {
-    if (!(fullTableName == rhs.fullTableName))
-      return false;
-    if (!(writeIdHighWaterMark == rhs.writeIdHighWaterMark))
-      return false;
-    if (!(invalidWriteIds == rhs.invalidWriteIds))
-      return false;
-    if (__isset.minOpenWriteId != rhs.__isset.minOpenWriteId)
-      return false;
-    else if (__isset.minOpenWriteId && !(minOpenWriteId == rhs.minOpenWriteId))
-      return false;
-    if (!(abortedBits == rhs.abortedBits))
-      return false;
-    return true;
-  }
+  bool operator == (const TableValidWriteIds & rhs) const;
   bool operator != (const TableValidWriteIds &rhs) const {
     return !(*this == rhs);
   }
@@ -9829,7 +7321,7 @@ class TableValidWriteIds : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TableValidWriteIds &a, TableValidWriteIds &b);
+void swap(TableValidWriteIds &a, TableValidWriteIds &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TableValidWriteIds& obj);
 
@@ -9839,20 +7331,14 @@ class GetValidWriteIdsResponse : public virtual ::apache::thrift::TBase {
 
   GetValidWriteIdsResponse(const GetValidWriteIdsResponse&);
   GetValidWriteIdsResponse& operator=(const GetValidWriteIdsResponse&);
-  GetValidWriteIdsResponse() noexcept {
-  }
+  GetValidWriteIdsResponse() noexcept;
 
   virtual ~GetValidWriteIdsResponse() noexcept;
   std::vector<TableValidWriteIds>  tblValidWriteIds;
 
   void __set_tblValidWriteIds(const std::vector<TableValidWriteIds> & val);
 
-  bool operator == (const GetValidWriteIdsResponse & rhs) const
-  {
-    if (!(tblValidWriteIds == rhs.tblValidWriteIds))
-      return false;
-    return true;
-  }
+  bool operator == (const GetValidWriteIdsResponse & rhs) const;
   bool operator != (const GetValidWriteIdsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -9865,7 +7351,7 @@ class GetValidWriteIdsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetValidWriteIdsResponse &a, GetValidWriteIdsResponse &b);
+void swap(GetValidWriteIdsResponse &a, GetValidWriteIdsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetValidWriteIdsResponse& obj);
 
@@ -9875,10 +7361,7 @@ class TxnToWriteId : public virtual ::apache::thrift::TBase {
 
   TxnToWriteId(const TxnToWriteId&) noexcept;
   TxnToWriteId& operator=(const TxnToWriteId&) noexcept;
-  TxnToWriteId() noexcept
-               : txnId(0),
-                 writeId(0) {
-  }
+  TxnToWriteId() noexcept;
 
   virtual ~TxnToWriteId() noexcept;
   int64_t txnId;
@@ -9888,14 +7371,7 @@ class TxnToWriteId : public virtual ::apache::thrift::TBase {
 
   void __set_writeId(const int64_t val);
 
-  bool operator == (const TxnToWriteId & rhs) const
-  {
-    if (!(txnId == rhs.txnId))
-      return false;
-    if (!(writeId == rhs.writeId))
-      return false;
-    return true;
-  }
+  bool operator == (const TxnToWriteId & rhs) const;
   bool operator != (const TxnToWriteId &rhs) const {
     return !(*this == rhs);
   }
@@ -9908,7 +7384,7 @@ class TxnToWriteId : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TxnToWriteId &a, TxnToWriteId &b);
+void swap(TxnToWriteId &a, TxnToWriteId &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TxnToWriteId& obj);
 
@@ -9925,12 +7401,7 @@ class AllocateTableWriteIdsRequest : public virtual ::apache::thrift::TBase {
 
   AllocateTableWriteIdsRequest(const AllocateTableWriteIdsRequest&);
   AllocateTableWriteIdsRequest& operator=(const AllocateTableWriteIdsRequest&);
-  AllocateTableWriteIdsRequest() noexcept
-                               : dbName(),
-                                 tableName(),
-                                 replPolicy(),
-                                 reallocate(false) {
-  }
+  AllocateTableWriteIdsRequest() noexcept;
 
   virtual ~AllocateTableWriteIdsRequest() noexcept;
   std::string dbName;
@@ -9954,30 +7425,7 @@ class AllocateTableWriteIdsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_reallocate(const bool val);
 
-  bool operator == (const AllocateTableWriteIdsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (__isset.txnIds != rhs.__isset.txnIds)
-      return false;
-    else if (__isset.txnIds && !(txnIds == rhs.txnIds))
-      return false;
-    if (__isset.replPolicy != rhs.__isset.replPolicy)
-      return false;
-    else if (__isset.replPolicy && !(replPolicy == rhs.replPolicy))
-      return false;
-    if (__isset.srcTxnToWriteIdList != rhs.__isset.srcTxnToWriteIdList)
-      return false;
-    else if (__isset.srcTxnToWriteIdList && !(srcTxnToWriteIdList == rhs.srcTxnToWriteIdList))
-      return false;
-    if (__isset.reallocate != rhs.__isset.reallocate)
-      return false;
-    else if (__isset.reallocate && !(reallocate == rhs.reallocate))
-      return false;
-    return true;
-  }
+  bool operator == (const AllocateTableWriteIdsRequest & rhs) const;
   bool operator != (const AllocateTableWriteIdsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -9990,7 +7438,7 @@ class AllocateTableWriteIdsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AllocateTableWriteIdsRequest &a, AllocateTableWriteIdsRequest &b);
+void swap(AllocateTableWriteIdsRequest &a, AllocateTableWriteIdsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AllocateTableWriteIdsRequest& obj);
 
@@ -10000,20 +7448,14 @@ class AllocateTableWriteIdsResponse : public virtual ::apache::thrift::TBase {
 
   AllocateTableWriteIdsResponse(const AllocateTableWriteIdsResponse&);
   AllocateTableWriteIdsResponse& operator=(const AllocateTableWriteIdsResponse&);
-  AllocateTableWriteIdsResponse() noexcept {
-  }
+  AllocateTableWriteIdsResponse() noexcept;
 
   virtual ~AllocateTableWriteIdsResponse() noexcept;
   std::vector<TxnToWriteId>  txnToWriteIds;
 
   void __set_txnToWriteIds(const std::vector<TxnToWriteId> & val);
 
-  bool operator == (const AllocateTableWriteIdsResponse & rhs) const
-  {
-    if (!(txnToWriteIds == rhs.txnToWriteIds))
-      return false;
-    return true;
-  }
+  bool operator == (const AllocateTableWriteIdsResponse & rhs) const;
   bool operator != (const AllocateTableWriteIdsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -10026,7 +7468,7 @@ class AllocateTableWriteIdsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AllocateTableWriteIdsResponse &a, AllocateTableWriteIdsResponse &b);
+void swap(AllocateTableWriteIdsResponse &a, AllocateTableWriteIdsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AllocateTableWriteIdsResponse& obj);
 
@@ -10036,10 +7478,7 @@ class MaxAllocatedTableWriteIdRequest : public virtual ::apache::thrift::TBase {
 
   MaxAllocatedTableWriteIdRequest(const MaxAllocatedTableWriteIdRequest&);
   MaxAllocatedTableWriteIdRequest& operator=(const MaxAllocatedTableWriteIdRequest&);
-  MaxAllocatedTableWriteIdRequest() noexcept
-                                  : dbName(),
-                                    tableName() {
-  }
+  MaxAllocatedTableWriteIdRequest() noexcept;
 
   virtual ~MaxAllocatedTableWriteIdRequest() noexcept;
   std::string dbName;
@@ -10049,14 +7488,7 @@ class MaxAllocatedTableWriteIdRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tableName(const std::string& val);
 
-  bool operator == (const MaxAllocatedTableWriteIdRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    return true;
-  }
+  bool operator == (const MaxAllocatedTableWriteIdRequest & rhs) const;
   bool operator != (const MaxAllocatedTableWriteIdRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10069,7 +7501,7 @@ class MaxAllocatedTableWriteIdRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(MaxAllocatedTableWriteIdRequest &a, MaxAllocatedTableWriteIdRequest &b);
+void swap(MaxAllocatedTableWriteIdRequest &a, MaxAllocatedTableWriteIdRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MaxAllocatedTableWriteIdRequest& obj);
 
@@ -10079,21 +7511,14 @@ class MaxAllocatedTableWriteIdResponse : public virtual ::apache::thrift::TBase
 
   MaxAllocatedTableWriteIdResponse(const MaxAllocatedTableWriteIdResponse&) noexcept;
   MaxAllocatedTableWriteIdResponse& operator=(const MaxAllocatedTableWriteIdResponse&) noexcept;
-  MaxAllocatedTableWriteIdResponse() noexcept
-                                   : maxWriteId(0) {
-  }
+  MaxAllocatedTableWriteIdResponse() noexcept;
 
   virtual ~MaxAllocatedTableWriteIdResponse() noexcept;
   int64_t maxWriteId;
 
   void __set_maxWriteId(const int64_t val);
 
-  bool operator == (const MaxAllocatedTableWriteIdResponse & rhs) const
-  {
-    if (!(maxWriteId == rhs.maxWriteId))
-      return false;
-    return true;
-  }
+  bool operator == (const MaxAllocatedTableWriteIdResponse & rhs) const;
   bool operator != (const MaxAllocatedTableWriteIdResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -10106,7 +7531,7 @@ class MaxAllocatedTableWriteIdResponse : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(MaxAllocatedTableWriteIdResponse &a, MaxAllocatedTableWriteIdResponse &b);
+void swap(MaxAllocatedTableWriteIdResponse &a, MaxAllocatedTableWriteIdResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MaxAllocatedTableWriteIdResponse& obj);
 
@@ -10116,11 +7541,7 @@ class SeedTableWriteIdsRequest : public virtual ::apache::thrift::TBase {
 
   SeedTableWriteIdsRequest(const SeedTableWriteIdsRequest&);
   SeedTableWriteIdsRequest& operator=(const SeedTableWriteIdsRequest&);
-  SeedTableWriteIdsRequest() noexcept
-                           : dbName(),
-                             tableName(),
-                             seedWriteId(0) {
-  }
+  SeedTableWriteIdsRequest() noexcept;
 
   virtual ~SeedTableWriteIdsRequest() noexcept;
   std::string dbName;
@@ -10133,16 +7554,7 @@ class SeedTableWriteIdsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_seedWriteId(const int64_t val);
 
-  bool operator == (const SeedTableWriteIdsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(seedWriteId == rhs.seedWriteId))
-      return false;
-    return true;
-  }
+  bool operator == (const SeedTableWriteIdsRequest & rhs) const;
   bool operator != (const SeedTableWriteIdsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10155,7 +7567,7 @@ class SeedTableWriteIdsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SeedTableWriteIdsRequest &a, SeedTableWriteIdsRequest &b);
+void swap(SeedTableWriteIdsRequest &a, SeedTableWriteIdsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SeedTableWriteIdsRequest& obj);
 
@@ -10165,21 +7577,14 @@ class SeedTxnIdRequest : public virtual ::apache::thrift::TBase {
 
   SeedTxnIdRequest(const SeedTxnIdRequest&) noexcept;
   SeedTxnIdRequest& operator=(const SeedTxnIdRequest&) noexcept;
-  SeedTxnIdRequest() noexcept
-                   : seedTxnId(0) {
-  }
+  SeedTxnIdRequest() noexcept;
 
   virtual ~SeedTxnIdRequest() noexcept;
   int64_t seedTxnId;
 
   void __set_seedTxnId(const int64_t val);
 
-  bool operator == (const SeedTxnIdRequest & rhs) const
-  {
-    if (!(seedTxnId == rhs.seedTxnId))
-      return false;
-    return true;
-  }
+  bool operator == (const SeedTxnIdRequest & rhs) const;
   bool operator != (const SeedTxnIdRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10192,7 +7597,7 @@ class SeedTxnIdRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SeedTxnIdRequest &a, SeedTxnIdRequest &b);
+void swap(SeedTxnIdRequest &a, SeedTxnIdRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SeedTxnIdRequest& obj);
 
@@ -10211,18 +7616,7 @@ class LockComponent : public virtual ::apache::thrift::TBase {
 
   LockComponent(const LockComponent&);
   LockComponent& operator=(const LockComponent&);
-  LockComponent() : type(static_cast<LockType::type>(0)),
-                    level(static_cast<LockLevel::type>(0)),
-                    dbname(),
-                    tablename(),
-                    partitionname(),
-                    operationType((DataOperationType::type)5),
-                    isTransactional(false),
-                    isDynamicPartitionWrite(false),
-                    catName("hive") {
-    operationType = (DataOperationType::type)5;
-
-  }
+  LockComponent();
 
   virtual ~LockComponent() noexcept;
   /**
@@ -10267,40 +7661,7 @@ class LockComponent : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const LockComponent & rhs) const
-  {
-    if (!(type == rhs.type))
-      return false;
-    if (!(level == rhs.level))
-      return false;
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (__isset.tablename != rhs.__isset.tablename)
-      return false;
-    else if (__isset.tablename && !(tablename == rhs.tablename))
-      return false;
-    if (__isset.partitionname != rhs.__isset.partitionname)
-      return false;
-    else if (__isset.partitionname && !(partitionname == rhs.partitionname))
-      return false;
-    if (__isset.operationType != rhs.__isset.operationType)
-      return false;
-    else if (__isset.operationType && !(operationType == rhs.operationType))
-      return false;
-    if (__isset.isTransactional != rhs.__isset.isTransactional)
-      return false;
-    else if (__isset.isTransactional && !(isTransactional == rhs.isTransactional))
-      return false;
-    if (__isset.isDynamicPartitionWrite != rhs.__isset.isDynamicPartitionWrite)
-      return false;
-    else if (__isset.isDynamicPartitionWrite && !(isDynamicPartitionWrite == rhs.isDynamicPartitionWrite))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const LockComponent & rhs) const;
   bool operator != (const LockComponent &rhs) const {
     return !(*this == rhs);
   }
@@ -10313,7 +7674,7 @@ class LockComponent : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(LockComponent &a, LockComponent &b);
+void swap(LockComponent &a, LockComponent &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const LockComponent& obj);
 
@@ -10331,14 +7692,7 @@ class LockRequest : public virtual ::apache::thrift::TBase {
 
   LockRequest(const LockRequest&);
   LockRequest& operator=(const LockRequest&);
-  LockRequest() : txnid(0),
-                  user(),
-                  hostname(),
-                  agentInfo("Unknown"),
-                  zeroWaitReadEnabled(false),
-                  exclusiveCTAS(false),
-                  locklessReadsEnabled(false) {
-  }
+  LockRequest();
 
   virtual ~LockRequest() noexcept;
   std::vector<LockComponent>  component;
@@ -10368,36 +7722,7 @@ class LockRequest : public virtual ::apache::thrift::TBase {
 
   void __set_locklessReadsEnabled(const bool val);
 
-  bool operator == (const LockRequest & rhs) const
-  {
-    if (!(component == rhs.component))
-      return false;
-    if (__isset.txnid != rhs.__isset.txnid)
-      return false;
-    else if (__isset.txnid && !(txnid == rhs.txnid))
-      return false;
-    if (!(user == rhs.user))
-      return false;
-    if (!(hostname == rhs.hostname))
-      return false;
-    if (__isset.agentInfo != rhs.__isset.agentInfo)
-      return false;
-    else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
-      return false;
-    if (__isset.zeroWaitReadEnabled != rhs.__isset.zeroWaitReadEnabled)
-      return false;
-    else if (__isset.zeroWaitReadEnabled && !(zeroWaitReadEnabled == rhs.zeroWaitReadEnabled))
-      return false;
-    if (__isset.exclusiveCTAS != rhs.__isset.exclusiveCTAS)
-      return false;
-    else if (__isset.exclusiveCTAS && !(exclusiveCTAS == rhs.exclusiveCTAS))
-      return false;
-    if (__isset.locklessReadsEnabled != rhs.__isset.locklessReadsEnabled)
-      return false;
-    else if (__isset.locklessReadsEnabled && !(locklessReadsEnabled == rhs.locklessReadsEnabled))
-      return false;
-    return true;
-  }
+  bool operator == (const LockRequest & rhs) const;
   bool operator != (const LockRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10410,7 +7735,7 @@ class LockRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(LockRequest &a, LockRequest &b);
+void swap(LockRequest &a, LockRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const LockRequest& obj);
 
@@ -10424,11 +7749,7 @@ class LockResponse : public virtual ::apache::thrift::TBase {
 
   LockResponse(const LockResponse&);
   LockResponse& operator=(const LockResponse&);
-  LockResponse() noexcept
-               : lockid(0),
-                 state(static_cast<LockState::type>(0)),
-                 errorMessage() {
-  }
+  LockResponse() noexcept;
 
   virtual ~LockResponse() noexcept;
   int64_t lockid;
@@ -10447,18 +7768,7 @@ class LockResponse : public virtual ::apache::thrift::TBase {
 
   void __set_errorMessage(const std::string& val);
 
-  bool operator == (const LockResponse & rhs) const
-  {
-    if (!(lockid == rhs.lockid))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    return true;
-  }
+  bool operator == (const LockResponse & rhs) const;
   bool operator != (const LockResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -10471,7 +7781,7 @@ class LockResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(LockResponse &a, LockResponse &b);
+void swap(LockResponse &a, LockResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const LockResponse& obj);
 
@@ -10486,11 +7796,7 @@ class CheckLockRequest : public virtual ::apache::thrift::TBase {
 
   CheckLockRequest(const CheckLockRequest&) noexcept;
   CheckLockRequest& operator=(const CheckLockRequest&) noexcept;
-  CheckLockRequest() noexcept
-                   : lockid(0),
-                     txnid(0),
-                     elapsed_ms(0) {
-  }
+  CheckLockRequest() noexcept;
 
   virtual ~CheckLockRequest() noexcept;
   int64_t lockid;
@@ -10505,20 +7811,7 @@ class CheckLockRequest : public virtual ::apache::thrift::TBase {
 
   void __set_elapsed_ms(const int64_t val);
 
-  bool operator == (const CheckLockRequest & rhs) const
-  {
-    if (!(lockid == rhs.lockid))
-      return false;
-    if (__isset.txnid != rhs.__isset.txnid)
-      return false;
-    else if (__isset.txnid && !(txnid == rhs.txnid))
-      return false;
-    if (__isset.elapsed_ms != rhs.__isset.elapsed_ms)
-      return false;
-    else if (__isset.elapsed_ms && !(elapsed_ms == rhs.elapsed_ms))
-      return false;
-    return true;
-  }
+  bool operator == (const CheckLockRequest & rhs) const;
   bool operator != (const CheckLockRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10531,7 +7824,7 @@ class CheckLockRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CheckLockRequest &a, CheckLockRequest &b);
+void swap(CheckLockRequest &a, CheckLockRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CheckLockRequest& obj);
 
@@ -10541,21 +7834,14 @@ class UnlockRequest : public virtual ::apache::thrift::TBase {
 
   UnlockRequest(const UnlockRequest&) noexcept;
   UnlockRequest& operator=(const UnlockRequest&) noexcept;
-  UnlockRequest() noexcept
-                : lockid(0) {
-  }
+  UnlockRequest() noexcept;
 
   virtual ~UnlockRequest() noexcept;
   int64_t lockid;
 
   void __set_lockid(const int64_t val);
 
-  bool operator == (const UnlockRequest & rhs) const
-  {
-    if (!(lockid == rhs.lockid))
-      return false;
-    return true;
-  }
+  bool operator == (const UnlockRequest & rhs) const;
   bool operator != (const UnlockRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10568,7 +7854,7 @@ class UnlockRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(UnlockRequest &a, UnlockRequest &b);
+void swap(UnlockRequest &a, UnlockRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UnlockRequest& obj);
 
@@ -10587,13 +7873,7 @@ class ShowLocksRequest : public virtual ::apache::thrift::TBase {
 
   ShowLocksRequest(const ShowLocksRequest&);
   ShowLocksRequest& operator=(const ShowLocksRequest&);
-  ShowLocksRequest() : dbname(),
-                       tablename(),
-                       partname(),
-                       isExtended(false),
-                       txnid(0),
-                       catname("hive") {
-  }
+  ShowLocksRequest();
 
   virtual ~ShowLocksRequest() noexcept;
   std::string dbname;
@@ -10617,34 +7897,7 @@ class ShowLocksRequest : public virtual ::apache::thrift::TBase {
 
   void __set_catname(const std::string& val);
 
-  bool operator == (const ShowLocksRequest & rhs) const
-  {
-    if (__isset.dbname != rhs.__isset.dbname)
-      return false;
-    else if (__isset.dbname && !(dbname == rhs.dbname))
-      return false;
-    if (__isset.tablename != rhs.__isset.tablename)
-      return false;
-    else if (__isset.tablename && !(tablename == rhs.tablename))
-      return false;
-    if (__isset.partname != rhs.__isset.partname)
-      return false;
-    else if (__isset.partname && !(partname == rhs.partname))
-      return false;
-    if (__isset.isExtended != rhs.__isset.isExtended)
-      return false;
-    else if (__isset.isExtended && !(isExtended == rhs.isExtended))
-      return false;
-    if (__isset.txnid != rhs.__isset.txnid)
-      return false;
-    else if (__isset.txnid && !(txnid == rhs.txnid))
-      return false;
-    if (__isset.catname != rhs.__isset.catname)
-      return false;
-    else if (__isset.catname && !(catname == rhs.catname))
-      return false;
-    return true;
-  }
+  bool operator == (const ShowLocksRequest & rhs) const;
   bool operator != (const ShowLocksRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10657,7 +7910,7 @@ class ShowLocksRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ShowLocksRequest &a, ShowLocksRequest &b);
+void swap(ShowLocksRequest &a, ShowLocksRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ShowLocksRequest& obj);
 
@@ -10679,25 +7932,7 @@ class ShowLocksResponseElement : public virtual ::apache::thrift::TBase {
 
   ShowLocksResponseElement(const ShowLocksResponseElement&);
   ShowLocksResponseElement& operator=(const ShowLocksResponseElement&);
-  ShowLocksResponseElement() noexcept
-                           : lockid(0),
-                             dbname(),
-                             tablename(),
-                             partname(),
-                             state(static_cast<LockState::type>(0)),
-                             type(static_cast<LockType::type>(0)),
-                             txnid(0),
-                             lastheartbeat(0),
-                             acquiredat(0),
-                             user(),
-                             hostname(),
-                             heartbeatCount(0),
-                             agentInfo(),
-                             blockedByExtId(0),
-                             blockedByIntId(0),
-                             lockIdInternal(0),
-                             catname() {
-  }
+  ShowLocksResponseElement() noexcept;
 
   virtual ~ShowLocksResponseElement() noexcept;
   int64_t lockid;
@@ -10762,62 +7997,7 @@ class ShowLocksResponseElement : public virtual ::apache::thrift::TBase {
 
   void __set_catname(const std::string& val);
 
-  bool operator == (const ShowLocksResponseElement & rhs) const
-  {
-    if (!(lockid == rhs.lockid))
-      return false;
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (__isset.tablename != rhs.__isset.tablename)
-      return false;
-    else if (__isset.tablename && !(tablename == rhs.tablename))
-      return false;
-    if (__isset.partname != rhs.__isset.partname)
-      return false;
-    else if (__isset.partname && !(partname == rhs.partname))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (__isset.txnid != rhs.__isset.txnid)
-      return false;
-    else if (__isset.txnid && !(txnid == rhs.txnid))
-      return false;
-    if (!(lastheartbeat == rhs.lastheartbeat))
-      return false;
-    if (__isset.acquiredat != rhs.__isset.acquiredat)
-      return false;
-    else if (__isset.acquiredat && !(acquiredat == rhs.acquiredat))
-      return false;
-    if (!(user == rhs.user))
-      return false;
-    if (!(hostname == rhs.hostname))
-      return false;
-    if (__isset.heartbeatCount != rhs.__isset.heartbeatCount)
-      return false;
-    else if (__isset.heartbeatCount && !(heartbeatCount == rhs.heartbeatCount))
-      return false;
-    if (__isset.agentInfo != rhs.__isset.agentInfo)
-      return false;
-    else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo))
-      return false;
-    if (__isset.blockedByExtId != rhs.__isset.blockedByExtId)
-      return false;
-    else if (__isset.blockedByExtId && !(blockedByExtId == rhs.blockedByExtId))
-      return false;
-    if (__isset.blockedByIntId != rhs.__isset.blockedByIntId)
-      return false;
-    else if (__isset.blockedByIntId && !(blockedByIntId == rhs.blockedByIntId))
-      return false;
-    if (__isset.lockIdInternal != rhs.__isset.lockIdInternal)
-      return false;
-    else if (__isset.lockIdInternal && !(lockIdInternal == rhs.lockIdInternal))
-      return false;
-    if (!(catname == rhs.catname))
-      return false;
-    return true;
-  }
+  bool operator == (const ShowLocksResponseElement & rhs) const;
   bool operator != (const ShowLocksResponseElement &rhs) const {
     return !(*this == rhs);
   }
@@ -10830,7 +8010,7 @@ class ShowLocksResponseElement : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ShowLocksResponseElement &a, ShowLocksResponseElement &b);
+void swap(ShowLocksResponseElement &a, ShowLocksResponseElement &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ShowLocksResponseElement& obj);
 
@@ -10840,12 +8020,7 @@ class LockMaterializationRebuildRequest : public virtual ::apache::thrift::TBase
 
   LockMaterializationRebuildRequest(const LockMaterializationRebuildRequest&);
   LockMaterializationRebuildRequest& operator=(const LockMaterializationRebuildRequest&);
-  LockMaterializationRebuildRequest() noexcept
-                                    : catName(),
-                                      dbName(),
-                                      tableName(),
-                                      txnId(0) {
-  }
+  LockMaterializationRebuildRequest() noexcept;
 
   virtual ~LockMaterializationRebuildRequest() noexcept;
   std::string catName;
@@ -10861,18 +8036,7 @@ class LockMaterializationRebuildRequest : public virtual ::apache::thrift::TBase
 
   void __set_txnId(const int64_t val);
 
-  bool operator == (const LockMaterializationRebuildRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(txnId == rhs.txnId))
-      return false;
-    return true;
-  }
+  bool operator == (const LockMaterializationRebuildRequest & rhs) const;
   bool operator != (const LockMaterializationRebuildRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10885,7 +8049,7 @@ class LockMaterializationRebuildRequest : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(LockMaterializationRebuildRequest &a, LockMaterializationRebuildRequest &b);
+void swap(LockMaterializationRebuildRequest &a, LockMaterializationRebuildRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const LockMaterializationRebuildRequest& obj);
 
@@ -10899,8 +8063,7 @@ class ShowLocksResponse : public virtual ::apache::thrift::TBase {
 
   ShowLocksResponse(const ShowLocksResponse&);
   ShowLocksResponse& operator=(const ShowLocksResponse&);
-  ShowLocksResponse() noexcept {
-  }
+  ShowLocksResponse() noexcept;
 
   virtual ~ShowLocksResponse() noexcept;
   std::vector<ShowLocksResponseElement>  locks;
@@ -10909,12 +8072,7 @@ class ShowLocksResponse : public virtual ::apache::thrift::TBase {
 
   void __set_locks(const std::vector<ShowLocksResponseElement> & val);
 
-  bool operator == (const ShowLocksResponse & rhs) const
-  {
-    if (!(locks == rhs.locks))
-      return false;
-    return true;
-  }
+  bool operator == (const ShowLocksResponse & rhs) const;
   bool operator != (const ShowLocksResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -10927,7 +8085,7 @@ class ShowLocksResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ShowLocksResponse &a, ShowLocksResponse &b);
+void swap(ShowLocksResponse &a, ShowLocksResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ShowLocksResponse& obj);
 
@@ -10942,10 +8100,7 @@ class HeartbeatRequest : public virtual ::apache::thrift::TBase {
 
   HeartbeatRequest(const HeartbeatRequest&) noexcept;
   HeartbeatRequest& operator=(const HeartbeatRequest&) noexcept;
-  HeartbeatRequest() noexcept
-                   : lockid(0),
-                     txnid(0) {
-  }
+  HeartbeatRequest() noexcept;
 
   virtual ~HeartbeatRequest() noexcept;
   int64_t lockid;
@@ -10957,18 +8112,7 @@ class HeartbeatRequest : public virtual ::apache::thrift::TBase {
 
   void __set_txnid(const int64_t val);
 
-  bool operator == (const HeartbeatRequest & rhs) const
-  {
-    if (__isset.lockid != rhs.__isset.lockid)
-      return false;
-    else if (__isset.lockid && !(lockid == rhs.lockid))
-      return false;
-    if (__isset.txnid != rhs.__isset.txnid)
-      return false;
-    else if (__isset.txnid && !(txnid == rhs.txnid))
-      return false;
-    return true;
-  }
+  bool operator == (const HeartbeatRequest & rhs) const;
   bool operator != (const HeartbeatRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -10981,7 +8125,7 @@ class HeartbeatRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(HeartbeatRequest &a, HeartbeatRequest &b);
+void swap(HeartbeatRequest &a, HeartbeatRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const HeartbeatRequest& obj);
 
@@ -10991,10 +8135,7 @@ class HeartbeatTxnRangeRequest : public virtual ::apache::thrift::TBase {
 
   HeartbeatTxnRangeRequest(const HeartbeatTxnRangeRequest&) noexcept;
   HeartbeatTxnRangeRequest& operator=(const HeartbeatTxnRangeRequest&) noexcept;
-  HeartbeatTxnRangeRequest() noexcept
-                           : min(0),
-                             max(0) {
-  }
+  HeartbeatTxnRangeRequest() noexcept;
 
   virtual ~HeartbeatTxnRangeRequest() noexcept;
   int64_t min;
@@ -11004,14 +8145,7 @@ class HeartbeatTxnRangeRequest : public virtual ::apache::thrift::TBase {
 
   void __set_max(const int64_t val);
 
-  bool operator == (const HeartbeatTxnRangeRequest & rhs) const
-  {
-    if (!(min == rhs.min))
-      return false;
-    if (!(max == rhs.max))
-      return false;
-    return true;
-  }
+  bool operator == (const HeartbeatTxnRangeRequest & rhs) const;
   bool operator != (const HeartbeatTxnRangeRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -11024,7 +8158,7 @@ class HeartbeatTxnRangeRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(HeartbeatTxnRangeRequest &a, HeartbeatTxnRangeRequest &b);
+void swap(HeartbeatTxnRangeRequest &a, HeartbeatTxnRangeRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const HeartbeatTxnRangeRequest& obj);
 
@@ -11034,8 +8168,7 @@ class HeartbeatTxnRangeResponse : public virtual ::apache::thrift::TBase {
 
   HeartbeatTxnRangeResponse(const HeartbeatTxnRangeResponse&);
   HeartbeatTxnRangeResponse& operator=(const HeartbeatTxnRangeResponse&);
-  HeartbeatTxnRangeResponse() noexcept {
-  }
+  HeartbeatTxnRangeResponse() noexcept;
 
   virtual ~HeartbeatTxnRangeResponse() noexcept;
   std::set<int64_t>  aborted;
@@ -11045,14 +8178,7 @@ class HeartbeatTxnRangeResponse : public virtual ::apache::thrift::TBase {
 
   void __set_nosuch(const std::set<int64_t> & val);
 
-  bool operator == (const HeartbeatTxnRangeResponse & rhs) const
-  {
-    if (!(aborted == rhs.aborted))
-      return false;
-    if (!(nosuch == rhs.nosuch))
-      return false;
-    return true;
-  }
+  bool operator == (const HeartbeatTxnRangeResponse & rhs) const;
   bool operator != (const HeartbeatTxnRangeResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -11065,7 +8191,7 @@ class HeartbeatTxnRangeResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(HeartbeatTxnRangeResponse &a, HeartbeatTxnRangeResponse &b);
+void swap(HeartbeatTxnRangeResponse &a, HeartbeatTxnRangeResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const HeartbeatTxnRangeResponse& obj);
 
@@ -11086,18 +8212,7 @@ class CompactionRequest : public virtual ::apache::thrift::TBase {
 
   CompactionRequest(const CompactionRequest&);
   CompactionRequest& operator=(const CompactionRequest&);
-  CompactionRequest() noexcept
-                    : dbname(),
-                      tablename(),
-                      partitionname(),
-                      type(static_cast<CompactionType::type>(0)),
-                      runas(),
-                      initiatorId(),
-                      initiatorVersion(),
-                      poolName(),
-                      numberOfBuckets(0),
-                      orderByClause() {
-  }
+  CompactionRequest() noexcept;
 
   virtual ~CompactionRequest() noexcept;
   std::string dbname;
@@ -11140,48 +8255,7 @@ class CompactionRequest : public virtual ::apache::thrift::TBase {
 
   void __set_orderByClause(const std::string& val);
 
-  bool operator == (const CompactionRequest & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tablename == rhs.tablename))
-      return false;
-    if (__isset.partitionname != rhs.__isset.partitionname)
-      return false;
-    else if (__isset.partitionname && !(partitionname == rhs.partitionname))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (__isset.runas != rhs.__isset.runas)
-      return false;
-    else if (__isset.runas && !(runas == rhs.runas))
-      return false;
-    if (__isset.properties != rhs.__isset.properties)
-      return false;
-    else if (__isset.properties && !(properties == rhs.properties))
-      return false;
-    if (__isset.initiatorId != rhs.__isset.initiatorId)
-      return false;
-    else if (__isset.initiatorId && !(initiatorId == rhs.initiatorId))
-      return false;
-    if (__isset.initiatorVersion != rhs.__isset.initiatorVersion)
-      return false;
-    else if (__isset.initiatorVersion && !(initiatorVersion == rhs.initiatorVersion))
-      return false;
-    if (__isset.poolName != rhs.__isset.poolName)
-      return false;
-    else if (__isset.poolName && !(poolName == rhs.poolName))
-      return false;
-    if (__isset.numberOfBuckets != rhs.__isset.numberOfBuckets)
-      return false;
-    else if (__isset.numberOfBuckets && !(numberOfBuckets == rhs.numberOfBuckets))
-      return false;
-    if (__isset.orderByClause != rhs.__isset.orderByClause)
-      return false;
-    else if (__isset.orderByClause && !(orderByClause == rhs.orderByClause))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionRequest & rhs) const;
   bool operator != (const CompactionRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -11194,7 +8268,7 @@ class CompactionRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CompactionRequest &a, CompactionRequest &b);
+void swap(CompactionRequest &a, CompactionRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionRequest& obj);
 
@@ -11222,27 +8296,7 @@ class CompactionInfoStruct : public virtual ::apache::thrift::TBase {
 
   CompactionInfoStruct(const CompactionInfoStruct&);
   CompactionInfoStruct& operator=(const CompactionInfoStruct&);
-  CompactionInfoStruct() noexcept
-                       : id(0),
-                         dbname(),
-                         tablename(),
-                         partitionname(),
-                         type(static_cast<CompactionType::type>(0)),
-                         runas(),
-                         properties(),
-                         toomanyaborts(0),
-                         state(),
-                         workerId(),
-                         start(0),
-                         highestWriteId(0),
-                         errorMessage(),
-                         hasoldabort(0),
-                         enqueueTime(0),
-                         retryRetention(0),
-                         poolname(),
-                         numberOfBuckets(0),
-                         orderByClause() {
-  }
+  CompactionInfoStruct() noexcept;
 
   virtual ~CompactionInfoStruct() noexcept;
   int64_t id;
@@ -11309,78 +8363,7 @@ class CompactionInfoStruct : public virtual ::apache::thrift::TBase {
 
   void __set_orderByClause(const std::string& val);
 
-  bool operator == (const CompactionInfoStruct & rhs) const
-  {
-    if (!(id == rhs.id))
-      return false;
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tablename == rhs.tablename))
-      return false;
-    if (__isset.partitionname != rhs.__isset.partitionname)
-      return false;
-    else if (__isset.partitionname && !(partitionname == rhs.partitionname))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (__isset.runas != rhs.__isset.runas)
-      return false;
-    else if (__isset.runas && !(runas == rhs.runas))
-      return false;
-    if (__isset.properties != rhs.__isset.properties)
-      return false;
-    else if (__isset.properties && !(properties == rhs.properties))
-      return false;
-    if (__isset.toomanyaborts != rhs.__isset.toomanyaborts)
-      return false;
-    else if (__isset.toomanyaborts && !(toomanyaborts == rhs.toomanyaborts))
-      return false;
-    if (__isset.state != rhs.__isset.state)
-      return false;
-    else if (__isset.state && !(state == rhs.state))
-      return false;
-    if (__isset.workerId != rhs.__isset.workerId)
-      return false;
-    else if (__isset.workerId && !(workerId == rhs.workerId))
-      return false;
-    if (__isset.start != rhs.__isset.start)
-      return false;
-    else if (__isset.start && !(start == rhs.start))
-      return false;
-    if (__isset.highestWriteId != rhs.__isset.highestWriteId)
-      return false;
-    else if (__isset.highestWriteId && !(highestWriteId == rhs.highestWriteId))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    if (__isset.hasoldabort != rhs.__isset.hasoldabort)
-      return false;
-    else if (__isset.hasoldabort && !(hasoldabort == rhs.hasoldabort))
-      return false;
-    if (__isset.enqueueTime != rhs.__isset.enqueueTime)
-      return false;
-    else if (__isset.enqueueTime && !(enqueueTime == rhs.enqueueTime))
-      return false;
-    if (__isset.retryRetention != rhs.__isset.retryRetention)
-      return false;
-    else if (__isset.retryRetention && !(retryRetention == rhs.retryRetention))
-      return false;
-    if (__isset.poolname != rhs.__isset.poolname)
-      return false;
-    else if (__isset.poolname && !(poolname == rhs.poolname))
-      return false;
-    if (__isset.numberOfBuckets != rhs.__isset.numberOfBuckets)
-      return false;
-    else if (__isset.numberOfBuckets && !(numberOfBuckets == rhs.numberOfBuckets))
-      return false;
-    if (__isset.orderByClause != rhs.__isset.orderByClause)
-      return false;
-    else if (__isset.orderByClause && !(orderByClause == rhs.orderByClause))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionInfoStruct & rhs) const;
   bool operator != (const CompactionInfoStruct &rhs) const {
     return !(*this == rhs);
   }
@@ -11393,7 +8376,7 @@ class CompactionInfoStruct : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CompactionInfoStruct &a, CompactionInfoStruct &b);
+void swap(CompactionInfoStruct &a, CompactionInfoStruct &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionInfoStruct& obj);
 
@@ -11407,8 +8390,7 @@ class OptionalCompactionInfoStruct : public virtual ::apache::thrift::TBase {
 
   OptionalCompactionInfoStruct(const OptionalCompactionInfoStruct&);
   OptionalCompactionInfoStruct& operator=(const OptionalCompactionInfoStruct&);
-  OptionalCompactionInfoStruct() noexcept {
-  }
+  OptionalCompactionInfoStruct() noexcept;
 
   virtual ~OptionalCompactionInfoStruct() noexcept;
   CompactionInfoStruct ci;
@@ -11417,14 +8399,7 @@ class OptionalCompactionInfoStruct : public virtual ::apache::thrift::TBase {
 
   void __set_ci(const CompactionInfoStruct& val);
 
-  bool operator == (const OptionalCompactionInfoStruct & rhs) const
-  {
-    if (__isset.ci != rhs.__isset.ci)
-      return false;
-    else if (__isset.ci && !(ci == rhs.ci))
-      return false;
-    return true;
-  }
+  bool operator == (const OptionalCompactionInfoStruct & rhs) const;
   bool operator != (const OptionalCompactionInfoStruct &rhs) const {
     return !(*this == rhs);
   }
@@ -11437,7 +8412,7 @@ class OptionalCompactionInfoStruct : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(OptionalCompactionInfoStruct &a, OptionalCompactionInfoStruct &b);
+void swap(OptionalCompactionInfoStruct &a, OptionalCompactionInfoStruct &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const OptionalCompactionInfoStruct& obj);
 
@@ -11451,15 +8426,7 @@ class CompactionMetricsDataStruct : public virtual ::apache::thrift::TBase {
 
   CompactionMetricsDataStruct(const CompactionMetricsDataStruct&);
   CompactionMetricsDataStruct& operator=(const CompactionMetricsDataStruct&);
-  CompactionMetricsDataStruct() noexcept
-                              : dbname(),
-                                tblname(),
-                                partitionname(),
-                                type(static_cast<CompactionMetricsMetricType::type>(0)),
-                                metricvalue(0),
-                                version(0),
-                                threshold(0) {
-  }
+  CompactionMetricsDataStruct() noexcept;
 
   virtual ~CompactionMetricsDataStruct() noexcept;
   std::string dbname;
@@ -11490,26 +8457,7 @@ class CompactionMetricsDataStruct : public virtual ::apache::thrift::TBase {
 
   void __set_threshold(const int32_t val);
 
-  bool operator == (const CompactionMetricsDataStruct & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tblname == rhs.tblname))
-      return false;
-    if (__isset.partitionname != rhs.__isset.partitionname)
-      return false;
-    else if (__isset.partitionname && !(partitionname == rhs.partitionname))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (!(metricvalue == rhs.metricvalue))
-      return false;
-    if (!(version == rhs.version))
-      return false;
-    if (!(threshold == rhs.threshold))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionMetricsDataStruct & rhs) const;
   bool operator != (const CompactionMetricsDataStruct &rhs) const {
     return !(*this == rhs);
   }
@@ -11522,7 +8470,7 @@ class CompactionMetricsDataStruct : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CompactionMetricsDataStruct &a, CompactionMetricsDataStruct &b);
+void swap(CompactionMetricsDataStruct &a, CompactionMetricsDataStruct &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionMetricsDataStruct& obj);
 
@@ -11536,8 +8484,7 @@ class CompactionMetricsDataResponse : public virtual ::apache::thrift::TBase {
 
   CompactionMetricsDataResponse(const CompactionMetricsDataResponse&);
   CompactionMetricsDataResponse& operator=(const CompactionMetricsDataResponse&);
-  CompactionMetricsDataResponse() noexcept {
-  }
+  CompactionMetricsDataResponse() noexcept;
 
   virtual ~CompactionMetricsDataResponse() noexcept;
   CompactionMetricsDataStruct data;
@@ -11546,14 +8493,7 @@ class CompactionMetricsDataResponse : public virtual ::apache::thrift::TBase {
 
   void __set_data(const CompactionMetricsDataStruct& val);
 
-  bool operator == (const CompactionMetricsDataResponse & rhs) const
-  {
-    if (__isset.data != rhs.__isset.data)
-      return false;
-    else if (__isset.data && !(data == rhs.data))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionMetricsDataResponse & rhs) const;
   bool operator != (const CompactionMetricsDataResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -11566,7 +8506,7 @@ class CompactionMetricsDataResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CompactionMetricsDataResponse &a, CompactionMetricsDataResponse &b);
+void swap(CompactionMetricsDataResponse &a, CompactionMetricsDataResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionMetricsDataResponse& obj);
 
@@ -11580,12 +8520,7 @@ class CompactionMetricsDataRequest : public virtual ::apache::thrift::TBase {
 
   CompactionMetricsDataRequest(const CompactionMetricsDataRequest&);
   CompactionMetricsDataRequest& operator=(const CompactionMetricsDataRequest&);
-  CompactionMetricsDataRequest() noexcept
-                               : dbName(),
-                                 tblName(),
-                                 partitionName(),
-                                 type(static_cast<CompactionMetricsMetricType::type>(0)) {
-  }
+  CompactionMetricsDataRequest() noexcept;
 
   virtual ~CompactionMetricsDataRequest() noexcept;
   std::string dbName;
@@ -11607,20 +8542,7 @@ class CompactionMetricsDataRequest : public virtual ::apache::thrift::TBase {
 
   void __set_type(const CompactionMetricsMetricType::type val);
 
-  bool operator == (const CompactionMetricsDataRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.partitionName != rhs.__isset.partitionName)
-      return false;
-    else if (__isset.partitionName && !(partitionName == rhs.partitionName))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionMetricsDataRequest & rhs) const;
   bool operator != (const CompactionMetricsDataRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -11633,7 +8555,7 @@ class CompactionMetricsDataRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CompactionMetricsDataRequest &a, CompactionMetricsDataRequest &b);
+void swap(CompactionMetricsDataRequest &a, CompactionMetricsDataRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionMetricsDataRequest& obj);
 
@@ -11647,12 +8569,7 @@ class CompactionResponse : public virtual ::apache::thrift::TBase {
 
   CompactionResponse(const CompactionResponse&);
   CompactionResponse& operator=(const CompactionResponse&);
-  CompactionResponse() noexcept
-                     : id(0),
-                       state(),
-                       accepted(0),
-                       errormessage() {
-  }
+  CompactionResponse() noexcept;
 
   virtual ~CompactionResponse() noexcept;
   int64_t id;
@@ -11670,20 +8587,7 @@ class CompactionResponse : public virtual ::apache::thrift::TBase {
 
   void __set_errormessage(const std::string& val);
 
-  bool operator == (const CompactionResponse & rhs) const
-  {
-    if (!(id == rhs.id))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    if (!(accepted == rhs.accepted))
-      return false;
-    if (__isset.errormessage != rhs.__isset.errormessage)
-      return false;
-    else if (__isset.errormessage && !(errormessage == rhs.errormessage))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionResponse & rhs) const;
   bool operator != (const CompactionResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -11696,7 +8600,7 @@ class CompactionResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CompactionResponse &a, CompactionResponse &b);
+void swap(CompactionResponse &a, CompactionResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionResponse& obj);
 
@@ -11718,17 +8622,7 @@ class ShowCompactRequest : public virtual ::apache::thrift::TBase {
 
   ShowCompactRequest(const ShowCompactRequest&);
   ShowCompactRequest& operator=(const ShowCompactRequest&);
-  ShowCompactRequest() noexcept
-                     : id(0),
-                       poolName(),
-                       dbName(),
-                       tbName(),
-                       partName(),
-                       type(static_cast<CompactionType::type>(0)),
-                       state(),
-                       limit(0),
-                       order() {
-  }
+  ShowCompactRequest() noexcept;
 
   virtual ~ShowCompactRequest() noexcept;
   int64_t id;
@@ -11765,46 +8659,7 @@ class ShowCompactRequest : public virtual ::apache::thrift::TBase {
 
   void __set_order(const std::string& val);
 
-  bool operator == (const ShowCompactRequest & rhs) const
-  {
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.poolName != rhs.__isset.poolName)
-      return false;
-    else if (__isset.poolName && !(poolName == rhs.poolName))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    if (__isset.tbName != rhs.__isset.tbName)
-      return false;
-    else if (__isset.tbName && !(tbName == rhs.tbName))
-      return false;
-    if (__isset.partName != rhs.__isset.partName)
-      return false;
-    else if (__isset.partName && !(partName == rhs.partName))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    if (__isset.state != rhs.__isset.state)
-      return false;
-    else if (__isset.state && !(state == rhs.state))
-      return false;
-    if (__isset.limit != rhs.__isset.limit)
-      return false;
-    else if (__isset.limit && !(limit == rhs.limit))
-      return false;
-    if (__isset.order != rhs.__isset.order)
-      return false;
-    else if (__isset.order && !(order == rhs.order))
-      return false;
-    return true;
-  }
+  bool operator == (const ShowCompactRequest & rhs) const;
   bool operator != (const ShowCompactRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -11817,7 +8672,7 @@ class ShowCompactRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ShowCompactRequest &a, ShowCompactRequest &b);
+void swap(ShowCompactRequest &a, ShowCompactRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ShowCompactRequest& obj);
 
@@ -11850,31 +8705,7 @@ class ShowCompactResponseElement : public virtual ::apache::thrift::TBase {
 
   ShowCompactResponseElement(const ShowCompactResponseElement&);
   ShowCompactResponseElement& operator=(const ShowCompactResponseElement&);
-  ShowCompactResponseElement() : dbname(),
-                                 tablename(),
-                                 partitionname(),
-                                 type(static_cast<CompactionType::type>(0)),
-                                 state(),
-                                 workerid(),
-                                 start(0),
-                                 runAs(),
-                                 hightestTxnId(0),
-                                 metaInfo(),
-                                 endTime(0),
-                                 hadoopJobId("None"),
-                                 id(0),
-                                 errorMessage(),
-                                 enqueueTime(0),
-                                 workerVersion(),
-                                 initiatorId(),
-                                 initiatorVersion(),
-                                 cleanerStart(0),
-                                 poolName(),
-                                 nextTxnId(0),
-                                 txnId(0),
-                                 commitTime(0),
-                                 hightestWriteId(0) {
-  }
+  ShowCompactResponseElement();
 
   virtual ~ShowCompactResponseElement() noexcept;
   std::string dbname;
@@ -11956,98 +8787,7 @@ class ShowCompactResponseElement : public virtual ::apache::thrift::TBase {
 
   void __set_hightestWriteId(const int64_t val);
 
-  bool operator == (const ShowCompactResponseElement & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tablename == rhs.tablename))
-      return false;
-    if (__isset.partitionname != rhs.__isset.partitionname)
-      return false;
-    else if (__isset.partitionname && !(partitionname == rhs.partitionname))
-      return false;
-    if (!(type == rhs.type))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    if (__isset.workerid != rhs.__isset.workerid)
-      return false;
-    else if (__isset.workerid && !(workerid == rhs.workerid))
-      return false;
-    if (__isset.start != rhs.__isset.start)
-      return false;
-    else if (__isset.start && !(start == rhs.start))
-      return false;
-    if (__isset.runAs != rhs.__isset.runAs)
-      return false;
-    else if (__isset.runAs && !(runAs == rhs.runAs))
-      return false;
-    if (__isset.hightestTxnId != rhs.__isset.hightestTxnId)
-      return false;
-    else if (__isset.hightestTxnId && !(hightestTxnId == rhs.hightestTxnId))
-      return false;
-    if (__isset.metaInfo != rhs.__isset.metaInfo)
-      return false;
-    else if (__isset.metaInfo && !(metaInfo == rhs.metaInfo))
-      return false;
-    if (__isset.endTime != rhs.__isset.endTime)
-      return false;
-    else if (__isset.endTime && !(endTime == rhs.endTime))
-      return false;
-    if (__isset.hadoopJobId != rhs.__isset.hadoopJobId)
-      return false;
-    else if (__isset.hadoopJobId && !(hadoopJobId == rhs.hadoopJobId))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    if (__isset.enqueueTime != rhs.__isset.enqueueTime)
-      return false;
-    else if (__isset.enqueueTime && !(enqueueTime == rhs.enqueueTime))
-      return false;
-    if (__isset.workerVersion != rhs.__isset.workerVersion)
-      return false;
-    else if (__isset.workerVersion && !(workerVersion == rhs.workerVersion))
-      return false;
-    if (__isset.initiatorId != rhs.__isset.initiatorId)
-      return false;
-    else if (__isset.initiatorId && !(initiatorId == rhs.initiatorId))
-      return false;
-    if (__isset.initiatorVersion != rhs.__isset.initiatorVersion)
-      return false;
-    else if (__isset.initiatorVersion && !(initiatorVersion == rhs.initiatorVersion))
-      return false;
-    if (__isset.cleanerStart != rhs.__isset.cleanerStart)
-      return false;
-    else if (__isset.cleanerStart && !(cleanerStart == rhs.cleanerStart))
-      return false;
-    if (__isset.poolName != rhs.__isset.poolName)
-      return false;
-    else if (__isset.poolName && !(poolName == rhs.poolName))
-      return false;
-    if (__isset.nextTxnId != rhs.__isset.nextTxnId)
-      return false;
-    else if (__isset.nextTxnId && !(nextTxnId == rhs.nextTxnId))
-      return false;
-    if (__isset.txnId != rhs.__isset.txnId)
-      return false;
-    else if (__isset.txnId && !(txnId == rhs.txnId))
-      return false;
-    if (__isset.commitTime != rhs.__isset.commitTime)
-      return false;
-    else if (__isset.commitTime && !(commitTime == rhs.commitTime))
-      return false;
-    if (__isset.hightestWriteId != rhs.__isset.hightestWriteId)
-      return false;
-    else if (__isset.hightestWriteId && !(hightestWriteId == rhs.hightestWriteId))
-      return false;
-    return true;
-  }
+  bool operator == (const ShowCompactResponseElement & rhs) const;
   bool operator != (const ShowCompactResponseElement &rhs) const {
     return !(*this == rhs);
   }
@@ -12060,7 +8800,7 @@ class ShowCompactResponseElement : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ShowCompactResponseElement &a, ShowCompactResponseElement &b);
+void swap(ShowCompactResponseElement &a, ShowCompactResponseElement &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ShowCompactResponseElement& obj);
 
@@ -12070,20 +8810,14 @@ class ShowCompactResponse : public virtual ::apache::thrift::TBase {
 
   ShowCompactResponse(const ShowCompactResponse&);
   ShowCompactResponse& operator=(const ShowCompactResponse&);
-  ShowCompactResponse() noexcept {
-  }
+  ShowCompactResponse() noexcept;
 
   virtual ~ShowCompactResponse() noexcept;
   std::vector<ShowCompactResponseElement>  compacts;
 
   void __set_compacts(const std::vector<ShowCompactResponseElement> & val);
 
-  bool operator == (const ShowCompactResponse & rhs) const
-  {
-    if (!(compacts == rhs.compacts))
-      return false;
-    return true;
-  }
+  bool operator == (const ShowCompactResponse & rhs) const;
   bool operator != (const ShowCompactResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -12096,7 +8830,7 @@ class ShowCompactResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ShowCompactResponse &a, ShowCompactResponse &b);
+void swap(ShowCompactResponse &a, ShowCompactResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ShowCompactResponse& obj);
 
@@ -12111,10 +8845,7 @@ class AbortCompactionRequest : public virtual ::apache::thrift::TBase {
 
   AbortCompactionRequest(const AbortCompactionRequest&);
   AbortCompactionRequest& operator=(const AbortCompactionRequest&);
-  AbortCompactionRequest() noexcept
-                         : type(),
-                           poolName() {
-  }
+  AbortCompactionRequest() noexcept;
 
   virtual ~AbortCompactionRequest() noexcept;
   std::vector<int64_t>  compactionIds;
@@ -12129,20 +8860,7 @@ class AbortCompactionRequest : public virtual ::apache::thrift::TBase {
 
   void __set_poolName(const std::string& val);
 
-  bool operator == (const AbortCompactionRequest & rhs) const
-  {
-    if (!(compactionIds == rhs.compactionIds))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    if (__isset.poolName != rhs.__isset.poolName)
-      return false;
-    else if (__isset.poolName && !(poolName == rhs.poolName))
-      return false;
-    return true;
-  }
+  bool operator == (const AbortCompactionRequest & rhs) const;
   bool operator != (const AbortCompactionRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -12155,7 +8873,7 @@ class AbortCompactionRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AbortCompactionRequest &a, AbortCompactionRequest &b);
+void swap(AbortCompactionRequest &a, AbortCompactionRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AbortCompactionRequest& obj);
 
@@ -12170,11 +8888,7 @@ class AbortCompactionResponseElement : public virtual ::apache::thrift::TBase {
 
   AbortCompactionResponseElement(const AbortCompactionResponseElement&);
   AbortCompactionResponseElement& operator=(const AbortCompactionResponseElement&);
-  AbortCompactionResponseElement() noexcept
-                                 : compactionId(0),
-                                   status(),
-                                   message() {
-  }
+  AbortCompactionResponseElement() noexcept;
 
   virtual ~AbortCompactionResponseElement() noexcept;
   int64_t compactionId;
@@ -12189,20 +8903,7 @@ class AbortCompactionResponseElement : public virtual ::apache::thrift::TBase {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const AbortCompactionResponseElement & rhs) const
-  {
-    if (!(compactionId == rhs.compactionId))
-      return false;
-    if (__isset.status != rhs.__isset.status)
-      return false;
-    else if (__isset.status && !(status == rhs.status))
-      return false;
-    if (__isset.message != rhs.__isset.message)
-      return false;
-    else if (__isset.message && !(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const AbortCompactionResponseElement & rhs) const;
   bool operator != (const AbortCompactionResponseElement &rhs) const {
     return !(*this == rhs);
   }
@@ -12215,7 +8916,7 @@ class AbortCompactionResponseElement : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AbortCompactionResponseElement &a, AbortCompactionResponseElement &b);
+void swap(AbortCompactionResponseElement &a, AbortCompactionResponseElement &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AbortCompactionResponseElement& obj);
 
@@ -12225,20 +8926,14 @@ class AbortCompactResponse : public virtual ::apache::thrift::TBase {
 
   AbortCompactResponse(const AbortCompactResponse&);
   AbortCompactResponse& operator=(const AbortCompactResponse&);
-  AbortCompactResponse() noexcept {
-  }
+  AbortCompactResponse() noexcept;
 
   virtual ~AbortCompactResponse() noexcept;
   std::map<int64_t, AbortCompactionResponseElement>  abortedcompacts;
 
   void __set_abortedcompacts(const std::map<int64_t, AbortCompactionResponseElement> & val);
 
-  bool operator == (const AbortCompactResponse & rhs) const
-  {
-    if (!(abortedcompacts == rhs.abortedcompacts))
-      return false;
-    return true;
-  }
+  bool operator == (const AbortCompactResponse & rhs) const;
   bool operator != (const AbortCompactResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -12251,7 +8946,7 @@ class AbortCompactResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AbortCompactResponse &a, AbortCompactResponse &b);
+void swap(AbortCompactResponse &a, AbortCompactResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AbortCompactResponse& obj);
 
@@ -12266,11 +8961,7 @@ class GetLatestCommittedCompactionInfoRequest : public virtual ::apache::thrift:
 
   GetLatestCommittedCompactionInfoRequest(const GetLatestCommittedCompactionInfoRequest&);
   GetLatestCommittedCompactionInfoRequest& operator=(const GetLatestCommittedCompactionInfoRequest&);
-  GetLatestCommittedCompactionInfoRequest() noexcept
-                                          : dbname(),
-                                            tablename(),
-                                            lastCompactionId(0) {
-  }
+  GetLatestCommittedCompactionInfoRequest() noexcept;
 
   virtual ~GetLatestCommittedCompactionInfoRequest() noexcept;
   std::string dbname;
@@ -12288,22 +8979,7 @@ class GetLatestCommittedCompactionInfoRequest : public virtual ::apache::thrift:
 
   void __set_lastCompactionId(const int64_t val);
 
-  bool operator == (const GetLatestCommittedCompactionInfoRequest & rhs) const
-  {
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tablename == rhs.tablename))
-      return false;
-    if (__isset.partitionnames != rhs.__isset.partitionnames)
-      return false;
-    else if (__isset.partitionnames && !(partitionnames == rhs.partitionnames))
-      return false;
-    if (__isset.lastCompactionId != rhs.__isset.lastCompactionId)
-      return false;
-    else if (__isset.lastCompactionId && !(lastCompactionId == rhs.lastCompactionId))
-      return false;
-    return true;
-  }
+  bool operator == (const GetLatestCommittedCompactionInfoRequest & rhs) const;
   bool operator != (const GetLatestCommittedCompactionInfoRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -12316,7 +8992,7 @@ class GetLatestCommittedCompactionInfoRequest : public virtual ::apache::thrift:
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetLatestCommittedCompactionInfoRequest &a, GetLatestCommittedCompactionInfoRequest &b);
+void swap(GetLatestCommittedCompactionInfoRequest &a, GetLatestCommittedCompactionInfoRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetLatestCommittedCompactionInfoRequest& obj);
 
@@ -12326,20 +9002,14 @@ class GetLatestCommittedCompactionInfoResponse : public virtual ::apache::thrift
 
   GetLatestCommittedCompactionInfoResponse(const GetLatestCommittedCompactionInfoResponse&);
   GetLatestCommittedCompactionInfoResponse& operator=(const GetLatestCommittedCompactionInfoResponse&);
-  GetLatestCommittedCompactionInfoResponse() noexcept {
-  }
+  GetLatestCommittedCompactionInfoResponse() noexcept;
 
   virtual ~GetLatestCommittedCompactionInfoResponse() noexcept;
   std::vector<CompactionInfoStruct>  compactions;
 
   void __set_compactions(const std::vector<CompactionInfoStruct> & val);
 
-  bool operator == (const GetLatestCommittedCompactionInfoResponse & rhs) const
-  {
-    if (!(compactions == rhs.compactions))
-      return false;
-    return true;
-  }
+  bool operator == (const GetLatestCommittedCompactionInfoResponse & rhs) const;
   bool operator != (const GetLatestCommittedCompactionInfoResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -12352,7 +9022,7 @@ class GetLatestCommittedCompactionInfoResponse : public virtual ::apache::thrift
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetLatestCommittedCompactionInfoResponse &a, GetLatestCommittedCompactionInfoResponse &b);
+void swap(GetLatestCommittedCompactionInfoResponse &a, GetLatestCommittedCompactionInfoResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetLatestCommittedCompactionInfoResponse& obj);
 
@@ -12368,11 +9038,7 @@ class FindNextCompactRequest : public virtual ::apache::thrift::TBase {
 
   FindNextCompactRequest(const FindNextCompactRequest&);
   FindNextCompactRequest& operator=(const FindNextCompactRequest&);
-  FindNextCompactRequest() noexcept
-                         : workerId(),
-                           workerVersion(),
-                           poolName() {
-  }
+  FindNextCompactRequest() noexcept;
 
   virtual ~FindNextCompactRequest() noexcept;
   std::string workerId;
@@ -12387,22 +9053,7 @@ class FindNextCompactRequest : public virtual ::apache::thrift::TBase {
 
   void __set_poolName(const std::string& val);
 
-  bool operator == (const FindNextCompactRequest & rhs) const
-  {
-    if (__isset.workerId != rhs.__isset.workerId)
-      return false;
-    else if (__isset.workerId && !(workerId == rhs.workerId))
-      return false;
-    if (__isset.workerVersion != rhs.__isset.workerVersion)
-      return false;
-    else if (__isset.workerVersion && !(workerVersion == rhs.workerVersion))
-      return false;
-    if (__isset.poolName != rhs.__isset.poolName)
-      return false;
-    else if (__isset.poolName && !(poolName == rhs.poolName))
-      return false;
-    return true;
-  }
+  bool operator == (const FindNextCompactRequest & rhs) const;
   bool operator != (const FindNextCompactRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -12415,7 +9066,7 @@ class FindNextCompactRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FindNextCompactRequest &a, FindNextCompactRequest &b);
+void swap(FindNextCompactRequest &a, FindNextCompactRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FindNextCompactRequest& obj);
 
@@ -12429,15 +9080,7 @@ class AddDynamicPartitions : public virtual ::apache::thrift::TBase {
 
   AddDynamicPartitions(const AddDynamicPartitions&);
   AddDynamicPartitions& operator=(const AddDynamicPartitions&);
-  AddDynamicPartitions() noexcept
-                       : txnid(0),
-                         writeid(0),
-                         dbname(),
-                         tablename(),
-                         operationType((DataOperationType::type)5) {
-    operationType = (DataOperationType::type)5;
-
-  }
+  AddDynamicPartitions() noexcept;
 
   virtual ~AddDynamicPartitions() noexcept;
   int64_t txnid;
@@ -12465,24 +9108,7 @@ class AddDynamicPartitions : public virtual ::apache::thrift::TBase {
 
   void __set_operationType(const DataOperationType::type val);
 
-  bool operator == (const AddDynamicPartitions & rhs) const
-  {
-    if (!(txnid == rhs.txnid))
-      return false;
-    if (!(writeid == rhs.writeid))
-      return false;
-    if (!(dbname == rhs.dbname))
-      return false;
-    if (!(tablename == rhs.tablename))
-      return false;
-    if (!(partitionnames == rhs.partitionnames))
-      return false;
-    if (__isset.operationType != rhs.__isset.operationType)
-      return false;
-    else if (__isset.operationType && !(operationType == rhs.operationType))
-      return false;
-    return true;
-  }
+  bool operator == (const AddDynamicPartitions & rhs) const;
   bool operator != (const AddDynamicPartitions &rhs) const {
     return !(*this == rhs);
   }
@@ -12495,7 +9121,7 @@ class AddDynamicPartitions : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddDynamicPartitions &a, AddDynamicPartitions &b);
+void swap(AddDynamicPartitions &a, AddDynamicPartitions &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddDynamicPartitions& obj);
 
@@ -12513,14 +9139,7 @@ class BasicTxnInfo : public virtual ::apache::thrift::TBase {
 
   BasicTxnInfo(const BasicTxnInfo&);
   BasicTxnInfo& operator=(const BasicTxnInfo&);
-  BasicTxnInfo() noexcept
-               : isnull(0),
-                 time(0),
-                 txnid(0),
-                 dbname(),
-                 tablename(),
-                 partitionname() {
-  }
+  BasicTxnInfo() noexcept;
 
   virtual ~BasicTxnInfo() noexcept;
   bool isnull;
@@ -12544,32 +9163,7 @@ class BasicTxnInfo : public virtual ::apache::thrift::TBase {
 
   void __set_partitionname(const std::string& val);
 
-  bool operator == (const BasicTxnInfo & rhs) const
-  {
-    if (!(isnull == rhs.isnull))
-      return false;
-    if (__isset.time != rhs.__isset.time)
-      return false;
-    else if (__isset.time && !(time == rhs.time))
-      return false;
-    if (__isset.txnid != rhs.__isset.txnid)
-      return false;
-    else if (__isset.txnid && !(txnid == rhs.txnid))
-      return false;
-    if (__isset.dbname != rhs.__isset.dbname)
-      return false;
-    else if (__isset.dbname && !(dbname == rhs.dbname))
-      return false;
-    if (__isset.tablename != rhs.__isset.tablename)
-      return false;
-    else if (__isset.tablename && !(tablename == rhs.tablename))
-      return false;
-    if (__isset.partitionname != rhs.__isset.partitionname)
-      return false;
-    else if (__isset.partitionname && !(partitionname == rhs.partitionname))
-      return false;
-    return true;
-  }
+  bool operator == (const BasicTxnInfo & rhs) const;
   bool operator != (const BasicTxnInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -12582,7 +9176,7 @@ class BasicTxnInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(BasicTxnInfo &a, BasicTxnInfo &b);
+void swap(BasicTxnInfo &a, BasicTxnInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const BasicTxnInfo& obj);
 
@@ -12601,12 +9195,7 @@ class NotificationEventRequest : public virtual ::apache::thrift::TBase {
 
   NotificationEventRequest(const NotificationEventRequest&);
   NotificationEventRequest& operator=(const NotificationEventRequest&);
-  NotificationEventRequest() noexcept
-                           : lastEvent(0),
-                             maxEvents(0),
-                             catName(),
-                             dbName() {
-  }
+  NotificationEventRequest() noexcept;
 
   virtual ~NotificationEventRequest() noexcept;
   int64_t lastEvent;
@@ -12633,36 +9222,7 @@ class NotificationEventRequest : public virtual ::apache::thrift::TBase {
 
   void __set_eventTypeList(const std::vector<std::string> & val);
 
-  bool operator == (const NotificationEventRequest & rhs) const
-  {
-    if (!(lastEvent == rhs.lastEvent))
-      return false;
-    if (__isset.maxEvents != rhs.__isset.maxEvents)
-      return false;
-    else if (__isset.maxEvents && !(maxEvents == rhs.maxEvents))
-      return false;
-    if (__isset.eventTypeSkipList != rhs.__isset.eventTypeSkipList)
-      return false;
-    else if (__isset.eventTypeSkipList && !(eventTypeSkipList == rhs.eventTypeSkipList))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    if (__isset.tableNames != rhs.__isset.tableNames)
-      return false;
-    else if (__isset.tableNames && !(tableNames == rhs.tableNames))
-      return false;
-    if (__isset.eventTypeList != rhs.__isset.eventTypeList)
-      return false;
-    else if (__isset.eventTypeList && !(eventTypeList == rhs.eventTypeList))
-      return false;
-    return true;
-  }
+  bool operator == (const NotificationEventRequest & rhs) const;
   bool operator != (const NotificationEventRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -12675,7 +9235,7 @@ class NotificationEventRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotificationEventRequest &a, NotificationEventRequest &b);
+void swap(NotificationEventRequest &a, NotificationEventRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotificationEventRequest& obj);
 
@@ -12692,16 +9252,7 @@ class NotificationEvent : public virtual ::apache::thrift::TBase {
 
   NotificationEvent(const NotificationEvent&);
   NotificationEvent& operator=(const NotificationEvent&);
-  NotificationEvent() noexcept
-                    : eventId(0),
-                      eventTime(0),
-                      eventType(),
-                      dbName(),
-                      tableName(),
-                      message(),
-                      messageFormat(),
-                      catName() {
-  }
+  NotificationEvent() noexcept;
 
   virtual ~NotificationEvent() noexcept;
   int64_t eventId;
@@ -12731,34 +9282,7 @@ class NotificationEvent : public virtual ::apache::thrift::TBase {
 
   void __set_catName(const std::string& val);
 
-  bool operator == (const NotificationEvent & rhs) const
-  {
-    if (!(eventId == rhs.eventId))
-      return false;
-    if (!(eventTime == rhs.eventTime))
-      return false;
-    if (!(eventType == rhs.eventType))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    if (!(message == rhs.message))
-      return false;
-    if (__isset.messageFormat != rhs.__isset.messageFormat)
-      return false;
-    else if (__isset.messageFormat && !(messageFormat == rhs.messageFormat))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    return true;
-  }
+  bool operator == (const NotificationEvent & rhs) const;
   bool operator != (const NotificationEvent &rhs) const {
     return !(*this == rhs);
   }
@@ -12771,7 +9295,7 @@ class NotificationEvent : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotificationEvent &a, NotificationEvent &b);
+void swap(NotificationEvent &a, NotificationEvent &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotificationEvent& obj);
 
@@ -12781,20 +9305,14 @@ class NotificationEventResponse : public virtual ::apache::thrift::TBase {
 
   NotificationEventResponse(const NotificationEventResponse&);
   NotificationEventResponse& operator=(const NotificationEventResponse&);
-  NotificationEventResponse() noexcept {
-  }
+  NotificationEventResponse() noexcept;
 
   virtual ~NotificationEventResponse() noexcept;
   std::vector<NotificationEvent>  events;
 
   void __set_events(const std::vector<NotificationEvent> & val);
 
-  bool operator == (const NotificationEventResponse & rhs) const
-  {
-    if (!(events == rhs.events))
-      return false;
-    return true;
-  }
+  bool operator == (const NotificationEventResponse & rhs) const;
   bool operator != (const NotificationEventResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -12807,7 +9325,7 @@ class NotificationEventResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotificationEventResponse &a, NotificationEventResponse &b);
+void swap(NotificationEventResponse &a, NotificationEventResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotificationEventResponse& obj);
 
@@ -12817,21 +9335,14 @@ class CurrentNotificationEventId : public virtual ::apache::thrift::TBase {
 
   CurrentNotificationEventId(const CurrentNotificationEventId&) noexcept;
   CurrentNotificationEventId& operator=(const CurrentNotificationEventId&) noexcept;
-  CurrentNotificationEventId() noexcept
-                             : eventId(0) {
-  }
+  CurrentNotificationEventId() noexcept;
 
   virtual ~CurrentNotificationEventId() noexcept;
   int64_t eventId;
 
   void __set_eventId(const int64_t val);
 
-  bool operator == (const CurrentNotificationEventId & rhs) const
-  {
-    if (!(eventId == rhs.eventId))
-      return false;
-    return true;
-  }
+  bool operator == (const CurrentNotificationEventId & rhs) const;
   bool operator != (const CurrentNotificationEventId &rhs) const {
     return !(*this == rhs);
   }
@@ -12844,7 +9355,7 @@ class CurrentNotificationEventId : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CurrentNotificationEventId &a, CurrentNotificationEventId &b);
+void swap(CurrentNotificationEventId &a, CurrentNotificationEventId &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CurrentNotificationEventId& obj);
 
@@ -12861,13 +9372,7 @@ class NotificationEventsCountRequest : public virtual ::apache::thrift::TBase {
 
   NotificationEventsCountRequest(const NotificationEventsCountRequest&);
   NotificationEventsCountRequest& operator=(const NotificationEventsCountRequest&);
-  NotificationEventsCountRequest() noexcept
-                                 : fromEventId(0),
-                                   dbName(),
-                                   catName(),
-                                   toEventId(0),
-                                   limit(0) {
-  }
+  NotificationEventsCountRequest() noexcept;
 
   virtual ~NotificationEventsCountRequest() noexcept;
   int64_t fromEventId;
@@ -12891,30 +9396,7 @@ class NotificationEventsCountRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tableNames(const std::vector<std::string> & val);
 
-  bool operator == (const NotificationEventsCountRequest & rhs) const
-  {
-    if (!(fromEventId == rhs.fromEventId))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.toEventId != rhs.__isset.toEventId)
-      return false;
-    else if (__isset.toEventId && !(toEventId == rhs.toEventId))
-      return false;
-    if (__isset.limit != rhs.__isset.limit)
-      return false;
-    else if (__isset.limit && !(limit == rhs.limit))
-      return false;
-    if (__isset.tableNames != rhs.__isset.tableNames)
-      return false;
-    else if (__isset.tableNames && !(tableNames == rhs.tableNames))
-      return false;
-    return true;
-  }
+  bool operator == (const NotificationEventsCountRequest & rhs) const;
   bool operator != (const NotificationEventsCountRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -12927,7 +9409,7 @@ class NotificationEventsCountRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotificationEventsCountRequest &a, NotificationEventsCountRequest &b);
+void swap(NotificationEventsCountRequest &a, NotificationEventsCountRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotificationEventsCountRequest& obj);
 
@@ -12937,21 +9419,14 @@ class NotificationEventsCountResponse : public virtual ::apache::thrift::TBase {
 
   NotificationEventsCountResponse(const NotificationEventsCountResponse&) noexcept;
   NotificationEventsCountResponse& operator=(const NotificationEventsCountResponse&) noexcept;
-  NotificationEventsCountResponse() noexcept
-                                  : eventsCount(0) {
-  }
+  NotificationEventsCountResponse() noexcept;
 
   virtual ~NotificationEventsCountResponse() noexcept;
   int64_t eventsCount;
 
   void __set_eventsCount(const int64_t val);
 
-  bool operator == (const NotificationEventsCountResponse & rhs) const
-  {
-    if (!(eventsCount == rhs.eventsCount))
-      return false;
-    return true;
-  }
+  bool operator == (const NotificationEventsCountResponse & rhs) const;
   bool operator != (const NotificationEventsCountResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -12964,7 +9439,7 @@ class NotificationEventsCountResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(NotificationEventsCountResponse &a, NotificationEventsCountResponse &b);
+void swap(NotificationEventsCountResponse &a, NotificationEventsCountResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NotificationEventsCountResponse& obj);
 
@@ -12981,9 +9456,7 @@ class InsertEventRequestData : public virtual ::apache::thrift::TBase {
 
   InsertEventRequestData(const InsertEventRequestData&);
   InsertEventRequestData& operator=(const InsertEventRequestData&);
-  InsertEventRequestData() noexcept
-                         : replace(0) {
-  }
+  InsertEventRequestData() noexcept;
 
   virtual ~InsertEventRequestData() noexcept;
   bool replace;
@@ -13004,28 +9477,7 @@ class InsertEventRequestData : public virtual ::apache::thrift::TBase {
 
   void __set_partitionVal(const std::vector<std::string> & val);
 
-  bool operator == (const InsertEventRequestData & rhs) const
-  {
-    if (__isset.replace != rhs.__isset.replace)
-      return false;
-    else if (__isset.replace && !(replace == rhs.replace))
-      return false;
-    if (!(filesAdded == rhs.filesAdded))
-      return false;
-    if (__isset.filesAddedChecksum != rhs.__isset.filesAddedChecksum)
-      return false;
-    else if (__isset.filesAddedChecksum && !(filesAddedChecksum == rhs.filesAddedChecksum))
-      return false;
-    if (__isset.subDirectoryList != rhs.__isset.subDirectoryList)
-      return false;
-    else if (__isset.subDirectoryList && !(subDirectoryList == rhs.subDirectoryList))
-      return false;
-    if (__isset.partitionVal != rhs.__isset.partitionVal)
-      return false;
-    else if (__isset.partitionVal && !(partitionVal == rhs.partitionVal))
-      return false;
-    return true;
-  }
+  bool operator == (const InsertEventRequestData & rhs) const;
   bool operator != (const InsertEventRequestData &rhs) const {
     return !(*this == rhs);
   }
@@ -13038,7 +9490,7 @@ class InsertEventRequestData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(InsertEventRequestData &a, InsertEventRequestData &b);
+void swap(InsertEventRequestData &a, InsertEventRequestData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const InsertEventRequestData& obj);
 
@@ -13054,9 +9506,7 @@ class FireEventRequestData : public virtual ::apache::thrift::TBase {
 
   FireEventRequestData(const FireEventRequestData&);
   FireEventRequestData& operator=(const FireEventRequestData&);
-  FireEventRequestData() noexcept
-                       : refreshEvent(0) {
-  }
+  FireEventRequestData() noexcept;
 
   virtual ~FireEventRequestData() noexcept;
   InsertEventRequestData insertData;
@@ -13071,22 +9521,7 @@ class FireEventRequestData : public virtual ::apache::thrift::TBase {
 
   void __set_refreshEvent(const bool val);
 
-  bool operator == (const FireEventRequestData & rhs) const
-  {
-    if (__isset.insertData != rhs.__isset.insertData)
-      return false;
-    else if (__isset.insertData && !(insertData == rhs.insertData))
-      return false;
-    if (__isset.insertDatas != rhs.__isset.insertDatas)
-      return false;
-    else if (__isset.insertDatas && !(insertDatas == rhs.insertDatas))
-      return false;
-    if (__isset.refreshEvent != rhs.__isset.refreshEvent)
-      return false;
-    else if (__isset.refreshEvent && !(refreshEvent == rhs.refreshEvent))
-      return false;
-    return true;
-  }
+  bool operator == (const FireEventRequestData & rhs) const;
   bool operator != (const FireEventRequestData &rhs) const {
     return !(*this == rhs);
   }
@@ -13099,7 +9534,7 @@ class FireEventRequestData : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FireEventRequestData &a, FireEventRequestData &b);
+void swap(FireEventRequestData &a, FireEventRequestData &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FireEventRequestData& obj);
 
@@ -13118,12 +9553,7 @@ class FireEventRequest : public virtual ::apache::thrift::TBase {
 
   FireEventRequest(const FireEventRequest&);
   FireEventRequest& operator=(const FireEventRequest&);
-  FireEventRequest() noexcept
-                   : successful(0),
-                     dbName(),
-                     tableName(),
-                     catName() {
-  }
+  FireEventRequest() noexcept;
 
   virtual ~FireEventRequest() noexcept;
   bool successful;
@@ -13153,38 +9583,7 @@ class FireEventRequest : public virtual ::apache::thrift::TBase {
 
   void __set_batchPartitionValsForRefresh(const std::vector<std::vector<std::string> > & val);
 
-  bool operator == (const FireEventRequest & rhs) const
-  {
-    if (!(successful == rhs.successful))
-      return false;
-    if (!(data == rhs.data))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    if (__isset.partitionVals != rhs.__isset.partitionVals)
-      return false;
-    else if (__isset.partitionVals && !(partitionVals == rhs.partitionVals))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.tblParams != rhs.__isset.tblParams)
-      return false;
-    else if (__isset.tblParams && !(tblParams == rhs.tblParams))
-      return false;
-    if (__isset.batchPartitionValsForRefresh != rhs.__isset.batchPartitionValsForRefresh)
-      return false;
-    else if (__isset.batchPartitionValsForRefresh && !(batchPartitionValsForRefresh == rhs.batchPartitionValsForRefresh))
-      return false;
-    return true;
-  }
+  bool operator == (const FireEventRequest & rhs) const;
   bool operator != (const FireEventRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13197,7 +9596,7 @@ class FireEventRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FireEventRequest &a, FireEventRequest &b);
+void swap(FireEventRequest &a, FireEventRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FireEventRequest& obj);
 
@@ -13211,8 +9610,7 @@ class FireEventResponse : public virtual ::apache::thrift::TBase {
 
   FireEventResponse(const FireEventResponse&);
   FireEventResponse& operator=(const FireEventResponse&);
-  FireEventResponse() noexcept {
-  }
+  FireEventResponse() noexcept;
 
   virtual ~FireEventResponse() noexcept;
   std::vector<int64_t>  eventIds;
@@ -13221,12 +9619,7 @@ class FireEventResponse : public virtual ::apache::thrift::TBase {
 
   void __set_eventIds(const std::vector<int64_t> & val);
 
-  bool operator == (const FireEventResponse & rhs) const
-  {
-    if (!(eventIds == rhs.eventIds))
-      return false;
-    return true;
-  }
+  bool operator == (const FireEventResponse & rhs) const;
   bool operator != (const FireEventResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -13239,7 +9632,7 @@ class FireEventResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FireEventResponse &a, FireEventResponse &b);
+void swap(FireEventResponse &a, FireEventResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FireEventResponse& obj);
 
@@ -13253,12 +9646,7 @@ class WriteNotificationLogRequest : public virtual ::apache::thrift::TBase {
 
   WriteNotificationLogRequest(const WriteNotificationLogRequest&);
   WriteNotificationLogRequest& operator=(const WriteNotificationLogRequest&);
-  WriteNotificationLogRequest() noexcept
-                              : txnId(0),
-                                writeId(0),
-                                db(),
-                                table() {
-  }
+  WriteNotificationLogRequest() noexcept;
 
   virtual ~WriteNotificationLogRequest() noexcept;
   int64_t txnId;
@@ -13282,24 +9670,7 @@ class WriteNotificationLogRequest : public virtual ::apache::thrift::TBase {
 
   void __set_partitionVals(const std::vector<std::string> & val);
 
-  bool operator == (const WriteNotificationLogRequest & rhs) const
-  {
-    if (!(txnId == rhs.txnId))
-      return false;
-    if (!(writeId == rhs.writeId))
-      return false;
-    if (!(db == rhs.db))
-      return false;
-    if (!(table == rhs.table))
-      return false;
-    if (!(fileInfo == rhs.fileInfo))
-      return false;
-    if (__isset.partitionVals != rhs.__isset.partitionVals)
-      return false;
-    else if (__isset.partitionVals && !(partitionVals == rhs.partitionVals))
-      return false;
-    return true;
-  }
+  bool operator == (const WriteNotificationLogRequest & rhs) const;
   bool operator != (const WriteNotificationLogRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13312,7 +9683,7 @@ class WriteNotificationLogRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WriteNotificationLogRequest &a, WriteNotificationLogRequest &b);
+void swap(WriteNotificationLogRequest &a, WriteNotificationLogRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WriteNotificationLogRequest& obj);
 
@@ -13322,15 +9693,11 @@ class WriteNotificationLogResponse : public virtual ::apache::thrift::TBase {
 
   WriteNotificationLogResponse(const WriteNotificationLogResponse&) noexcept;
   WriteNotificationLogResponse& operator=(const WriteNotificationLogResponse&) noexcept;
-  WriteNotificationLogResponse() noexcept {
-  }
+  WriteNotificationLogResponse() noexcept;
 
   virtual ~WriteNotificationLogResponse() noexcept;
 
-  bool operator == (const WriteNotificationLogResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WriteNotificationLogResponse & /* rhs */) const;
   bool operator != (const WriteNotificationLogResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -13343,7 +9710,7 @@ class WriteNotificationLogResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WriteNotificationLogResponse &a, WriteNotificationLogResponse &b);
+void swap(WriteNotificationLogResponse &a, WriteNotificationLogResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WriteNotificationLogResponse& obj);
 
@@ -13353,11 +9720,7 @@ class WriteNotificationLogBatchRequest : public virtual ::apache::thrift::TBase
 
   WriteNotificationLogBatchRequest(const WriteNotificationLogBatchRequest&);
   WriteNotificationLogBatchRequest& operator=(const WriteNotificationLogBatchRequest&);
-  WriteNotificationLogBatchRequest() noexcept
-                                   : catalog(),
-                                     db(),
-                                     table() {
-  }
+  WriteNotificationLogBatchRequest() noexcept;
 
   virtual ~WriteNotificationLogBatchRequest() noexcept;
   std::string catalog;
@@ -13373,18 +9736,7 @@ class WriteNotificationLogBatchRequest : public virtual ::apache::thrift::TBase
 
   void __set_requestList(const std::vector<WriteNotificationLogRequest> & val);
 
-  bool operator == (const WriteNotificationLogBatchRequest & rhs) const
-  {
-    if (!(catalog == rhs.catalog))
-      return false;
-    if (!(db == rhs.db))
-      return false;
-    if (!(table == rhs.table))
-      return false;
-    if (!(requestList == rhs.requestList))
-      return false;
-    return true;
-  }
+  bool operator == (const WriteNotificationLogBatchRequest & rhs) const;
   bool operator != (const WriteNotificationLogBatchRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13397,7 +9749,7 @@ class WriteNotificationLogBatchRequest : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WriteNotificationLogBatchRequest &a, WriteNotificationLogBatchRequest &b);
+void swap(WriteNotificationLogBatchRequest &a, WriteNotificationLogBatchRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WriteNotificationLogBatchRequest& obj);
 
@@ -13407,15 +9759,11 @@ class WriteNotificationLogBatchResponse : public virtual ::apache::thrift::TBase
 
   WriteNotificationLogBatchResponse(const WriteNotificationLogBatchResponse&) noexcept;
   WriteNotificationLogBatchResponse& operator=(const WriteNotificationLogBatchResponse&) noexcept;
-  WriteNotificationLogBatchResponse() noexcept {
-  }
+  WriteNotificationLogBatchResponse() noexcept;
 
   virtual ~WriteNotificationLogBatchResponse() noexcept;
 
-  bool operator == (const WriteNotificationLogBatchResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WriteNotificationLogBatchResponse & /* rhs */) const;
   bool operator != (const WriteNotificationLogBatchResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -13428,7 +9776,7 @@ class WriteNotificationLogBatchResponse : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WriteNotificationLogBatchResponse &a, WriteNotificationLogBatchResponse &b);
+void swap(WriteNotificationLogBatchResponse &a, WriteNotificationLogBatchResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WriteNotificationLogBatchResponse& obj);
 
@@ -13443,10 +9791,7 @@ class MetadataPpdResult : public virtual ::apache::thrift::TBase {
 
   MetadataPpdResult(const MetadataPpdResult&);
   MetadataPpdResult& operator=(const MetadataPpdResult&);
-  MetadataPpdResult() noexcept
-                    : metadata(),
-                      includeBitset() {
-  }
+  MetadataPpdResult() noexcept;
 
   virtual ~MetadataPpdResult() noexcept;
   std::string metadata;
@@ -13458,18 +9803,7 @@ class MetadataPpdResult : public virtual ::apache::thrift::TBase {
 
   void __set_includeBitset(const std::string& val);
 
-  bool operator == (const MetadataPpdResult & rhs) const
-  {
-    if (__isset.metadata != rhs.__isset.metadata)
-      return false;
-    else if (__isset.metadata && !(metadata == rhs.metadata))
-      return false;
-    if (__isset.includeBitset != rhs.__isset.includeBitset)
-      return false;
-    else if (__isset.includeBitset && !(includeBitset == rhs.includeBitset))
-      return false;
-    return true;
-  }
+  bool operator == (const MetadataPpdResult & rhs) const;
   bool operator != (const MetadataPpdResult &rhs) const {
     return !(*this == rhs);
   }
@@ -13482,7 +9816,7 @@ class MetadataPpdResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(MetadataPpdResult &a, MetadataPpdResult &b);
+void swap(MetadataPpdResult &a, MetadataPpdResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MetadataPpdResult& obj);
 
@@ -13492,9 +9826,7 @@ class GetFileMetadataByExprResult : public virtual ::apache::thrift::TBase {
 
   GetFileMetadataByExprResult(const GetFileMetadataByExprResult&);
   GetFileMetadataByExprResult& operator=(const GetFileMetadataByExprResult&);
-  GetFileMetadataByExprResult() noexcept
-                              : isSupported(0) {
-  }
+  GetFileMetadataByExprResult() noexcept;
 
   virtual ~GetFileMetadataByExprResult() noexcept;
   std::map<int64_t, MetadataPpdResult>  metadata;
@@ -13504,14 +9836,7 @@ class GetFileMetadataByExprResult : public virtual ::apache::thrift::TBase {
 
   void __set_isSupported(const bool val);
 
-  bool operator == (const GetFileMetadataByExprResult & rhs) const
-  {
-    if (!(metadata == rhs.metadata))
-      return false;
-    if (!(isSupported == rhs.isSupported))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFileMetadataByExprResult & rhs) const;
   bool operator != (const GetFileMetadataByExprResult &rhs) const {
     return !(*this == rhs);
   }
@@ -13524,7 +9849,7 @@ class GetFileMetadataByExprResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFileMetadataByExprResult &a, GetFileMetadataByExprResult &b);
+void swap(GetFileMetadataByExprResult &a, GetFileMetadataByExprResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFileMetadataByExprResult& obj);
 
@@ -13539,11 +9864,7 @@ class GetFileMetadataByExprRequest : public virtual ::apache::thrift::TBase {
 
   GetFileMetadataByExprRequest(const GetFileMetadataByExprRequest&);
   GetFileMetadataByExprRequest& operator=(const GetFileMetadataByExprRequest&);
-  GetFileMetadataByExprRequest() noexcept
-                               : expr(),
-                                 doGetFooters(0),
-                                 type(static_cast<FileMetadataExprType::type>(0)) {
-  }
+  GetFileMetadataByExprRequest() noexcept;
 
   virtual ~GetFileMetadataByExprRequest() noexcept;
   std::vector<int64_t>  fileIds;
@@ -13565,22 +9886,7 @@ class GetFileMetadataByExprRequest : public virtual ::apache::thrift::TBase {
 
   void __set_type(const FileMetadataExprType::type val);
 
-  bool operator == (const GetFileMetadataByExprRequest & rhs) const
-  {
-    if (!(fileIds == rhs.fileIds))
-      return false;
-    if (!(expr == rhs.expr))
-      return false;
-    if (__isset.doGetFooters != rhs.__isset.doGetFooters)
-      return false;
-    else if (__isset.doGetFooters && !(doGetFooters == rhs.doGetFooters))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFileMetadataByExprRequest & rhs) const;
   bool operator != (const GetFileMetadataByExprRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13593,7 +9899,7 @@ class GetFileMetadataByExprRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFileMetadataByExprRequest &a, GetFileMetadataByExprRequest &b);
+void swap(GetFileMetadataByExprRequest &a, GetFileMetadataByExprRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFileMetadataByExprRequest& obj);
 
@@ -13603,9 +9909,7 @@ class GetFileMetadataResult : public virtual ::apache::thrift::TBase {
 
   GetFileMetadataResult(const GetFileMetadataResult&);
   GetFileMetadataResult& operator=(const GetFileMetadataResult&);
-  GetFileMetadataResult() noexcept
-                        : isSupported(0) {
-  }
+  GetFileMetadataResult() noexcept;
 
   virtual ~GetFileMetadataResult() noexcept;
   std::map<int64_t, std::string>  metadata;
@@ -13615,14 +9919,7 @@ class GetFileMetadataResult : public virtual ::apache::thrift::TBase {
 
   void __set_isSupported(const bool val);
 
-  bool operator == (const GetFileMetadataResult & rhs) const
-  {
-    if (!(metadata == rhs.metadata))
-      return false;
-    if (!(isSupported == rhs.isSupported))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFileMetadataResult & rhs) const;
   bool operator != (const GetFileMetadataResult &rhs) const {
     return !(*this == rhs);
   }
@@ -13635,7 +9932,7 @@ class GetFileMetadataResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFileMetadataResult &a, GetFileMetadataResult &b);
+void swap(GetFileMetadataResult &a, GetFileMetadataResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFileMetadataResult& obj);
 
@@ -13645,20 +9942,14 @@ class GetFileMetadataRequest : public virtual ::apache::thrift::TBase {
 
   GetFileMetadataRequest(const GetFileMetadataRequest&);
   GetFileMetadataRequest& operator=(const GetFileMetadataRequest&);
-  GetFileMetadataRequest() noexcept {
-  }
+  GetFileMetadataRequest() noexcept;
 
   virtual ~GetFileMetadataRequest() noexcept;
   std::vector<int64_t>  fileIds;
 
   void __set_fileIds(const std::vector<int64_t> & val);
 
-  bool operator == (const GetFileMetadataRequest & rhs) const
-  {
-    if (!(fileIds == rhs.fileIds))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFileMetadataRequest & rhs) const;
   bool operator != (const GetFileMetadataRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13671,7 +9962,7 @@ class GetFileMetadataRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFileMetadataRequest &a, GetFileMetadataRequest &b);
+void swap(GetFileMetadataRequest &a, GetFileMetadataRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFileMetadataRequest& obj);
 
@@ -13681,15 +9972,11 @@ class PutFileMetadataResult : public virtual ::apache::thrift::TBase {
 
   PutFileMetadataResult(const PutFileMetadataResult&) noexcept;
   PutFileMetadataResult& operator=(const PutFileMetadataResult&) noexcept;
-  PutFileMetadataResult() noexcept {
-  }
+  PutFileMetadataResult() noexcept;
 
   virtual ~PutFileMetadataResult() noexcept;
 
-  bool operator == (const PutFileMetadataResult & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const PutFileMetadataResult & /* rhs */) const;
   bool operator != (const PutFileMetadataResult &rhs) const {
     return !(*this == rhs);
   }
@@ -13702,7 +9989,7 @@ class PutFileMetadataResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PutFileMetadataResult &a, PutFileMetadataResult &b);
+void swap(PutFileMetadataResult &a, PutFileMetadataResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PutFileMetadataResult& obj);
 
@@ -13716,9 +10003,7 @@ class PutFileMetadataRequest : public virtual ::apache::thrift::TBase {
 
   PutFileMetadataRequest(const PutFileMetadataRequest&);
   PutFileMetadataRequest& operator=(const PutFileMetadataRequest&);
-  PutFileMetadataRequest() noexcept
-                         : type(static_cast<FileMetadataExprType::type>(0)) {
-  }
+  PutFileMetadataRequest() noexcept;
 
   virtual ~PutFileMetadataRequest() noexcept;
   std::vector<int64_t>  fileIds;
@@ -13737,18 +10022,7 @@ class PutFileMetadataRequest : public virtual ::apache::thrift::TBase {
 
   void __set_type(const FileMetadataExprType::type val);
 
-  bool operator == (const PutFileMetadataRequest & rhs) const
-  {
-    if (!(fileIds == rhs.fileIds))
-      return false;
-    if (!(metadata == rhs.metadata))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    return true;
-  }
+  bool operator == (const PutFileMetadataRequest & rhs) const;
   bool operator != (const PutFileMetadataRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13761,7 +10035,7 @@ class PutFileMetadataRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PutFileMetadataRequest &a, PutFileMetadataRequest &b);
+void swap(PutFileMetadataRequest &a, PutFileMetadataRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PutFileMetadataRequest& obj);
 
@@ -13771,15 +10045,11 @@ class ClearFileMetadataResult : public virtual ::apache::thrift::TBase {
 
   ClearFileMetadataResult(const ClearFileMetadataResult&) noexcept;
   ClearFileMetadataResult& operator=(const ClearFileMetadataResult&) noexcept;
-  ClearFileMetadataResult() noexcept {
-  }
+  ClearFileMetadataResult() noexcept;
 
   virtual ~ClearFileMetadataResult() noexcept;
 
-  bool operator == (const ClearFileMetadataResult & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const ClearFileMetadataResult & /* rhs */) const;
   bool operator != (const ClearFileMetadataResult &rhs) const {
     return !(*this == rhs);
   }
@@ -13792,7 +10062,7 @@ class ClearFileMetadataResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ClearFileMetadataResult &a, ClearFileMetadataResult &b);
+void swap(ClearFileMetadataResult &a, ClearFileMetadataResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ClearFileMetadataResult& obj);
 
@@ -13802,20 +10072,14 @@ class ClearFileMetadataRequest : public virtual ::apache::thrift::TBase {
 
   ClearFileMetadataRequest(const ClearFileMetadataRequest&);
   ClearFileMetadataRequest& operator=(const ClearFileMetadataRequest&);
-  ClearFileMetadataRequest() noexcept {
-  }
+  ClearFileMetadataRequest() noexcept;
 
   virtual ~ClearFileMetadataRequest() noexcept;
   std::vector<int64_t>  fileIds;
 
   void __set_fileIds(const std::vector<int64_t> & val);
 
-  bool operator == (const ClearFileMetadataRequest & rhs) const
-  {
-    if (!(fileIds == rhs.fileIds))
-      return false;
-    return true;
-  }
+  bool operator == (const ClearFileMetadataRequest & rhs) const;
   bool operator != (const ClearFileMetadataRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13828,7 +10092,7 @@ class ClearFileMetadataRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ClearFileMetadataRequest &a, ClearFileMetadataRequest &b);
+void swap(ClearFileMetadataRequest &a, ClearFileMetadataRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ClearFileMetadataRequest& obj);
 
@@ -13838,21 +10102,14 @@ class CacheFileMetadataResult : public virtual ::apache::thrift::TBase {
 
   CacheFileMetadataResult(const CacheFileMetadataResult&) noexcept;
   CacheFileMetadataResult& operator=(const CacheFileMetadataResult&) noexcept;
-  CacheFileMetadataResult() noexcept
-                          : isSupported(0) {
-  }
+  CacheFileMetadataResult() noexcept;
 
   virtual ~CacheFileMetadataResult() noexcept;
   bool isSupported;
 
   void __set_isSupported(const bool val);
 
-  bool operator == (const CacheFileMetadataResult & rhs) const
-  {
-    if (!(isSupported == rhs.isSupported))
-      return false;
-    return true;
-  }
+  bool operator == (const CacheFileMetadataResult & rhs) const;
   bool operator != (const CacheFileMetadataResult &rhs) const {
     return !(*this == rhs);
   }
@@ -13865,7 +10122,7 @@ class CacheFileMetadataResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CacheFileMetadataResult &a, CacheFileMetadataResult &b);
+void swap(CacheFileMetadataResult &a, CacheFileMetadataResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CacheFileMetadataResult& obj);
 
@@ -13880,12 +10137,7 @@ class CacheFileMetadataRequest : public virtual ::apache::thrift::TBase {
 
   CacheFileMetadataRequest(const CacheFileMetadataRequest&);
   CacheFileMetadataRequest& operator=(const CacheFileMetadataRequest&);
-  CacheFileMetadataRequest() noexcept
-                           : dbName(),
-                             tblName(),
-                             partName(),
-                             isAllParts(0) {
-  }
+  CacheFileMetadataRequest() noexcept;
 
   virtual ~CacheFileMetadataRequest() noexcept;
   std::string dbName;
@@ -13903,22 +10155,7 @@ class CacheFileMetadataRequest : public virtual ::apache::thrift::TBase {
 
   void __set_isAllParts(const bool val);
 
-  bool operator == (const CacheFileMetadataRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.partName != rhs.__isset.partName)
-      return false;
-    else if (__isset.partName && !(partName == rhs.partName))
-      return false;
-    if (__isset.isAllParts != rhs.__isset.isAllParts)
-      return false;
-    else if (__isset.isAllParts && !(isAllParts == rhs.isAllParts))
-      return false;
-    return true;
-  }
+  bool operator == (const CacheFileMetadataRequest & rhs) const;
   bool operator != (const CacheFileMetadataRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -13931,7 +10168,7 @@ class CacheFileMetadataRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CacheFileMetadataRequest &a, CacheFileMetadataRequest &b);
+void swap(CacheFileMetadataRequest &a, CacheFileMetadataRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CacheFileMetadataRequest& obj);
 
@@ -13945,8 +10182,7 @@ class GetAllFunctionsResponse : public virtual ::apache::thrift::TBase {
 
   GetAllFunctionsResponse(const GetAllFunctionsResponse&);
   GetAllFunctionsResponse& operator=(const GetAllFunctionsResponse&);
-  GetAllFunctionsResponse() noexcept {
-  }
+  GetAllFunctionsResponse() noexcept;
 
   virtual ~GetAllFunctionsResponse() noexcept;
   std::vector<Function>  functions;
@@ -13955,14 +10191,7 @@ class GetAllFunctionsResponse : public virtual ::apache::thrift::TBase {
 
   void __set_functions(const std::vector<Function> & val);
 
-  bool operator == (const GetAllFunctionsResponse & rhs) const
-  {
-    if (__isset.functions != rhs.__isset.functions)
-      return false;
-    else if (__isset.functions && !(functions == rhs.functions))
-      return false;
-    return true;
-  }
+  bool operator == (const GetAllFunctionsResponse & rhs) const;
   bool operator != (const GetAllFunctionsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -13975,7 +10204,7 @@ class GetAllFunctionsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetAllFunctionsResponse &a, GetAllFunctionsResponse &b);
+void swap(GetAllFunctionsResponse &a, GetAllFunctionsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetAllFunctionsResponse& obj);
 
@@ -13985,20 +10214,14 @@ class ClientCapabilities : public virtual ::apache::thrift::TBase {
 
   ClientCapabilities(const ClientCapabilities&);
   ClientCapabilities& operator=(const ClientCapabilities&);
-  ClientCapabilities() noexcept {
-  }
+  ClientCapabilities() noexcept;
 
   virtual ~ClientCapabilities() noexcept;
   std::vector<ClientCapability::type>  values;
 
   void __set_values(const std::vector<ClientCapability::type> & val);
 
-  bool operator == (const ClientCapabilities & rhs) const
-  {
-    if (!(values == rhs.values))
-      return false;
-    return true;
-  }
+  bool operator == (const ClientCapabilities & rhs) const;
   bool operator != (const ClientCapabilities &rhs) const {
     return !(*this == rhs);
   }
@@ -14011,7 +10234,7 @@ class ClientCapabilities : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ClientCapabilities &a, ClientCapabilities &b);
+void swap(ClientCapabilities &a, ClientCapabilities &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ClientCapabilities& obj);
 
@@ -14027,10 +10250,7 @@ class GetProjectionsSpec : public virtual ::apache::thrift::TBase {
 
   GetProjectionsSpec(const GetProjectionsSpec&);
   GetProjectionsSpec& operator=(const GetProjectionsSpec&);
-  GetProjectionsSpec() noexcept
-                     : includeParamKeyPattern(),
-                       excludeParamKeyPattern() {
-  }
+  GetProjectionsSpec() noexcept;
 
   virtual ~GetProjectionsSpec() noexcept;
   std::vector<std::string>  fieldList;
@@ -14045,16 +10265,7 @@ class GetProjectionsSpec : public virtual ::apache::thrift::TBase {
 
   void __set_excludeParamKeyPattern(const std::string& val);
 
-  bool operator == (const GetProjectionsSpec & rhs) const
-  {
-    if (!(fieldList == rhs.fieldList))
-      return false;
-    if (!(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (!(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    return true;
-  }
+  bool operator == (const GetProjectionsSpec & rhs) const;
   bool operator != (const GetProjectionsSpec &rhs) const {
     return !(*this == rhs);
   }
@@ -14067,7 +10278,7 @@ class GetProjectionsSpec : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetProjectionsSpec &a, GetProjectionsSpec &b);
+void swap(GetProjectionsSpec &a, GetProjectionsSpec &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetProjectionsSpec& obj);
 
@@ -14088,15 +10299,7 @@ class GetTableRequest : public virtual ::apache::thrift::TBase {
 
   GetTableRequest(const GetTableRequest&);
   GetTableRequest& operator=(const GetTableRequest&);
-  GetTableRequest() : dbName(),
-                      tblName(),
-                      catName(),
-                      validWriteIdList(),
-                      getColumnStats(0),
-                      processorIdentifier(),
-                      engine("hive"),
-                      id(-1LL) {
-  }
+  GetTableRequest();
 
   virtual ~GetTableRequest() noexcept;
   std::string dbName;
@@ -14132,46 +10335,7 @@ class GetTableRequest : public virtual ::apache::thrift::TBase {
 
   void __set_id(const int64_t val);
 
-  bool operator == (const GetTableRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.capabilities != rhs.__isset.capabilities)
-      return false;
-    else if (__isset.capabilities && !(capabilities == rhs.capabilities))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.getColumnStats != rhs.__isset.getColumnStats)
-      return false;
-    else if (__isset.getColumnStats && !(getColumnStats == rhs.getColumnStats))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    return true;
-  }
+  bool operator == (const GetTableRequest & rhs) const;
   bool operator != (const GetTableRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14184,7 +10348,7 @@ class GetTableRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetTableRequest &a, GetTableRequest &b);
+void swap(GetTableRequest &a, GetTableRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetTableRequest& obj);
 
@@ -14198,9 +10362,7 @@ class GetTableResult : public virtual ::apache::thrift::TBase {
 
   GetTableResult(const GetTableResult&);
   GetTableResult& operator=(const GetTableResult&);
-  GetTableResult() noexcept
-                 : isStatsCompliant(0) {
-  }
+  GetTableResult() noexcept;
 
   virtual ~GetTableResult() noexcept;
   Table table;
@@ -14212,16 +10374,7 @@ class GetTableResult : public virtual ::apache::thrift::TBase {
 
   void __set_isStatsCompliant(const bool val);
 
-  bool operator == (const GetTableResult & rhs) const
-  {
-    if (!(table == rhs.table))
-      return false;
-    if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
-      return false;
-    else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
-      return false;
-    return true;
-  }
+  bool operator == (const GetTableResult & rhs) const;
   bool operator != (const GetTableResult &rhs) const {
     return !(*this == rhs);
   }
@@ -14234,7 +10387,7 @@ class GetTableResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetTableResult &a, GetTableResult &b);
+void swap(GetTableResult &a, GetTableResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetTableResult& obj);
 
@@ -14254,12 +10407,7 @@ class GetTablesRequest : public virtual ::apache::thrift::TBase {
 
   GetTablesRequest(const GetTablesRequest&);
   GetTablesRequest& operator=(const GetTablesRequest&);
-  GetTablesRequest() noexcept
-                   : dbName(),
-                     catName(),
-                     processorIdentifier(),
-                     tablesPattern() {
-  }
+  GetTablesRequest() noexcept;
 
   virtual ~GetTablesRequest() noexcept;
   std::string dbName;
@@ -14289,40 +10437,7 @@ class GetTablesRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tablesPattern(const std::string& val);
 
-  bool operator == (const GetTablesRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (__isset.tblNames != rhs.__isset.tblNames)
-      return false;
-    else if (__isset.tblNames && !(tblNames == rhs.tblNames))
-      return false;
-    if (__isset.capabilities != rhs.__isset.capabilities)
-      return false;
-    else if (__isset.capabilities && !(capabilities == rhs.capabilities))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    if (__isset.projectionSpec != rhs.__isset.projectionSpec)
-      return false;
-    else if (__isset.projectionSpec && !(projectionSpec == rhs.projectionSpec))
-      return false;
-    if (__isset.tablesPattern != rhs.__isset.tablesPattern)
-      return false;
-    else if (__isset.tablesPattern && !(tablesPattern == rhs.tablesPattern))
-      return false;
-    return true;
-  }
+  bool operator == (const GetTablesRequest & rhs) const;
   bool operator != (const GetTablesRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14335,7 +10450,7 @@ class GetTablesRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetTablesRequest &a, GetTablesRequest &b);
+void swap(GetTablesRequest &a, GetTablesRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetTablesRequest& obj);
 
@@ -14345,20 +10460,14 @@ class GetTablesResult : public virtual ::apache::thrift::TBase {
 
   GetTablesResult(const GetTablesResult&);
   GetTablesResult& operator=(const GetTablesResult&);
-  GetTablesResult() noexcept {
-  }
+  GetTablesResult() noexcept;
 
   virtual ~GetTablesResult() noexcept;
   std::vector<Table>  tables;
 
   void __set_tables(const std::vector<Table> & val);
 
-  bool operator == (const GetTablesResult & rhs) const
-  {
-    if (!(tables == rhs.tables))
-      return false;
-    return true;
-  }
+  bool operator == (const GetTablesResult & rhs) const;
   bool operator != (const GetTablesResult &rhs) const {
     return !(*this == rhs);
   }
@@ -14371,7 +10480,7 @@ class GetTablesResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetTablesResult &a, GetTablesResult &b);
+void swap(GetTablesResult &a, GetTablesResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetTablesResult& obj);
 
@@ -14387,14 +10496,7 @@ class GetTablesExtRequest : public virtual ::apache::thrift::TBase {
 
   GetTablesExtRequest(const GetTablesExtRequest&);
   GetTablesExtRequest& operator=(const GetTablesExtRequest&);
-  GetTablesExtRequest() noexcept
-                      : catalog(),
-                        database(),
-                        tableNamePattern(),
-                        requestedFields(0),
-                        limit(0),
-                        processorIdentifier() {
-  }
+  GetTablesExtRequest() noexcept;
 
   virtual ~GetTablesExtRequest() noexcept;
   std::string catalog;
@@ -14421,30 +10523,7 @@ class GetTablesExtRequest : public virtual ::apache::thrift::TBase {
 
   void __set_processorIdentifier(const std::string& val);
 
-  bool operator == (const GetTablesExtRequest & rhs) const
-  {
-    if (!(catalog == rhs.catalog))
-      return false;
-    if (!(database == rhs.database))
-      return false;
-    if (!(tableNamePattern == rhs.tableNamePattern))
-      return false;
-    if (!(requestedFields == rhs.requestedFields))
-      return false;
-    if (__isset.limit != rhs.__isset.limit)
-      return false;
-    else if (__isset.limit && !(limit == rhs.limit))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    return true;
-  }
+  bool operator == (const GetTablesExtRequest & rhs) const;
   bool operator != (const GetTablesExtRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14457,7 +10536,7 @@ class GetTablesExtRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetTablesExtRequest &a, GetTablesExtRequest &b);
+void swap(GetTablesExtRequest &a, GetTablesExtRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetTablesExtRequest& obj);
 
@@ -14473,10 +10552,7 @@ class ExtendedTableInfo : public virtual ::apache::thrift::TBase {
 
   ExtendedTableInfo(const ExtendedTableInfo&);
   ExtendedTableInfo& operator=(const ExtendedTableInfo&);
-  ExtendedTableInfo() noexcept
-                    : tblName(),
-                      accessType(0) {
-  }
+  ExtendedTableInfo() noexcept;
 
   virtual ~ExtendedTableInfo() noexcept;
   std::string tblName;
@@ -14494,24 +10570,7 @@ class ExtendedTableInfo : public virtual ::apache::thrift::TBase {
 
   void __set_requiredWriteCapabilities(const std::vector<std::string> & val);
 
-  bool operator == (const ExtendedTableInfo & rhs) const
-  {
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.accessType != rhs.__isset.accessType)
-      return false;
-    else if (__isset.accessType && !(accessType == rhs.accessType))
-      return false;
-    if (__isset.requiredReadCapabilities != rhs.__isset.requiredReadCapabilities)
-      return false;
-    else if (__isset.requiredReadCapabilities && !(requiredReadCapabilities == rhs.requiredReadCapabilities))
-      return false;
-    if (__isset.requiredWriteCapabilities != rhs.__isset.requiredWriteCapabilities)
-      return false;
-    else if (__isset.requiredWriteCapabilities && !(requiredWriteCapabilities == rhs.requiredWriteCapabilities))
-      return false;
-    return true;
-  }
+  bool operator == (const ExtendedTableInfo & rhs) const;
   bool operator != (const ExtendedTableInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -14524,7 +10583,7 @@ class ExtendedTableInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ExtendedTableInfo &a, ExtendedTableInfo &b);
+void swap(ExtendedTableInfo &a, ExtendedTableInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ExtendedTableInfo& obj);
 
@@ -14544,16 +10603,7 @@ class DropTableRequest : public virtual ::apache::thrift::TBase {
 
   DropTableRequest(const DropTableRequest&);
   DropTableRequest& operator=(const DropTableRequest&);
-  DropTableRequest() noexcept
-                   : catalogName(),
-                     dbName(),
-                     tableName(),
-                     deleteData(0),
-                     dropPartitions(0),
-                     id(),
-                     asyncDrop(0),
-                     cancel(0) {
-  }
+  DropTableRequest() noexcept;
 
   virtual ~DropTableRequest() noexcept;
   std::string catalogName;
@@ -14586,42 +10636,7 @@ class DropTableRequest : public virtual ::apache::thrift::TBase {
 
   void __set_cancel(const bool val);
 
-  bool operator == (const DropTableRequest & rhs) const
-  {
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (__isset.deleteData != rhs.__isset.deleteData)
-      return false;
-    else if (__isset.deleteData && !(deleteData == rhs.deleteData))
-      return false;
-    if (__isset.envContext != rhs.__isset.envContext)
-      return false;
-    else if (__isset.envContext && !(envContext == rhs.envContext))
-      return false;
-    if (__isset.dropPartitions != rhs.__isset.dropPartitions)
-      return false;
-    else if (__isset.dropPartitions && !(dropPartitions == rhs.dropPartitions))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.asyncDrop != rhs.__isset.asyncDrop)
-      return false;
-    else if (__isset.asyncDrop && !(asyncDrop == rhs.asyncDrop))
-      return false;
-    if (__isset.cancel != rhs.__isset.cancel)
-      return false;
-    else if (__isset.cancel && !(cancel == rhs.cancel))
-      return false;
-    return true;
-  }
+  bool operator == (const DropTableRequest & rhs) const;
   bool operator != (const DropTableRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14634,7 +10649,7 @@ class DropTableRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropTableRequest &a, DropTableRequest &b);
+void swap(DropTableRequest &a, DropTableRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropTableRequest& obj);
 
@@ -14649,11 +10664,7 @@ class AsyncOperationResp : public virtual ::apache::thrift::TBase {
 
   AsyncOperationResp(const AsyncOperationResp&);
   AsyncOperationResp& operator=(const AsyncOperationResp&);
-  AsyncOperationResp() noexcept
-                     : id(),
-                       message(),
-                       finished(0) {
-  }
+  AsyncOperationResp() noexcept;
 
   virtual ~AsyncOperationResp() noexcept;
   std::string id;
@@ -14668,20 +10679,7 @@ class AsyncOperationResp : public virtual ::apache::thrift::TBase {
 
   void __set_finished(const bool val);
 
-  bool operator == (const AsyncOperationResp & rhs) const
-  {
-    if (!(id == rhs.id))
-      return false;
-    if (__isset.message != rhs.__isset.message)
-      return false;
-    else if (__isset.message && !(message == rhs.message))
-      return false;
-    if (__isset.finished != rhs.__isset.finished)
-      return false;
-    else if (__isset.finished && !(finished == rhs.finished))
-      return false;
-    return true;
-  }
+  bool operator == (const AsyncOperationResp & rhs) const;
   bool operator != (const AsyncOperationResp &rhs) const {
     return !(*this == rhs);
   }
@@ -14694,7 +10692,7 @@ class AsyncOperationResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AsyncOperationResp &a, AsyncOperationResp &b);
+void swap(AsyncOperationResp &a, AsyncOperationResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AsyncOperationResp& obj);
 
@@ -14711,11 +10709,7 @@ class GetDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   GetDatabaseRequest(const GetDatabaseRequest&);
   GetDatabaseRequest& operator=(const GetDatabaseRequest&);
-  GetDatabaseRequest() noexcept
-                     : name(),
-                       catalogName(),
-                       processorIdentifier() {
-  }
+  GetDatabaseRequest() noexcept;
 
   virtual ~GetDatabaseRequest() noexcept;
   std::string name;
@@ -14733,26 +10727,7 @@ class GetDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   void __set_processorIdentifier(const std::string& val);
 
-  bool operator == (const GetDatabaseRequest & rhs) const
-  {
-    if (__isset.name != rhs.__isset.name)
-      return false;
-    else if (__isset.name && !(name == rhs.name))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    return true;
-  }
+  bool operator == (const GetDatabaseRequest & rhs) const;
   bool operator != (const GetDatabaseRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14765,7 +10740,7 @@ class GetDatabaseRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetDatabaseRequest &a, GetDatabaseRequest &b);
+void swap(GetDatabaseRequest &a, GetDatabaseRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetDatabaseRequest& obj);
 
@@ -14775,9 +10750,7 @@ class AlterDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   AlterDatabaseRequest(const AlterDatabaseRequest&);
   AlterDatabaseRequest& operator=(const AlterDatabaseRequest&);
-  AlterDatabaseRequest() noexcept
-                       : oldDbName() {
-  }
+  AlterDatabaseRequest() noexcept;
 
   virtual ~AlterDatabaseRequest() noexcept;
   std::string oldDbName;
@@ -14787,14 +10760,7 @@ class AlterDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   void __set_newDb(const Database& val);
 
-  bool operator == (const AlterDatabaseRequest & rhs) const
-  {
-    if (!(oldDbName == rhs.oldDbName))
-      return false;
-    if (!(newDb == rhs.newDb))
-      return false;
-    return true;
-  }
+  bool operator == (const AlterDatabaseRequest & rhs) const;
   bool operator != (const AlterDatabaseRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14807,7 +10773,7 @@ class AlterDatabaseRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterDatabaseRequest &a, AlterDatabaseRequest &b);
+void swap(AlterDatabaseRequest &a, AlterDatabaseRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterDatabaseRequest& obj);
 
@@ -14827,19 +10793,7 @@ class DropDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   DropDatabaseRequest(const DropDatabaseRequest&);
   DropDatabaseRequest& operator=(const DropDatabaseRequest&);
-  DropDatabaseRequest() noexcept
-                      : name(),
-                        catalogName(),
-                        ignoreUnknownDb(0),
-                        deleteData(0),
-                        cascade(0),
-                        softDelete(false),
-                        txnId(0LL),
-                        deleteManagedDir(true),
-                        id(),
-                        asyncDrop(0),
-                        cancel(0) {
-  }
+  DropDatabaseRequest() noexcept;
 
   virtual ~DropDatabaseRequest() noexcept;
   std::string name;
@@ -14878,46 +10832,7 @@ class DropDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   void __set_cancel(const bool val);
 
-  bool operator == (const DropDatabaseRequest & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (!(ignoreUnknownDb == rhs.ignoreUnknownDb))
-      return false;
-    if (!(deleteData == rhs.deleteData))
-      return false;
-    if (!(cascade == rhs.cascade))
-      return false;
-    if (__isset.softDelete != rhs.__isset.softDelete)
-      return false;
-    else if (__isset.softDelete && !(softDelete == rhs.softDelete))
-      return false;
-    if (__isset.txnId != rhs.__isset.txnId)
-      return false;
-    else if (__isset.txnId && !(txnId == rhs.txnId))
-      return false;
-    if (__isset.deleteManagedDir != rhs.__isset.deleteManagedDir)
-      return false;
-    else if (__isset.deleteManagedDir && !(deleteManagedDir == rhs.deleteManagedDir))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.asyncDrop != rhs.__isset.asyncDrop)
-      return false;
-    else if (__isset.asyncDrop && !(asyncDrop == rhs.asyncDrop))
-      return false;
-    if (__isset.cancel != rhs.__isset.cancel)
-      return false;
-    else if (__isset.cancel && !(cancel == rhs.cancel))
-      return false;
-    return true;
-  }
+  bool operator == (const DropDatabaseRequest & rhs) const;
   bool operator != (const DropDatabaseRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14930,7 +10845,7 @@ class DropDatabaseRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropDatabaseRequest &a, DropDatabaseRequest &b);
+void swap(DropDatabaseRequest &a, DropDatabaseRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropDatabaseRequest& obj);
 
@@ -14946,12 +10861,7 @@ class GetFunctionsRequest : public virtual ::apache::thrift::TBase {
 
   GetFunctionsRequest(const GetFunctionsRequest&);
   GetFunctionsRequest& operator=(const GetFunctionsRequest&);
-  GetFunctionsRequest() noexcept
-                      : dbName(),
-                        catalogName(),
-                        pattern(),
-                        returnNames(true) {
-  }
+  GetFunctionsRequest() noexcept;
 
   virtual ~GetFunctionsRequest() noexcept;
   std::string dbName;
@@ -14969,24 +10879,7 @@ class GetFunctionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_returnNames(const bool val);
 
-  bool operator == (const GetFunctionsRequest & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.pattern != rhs.__isset.pattern)
-      return false;
-    else if (__isset.pattern && !(pattern == rhs.pattern))
-      return false;
-    if (__isset.returnNames != rhs.__isset.returnNames)
-      return false;
-    else if (__isset.returnNames && !(returnNames == rhs.returnNames))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFunctionsRequest & rhs) const;
   bool operator != (const GetFunctionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -14999,7 +10892,7 @@ class GetFunctionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFunctionsRequest &a, GetFunctionsRequest &b);
+void swap(GetFunctionsRequest &a, GetFunctionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFunctionsRequest& obj);
 
@@ -15014,8 +10907,7 @@ class GetFunctionsResponse : public virtual ::apache::thrift::TBase {
 
   GetFunctionsResponse(const GetFunctionsResponse&);
   GetFunctionsResponse& operator=(const GetFunctionsResponse&);
-  GetFunctionsResponse() noexcept {
-  }
+  GetFunctionsResponse() noexcept;
 
   virtual ~GetFunctionsResponse() noexcept;
   std::vector<std::string>  function_names;
@@ -15027,18 +10919,7 @@ class GetFunctionsResponse : public virtual ::apache::thrift::TBase {
 
   void __set_functions(const std::vector<Function> & val);
 
-  bool operator == (const GetFunctionsResponse & rhs) const
-  {
-    if (__isset.function_names != rhs.__isset.function_names)
-      return false;
-    else if (__isset.function_names && !(function_names == rhs.function_names))
-      return false;
-    if (__isset.functions != rhs.__isset.functions)
-      return false;
-    else if (__isset.functions && !(functions == rhs.functions))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFunctionsResponse & rhs) const;
   bool operator != (const GetFunctionsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -15051,7 +10932,7 @@ class GetFunctionsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFunctionsResponse &a, GetFunctionsResponse &b);
+void swap(GetFunctionsResponse &a, GetFunctionsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFunctionsResponse& obj);
 
@@ -15061,10 +10942,7 @@ class CmRecycleRequest : public virtual ::apache::thrift::TBase {
 
   CmRecycleRequest(const CmRecycleRequest&);
   CmRecycleRequest& operator=(const CmRecycleRequest&);
-  CmRecycleRequest() noexcept
-                   : dataPath(),
-                     purge(0) {
-  }
+  CmRecycleRequest() noexcept;
 
   virtual ~CmRecycleRequest() noexcept;
   std::string dataPath;
@@ -15074,14 +10952,7 @@ class CmRecycleRequest : public virtual ::apache::thrift::TBase {
 
   void __set_purge(const bool val);
 
-  bool operator == (const CmRecycleRequest & rhs) const
-  {
-    if (!(dataPath == rhs.dataPath))
-      return false;
-    if (!(purge == rhs.purge))
-      return false;
-    return true;
-  }
+  bool operator == (const CmRecycleRequest & rhs) const;
   bool operator != (const CmRecycleRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -15094,7 +10965,7 @@ class CmRecycleRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CmRecycleRequest &a, CmRecycleRequest &b);
+void swap(CmRecycleRequest &a, CmRecycleRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CmRecycleRequest& obj);
 
@@ -15104,15 +10975,11 @@ class CmRecycleResponse : public virtual ::apache::thrift::TBase {
 
   CmRecycleResponse(const CmRecycleResponse&) noexcept;
   CmRecycleResponse& operator=(const CmRecycleResponse&) noexcept;
-  CmRecycleResponse() noexcept {
-  }
+  CmRecycleResponse() noexcept;
 
   virtual ~CmRecycleResponse() noexcept;
 
-  bool operator == (const CmRecycleResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const CmRecycleResponse & /* rhs */) const;
   bool operator != (const CmRecycleResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -15125,7 +10992,7 @@ class CmRecycleResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CmRecycleResponse &a, CmRecycleResponse &b);
+void swap(CmRecycleResponse &a, CmRecycleResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CmRecycleResponse& obj);
 
@@ -15142,15 +11009,7 @@ class TableMeta : public virtual ::apache::thrift::TBase {
 
   TableMeta(const TableMeta&);
   TableMeta& operator=(const TableMeta&);
-  TableMeta() noexcept
-            : dbName(),
-              tableName(),
-              tableType(),
-              comments(),
-              catName(),
-              ownerName(),
-              ownerType(static_cast<PrincipalType::type>(0)) {
-  }
+  TableMeta() noexcept;
 
   virtual ~TableMeta() noexcept;
   std::string dbName;
@@ -15181,32 +11040,7 @@ class TableMeta : public virtual ::apache::thrift::TBase {
 
   void __set_ownerType(const PrincipalType::type val);
 
-  bool operator == (const TableMeta & rhs) const
-  {
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(tableType == rhs.tableType))
-      return false;
-    if (__isset.comments != rhs.__isset.comments)
-      return false;
-    else if (__isset.comments && !(comments == rhs.comments))
-      return false;
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (__isset.ownerName != rhs.__isset.ownerName)
-      return false;
-    else if (__isset.ownerName && !(ownerName == rhs.ownerName))
-      return false;
-    if (__isset.ownerType != rhs.__isset.ownerType)
-      return false;
-    else if (__isset.ownerType && !(ownerType == rhs.ownerType))
-      return false;
-    return true;
-  }
+  bool operator == (const TableMeta & rhs) const;
   bool operator != (const TableMeta &rhs) const {
     return !(*this == rhs);
   }
@@ -15219,7 +11053,7 @@ class TableMeta : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TableMeta &a, TableMeta &b);
+void swap(TableMeta &a, TableMeta &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TableMeta& obj);
 
@@ -15229,10 +11063,7 @@ class Materialization : public virtual ::apache::thrift::TBase {
 
   Materialization(const Materialization&) noexcept;
   Materialization& operator=(const Materialization&) noexcept;
-  Materialization() noexcept
-                  : sourceTablesUpdateDeleteModified(0),
-                    sourceTablesCompacted(0) {
-  }
+  Materialization() noexcept;
 
   virtual ~Materialization() noexcept;
   bool sourceTablesUpdateDeleteModified;
@@ -15242,14 +11073,7 @@ class Materialization : public virtual ::apache::thrift::TBase {
 
   void __set_sourceTablesCompacted(const bool val);
 
-  bool operator == (const Materialization & rhs) const
-  {
-    if (!(sourceTablesUpdateDeleteModified == rhs.sourceTablesUpdateDeleteModified))
-      return false;
-    if (!(sourceTablesCompacted == rhs.sourceTablesCompacted))
-      return false;
-    return true;
-  }
+  bool operator == (const Materialization & rhs) const;
   bool operator != (const Materialization &rhs) const {
     return !(*this == rhs);
   }
@@ -15262,7 +11086,7 @@ class Materialization : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Materialization &a, Materialization &b);
+void swap(Materialization &a, Materialization &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Materialization& obj);
 
@@ -15279,13 +11103,7 @@ class WMResourcePlan : public virtual ::apache::thrift::TBase {
 
   WMResourcePlan(const WMResourcePlan&);
   WMResourcePlan& operator=(const WMResourcePlan&);
-  WMResourcePlan() noexcept
-                 : name(),
-                   status(static_cast<WMResourcePlanStatus::type>(0)),
-                   queryParallelism(0),
-                   defaultPoolPath(),
-                   ns() {
-  }
+  WMResourcePlan() noexcept;
 
   virtual ~WMResourcePlan() noexcept;
   std::string name;
@@ -15310,28 +11128,7 @@ class WMResourcePlan : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMResourcePlan & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (__isset.status != rhs.__isset.status)
-      return false;
-    else if (__isset.status && !(status == rhs.status))
-      return false;
-    if (__isset.queryParallelism != rhs.__isset.queryParallelism)
-      return false;
-    else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
-      return false;
-    if (__isset.defaultPoolPath != rhs.__isset.defaultPoolPath)
-      return false;
-    else if (__isset.defaultPoolPath && !(defaultPoolPath == rhs.defaultPoolPath))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMResourcePlan & rhs) const;
   bool operator != (const WMResourcePlan &rhs) const {
     return !(*this == rhs);
   }
@@ -15344,7 +11141,7 @@ class WMResourcePlan : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMResourcePlan &a, WMResourcePlan &b);
+void swap(WMResourcePlan &a, WMResourcePlan &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMResourcePlan& obj);
 
@@ -15364,15 +11161,7 @@ class WMNullableResourcePlan : public virtual ::apache::thrift::TBase {
 
   WMNullableResourcePlan(const WMNullableResourcePlan&);
   WMNullableResourcePlan& operator=(const WMNullableResourcePlan&);
-  WMNullableResourcePlan() noexcept
-                         : name(),
-                           status(static_cast<WMResourcePlanStatus::type>(0)),
-                           queryParallelism(0),
-                           isSetQueryParallelism(0),
-                           defaultPoolPath(),
-                           isSetDefaultPoolPath(0),
-                           ns() {
-  }
+  WMNullableResourcePlan() noexcept;
 
   virtual ~WMNullableResourcePlan() noexcept;
   std::string name;
@@ -15403,38 +11192,7 @@ class WMNullableResourcePlan : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMNullableResourcePlan & rhs) const
-  {
-    if (__isset.name != rhs.__isset.name)
-      return false;
-    else if (__isset.name && !(name == rhs.name))
-      return false;
-    if (__isset.status != rhs.__isset.status)
-      return false;
-    else if (__isset.status && !(status == rhs.status))
-      return false;
-    if (__isset.queryParallelism != rhs.__isset.queryParallelism)
-      return false;
-    else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
-      return false;
-    if (__isset.isSetQueryParallelism != rhs.__isset.isSetQueryParallelism)
-      return false;
-    else if (__isset.isSetQueryParallelism && !(isSetQueryParallelism == rhs.isSetQueryParallelism))
-      return false;
-    if (__isset.defaultPoolPath != rhs.__isset.defaultPoolPath)
-      return false;
-    else if (__isset.defaultPoolPath && !(defaultPoolPath == rhs.defaultPoolPath))
-      return false;
-    if (__isset.isSetDefaultPoolPath != rhs.__isset.isSetDefaultPoolPath)
-      return false;
-    else if (__isset.isSetDefaultPoolPath && !(isSetDefaultPoolPath == rhs.isSetDefaultPoolPath))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMNullableResourcePlan & rhs) const;
   bool operator != (const WMNullableResourcePlan &rhs) const {
     return !(*this == rhs);
   }
@@ -15447,7 +11205,7 @@ class WMNullableResourcePlan : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMNullableResourcePlan &a, WMNullableResourcePlan &b);
+void swap(WMNullableResourcePlan &a, WMNullableResourcePlan &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMNullableResourcePlan& obj);
 
@@ -15464,14 +11222,7 @@ class WMPool : public virtual ::apache::thrift::TBase {
 
   WMPool(const WMPool&);
   WMPool& operator=(const WMPool&);
-  WMPool() noexcept
-         : resourcePlanName(),
-           poolPath(),
-           allocFraction(0),
-           queryParallelism(0),
-           schedulingPolicy(),
-           ns() {
-  }
+  WMPool() noexcept;
 
   virtual ~WMPool() noexcept;
   std::string resourcePlanName;
@@ -15495,30 +11246,7 @@ class WMPool : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMPool & rhs) const
-  {
-    if (!(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (!(poolPath == rhs.poolPath))
-      return false;
-    if (__isset.allocFraction != rhs.__isset.allocFraction)
-      return false;
-    else if (__isset.allocFraction && !(allocFraction == rhs.allocFraction))
-      return false;
-    if (__isset.queryParallelism != rhs.__isset.queryParallelism)
-      return false;
-    else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
-      return false;
-    if (__isset.schedulingPolicy != rhs.__isset.schedulingPolicy)
-      return false;
-    else if (__isset.schedulingPolicy && !(schedulingPolicy == rhs.schedulingPolicy))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMPool & rhs) const;
   bool operator != (const WMPool &rhs) const {
     return !(*this == rhs);
   }
@@ -15531,7 +11259,7 @@ class WMPool : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMPool &a, WMPool &b);
+void swap(WMPool &a, WMPool &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMPool& obj);
 
@@ -15549,15 +11277,7 @@ class WMNullablePool : public virtual ::apache::thrift::TBase {
 
   WMNullablePool(const WMNullablePool&);
   WMNullablePool& operator=(const WMNullablePool&);
-  WMNullablePool() noexcept
-                 : resourcePlanName(),
-                   poolPath(),
-                   allocFraction(0),
-                   queryParallelism(0),
-                   schedulingPolicy(),
-                   isSetSchedulingPolicy(0),
-                   ns() {
-  }
+  WMNullablePool() noexcept;
 
   virtual ~WMNullablePool() noexcept;
   std::string resourcePlanName;
@@ -15584,34 +11304,7 @@ class WMNullablePool : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMNullablePool & rhs) const
-  {
-    if (!(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (!(poolPath == rhs.poolPath))
-      return false;
-    if (__isset.allocFraction != rhs.__isset.allocFraction)
-      return false;
-    else if (__isset.allocFraction && !(allocFraction == rhs.allocFraction))
-      return false;
-    if (__isset.queryParallelism != rhs.__isset.queryParallelism)
-      return false;
-    else if (__isset.queryParallelism && !(queryParallelism == rhs.queryParallelism))
-      return false;
-    if (__isset.schedulingPolicy != rhs.__isset.schedulingPolicy)
-      return false;
-    else if (__isset.schedulingPolicy && !(schedulingPolicy == rhs.schedulingPolicy))
-      return false;
-    if (__isset.isSetSchedulingPolicy != rhs.__isset.isSetSchedulingPolicy)
-      return false;
-    else if (__isset.isSetSchedulingPolicy && !(isSetSchedulingPolicy == rhs.isSetSchedulingPolicy))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMNullablePool & rhs) const;
   bool operator != (const WMNullablePool &rhs) const {
     return !(*this == rhs);
   }
@@ -15624,7 +11317,7 @@ class WMNullablePool : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMNullablePool &a, WMNullablePool &b);
+void swap(WMNullablePool &a, WMNullablePool &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMNullablePool& obj);
 
@@ -15641,14 +11334,7 @@ class WMTrigger : public virtual ::apache::thrift::TBase {
 
   WMTrigger(const WMTrigger&);
   WMTrigger& operator=(const WMTrigger&);
-  WMTrigger() noexcept
-            : resourcePlanName(),
-              triggerName(),
-              triggerExpression(),
-              actionExpression(),
-              isInUnmanaged(0),
-              ns() {
-  }
+  WMTrigger() noexcept;
 
   virtual ~WMTrigger() noexcept;
   std::string resourcePlanName;
@@ -15672,30 +11358,7 @@ class WMTrigger : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMTrigger & rhs) const
-  {
-    if (!(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (!(triggerName == rhs.triggerName))
-      return false;
-    if (__isset.triggerExpression != rhs.__isset.triggerExpression)
-      return false;
-    else if (__isset.triggerExpression && !(triggerExpression == rhs.triggerExpression))
-      return false;
-    if (__isset.actionExpression != rhs.__isset.actionExpression)
-      return false;
-    else if (__isset.actionExpression && !(actionExpression == rhs.actionExpression))
-      return false;
-    if (__isset.isInUnmanaged != rhs.__isset.isInUnmanaged)
-      return false;
-    else if (__isset.isInUnmanaged && !(isInUnmanaged == rhs.isInUnmanaged))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMTrigger & rhs) const;
   bool operator != (const WMTrigger &rhs) const {
     return !(*this == rhs);
   }
@@ -15708,7 +11371,7 @@ class WMTrigger : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMTrigger &a, WMTrigger &b);
+void swap(WMTrigger &a, WMTrigger &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMTrigger& obj);
 
@@ -15724,14 +11387,7 @@ class WMMapping : public virtual ::apache::thrift::TBase {
 
   WMMapping(const WMMapping&);
   WMMapping& operator=(const WMMapping&);
-  WMMapping() noexcept
-            : resourcePlanName(),
-              entityType(),
-              entityName(),
-              poolPath(),
-              ordering(0),
-              ns() {
-  }
+  WMMapping() noexcept;
 
   virtual ~WMMapping() noexcept;
   std::string resourcePlanName;
@@ -15755,28 +11411,7 @@ class WMMapping : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMMapping & rhs) const
-  {
-    if (!(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (!(entityType == rhs.entityType))
-      return false;
-    if (!(entityName == rhs.entityName))
-      return false;
-    if (__isset.poolPath != rhs.__isset.poolPath)
-      return false;
-    else if (__isset.poolPath && !(poolPath == rhs.poolPath))
-      return false;
-    if (__isset.ordering != rhs.__isset.ordering)
-      return false;
-    else if (__isset.ordering && !(ordering == rhs.ordering))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMMapping & rhs) const;
   bool operator != (const WMMapping &rhs) const {
     return !(*this == rhs);
   }
@@ -15789,7 +11424,7 @@ class WMMapping : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMMapping &a, WMMapping &b);
+void swap(WMMapping &a, WMMapping &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMMapping& obj);
 
@@ -15803,11 +11438,7 @@ class WMPoolTrigger : public virtual ::apache::thrift::TBase {
 
   WMPoolTrigger(const WMPoolTrigger&);
   WMPoolTrigger& operator=(const WMPoolTrigger&);
-  WMPoolTrigger() noexcept
-                : pool(),
-                  trigger(),
-                  ns() {
-  }
+  WMPoolTrigger() noexcept;
 
   virtual ~WMPoolTrigger() noexcept;
   std::string pool;
@@ -15822,18 +11453,7 @@ class WMPoolTrigger : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMPoolTrigger & rhs) const
-  {
-    if (!(pool == rhs.pool))
-      return false;
-    if (!(trigger == rhs.trigger))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMPoolTrigger & rhs) const;
   bool operator != (const WMPoolTrigger &rhs) const {
     return !(*this == rhs);
   }
@@ -15846,7 +11466,7 @@ class WMPoolTrigger : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMPoolTrigger &a, WMPoolTrigger &b);
+void swap(WMPoolTrigger &a, WMPoolTrigger &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMPoolTrigger& obj);
 
@@ -15862,8 +11482,7 @@ class WMFullResourcePlan : public virtual ::apache::thrift::TBase {
 
   WMFullResourcePlan(const WMFullResourcePlan&);
   WMFullResourcePlan& operator=(const WMFullResourcePlan&);
-  WMFullResourcePlan() noexcept {
-  }
+  WMFullResourcePlan() noexcept;
 
   virtual ~WMFullResourcePlan() noexcept;
   WMResourcePlan plan;
@@ -15884,26 +11503,7 @@ class WMFullResourcePlan : public virtual ::apache::thrift::TBase {
 
   void __set_poolTriggers(const std::vector<WMPoolTrigger> & val);
 
-  bool operator == (const WMFullResourcePlan & rhs) const
-  {
-    if (!(plan == rhs.plan))
-      return false;
-    if (!(pools == rhs.pools))
-      return false;
-    if (__isset.mappings != rhs.__isset.mappings)
-      return false;
-    else if (__isset.mappings && !(mappings == rhs.mappings))
-      return false;
-    if (__isset.triggers != rhs.__isset.triggers)
-      return false;
-    else if (__isset.triggers && !(triggers == rhs.triggers))
-      return false;
-    if (__isset.poolTriggers != rhs.__isset.poolTriggers)
-      return false;
-    else if (__isset.poolTriggers && !(poolTriggers == rhs.poolTriggers))
-      return false;
-    return true;
-  }
+  bool operator == (const WMFullResourcePlan & rhs) const;
   bool operator != (const WMFullResourcePlan &rhs) const {
     return !(*this == rhs);
   }
@@ -15916,7 +11516,7 @@ class WMFullResourcePlan : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMFullResourcePlan &a, WMFullResourcePlan &b);
+void swap(WMFullResourcePlan &a, WMFullResourcePlan &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMFullResourcePlan& obj);
 
@@ -15931,9 +11531,7 @@ class WMCreateResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMCreateResourcePlanRequest(const WMCreateResourcePlanRequest&);
   WMCreateResourcePlanRequest& operator=(const WMCreateResourcePlanRequest&);
-  WMCreateResourcePlanRequest() noexcept
-                              : copyFrom() {
-  }
+  WMCreateResourcePlanRequest() noexcept;
 
   virtual ~WMCreateResourcePlanRequest() noexcept;
   WMResourcePlan resourcePlan;
@@ -15945,18 +11543,7 @@ class WMCreateResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_copyFrom(const std::string& val);
 
-  bool operator == (const WMCreateResourcePlanRequest & rhs) const
-  {
-    if (__isset.resourcePlan != rhs.__isset.resourcePlan)
-      return false;
-    else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
-      return false;
-    if (__isset.copyFrom != rhs.__isset.copyFrom)
-      return false;
-    else if (__isset.copyFrom && !(copyFrom == rhs.copyFrom))
-      return false;
-    return true;
-  }
+  bool operator == (const WMCreateResourcePlanRequest & rhs) const;
   bool operator != (const WMCreateResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -15969,7 +11556,7 @@ class WMCreateResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateResourcePlanRequest &a, WMCreateResourcePlanRequest &b);
+void swap(WMCreateResourcePlanRequest &a, WMCreateResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateResourcePlanRequest& obj);
 
@@ -15979,15 +11566,11 @@ class WMCreateResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMCreateResourcePlanResponse(const WMCreateResourcePlanResponse&) noexcept;
   WMCreateResourcePlanResponse& operator=(const WMCreateResourcePlanResponse&) noexcept;
-  WMCreateResourcePlanResponse() noexcept {
-  }
+  WMCreateResourcePlanResponse() noexcept;
 
   virtual ~WMCreateResourcePlanResponse() noexcept;
 
-  bool operator == (const WMCreateResourcePlanResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMCreateResourcePlanResponse & /* rhs */) const;
   bool operator != (const WMCreateResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16000,7 +11583,7 @@ class WMCreateResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateResourcePlanResponse &a, WMCreateResourcePlanResponse &b);
+void swap(WMCreateResourcePlanResponse &a, WMCreateResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateResourcePlanResponse& obj);
 
@@ -16014,9 +11597,7 @@ class WMGetActiveResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMGetActiveResourcePlanRequest(const WMGetActiveResourcePlanRequest&);
   WMGetActiveResourcePlanRequest& operator=(const WMGetActiveResourcePlanRequest&);
-  WMGetActiveResourcePlanRequest() noexcept
-                                 : ns() {
-  }
+  WMGetActiveResourcePlanRequest() noexcept;
 
   virtual ~WMGetActiveResourcePlanRequest() noexcept;
   std::string ns;
@@ -16025,14 +11606,7 @@ class WMGetActiveResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMGetActiveResourcePlanRequest & rhs) const
-  {
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetActiveResourcePlanRequest & rhs) const;
   bool operator != (const WMGetActiveResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16045,7 +11619,7 @@ class WMGetActiveResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetActiveResourcePlanRequest &a, WMGetActiveResourcePlanRequest &b);
+void swap(WMGetActiveResourcePlanRequest &a, WMGetActiveResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetActiveResourcePlanRequest& obj);
 
@@ -16059,8 +11633,7 @@ class WMGetActiveResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMGetActiveResourcePlanResponse(const WMGetActiveResourcePlanResponse&);
   WMGetActiveResourcePlanResponse& operator=(const WMGetActiveResourcePlanResponse&);
-  WMGetActiveResourcePlanResponse() noexcept {
-  }
+  WMGetActiveResourcePlanResponse() noexcept;
 
   virtual ~WMGetActiveResourcePlanResponse() noexcept;
   WMFullResourcePlan resourcePlan;
@@ -16069,14 +11642,7 @@ class WMGetActiveResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   void __set_resourcePlan(const WMFullResourcePlan& val);
 
-  bool operator == (const WMGetActiveResourcePlanResponse & rhs) const
-  {
-    if (__isset.resourcePlan != rhs.__isset.resourcePlan)
-      return false;
-    else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetActiveResourcePlanResponse & rhs) const;
   bool operator != (const WMGetActiveResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16089,7 +11655,7 @@ class WMGetActiveResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetActiveResourcePlanResponse &a, WMGetActiveResourcePlanResponse &b);
+void swap(WMGetActiveResourcePlanResponse &a, WMGetActiveResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetActiveResourcePlanResponse& obj);
 
@@ -16104,10 +11670,7 @@ class WMGetResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMGetResourcePlanRequest(const WMGetResourcePlanRequest&);
   WMGetResourcePlanRequest& operator=(const WMGetResourcePlanRequest&);
-  WMGetResourcePlanRequest() noexcept
-                           : resourcePlanName(),
-                             ns() {
-  }
+  WMGetResourcePlanRequest() noexcept;
 
   virtual ~WMGetResourcePlanRequest() noexcept;
   std::string resourcePlanName;
@@ -16119,18 +11682,7 @@ class WMGetResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMGetResourcePlanRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetResourcePlanRequest & rhs) const;
   bool operator != (const WMGetResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16143,7 +11695,7 @@ class WMGetResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetResourcePlanRequest &a, WMGetResourcePlanRequest &b);
+void swap(WMGetResourcePlanRequest &a, WMGetResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetResourcePlanRequest& obj);
 
@@ -16157,8 +11709,7 @@ class WMGetResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMGetResourcePlanResponse(const WMGetResourcePlanResponse&);
   WMGetResourcePlanResponse& operator=(const WMGetResourcePlanResponse&);
-  WMGetResourcePlanResponse() noexcept {
-  }
+  WMGetResourcePlanResponse() noexcept;
 
   virtual ~WMGetResourcePlanResponse() noexcept;
   WMFullResourcePlan resourcePlan;
@@ -16167,14 +11718,7 @@ class WMGetResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   void __set_resourcePlan(const WMFullResourcePlan& val);
 
-  bool operator == (const WMGetResourcePlanResponse & rhs) const
-  {
-    if (__isset.resourcePlan != rhs.__isset.resourcePlan)
-      return false;
-    else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetResourcePlanResponse & rhs) const;
   bool operator != (const WMGetResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16187,7 +11731,7 @@ class WMGetResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetResourcePlanResponse &a, WMGetResourcePlanResponse &b);
+void swap(WMGetResourcePlanResponse &a, WMGetResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetResourcePlanResponse& obj);
 
@@ -16201,9 +11745,7 @@ class WMGetAllResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMGetAllResourcePlanRequest(const WMGetAllResourcePlanRequest&);
   WMGetAllResourcePlanRequest& operator=(const WMGetAllResourcePlanRequest&);
-  WMGetAllResourcePlanRequest() noexcept
-                              : ns() {
-  }
+  WMGetAllResourcePlanRequest() noexcept;
 
   virtual ~WMGetAllResourcePlanRequest() noexcept;
   std::string ns;
@@ -16212,14 +11754,7 @@ class WMGetAllResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMGetAllResourcePlanRequest & rhs) const
-  {
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetAllResourcePlanRequest & rhs) const;
   bool operator != (const WMGetAllResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16232,7 +11767,7 @@ class WMGetAllResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetAllResourcePlanRequest &a, WMGetAllResourcePlanRequest &b);
+void swap(WMGetAllResourcePlanRequest &a, WMGetAllResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetAllResourcePlanRequest& obj);
 
@@ -16246,8 +11781,7 @@ class WMGetAllResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMGetAllResourcePlanResponse(const WMGetAllResourcePlanResponse&);
   WMGetAllResourcePlanResponse& operator=(const WMGetAllResourcePlanResponse&);
-  WMGetAllResourcePlanResponse() noexcept {
-  }
+  WMGetAllResourcePlanResponse() noexcept;
 
   virtual ~WMGetAllResourcePlanResponse() noexcept;
   std::vector<WMResourcePlan>  resourcePlans;
@@ -16256,14 +11790,7 @@ class WMGetAllResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   void __set_resourcePlans(const std::vector<WMResourcePlan> & val);
 
-  bool operator == (const WMGetAllResourcePlanResponse & rhs) const
-  {
-    if (__isset.resourcePlans != rhs.__isset.resourcePlans)
-      return false;
-    else if (__isset.resourcePlans && !(resourcePlans == rhs.resourcePlans))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetAllResourcePlanResponse & rhs) const;
   bool operator != (const WMGetAllResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16276,7 +11803,7 @@ class WMGetAllResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetAllResourcePlanResponse &a, WMGetAllResourcePlanResponse &b);
+void swap(WMGetAllResourcePlanResponse &a, WMGetAllResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetAllResourcePlanResponse& obj);
 
@@ -16295,13 +11822,7 @@ class WMAlterResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMAlterResourcePlanRequest(const WMAlterResourcePlanRequest&);
   WMAlterResourcePlanRequest& operator=(const WMAlterResourcePlanRequest&);
-  WMAlterResourcePlanRequest() noexcept
-                             : resourcePlanName(),
-                               isEnableAndActivate(0),
-                               isForceDeactivate(0),
-                               isReplace(0),
-                               ns() {
-  }
+  WMAlterResourcePlanRequest() noexcept;
 
   virtual ~WMAlterResourcePlanRequest() noexcept;
   std::string resourcePlanName;
@@ -16325,34 +11846,7 @@ class WMAlterResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMAlterResourcePlanRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.resourcePlan != rhs.__isset.resourcePlan)
-      return false;
-    else if (__isset.resourcePlan && !(resourcePlan == rhs.resourcePlan))
-      return false;
-    if (__isset.isEnableAndActivate != rhs.__isset.isEnableAndActivate)
-      return false;
-    else if (__isset.isEnableAndActivate && !(isEnableAndActivate == rhs.isEnableAndActivate))
-      return false;
-    if (__isset.isForceDeactivate != rhs.__isset.isForceDeactivate)
-      return false;
-    else if (__isset.isForceDeactivate && !(isForceDeactivate == rhs.isForceDeactivate))
-      return false;
-    if (__isset.isReplace != rhs.__isset.isReplace)
-      return false;
-    else if (__isset.isReplace && !(isReplace == rhs.isReplace))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMAlterResourcePlanRequest & rhs) const;
   bool operator != (const WMAlterResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16365,7 +11859,7 @@ class WMAlterResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMAlterResourcePlanRequest &a, WMAlterResourcePlanRequest &b);
+void swap(WMAlterResourcePlanRequest &a, WMAlterResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMAlterResourcePlanRequest& obj);
 
@@ -16379,8 +11873,7 @@ class WMAlterResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMAlterResourcePlanResponse(const WMAlterResourcePlanResponse&);
   WMAlterResourcePlanResponse& operator=(const WMAlterResourcePlanResponse&);
-  WMAlterResourcePlanResponse() noexcept {
-  }
+  WMAlterResourcePlanResponse() noexcept;
 
   virtual ~WMAlterResourcePlanResponse() noexcept;
   WMFullResourcePlan fullResourcePlan;
@@ -16389,14 +11882,7 @@ class WMAlterResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   void __set_fullResourcePlan(const WMFullResourcePlan& val);
 
-  bool operator == (const WMAlterResourcePlanResponse & rhs) const
-  {
-    if (__isset.fullResourcePlan != rhs.__isset.fullResourcePlan)
-      return false;
-    else if (__isset.fullResourcePlan && !(fullResourcePlan == rhs.fullResourcePlan))
-      return false;
-    return true;
-  }
+  bool operator == (const WMAlterResourcePlanResponse & rhs) const;
   bool operator != (const WMAlterResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16409,7 +11895,7 @@ class WMAlterResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMAlterResourcePlanResponse &a, WMAlterResourcePlanResponse &b);
+void swap(WMAlterResourcePlanResponse &a, WMAlterResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMAlterResourcePlanResponse& obj);
 
@@ -16424,10 +11910,7 @@ class WMValidateResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMValidateResourcePlanRequest(const WMValidateResourcePlanRequest&);
   WMValidateResourcePlanRequest& operator=(const WMValidateResourcePlanRequest&);
-  WMValidateResourcePlanRequest() noexcept
-                                : resourcePlanName(),
-                                  ns() {
-  }
+  WMValidateResourcePlanRequest() noexcept;
 
   virtual ~WMValidateResourcePlanRequest() noexcept;
   std::string resourcePlanName;
@@ -16439,18 +11922,7 @@ class WMValidateResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMValidateResourcePlanRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMValidateResourcePlanRequest & rhs) const;
   bool operator != (const WMValidateResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16463,7 +11935,7 @@ class WMValidateResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMValidateResourcePlanRequest &a, WMValidateResourcePlanRequest &b);
+void swap(WMValidateResourcePlanRequest &a, WMValidateResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMValidateResourcePlanRequest& obj);
 
@@ -16478,8 +11950,7 @@ class WMValidateResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMValidateResourcePlanResponse(const WMValidateResourcePlanResponse&);
   WMValidateResourcePlanResponse& operator=(const WMValidateResourcePlanResponse&);
-  WMValidateResourcePlanResponse() noexcept {
-  }
+  WMValidateResourcePlanResponse() noexcept;
 
   virtual ~WMValidateResourcePlanResponse() noexcept;
   std::vector<std::string>  errors;
@@ -16491,18 +11962,7 @@ class WMValidateResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   void __set_warnings(const std::vector<std::string> & val);
 
-  bool operator == (const WMValidateResourcePlanResponse & rhs) const
-  {
-    if (__isset.errors != rhs.__isset.errors)
-      return false;
-    else if (__isset.errors && !(errors == rhs.errors))
-      return false;
-    if (__isset.warnings != rhs.__isset.warnings)
-      return false;
-    else if (__isset.warnings && !(warnings == rhs.warnings))
-      return false;
-    return true;
-  }
+  bool operator == (const WMValidateResourcePlanResponse & rhs) const;
   bool operator != (const WMValidateResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16515,7 +11975,7 @@ class WMValidateResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMValidateResourcePlanResponse &a, WMValidateResourcePlanResponse &b);
+void swap(WMValidateResourcePlanResponse &a, WMValidateResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMValidateResourcePlanResponse& obj);
 
@@ -16530,10 +11990,7 @@ class WMDropResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   WMDropResourcePlanRequest(const WMDropResourcePlanRequest&);
   WMDropResourcePlanRequest& operator=(const WMDropResourcePlanRequest&);
-  WMDropResourcePlanRequest() noexcept
-                            : resourcePlanName(),
-                              ns() {
-  }
+  WMDropResourcePlanRequest() noexcept;
 
   virtual ~WMDropResourcePlanRequest() noexcept;
   std::string resourcePlanName;
@@ -16545,18 +12002,7 @@ class WMDropResourcePlanRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMDropResourcePlanRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMDropResourcePlanRequest & rhs) const;
   bool operator != (const WMDropResourcePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16569,7 +12015,7 @@ class WMDropResourcePlanRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropResourcePlanRequest &a, WMDropResourcePlanRequest &b);
+void swap(WMDropResourcePlanRequest &a, WMDropResourcePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropResourcePlanRequest& obj);
 
@@ -16579,15 +12025,11 @@ class WMDropResourcePlanResponse : public virtual ::apache::thrift::TBase {
 
   WMDropResourcePlanResponse(const WMDropResourcePlanResponse&) noexcept;
   WMDropResourcePlanResponse& operator=(const WMDropResourcePlanResponse&) noexcept;
-  WMDropResourcePlanResponse() noexcept {
-  }
+  WMDropResourcePlanResponse() noexcept;
 
   virtual ~WMDropResourcePlanResponse() noexcept;
 
-  bool operator == (const WMDropResourcePlanResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMDropResourcePlanResponse & /* rhs */) const;
   bool operator != (const WMDropResourcePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16600,7 +12042,7 @@ class WMDropResourcePlanResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropResourcePlanResponse &a, WMDropResourcePlanResponse &b);
+void swap(WMDropResourcePlanResponse &a, WMDropResourcePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropResourcePlanResponse& obj);
 
@@ -16614,8 +12056,7 @@ class WMCreateTriggerRequest : public virtual ::apache::thrift::TBase {
 
   WMCreateTriggerRequest(const WMCreateTriggerRequest&);
   WMCreateTriggerRequest& operator=(const WMCreateTriggerRequest&);
-  WMCreateTriggerRequest() noexcept {
-  }
+  WMCreateTriggerRequest() noexcept;
 
   virtual ~WMCreateTriggerRequest() noexcept;
   WMTrigger trigger;
@@ -16624,14 +12065,7 @@ class WMCreateTriggerRequest : public virtual ::apache::thrift::TBase {
 
   void __set_trigger(const WMTrigger& val);
 
-  bool operator == (const WMCreateTriggerRequest & rhs) const
-  {
-    if (__isset.trigger != rhs.__isset.trigger)
-      return false;
-    else if (__isset.trigger && !(trigger == rhs.trigger))
-      return false;
-    return true;
-  }
+  bool operator == (const WMCreateTriggerRequest & rhs) const;
   bool operator != (const WMCreateTriggerRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16644,7 +12078,7 @@ class WMCreateTriggerRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateTriggerRequest &a, WMCreateTriggerRequest &b);
+void swap(WMCreateTriggerRequest &a, WMCreateTriggerRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateTriggerRequest& obj);
 
@@ -16654,15 +12088,11 @@ class WMCreateTriggerResponse : public virtual ::apache::thrift::TBase {
 
   WMCreateTriggerResponse(const WMCreateTriggerResponse&) noexcept;
   WMCreateTriggerResponse& operator=(const WMCreateTriggerResponse&) noexcept;
-  WMCreateTriggerResponse() noexcept {
-  }
+  WMCreateTriggerResponse() noexcept;
 
   virtual ~WMCreateTriggerResponse() noexcept;
 
-  bool operator == (const WMCreateTriggerResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMCreateTriggerResponse & /* rhs */) const;
   bool operator != (const WMCreateTriggerResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16675,7 +12105,7 @@ class WMCreateTriggerResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateTriggerResponse &a, WMCreateTriggerResponse &b);
+void swap(WMCreateTriggerResponse &a, WMCreateTriggerResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateTriggerResponse& obj);
 
@@ -16689,8 +12119,7 @@ class WMAlterTriggerRequest : public virtual ::apache::thrift::TBase {
 
   WMAlterTriggerRequest(const WMAlterTriggerRequest&);
   WMAlterTriggerRequest& operator=(const WMAlterTriggerRequest&);
-  WMAlterTriggerRequest() noexcept {
-  }
+  WMAlterTriggerRequest() noexcept;
 
   virtual ~WMAlterTriggerRequest() noexcept;
   WMTrigger trigger;
@@ -16699,14 +12128,7 @@ class WMAlterTriggerRequest : public virtual ::apache::thrift::TBase {
 
   void __set_trigger(const WMTrigger& val);
 
-  bool operator == (const WMAlterTriggerRequest & rhs) const
-  {
-    if (__isset.trigger != rhs.__isset.trigger)
-      return false;
-    else if (__isset.trigger && !(trigger == rhs.trigger))
-      return false;
-    return true;
-  }
+  bool operator == (const WMAlterTriggerRequest & rhs) const;
   bool operator != (const WMAlterTriggerRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16719,7 +12141,7 @@ class WMAlterTriggerRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMAlterTriggerRequest &a, WMAlterTriggerRequest &b);
+void swap(WMAlterTriggerRequest &a, WMAlterTriggerRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMAlterTriggerRequest& obj);
 
@@ -16729,15 +12151,11 @@ class WMAlterTriggerResponse : public virtual ::apache::thrift::TBase {
 
   WMAlterTriggerResponse(const WMAlterTriggerResponse&) noexcept;
   WMAlterTriggerResponse& operator=(const WMAlterTriggerResponse&) noexcept;
-  WMAlterTriggerResponse() noexcept {
-  }
+  WMAlterTriggerResponse() noexcept;
 
   virtual ~WMAlterTriggerResponse() noexcept;
 
-  bool operator == (const WMAlterTriggerResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMAlterTriggerResponse & /* rhs */) const;
   bool operator != (const WMAlterTriggerResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16750,7 +12168,7 @@ class WMAlterTriggerResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMAlterTriggerResponse &a, WMAlterTriggerResponse &b);
+void swap(WMAlterTriggerResponse &a, WMAlterTriggerResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMAlterTriggerResponse& obj);
 
@@ -16766,11 +12184,7 @@ class WMDropTriggerRequest : public virtual ::apache::thrift::TBase {
 
   WMDropTriggerRequest(const WMDropTriggerRequest&);
   WMDropTriggerRequest& operator=(const WMDropTriggerRequest&);
-  WMDropTriggerRequest() noexcept
-                       : resourcePlanName(),
-                         triggerName(),
-                         ns() {
-  }
+  WMDropTriggerRequest() noexcept;
 
   virtual ~WMDropTriggerRequest() noexcept;
   std::string resourcePlanName;
@@ -16785,22 +12199,7 @@ class WMDropTriggerRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMDropTriggerRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.triggerName != rhs.__isset.triggerName)
-      return false;
-    else if (__isset.triggerName && !(triggerName == rhs.triggerName))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMDropTriggerRequest & rhs) const;
   bool operator != (const WMDropTriggerRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16813,7 +12212,7 @@ class WMDropTriggerRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropTriggerRequest &a, WMDropTriggerRequest &b);
+void swap(WMDropTriggerRequest &a, WMDropTriggerRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropTriggerRequest& obj);
 
@@ -16823,15 +12222,11 @@ class WMDropTriggerResponse : public virtual ::apache::thrift::TBase {
 
   WMDropTriggerResponse(const WMDropTriggerResponse&) noexcept;
   WMDropTriggerResponse& operator=(const WMDropTriggerResponse&) noexcept;
-  WMDropTriggerResponse() noexcept {
-  }
+  WMDropTriggerResponse() noexcept;
 
   virtual ~WMDropTriggerResponse() noexcept;
 
-  bool operator == (const WMDropTriggerResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMDropTriggerResponse & /* rhs */) const;
   bool operator != (const WMDropTriggerResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16844,7 +12239,7 @@ class WMDropTriggerResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropTriggerResponse &a, WMDropTriggerResponse &b);
+void swap(WMDropTriggerResponse &a, WMDropTriggerResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropTriggerResponse& obj);
 
@@ -16859,10 +12254,7 @@ class WMGetTriggersForResourePlanRequest : public virtual ::apache::thrift::TBas
 
   WMGetTriggersForResourePlanRequest(const WMGetTriggersForResourePlanRequest&);
   WMGetTriggersForResourePlanRequest& operator=(const WMGetTriggersForResourePlanRequest&);
-  WMGetTriggersForResourePlanRequest() noexcept
-                                     : resourcePlanName(),
-                                       ns() {
-  }
+  WMGetTriggersForResourePlanRequest() noexcept;
 
   virtual ~WMGetTriggersForResourePlanRequest() noexcept;
   std::string resourcePlanName;
@@ -16874,18 +12266,7 @@ class WMGetTriggersForResourePlanRequest : public virtual ::apache::thrift::TBas
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMGetTriggersForResourePlanRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetTriggersForResourePlanRequest & rhs) const;
   bool operator != (const WMGetTriggersForResourePlanRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16898,7 +12279,7 @@ class WMGetTriggersForResourePlanRequest : public virtual ::apache::thrift::TBas
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetTriggersForResourePlanRequest &a, WMGetTriggersForResourePlanRequest &b);
+void swap(WMGetTriggersForResourePlanRequest &a, WMGetTriggersForResourePlanRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetTriggersForResourePlanRequest& obj);
 
@@ -16912,8 +12293,7 @@ class WMGetTriggersForResourePlanResponse : public virtual ::apache::thrift::TBa
 
   WMGetTriggersForResourePlanResponse(const WMGetTriggersForResourePlanResponse&);
   WMGetTriggersForResourePlanResponse& operator=(const WMGetTriggersForResourePlanResponse&);
-  WMGetTriggersForResourePlanResponse() noexcept {
-  }
+  WMGetTriggersForResourePlanResponse() noexcept;
 
   virtual ~WMGetTriggersForResourePlanResponse() noexcept;
   std::vector<WMTrigger>  triggers;
@@ -16922,14 +12302,7 @@ class WMGetTriggersForResourePlanResponse : public virtual ::apache::thrift::TBa
 
   void __set_triggers(const std::vector<WMTrigger> & val);
 
-  bool operator == (const WMGetTriggersForResourePlanResponse & rhs) const
-  {
-    if (__isset.triggers != rhs.__isset.triggers)
-      return false;
-    else if (__isset.triggers && !(triggers == rhs.triggers))
-      return false;
-    return true;
-  }
+  bool operator == (const WMGetTriggersForResourePlanResponse & rhs) const;
   bool operator != (const WMGetTriggersForResourePlanResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -16942,7 +12315,7 @@ class WMGetTriggersForResourePlanResponse : public virtual ::apache::thrift::TBa
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMGetTriggersForResourePlanResponse &a, WMGetTriggersForResourePlanResponse &b);
+void swap(WMGetTriggersForResourePlanResponse &a, WMGetTriggersForResourePlanResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMGetTriggersForResourePlanResponse& obj);
 
@@ -16956,8 +12329,7 @@ class WMCreatePoolRequest : public virtual ::apache::thrift::TBase {
 
   WMCreatePoolRequest(const WMCreatePoolRequest&);
   WMCreatePoolRequest& operator=(const WMCreatePoolRequest&);
-  WMCreatePoolRequest() noexcept {
-  }
+  WMCreatePoolRequest() noexcept;
 
   virtual ~WMCreatePoolRequest() noexcept;
   WMPool pool;
@@ -16966,14 +12338,7 @@ class WMCreatePoolRequest : public virtual ::apache::thrift::TBase {
 
   void __set_pool(const WMPool& val);
 
-  bool operator == (const WMCreatePoolRequest & rhs) const
-  {
-    if (__isset.pool != rhs.__isset.pool)
-      return false;
-    else if (__isset.pool && !(pool == rhs.pool))
-      return false;
-    return true;
-  }
+  bool operator == (const WMCreatePoolRequest & rhs) const;
   bool operator != (const WMCreatePoolRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -16986,7 +12351,7 @@ class WMCreatePoolRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreatePoolRequest &a, WMCreatePoolRequest &b);
+void swap(WMCreatePoolRequest &a, WMCreatePoolRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreatePoolRequest& obj);
 
@@ -16996,15 +12361,11 @@ class WMCreatePoolResponse : public virtual ::apache::thrift::TBase {
 
   WMCreatePoolResponse(const WMCreatePoolResponse&) noexcept;
   WMCreatePoolResponse& operator=(const WMCreatePoolResponse&) noexcept;
-  WMCreatePoolResponse() noexcept {
-  }
+  WMCreatePoolResponse() noexcept;
 
   virtual ~WMCreatePoolResponse() noexcept;
 
-  bool operator == (const WMCreatePoolResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMCreatePoolResponse & /* rhs */) const;
   bool operator != (const WMCreatePoolResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -17017,7 +12378,7 @@ class WMCreatePoolResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreatePoolResponse &a, WMCreatePoolResponse &b);
+void swap(WMCreatePoolResponse &a, WMCreatePoolResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreatePoolResponse& obj);
 
@@ -17032,9 +12393,7 @@ class WMAlterPoolRequest : public virtual ::apache::thrift::TBase {
 
   WMAlterPoolRequest(const WMAlterPoolRequest&);
   WMAlterPoolRequest& operator=(const WMAlterPoolRequest&);
-  WMAlterPoolRequest() noexcept
-                     : poolPath() {
-  }
+  WMAlterPoolRequest() noexcept;
 
   virtual ~WMAlterPoolRequest() noexcept;
   WMNullablePool pool;
@@ -17046,18 +12405,7 @@ class WMAlterPoolRequest : public virtual ::apache::thrift::TBase {
 
   void __set_poolPath(const std::string& val);
 
-  bool operator == (const WMAlterPoolRequest & rhs) const
-  {
-    if (__isset.pool != rhs.__isset.pool)
-      return false;
-    else if (__isset.pool && !(pool == rhs.pool))
-      return false;
-    if (__isset.poolPath != rhs.__isset.poolPath)
-      return false;
-    else if (__isset.poolPath && !(poolPath == rhs.poolPath))
-      return false;
-    return true;
-  }
+  bool operator == (const WMAlterPoolRequest & rhs) const;
   bool operator != (const WMAlterPoolRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -17070,7 +12418,7 @@ class WMAlterPoolRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMAlterPoolRequest &a, WMAlterPoolRequest &b);
+void swap(WMAlterPoolRequest &a, WMAlterPoolRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMAlterPoolRequest& obj);
 
@@ -17080,15 +12428,11 @@ class WMAlterPoolResponse : public virtual ::apache::thrift::TBase {
 
   WMAlterPoolResponse(const WMAlterPoolResponse&) noexcept;
   WMAlterPoolResponse& operator=(const WMAlterPoolResponse&) noexcept;
-  WMAlterPoolResponse() noexcept {
-  }
+  WMAlterPoolResponse() noexcept;
 
   virtual ~WMAlterPoolResponse() noexcept;
 
-  bool operator == (const WMAlterPoolResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMAlterPoolResponse & /* rhs */) const;
   bool operator != (const WMAlterPoolResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -17101,7 +12445,7 @@ class WMAlterPoolResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMAlterPoolResponse &a, WMAlterPoolResponse &b);
+void swap(WMAlterPoolResponse &a, WMAlterPoolResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMAlterPoolResponse& obj);
 
@@ -17117,11 +12461,7 @@ class WMDropPoolRequest : public virtual ::apache::thrift::TBase {
 
   WMDropPoolRequest(const WMDropPoolRequest&);
   WMDropPoolRequest& operator=(const WMDropPoolRequest&);
-  WMDropPoolRequest() noexcept
-                    : resourcePlanName(),
-                      poolPath(),
-                      ns() {
-  }
+  WMDropPoolRequest() noexcept;
 
   virtual ~WMDropPoolRequest() noexcept;
   std::string resourcePlanName;
@@ -17136,22 +12476,7 @@ class WMDropPoolRequest : public virtual ::apache::thrift::TBase {
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMDropPoolRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.poolPath != rhs.__isset.poolPath)
-      return false;
-    else if (__isset.poolPath && !(poolPath == rhs.poolPath))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMDropPoolRequest & rhs) const;
   bool operator != (const WMDropPoolRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -17164,7 +12489,7 @@ class WMDropPoolRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropPoolRequest &a, WMDropPoolRequest &b);
+void swap(WMDropPoolRequest &a, WMDropPoolRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropPoolRequest& obj);
 
@@ -17174,15 +12499,11 @@ class WMDropPoolResponse : public virtual ::apache::thrift::TBase {
 
   WMDropPoolResponse(const WMDropPoolResponse&) noexcept;
   WMDropPoolResponse& operator=(const WMDropPoolResponse&) noexcept;
-  WMDropPoolResponse() noexcept {
-  }
+  WMDropPoolResponse() noexcept;
 
   virtual ~WMDropPoolResponse() noexcept;
 
-  bool operator == (const WMDropPoolResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMDropPoolResponse & /* rhs */) const;
   bool operator != (const WMDropPoolResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -17195,7 +12516,7 @@ class WMDropPoolResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropPoolResponse &a, WMDropPoolResponse &b);
+void swap(WMDropPoolResponse &a, WMDropPoolResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropPoolResponse& obj);
 
@@ -17210,9 +12531,7 @@ class WMCreateOrUpdateMappingRequest : public virtual ::apache::thrift::TBase {
 
   WMCreateOrUpdateMappingRequest(const WMCreateOrUpdateMappingRequest&);
   WMCreateOrUpdateMappingRequest& operator=(const WMCreateOrUpdateMappingRequest&);
-  WMCreateOrUpdateMappingRequest() noexcept
-                                 : update(0) {
-  }
+  WMCreateOrUpdateMappingRequest() noexcept;
 
   virtual ~WMCreateOrUpdateMappingRequest() noexcept;
   WMMapping mapping;
@@ -17224,18 +12543,7 @@ class WMCreateOrUpdateMappingRequest : public virtual ::apache::thrift::TBase {
 
   void __set_update(const bool val);
 
-  bool operator == (const WMCreateOrUpdateMappingRequest & rhs) const
-  {
-    if (__isset.mapping != rhs.__isset.mapping)
-      return false;
-    else if (__isset.mapping && !(mapping == rhs.mapping))
-      return false;
-    if (__isset.update != rhs.__isset.update)
-      return false;
-    else if (__isset.update && !(update == rhs.update))
-      return false;
-    return true;
-  }
+  bool operator == (const WMCreateOrUpdateMappingRequest & rhs) const;
   bool operator != (const WMCreateOrUpdateMappingRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -17248,7 +12556,7 @@ class WMCreateOrUpdateMappingRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateOrUpdateMappingRequest &a, WMCreateOrUpdateMappingRequest &b);
+void swap(WMCreateOrUpdateMappingRequest &a, WMCreateOrUpdateMappingRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateOrUpdateMappingRequest& obj);
 
@@ -17258,15 +12566,11 @@ class WMCreateOrUpdateMappingResponse : public virtual ::apache::thrift::TBase {
 
   WMCreateOrUpdateMappingResponse(const WMCreateOrUpdateMappingResponse&) noexcept;
   WMCreateOrUpdateMappingResponse& operator=(const WMCreateOrUpdateMappingResponse&) noexcept;
-  WMCreateOrUpdateMappingResponse() noexcept {
-  }
+  WMCreateOrUpdateMappingResponse() noexcept;
 
   virtual ~WMCreateOrUpdateMappingResponse() noexcept;
 
-  bool operator == (const WMCreateOrUpdateMappingResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMCreateOrUpdateMappingResponse & /* rhs */) const;
   bool operator != (const WMCreateOrUpdateMappingResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -17279,7 +12583,7 @@ class WMCreateOrUpdateMappingResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateOrUpdateMappingResponse &a, WMCreateOrUpdateMappingResponse &b);
+void swap(WMCreateOrUpdateMappingResponse &a, WMCreateOrUpdateMappingResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateOrUpdateMappingResponse& obj);
 
@@ -17293,8 +12597,7 @@ class WMDropMappingRequest : public virtual ::apache::thrift::TBase {
 
   WMDropMappingRequest(const WMDropMappingRequest&);
   WMDropMappingRequest& operator=(const WMDropMappingRequest&);
-  WMDropMappingRequest() noexcept {
-  }
+  WMDropMappingRequest() noexcept;
 
   virtual ~WMDropMappingRequest() noexcept;
   WMMapping mapping;
@@ -17303,14 +12606,7 @@ class WMDropMappingRequest : public virtual ::apache::thrift::TBase {
 
   void __set_mapping(const WMMapping& val);
 
-  bool operator == (const WMDropMappingRequest & rhs) const
-  {
-    if (__isset.mapping != rhs.__isset.mapping)
-      return false;
-    else if (__isset.mapping && !(mapping == rhs.mapping))
-      return false;
-    return true;
-  }
+  bool operator == (const WMDropMappingRequest & rhs) const;
   bool operator != (const WMDropMappingRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -17323,7 +12619,7 @@ class WMDropMappingRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropMappingRequest &a, WMDropMappingRequest &b);
+void swap(WMDropMappingRequest &a, WMDropMappingRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropMappingRequest& obj);
 
@@ -17333,15 +12629,11 @@ class WMDropMappingResponse : public virtual ::apache::thrift::TBase {
 
   WMDropMappingResponse(const WMDropMappingResponse&) noexcept;
   WMDropMappingResponse& operator=(const WMDropMappingResponse&) noexcept;
-  WMDropMappingResponse() noexcept {
-  }
+  WMDropMappingResponse() noexcept;
 
   virtual ~WMDropMappingResponse() noexcept;
 
-  bool operator == (const WMDropMappingResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMDropMappingResponse & /* rhs */) const;
   bool operator != (const WMDropMappingResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -17354,7 +12646,7 @@ class WMDropMappingResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMDropMappingResponse &a, WMDropMappingResponse &b);
+void swap(WMDropMappingResponse &a, WMDropMappingResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMDropMappingResponse& obj);
 
@@ -17372,13 +12664,7 @@ class WMCreateOrDropTriggerToPoolMappingRequest : public virtual ::apache::thrif
 
   WMCreateOrDropTriggerToPoolMappingRequest(const WMCreateOrDropTriggerToPoolMappingRequest&);
   WMCreateOrDropTriggerToPoolMappingRequest& operator=(const WMCreateOrDropTriggerToPoolMappingRequest&);
-  WMCreateOrDropTriggerToPoolMappingRequest() noexcept
-                                            : resourcePlanName(),
-                                              triggerName(),
-                                              poolPath(),
-                                              drop(0),
-                                              ns() {
-  }
+  WMCreateOrDropTriggerToPoolMappingRequest() noexcept;
 
   virtual ~WMCreateOrDropTriggerToPoolMappingRequest() noexcept;
   std::string resourcePlanName;
@@ -17399,30 +12685,7 @@ class WMCreateOrDropTriggerToPoolMappingRequest : public virtual ::apache::thrif
 
   void __set_ns(const std::string& val);
 
-  bool operator == (const WMCreateOrDropTriggerToPoolMappingRequest & rhs) const
-  {
-    if (__isset.resourcePlanName != rhs.__isset.resourcePlanName)
-      return false;
-    else if (__isset.resourcePlanName && !(resourcePlanName == rhs.resourcePlanName))
-      return false;
-    if (__isset.triggerName != rhs.__isset.triggerName)
-      return false;
-    else if (__isset.triggerName && !(triggerName == rhs.triggerName))
-      return false;
-    if (__isset.poolPath != rhs.__isset.poolPath)
-      return false;
-    else if (__isset.poolPath && !(poolPath == rhs.poolPath))
-      return false;
-    if (__isset.drop != rhs.__isset.drop)
-      return false;
-    else if (__isset.drop && !(drop == rhs.drop))
-      return false;
-    if (__isset.ns != rhs.__isset.ns)
-      return false;
-    else if (__isset.ns && !(ns == rhs.ns))
-      return false;
-    return true;
-  }
+  bool operator == (const WMCreateOrDropTriggerToPoolMappingRequest & rhs) const;
   bool operator != (const WMCreateOrDropTriggerToPoolMappingRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -17435,7 +12698,7 @@ class WMCreateOrDropTriggerToPoolMappingRequest : public virtual ::apache::thrif
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateOrDropTriggerToPoolMappingRequest &a, WMCreateOrDropTriggerToPoolMappingRequest &b);
+void swap(WMCreateOrDropTriggerToPoolMappingRequest &a, WMCreateOrDropTriggerToPoolMappingRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateOrDropTriggerToPoolMappingRequest& obj);
 
@@ -17445,15 +12708,11 @@ class WMCreateOrDropTriggerToPoolMappingResponse : public virtual ::apache::thri
 
   WMCreateOrDropTriggerToPoolMappingResponse(const WMCreateOrDropTriggerToPoolMappingResponse&) noexcept;
   WMCreateOrDropTriggerToPoolMappingResponse& operator=(const WMCreateOrDropTriggerToPoolMappingResponse&) noexcept;
-  WMCreateOrDropTriggerToPoolMappingResponse() noexcept {
-  }
+  WMCreateOrDropTriggerToPoolMappingResponse() noexcept;
 
   virtual ~WMCreateOrDropTriggerToPoolMappingResponse() noexcept;
 
-  bool operator == (const WMCreateOrDropTriggerToPoolMappingResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const WMCreateOrDropTriggerToPoolMappingResponse & /* rhs */) const;
   bool operator != (const WMCreateOrDropTriggerToPoolMappingResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -17466,7 +12725,7 @@ class WMCreateOrDropTriggerToPoolMappingResponse : public virtual ::apache::thri
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(WMCreateOrDropTriggerToPoolMappingResponse &a, WMCreateOrDropTriggerToPoolMappingResponse &b);
+void swap(WMCreateOrDropTriggerToPoolMappingResponse &a, WMCreateOrDropTriggerToPoolMappingResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const WMCreateOrDropTriggerToPoolMappingResponse& obj);
 
@@ -17488,17 +12747,7 @@ class ISchema : public virtual ::apache::thrift::TBase {
 
   ISchema(const ISchema&);
   ISchema& operator=(const ISchema&);
-  ISchema() noexcept
-          : schemaType(static_cast<SchemaType::type>(0)),
-            name(),
-            catName(),
-            dbName(),
-            compatibility(static_cast<SchemaCompatibility::type>(0)),
-            validationLevel(static_cast<SchemaValidation::type>(0)),
-            canEvolve(0),
-            schemaGroup(),
-            description() {
-  }
+  ISchema() noexcept;
 
   virtual ~ISchema() noexcept;
   /**
@@ -17543,32 +12792,7 @@ class ISchema : public virtual ::apache::thrift::TBase {
 
   void __set_description(const std::string& val);
 
-  bool operator == (const ISchema & rhs) const
-  {
-    if (!(schemaType == rhs.schemaType))
-      return false;
-    if (!(name == rhs.name))
-      return false;
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(compatibility == rhs.compatibility))
-      return false;
-    if (!(validationLevel == rhs.validationLevel))
-      return false;
-    if (!(canEvolve == rhs.canEvolve))
-      return false;
-    if (__isset.schemaGroup != rhs.__isset.schemaGroup)
-      return false;
-    else if (__isset.schemaGroup && !(schemaGroup == rhs.schemaGroup))
-      return false;
-    if (__isset.description != rhs.__isset.description)
-      return false;
-    else if (__isset.description && !(description == rhs.description))
-      return false;
-    return true;
-  }
+  bool operator == (const ISchema & rhs) const;
   bool operator != (const ISchema &rhs) const {
     return !(*this == rhs);
   }
@@ -17581,7 +12805,7 @@ class ISchema : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ISchema &a, ISchema &b);
+void swap(ISchema &a, ISchema &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ISchema& obj);
 
@@ -17597,11 +12821,7 @@ class ISchemaName : public virtual ::apache::thrift::TBase {
 
   ISchemaName(const ISchemaName&);
   ISchemaName& operator=(const ISchemaName&);
-  ISchemaName() noexcept
-              : catName(),
-                dbName(),
-                schemaName() {
-  }
+  ISchemaName() noexcept;
 
   virtual ~ISchemaName() noexcept;
   std::string catName;
@@ -17616,16 +12836,7 @@ class ISchemaName : public virtual ::apache::thrift::TBase {
 
   void __set_schemaName(const std::string& val);
 
-  bool operator == (const ISchemaName & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(schemaName == rhs.schemaName))
-      return false;
-    return true;
-  }
+  bool operator == (const ISchemaName & rhs) const;
   bool operator != (const ISchemaName &rhs) const {
     return !(*this == rhs);
   }
@@ -17638,7 +12849,7 @@ class ISchemaName : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ISchemaName &a, ISchemaName &b);
+void swap(ISchemaName &a, ISchemaName &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ISchemaName& obj);
 
@@ -17653,8 +12864,7 @@ class AlterISchemaRequest : public virtual ::apache::thrift::TBase {
 
   AlterISchemaRequest(const AlterISchemaRequest&);
   AlterISchemaRequest& operator=(const AlterISchemaRequest&);
-  AlterISchemaRequest() noexcept {
-  }
+  AlterISchemaRequest() noexcept;
 
   virtual ~AlterISchemaRequest() noexcept;
   ISchemaName name;
@@ -17666,14 +12876,7 @@ class AlterISchemaRequest : public virtual ::apache::thrift::TBase {
 
   void __set_newSchema(const ISchema& val);
 
-  bool operator == (const AlterISchemaRequest & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(newSchema == rhs.newSchema))
-      return false;
-    return true;
-  }
+  bool operator == (const AlterISchemaRequest & rhs) const;
   bool operator != (const AlterISchemaRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -17686,7 +12889,7 @@ class AlterISchemaRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterISchemaRequest &a, AlterISchemaRequest &b);
+void swap(AlterISchemaRequest &a, AlterISchemaRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterISchemaRequest& obj);
 
@@ -17709,15 +12912,7 @@ class SchemaVersion : public virtual ::apache::thrift::TBase {
 
   SchemaVersion(const SchemaVersion&);
   SchemaVersion& operator=(const SchemaVersion&);
-  SchemaVersion() noexcept
-                : version(0),
-                  createdAt(0),
-                  state(static_cast<SchemaVersionState::type>(0)),
-                  description(),
-                  schemaText(),
-                  fingerprint(),
-                  name() {
-  }
+  SchemaVersion() noexcept;
 
   virtual ~SchemaVersion() noexcept;
   ISchemaName schema;
@@ -17757,42 +12952,7 @@ class SchemaVersion : public virtual ::apache::thrift::TBase {
 
   void __set_serDe(const SerDeInfo& val);
 
-  bool operator == (const SchemaVersion & rhs) const
-  {
-    if (!(schema == rhs.schema))
-      return false;
-    if (!(version == rhs.version))
-      return false;
-    if (!(createdAt == rhs.createdAt))
-      return false;
-    if (!(cols == rhs.cols))
-      return false;
-    if (__isset.state != rhs.__isset.state)
-      return false;
-    else if (__isset.state && !(state == rhs.state))
-      return false;
-    if (__isset.description != rhs.__isset.description)
-      return false;
-    else if (__isset.description && !(description == rhs.description))
-      return false;
-    if (__isset.schemaText != rhs.__isset.schemaText)
-      return false;
-    else if (__isset.schemaText && !(schemaText == rhs.schemaText))
-      return false;
-    if (__isset.fingerprint != rhs.__isset.fingerprint)
-      return false;
-    else if (__isset.fingerprint && !(fingerprint == rhs.fingerprint))
-      return false;
-    if (__isset.name != rhs.__isset.name)
-      return false;
-    else if (__isset.name && !(name == rhs.name))
-      return false;
-    if (__isset.serDe != rhs.__isset.serDe)
-      return false;
-    else if (__isset.serDe && !(serDe == rhs.serDe))
-      return false;
-    return true;
-  }
+  bool operator == (const SchemaVersion & rhs) const;
   bool operator != (const SchemaVersion &rhs) const {
     return !(*this == rhs);
   }
@@ -17805,7 +12965,7 @@ class SchemaVersion : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SchemaVersion &a, SchemaVersion &b);
+void swap(SchemaVersion &a, SchemaVersion &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SchemaVersion& obj);
 
@@ -17820,9 +12980,7 @@ class SchemaVersionDescriptor : public virtual ::apache::thrift::TBase {
 
   SchemaVersionDescriptor(const SchemaVersionDescriptor&);
   SchemaVersionDescriptor& operator=(const SchemaVersionDescriptor&);
-  SchemaVersionDescriptor() noexcept
-                          : version(0) {
-  }
+  SchemaVersionDescriptor() noexcept;
 
   virtual ~SchemaVersionDescriptor() noexcept;
   ISchemaName schema;
@@ -17834,14 +12992,7 @@ class SchemaVersionDescriptor : public virtual ::apache::thrift::TBase {
 
   void __set_version(const int32_t val);
 
-  bool operator == (const SchemaVersionDescriptor & rhs) const
-  {
-    if (!(schema == rhs.schema))
-      return false;
-    if (!(version == rhs.version))
-      return false;
-    return true;
-  }
+  bool operator == (const SchemaVersionDescriptor & rhs) const;
   bool operator != (const SchemaVersionDescriptor &rhs) const {
     return !(*this == rhs);
   }
@@ -17854,7 +13005,7 @@ class SchemaVersionDescriptor : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SchemaVersionDescriptor &a, SchemaVersionDescriptor &b);
+void swap(SchemaVersionDescriptor &a, SchemaVersionDescriptor &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SchemaVersionDescriptor& obj);
 
@@ -17870,11 +13021,7 @@ class FindSchemasByColsRqst : public virtual ::apache::thrift::TBase {
 
   FindSchemasByColsRqst(const FindSchemasByColsRqst&);
   FindSchemasByColsRqst& operator=(const FindSchemasByColsRqst&);
-  FindSchemasByColsRqst() noexcept
-                        : colName(),
-                          colNamespace(),
-                          type() {
-  }
+  FindSchemasByColsRqst() noexcept;
 
   virtual ~FindSchemasByColsRqst() noexcept;
   std::string colName;
@@ -17889,22 +13036,7 @@ class FindSchemasByColsRqst : public virtual ::apache::thrift::TBase {
 
   void __set_type(const std::string& val);
 
-  bool operator == (const FindSchemasByColsRqst & rhs) const
-  {
-    if (__isset.colName != rhs.__isset.colName)
-      return false;
-    else if (__isset.colName && !(colName == rhs.colName))
-      return false;
-    if (__isset.colNamespace != rhs.__isset.colNamespace)
-      return false;
-    else if (__isset.colNamespace && !(colNamespace == rhs.colNamespace))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    return true;
-  }
+  bool operator == (const FindSchemasByColsRqst & rhs) const;
   bool operator != (const FindSchemasByColsRqst &rhs) const {
     return !(*this == rhs);
   }
@@ -17917,7 +13049,7 @@ class FindSchemasByColsRqst : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FindSchemasByColsRqst &a, FindSchemasByColsRqst &b);
+void swap(FindSchemasByColsRqst &a, FindSchemasByColsRqst &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FindSchemasByColsRqst& obj);
 
@@ -17931,8 +13063,7 @@ class FindSchemasByColsResp : public virtual ::apache::thrift::TBase {
 
   FindSchemasByColsResp(const FindSchemasByColsResp&);
   FindSchemasByColsResp& operator=(const FindSchemasByColsResp&);
-  FindSchemasByColsResp() noexcept {
-  }
+  FindSchemasByColsResp() noexcept;
 
   virtual ~FindSchemasByColsResp() noexcept;
   std::vector<SchemaVersionDescriptor>  schemaVersions;
@@ -17941,12 +13072,7 @@ class FindSchemasByColsResp : public virtual ::apache::thrift::TBase {
 
   void __set_schemaVersions(const std::vector<SchemaVersionDescriptor> & val);
 
-  bool operator == (const FindSchemasByColsResp & rhs) const
-  {
-    if (!(schemaVersions == rhs.schemaVersions))
-      return false;
-    return true;
-  }
+  bool operator == (const FindSchemasByColsResp & rhs) const;
   bool operator != (const FindSchemasByColsResp &rhs) const {
     return !(*this == rhs);
   }
@@ -17959,7 +13085,7 @@ class FindSchemasByColsResp : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(FindSchemasByColsResp &a, FindSchemasByColsResp &b);
+void swap(FindSchemasByColsResp &a, FindSchemasByColsResp &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const FindSchemasByColsResp& obj);
 
@@ -17974,9 +13100,7 @@ class MapSchemaVersionToSerdeRequest : public virtual ::apache::thrift::TBase {
 
   MapSchemaVersionToSerdeRequest(const MapSchemaVersionToSerdeRequest&);
   MapSchemaVersionToSerdeRequest& operator=(const MapSchemaVersionToSerdeRequest&);
-  MapSchemaVersionToSerdeRequest() noexcept
-                                 : serdeName() {
-  }
+  MapSchemaVersionToSerdeRequest() noexcept;
 
   virtual ~MapSchemaVersionToSerdeRequest() noexcept;
   SchemaVersionDescriptor schemaVersion;
@@ -17988,14 +13112,7 @@ class MapSchemaVersionToSerdeRequest : public virtual ::apache::thrift::TBase {
 
   void __set_serdeName(const std::string& val);
 
-  bool operator == (const MapSchemaVersionToSerdeRequest & rhs) const
-  {
-    if (!(schemaVersion == rhs.schemaVersion))
-      return false;
-    if (!(serdeName == rhs.serdeName))
-      return false;
-    return true;
-  }
+  bool operator == (const MapSchemaVersionToSerdeRequest & rhs) const;
   bool operator != (const MapSchemaVersionToSerdeRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18008,7 +13125,7 @@ class MapSchemaVersionToSerdeRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(MapSchemaVersionToSerdeRequest &a, MapSchemaVersionToSerdeRequest &b);
+void swap(MapSchemaVersionToSerdeRequest &a, MapSchemaVersionToSerdeRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MapSchemaVersionToSerdeRequest& obj);
 
@@ -18023,9 +13140,7 @@ class SetSchemaVersionStateRequest : public virtual ::apache::thrift::TBase {
 
   SetSchemaVersionStateRequest(const SetSchemaVersionStateRequest&);
   SetSchemaVersionStateRequest& operator=(const SetSchemaVersionStateRequest&);
-  SetSchemaVersionStateRequest() noexcept
-                               : state(static_cast<SchemaVersionState::type>(0)) {
-  }
+  SetSchemaVersionStateRequest() noexcept;
 
   virtual ~SetSchemaVersionStateRequest() noexcept;
   SchemaVersionDescriptor schemaVersion;
@@ -18041,14 +13156,7 @@ class SetSchemaVersionStateRequest : public virtual ::apache::thrift::TBase {
 
   void __set_state(const SchemaVersionState::type val);
 
-  bool operator == (const SetSchemaVersionStateRequest & rhs) const
-  {
-    if (!(schemaVersion == rhs.schemaVersion))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    return true;
-  }
+  bool operator == (const SetSchemaVersionStateRequest & rhs) const;
   bool operator != (const SetSchemaVersionStateRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18061,7 +13169,7 @@ class SetSchemaVersionStateRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(SetSchemaVersionStateRequest &a, SetSchemaVersionStateRequest &b);
+void swap(SetSchemaVersionStateRequest &a, SetSchemaVersionStateRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const SetSchemaVersionStateRequest& obj);
 
@@ -18075,9 +13183,7 @@ class GetSerdeRequest : public virtual ::apache::thrift::TBase {
 
   GetSerdeRequest(const GetSerdeRequest&);
   GetSerdeRequest& operator=(const GetSerdeRequest&);
-  GetSerdeRequest() noexcept
-                  : serdeName() {
-  }
+  GetSerdeRequest() noexcept;
 
   virtual ~GetSerdeRequest() noexcept;
   std::string serdeName;
@@ -18086,12 +13192,7 @@ class GetSerdeRequest : public virtual ::apache::thrift::TBase {
 
   void __set_serdeName(const std::string& val);
 
-  bool operator == (const GetSerdeRequest & rhs) const
-  {
-    if (!(serdeName == rhs.serdeName))
-      return false;
-    return true;
-  }
+  bool operator == (const GetSerdeRequest & rhs) const;
   bool operator != (const GetSerdeRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18104,7 +13205,7 @@ class GetSerdeRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetSerdeRequest &a, GetSerdeRequest &b);
+void swap(GetSerdeRequest &a, GetSerdeRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetSerdeRequest& obj);
 
@@ -18118,11 +13219,7 @@ class RuntimeStat : public virtual ::apache::thrift::TBase {
 
   RuntimeStat(const RuntimeStat&);
   RuntimeStat& operator=(const RuntimeStat&);
-  RuntimeStat() noexcept
-              : createTime(0),
-                weight(0),
-                payload() {
-  }
+  RuntimeStat() noexcept;
 
   virtual ~RuntimeStat() noexcept;
   int32_t createTime;
@@ -18137,18 +13234,7 @@ class RuntimeStat : public virtual ::apache::thrift::TBase {
 
   void __set_payload(const std::string& val);
 
-  bool operator == (const RuntimeStat & rhs) const
-  {
-    if (__isset.createTime != rhs.__isset.createTime)
-      return false;
-    else if (__isset.createTime && !(createTime == rhs.createTime))
-      return false;
-    if (!(weight == rhs.weight))
-      return false;
-    if (!(payload == rhs.payload))
-      return false;
-    return true;
-  }
+  bool operator == (const RuntimeStat & rhs) const;
   bool operator != (const RuntimeStat &rhs) const {
     return !(*this == rhs);
   }
@@ -18161,7 +13247,7 @@ class RuntimeStat : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(RuntimeStat &a, RuntimeStat &b);
+void swap(RuntimeStat &a, RuntimeStat &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const RuntimeStat& obj);
 
@@ -18171,10 +13257,7 @@ class GetRuntimeStatsRequest : public virtual ::apache::thrift::TBase {
 
   GetRuntimeStatsRequest(const GetRuntimeStatsRequest&) noexcept;
   GetRuntimeStatsRequest& operator=(const GetRuntimeStatsRequest&) noexcept;
-  GetRuntimeStatsRequest() noexcept
-                         : maxWeight(0),
-                           maxCreateTime(0) {
-  }
+  GetRuntimeStatsRequest() noexcept;
 
   virtual ~GetRuntimeStatsRequest() noexcept;
   int32_t maxWeight;
@@ -18184,14 +13267,7 @@ class GetRuntimeStatsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_maxCreateTime(const int32_t val);
 
-  bool operator == (const GetRuntimeStatsRequest & rhs) const
-  {
-    if (!(maxWeight == rhs.maxWeight))
-      return false;
-    if (!(maxCreateTime == rhs.maxCreateTime))
-      return false;
-    return true;
-  }
+  bool operator == (const GetRuntimeStatsRequest & rhs) const;
   bool operator != (const GetRuntimeStatsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18204,7 +13280,7 @@ class GetRuntimeStatsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetRuntimeStatsRequest &a, GetRuntimeStatsRequest &b);
+void swap(GetRuntimeStatsRequest &a, GetRuntimeStatsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetRuntimeStatsRequest& obj);
 
@@ -18226,9 +13302,7 @@ class CreateTableRequest : public virtual ::apache::thrift::TBase {
 
   CreateTableRequest(const CreateTableRequest&);
   CreateTableRequest& operator=(const CreateTableRequest&);
-  CreateTableRequest() noexcept
-                     : processorIdentifier() {
-  }
+  CreateTableRequest() noexcept;
 
   virtual ~CreateTableRequest() noexcept;
   Table table;
@@ -18264,48 +13338,7 @@ class CreateTableRequest : public virtual ::apache::thrift::TBase {
 
   void __set_processorIdentifier(const std::string& val);
 
-  bool operator == (const CreateTableRequest & rhs) const
-  {
-    if (!(table == rhs.table))
-      return false;
-    if (__isset.envContext != rhs.__isset.envContext)
-      return false;
-    else if (__isset.envContext && !(envContext == rhs.envContext))
-      return false;
-    if (__isset.primaryKeys != rhs.__isset.primaryKeys)
-      return false;
-    else if (__isset.primaryKeys && !(primaryKeys == rhs.primaryKeys))
-      return false;
-    if (__isset.foreignKeys != rhs.__isset.foreignKeys)
-      return false;
-    else if (__isset.foreignKeys && !(foreignKeys == rhs.foreignKeys))
-      return false;
-    if (__isset.uniqueConstraints != rhs.__isset.uniqueConstraints)
-      return false;
-    else if (__isset.uniqueConstraints && !(uniqueConstraints == rhs.uniqueConstraints))
-      return false;
-    if (__isset.notNullConstraints != rhs.__isset.notNullConstraints)
-      return false;
-    else if (__isset.notNullConstraints && !(notNullConstraints == rhs.notNullConstraints))
-      return false;
-    if (__isset.defaultConstraints != rhs.__isset.defaultConstraints)
-      return false;
-    else if (__isset.defaultConstraints && !(defaultConstraints == rhs.defaultConstraints))
-      return false;
-    if (__isset.checkConstraints != rhs.__isset.checkConstraints)
-      return false;
-    else if (__isset.checkConstraints && !(checkConstraints == rhs.checkConstraints))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    return true;
-  }
+  bool operator == (const CreateTableRequest & rhs) const;
   bool operator != (const CreateTableRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18318,7 +13351,7 @@ class CreateTableRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CreateTableRequest &a, CreateTableRequest &b);
+void swap(CreateTableRequest &a, CreateTableRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CreateTableRequest& obj);
 
@@ -18343,19 +13376,7 @@ class CreateDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   CreateDatabaseRequest(const CreateDatabaseRequest&);
   CreateDatabaseRequest& operator=(const CreateDatabaseRequest&);
-  CreateDatabaseRequest() noexcept
-                        : databaseName(),
-                          description(),
-                          locationUri(),
-                          ownerName(),
-                          ownerType(static_cast<PrincipalType::type>(0)),
-                          catalogName(),
-                          createTime(0),
-                          managedLocationUri(),
-                          type(static_cast<DatabaseType::type>(0)),
-                          dataConnectorName(),
-                          remote_dbname() {
-  }
+  CreateDatabaseRequest() noexcept;
 
   virtual ~CreateDatabaseRequest() noexcept;
   std::string databaseName;
@@ -18408,60 +13429,7 @@ class CreateDatabaseRequest : public virtual ::apache::thrift::TBase {
 
   void __set_remote_dbname(const std::string& val);
 
-  bool operator == (const CreateDatabaseRequest & rhs) const
-  {
-    if (!(databaseName == rhs.databaseName))
-      return false;
-    if (__isset.description != rhs.__isset.description)
-      return false;
-    else if (__isset.description && !(description == rhs.description))
-      return false;
-    if (__isset.locationUri != rhs.__isset.locationUri)
-      return false;
-    else if (__isset.locationUri && !(locationUri == rhs.locationUri))
-      return false;
-    if (__isset.parameters != rhs.__isset.parameters)
-      return false;
-    else if (__isset.parameters && !(parameters == rhs.parameters))
-      return false;
-    if (__isset.privileges != rhs.__isset.privileges)
-      return false;
-    else if (__isset.privileges && !(privileges == rhs.privileges))
-      return false;
-    if (__isset.ownerName != rhs.__isset.ownerName)
-      return false;
-    else if (__isset.ownerName && !(ownerName == rhs.ownerName))
-      return false;
-    if (__isset.ownerType != rhs.__isset.ownerType)
-      return false;
-    else if (__isset.ownerType && !(ownerType == rhs.ownerType))
-      return false;
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (__isset.createTime != rhs.__isset.createTime)
-      return false;
-    else if (__isset.createTime && !(createTime == rhs.createTime))
-      return false;
-    if (__isset.managedLocationUri != rhs.__isset.managedLocationUri)
-      return false;
-    else if (__isset.managedLocationUri && !(managedLocationUri == rhs.managedLocationUri))
-      return false;
-    if (__isset.type != rhs.__isset.type)
-      return false;
-    else if (__isset.type && !(type == rhs.type))
-      return false;
-    if (__isset.dataConnectorName != rhs.__isset.dataConnectorName)
-      return false;
-    else if (__isset.dataConnectorName && !(dataConnectorName == rhs.dataConnectorName))
-      return false;
-    if (__isset.remote_dbname != rhs.__isset.remote_dbname)
-      return false;
-    else if (__isset.remote_dbname && !(remote_dbname == rhs.remote_dbname))
-      return false;
-    return true;
-  }
+  bool operator == (const CreateDatabaseRequest & rhs) const;
   bool operator != (const CreateDatabaseRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18474,7 +13442,7 @@ class CreateDatabaseRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CreateDatabaseRequest &a, CreateDatabaseRequest &b);
+void swap(CreateDatabaseRequest &a, CreateDatabaseRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CreateDatabaseRequest& obj);
 
@@ -18484,20 +13452,14 @@ class CreateDataConnectorRequest : public virtual ::apache::thrift::TBase {
 
   CreateDataConnectorRequest(const CreateDataConnectorRequest&);
   CreateDataConnectorRequest& operator=(const CreateDataConnectorRequest&);
-  CreateDataConnectorRequest() noexcept {
-  }
+  CreateDataConnectorRequest() noexcept;
 
   virtual ~CreateDataConnectorRequest() noexcept;
   DataConnector connector;
 
   void __set_connector(const DataConnector& val);
 
-  bool operator == (const CreateDataConnectorRequest & rhs) const
-  {
-    if (!(connector == rhs.connector))
-      return false;
-    return true;
-  }
+  bool operator == (const CreateDataConnectorRequest & rhs) const;
   bool operator != (const CreateDataConnectorRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18510,7 +13472,7 @@ class CreateDataConnectorRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(CreateDataConnectorRequest &a, CreateDataConnectorRequest &b);
+void swap(CreateDataConnectorRequest &a, CreateDataConnectorRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CreateDataConnectorRequest& obj);
 
@@ -18520,21 +13482,14 @@ class GetDataConnectorRequest : public virtual ::apache::thrift::TBase {
 
   GetDataConnectorRequest(const GetDataConnectorRequest&);
   GetDataConnectorRequest& operator=(const GetDataConnectorRequest&);
-  GetDataConnectorRequest() noexcept
-                          : connectorName() {
-  }
+  GetDataConnectorRequest() noexcept;
 
   virtual ~GetDataConnectorRequest() noexcept;
   std::string connectorName;
 
   void __set_connectorName(const std::string& val);
 
-  bool operator == (const GetDataConnectorRequest & rhs) const
-  {
-    if (!(connectorName == rhs.connectorName))
-      return false;
-    return true;
-  }
+  bool operator == (const GetDataConnectorRequest & rhs) const;
   bool operator != (const GetDataConnectorRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18547,7 +13502,7 @@ class GetDataConnectorRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetDataConnectorRequest &a, GetDataConnectorRequest &b);
+void swap(GetDataConnectorRequest &a, GetDataConnectorRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetDataConnectorRequest& obj);
 
@@ -18557,9 +13512,7 @@ class AlterDataConnectorRequest : public virtual ::apache::thrift::TBase {
 
   AlterDataConnectorRequest(const AlterDataConnectorRequest&);
   AlterDataConnectorRequest& operator=(const AlterDataConnectorRequest&);
-  AlterDataConnectorRequest() noexcept
-                            : connectorName() {
-  }
+  AlterDataConnectorRequest() noexcept;
 
   virtual ~AlterDataConnectorRequest() noexcept;
   std::string connectorName;
@@ -18569,14 +13522,7 @@ class AlterDataConnectorRequest : public virtual ::apache::thrift::TBase {
 
   void __set_newConnector(const DataConnector& val);
 
-  bool operator == (const AlterDataConnectorRequest & rhs) const
-  {
-    if (!(connectorName == rhs.connectorName))
-      return false;
-    if (!(newConnector == rhs.newConnector))
-      return false;
-    return true;
-  }
+  bool operator == (const AlterDataConnectorRequest & rhs) const;
   bool operator != (const AlterDataConnectorRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18589,7 +13535,7 @@ class AlterDataConnectorRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterDataConnectorRequest &a, AlterDataConnectorRequest &b);
+void swap(AlterDataConnectorRequest &a, AlterDataConnectorRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterDataConnectorRequest& obj);
 
@@ -18604,11 +13550,7 @@ class DropDataConnectorRequest : public virtual ::apache::thrift::TBase {
 
   DropDataConnectorRequest(const DropDataConnectorRequest&);
   DropDataConnectorRequest& operator=(const DropDataConnectorRequest&);
-  DropDataConnectorRequest() noexcept
-                           : connectorName(),
-                             ifNotExists(0),
-                             checkReferences(0) {
-  }
+  DropDataConnectorRequest() noexcept;
 
   virtual ~DropDataConnectorRequest() noexcept;
   std::string connectorName;
@@ -18623,20 +13565,7 @@ class DropDataConnectorRequest : public virtual ::apache::thrift::TBase {
 
   void __set_checkReferences(const bool val);
 
-  bool operator == (const DropDataConnectorRequest & rhs) const
-  {
-    if (!(connectorName == rhs.connectorName))
-      return false;
-    if (__isset.ifNotExists != rhs.__isset.ifNotExists)
-      return false;
-    else if (__isset.ifNotExists && !(ifNotExists == rhs.ifNotExists))
-      return false;
-    if (__isset.checkReferences != rhs.__isset.checkReferences)
-      return false;
-    else if (__isset.checkReferences && !(checkReferences == rhs.checkReferences))
-      return false;
-    return true;
-  }
+  bool operator == (const DropDataConnectorRequest & rhs) const;
   bool operator != (const DropDataConnectorRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18649,7 +13578,7 @@ class DropDataConnectorRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropDataConnectorRequest &a, DropDataConnectorRequest &b);
+void swap(DropDataConnectorRequest &a, DropDataConnectorRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropDataConnectorRequest& obj);
 
@@ -18659,21 +13588,14 @@ class ScheduledQueryPollRequest : public virtual ::apache::thrift::TBase {
 
   ScheduledQueryPollRequest(const ScheduledQueryPollRequest&);
   ScheduledQueryPollRequest& operator=(const ScheduledQueryPollRequest&);
-  ScheduledQueryPollRequest() noexcept
-                            : clusterNamespace() {
-  }
+  ScheduledQueryPollRequest() noexcept;
 
   virtual ~ScheduledQueryPollRequest() noexcept;
   std::string clusterNamespace;
 
   void __set_clusterNamespace(const std::string& val);
 
-  bool operator == (const ScheduledQueryPollRequest & rhs) const
-  {
-    if (!(clusterNamespace == rhs.clusterNamespace))
-      return false;
-    return true;
-  }
+  bool operator == (const ScheduledQueryPollRequest & rhs) const;
   bool operator != (const ScheduledQueryPollRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18686,7 +13608,7 @@ class ScheduledQueryPollRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ScheduledQueryPollRequest &a, ScheduledQueryPollRequest &b);
+void swap(ScheduledQueryPollRequest &a, ScheduledQueryPollRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ScheduledQueryPollRequest& obj);
 
@@ -18696,10 +13618,7 @@ class ScheduledQueryKey : public virtual ::apache::thrift::TBase {
 
   ScheduledQueryKey(const ScheduledQueryKey&);
   ScheduledQueryKey& operator=(const ScheduledQueryKey&);
-  ScheduledQueryKey() noexcept
-                    : scheduleName(),
-                      clusterNamespace() {
-  }
+  ScheduledQueryKey() noexcept;
 
   virtual ~ScheduledQueryKey() noexcept;
   std::string scheduleName;
@@ -18709,14 +13628,7 @@ class ScheduledQueryKey : public virtual ::apache::thrift::TBase {
 
   void __set_clusterNamespace(const std::string& val);
 
-  bool operator == (const ScheduledQueryKey & rhs) const
-  {
-    if (!(scheduleName == rhs.scheduleName))
-      return false;
-    if (!(clusterNamespace == rhs.clusterNamespace))
-      return false;
-    return true;
-  }
+  bool operator == (const ScheduledQueryKey & rhs) const;
   bool operator != (const ScheduledQueryKey &rhs) const {
     return !(*this == rhs);
   }
@@ -18729,7 +13641,7 @@ class ScheduledQueryKey : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ScheduledQueryKey &a, ScheduledQueryKey &b);
+void swap(ScheduledQueryKey &a, ScheduledQueryKey &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ScheduledQueryKey& obj);
 
@@ -18746,11 +13658,7 @@ class ScheduledQueryPollResponse : public virtual ::apache::thrift::TBase {
 
   ScheduledQueryPollResponse(const ScheduledQueryPollResponse&);
   ScheduledQueryPollResponse& operator=(const ScheduledQueryPollResponse&);
-  ScheduledQueryPollResponse() noexcept
-                             : executionId(0),
-                               query(),
-                               user() {
-  }
+  ScheduledQueryPollResponse() noexcept;
 
   virtual ~ScheduledQueryPollResponse() noexcept;
   ScheduledQueryKey scheduleKey;
@@ -18768,26 +13676,7 @@ class ScheduledQueryPollResponse : public virtual ::apache::thrift::TBase {
 
   void __set_user(const std::string& val);
 
-  bool operator == (const ScheduledQueryPollResponse & rhs) const
-  {
-    if (__isset.scheduleKey != rhs.__isset.scheduleKey)
-      return false;
-    else if (__isset.scheduleKey && !(scheduleKey == rhs.scheduleKey))
-      return false;
-    if (__isset.executionId != rhs.__isset.executionId)
-      return false;
-    else if (__isset.executionId && !(executionId == rhs.executionId))
-      return false;
-    if (__isset.query != rhs.__isset.query)
-      return false;
-    else if (__isset.query && !(query == rhs.query))
-      return false;
-    if (__isset.user != rhs.__isset.user)
-      return false;
-    else if (__isset.user && !(user == rhs.user))
-      return false;
-    return true;
-  }
+  bool operator == (const ScheduledQueryPollResponse & rhs) const;
   bool operator != (const ScheduledQueryPollResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -18800,7 +13689,7 @@ class ScheduledQueryPollResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ScheduledQueryPollResponse &a, ScheduledQueryPollResponse &b);
+void swap(ScheduledQueryPollResponse &a, ScheduledQueryPollResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ScheduledQueryPollResponse& obj);
 
@@ -18818,13 +13707,7 @@ class ScheduledQuery : public virtual ::apache::thrift::TBase {
 
   ScheduledQuery(const ScheduledQuery&);
   ScheduledQuery& operator=(const ScheduledQuery&);
-  ScheduledQuery() noexcept
-                 : enabled(0),
-                   schedule(),
-                   user(),
-                   query(),
-                   nextExecution(0) {
-  }
+  ScheduledQuery() noexcept;
 
   virtual ~ScheduledQuery() noexcept;
   ScheduledQueryKey scheduleKey;
@@ -18848,32 +13731,7 @@ class ScheduledQuery : public virtual ::apache::thrift::TBase {
 
   void __set_nextExecution(const int32_t val);
 
-  bool operator == (const ScheduledQuery & rhs) const
-  {
-    if (!(scheduleKey == rhs.scheduleKey))
-      return false;
-    if (__isset.enabled != rhs.__isset.enabled)
-      return false;
-    else if (__isset.enabled && !(enabled == rhs.enabled))
-      return false;
-    if (__isset.schedule != rhs.__isset.schedule)
-      return false;
-    else if (__isset.schedule && !(schedule == rhs.schedule))
-      return false;
-    if (__isset.user != rhs.__isset.user)
-      return false;
-    else if (__isset.user && !(user == rhs.user))
-      return false;
-    if (__isset.query != rhs.__isset.query)
-      return false;
-    else if (__isset.query && !(query == rhs.query))
-      return false;
-    if (__isset.nextExecution != rhs.__isset.nextExecution)
-      return false;
-    else if (__isset.nextExecution && !(nextExecution == rhs.nextExecution))
-      return false;
-    return true;
-  }
+  bool operator == (const ScheduledQuery & rhs) const;
   bool operator != (const ScheduledQuery &rhs) const {
     return !(*this == rhs);
   }
@@ -18886,7 +13744,7 @@ class ScheduledQuery : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ScheduledQuery &a, ScheduledQuery &b);
+void swap(ScheduledQuery &a, ScheduledQuery &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ScheduledQuery& obj);
 
@@ -18896,9 +13754,7 @@ class ScheduledQueryMaintenanceRequest : public virtual ::apache::thrift::TBase
 
   ScheduledQueryMaintenanceRequest(const ScheduledQueryMaintenanceRequest&);
   ScheduledQueryMaintenanceRequest& operator=(const ScheduledQueryMaintenanceRequest&);
-  ScheduledQueryMaintenanceRequest() noexcept
-                                   : type(static_cast<ScheduledQueryMaintenanceRequestType::type>(0)) {
-  }
+  ScheduledQueryMaintenanceRequest() noexcept;
 
   virtual ~ScheduledQueryMaintenanceRequest() noexcept;
   /**
@@ -18912,14 +13768,7 @@ class ScheduledQueryMaintenanceRequest : public virtual ::apache::thrift::TBase
 
   void __set_scheduledQuery(const ScheduledQuery& val);
 
-  bool operator == (const ScheduledQueryMaintenanceRequest & rhs) const
-  {
-    if (!(type == rhs.type))
-      return false;
-    if (!(scheduledQuery == rhs.scheduledQuery))
-      return false;
-    return true;
-  }
+  bool operator == (const ScheduledQueryMaintenanceRequest & rhs) const;
   bool operator != (const ScheduledQueryMaintenanceRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -18932,7 +13781,7 @@ class ScheduledQueryMaintenanceRequest : public virtual ::apache::thrift::TBase
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ScheduledQueryMaintenanceRequest &a, ScheduledQueryMaintenanceRequest &b);
+void swap(ScheduledQueryMaintenanceRequest &a, ScheduledQueryMaintenanceRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ScheduledQueryMaintenanceRequest& obj);
 
@@ -18946,12 +13795,7 @@ class ScheduledQueryProgressInfo : public virtual ::apache::thrift::TBase {
 
   ScheduledQueryProgressInfo(const ScheduledQueryProgressInfo&);
   ScheduledQueryProgressInfo& operator=(const ScheduledQueryProgressInfo&);
-  ScheduledQueryProgressInfo() noexcept
-                             : scheduledExecutionId(0),
-                               state(static_cast<QueryState::type>(0)),
-                               executorQueryId(),
-                               errorMessage() {
-  }
+  ScheduledQueryProgressInfo() noexcept;
 
   virtual ~ScheduledQueryProgressInfo() noexcept;
   int64_t scheduledExecutionId;
@@ -18973,20 +13817,7 @@ class ScheduledQueryProgressInfo : public virtual ::apache::thrift::TBase {
 
   void __set_errorMessage(const std::string& val);
 
-  bool operator == (const ScheduledQueryProgressInfo & rhs) const
-  {
-    if (!(scheduledExecutionId == rhs.scheduledExecutionId))
-      return false;
-    if (!(state == rhs.state))
-      return false;
-    if (!(executorQueryId == rhs.executorQueryId))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    return true;
-  }
+  bool operator == (const ScheduledQueryProgressInfo & rhs) const;
   bool operator != (const ScheduledQueryProgressInfo &rhs) const {
     return !(*this == rhs);
   }
@@ -18999,7 +13830,7 @@ class ScheduledQueryProgressInfo : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ScheduledQueryProgressInfo &a, ScheduledQueryProgressInfo &b);
+void swap(ScheduledQueryProgressInfo &a, ScheduledQueryProgressInfo &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ScheduledQueryProgressInfo& obj);
 
@@ -19018,14 +13849,7 @@ class AlterPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   AlterPartitionsRequest(const AlterPartitionsRequest&);
   AlterPartitionsRequest& operator=(const AlterPartitionsRequest&);
-  AlterPartitionsRequest() noexcept
-                         : catName(),
-                           dbName(),
-                           tableName(),
-                           writeId(-1LL),
-                           validWriteIdList(),
-                           skipColumnSchemaForPartition(0) {
-  }
+  AlterPartitionsRequest() noexcept;
 
   virtual ~AlterPartitionsRequest() noexcept;
   std::string catName;
@@ -19058,40 +13882,7 @@ class AlterPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_partitionColSchema(const std::vector<FieldSchema> & val);
 
-  bool operator == (const AlterPartitionsRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(partitions == rhs.partitions))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.partitionColSchema != rhs.__isset.partitionColSchema)
-      return false;
-    else if (__isset.partitionColSchema && !(partitionColSchema == rhs.partitionColSchema))
-      return false;
-    return true;
-  }
+  bool operator == (const AlterPartitionsRequest & rhs) const;
   bool operator != (const AlterPartitionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -19104,7 +13895,7 @@ class AlterPartitionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterPartitionsRequest &a, AlterPartitionsRequest &b);
+void swap(AlterPartitionsRequest &a, AlterPartitionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterPartitionsRequest& obj);
 
@@ -19121,12 +13912,7 @@ class AppendPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   AppendPartitionsRequest(const AppendPartitionsRequest&);
   AppendPartitionsRequest& operator=(const AppendPartitionsRequest&);
-  AppendPartitionsRequest() noexcept
-                          : catalogName(),
-                            dbName(),
-                            tableName(),
-                            name() {
-  }
+  AppendPartitionsRequest() noexcept;
 
   virtual ~AppendPartitionsRequest() noexcept;
   std::string catalogName;
@@ -19150,30 +13936,7 @@ class AppendPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_environmentContext(const EnvironmentContext& val);
 
-  bool operator == (const AppendPartitionsRequest & rhs) const
-  {
-    if (__isset.catalogName != rhs.__isset.catalogName)
-      return false;
-    else if (__isset.catalogName && !(catalogName == rhs.catalogName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (__isset.name != rhs.__isset.name)
-      return false;
-    else if (__isset.name && !(name == rhs.name))
-      return false;
-    if (__isset.partVals != rhs.__isset.partVals)
-      return false;
-    else if (__isset.partVals && !(partVals == rhs.partVals))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    return true;
-  }
+  bool operator == (const AppendPartitionsRequest & rhs) const;
   bool operator != (const AppendPartitionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -19186,7 +13949,7 @@ class AppendPartitionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AppendPartitionsRequest &a, AppendPartitionsRequest &b);
+void swap(AppendPartitionsRequest &a, AppendPartitionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AppendPartitionsRequest& obj);
 
@@ -19196,15 +13959,11 @@ class AlterPartitionsResponse : public virtual ::apache::thrift::TBase {
 
   AlterPartitionsResponse(const AlterPartitionsResponse&) noexcept;
   AlterPartitionsResponse& operator=(const AlterPartitionsResponse&) noexcept;
-  AlterPartitionsResponse() noexcept {
-  }
+  AlterPartitionsResponse() noexcept;
 
   virtual ~AlterPartitionsResponse() noexcept;
 
-  bool operator == (const AlterPartitionsResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const AlterPartitionsResponse & /* rhs */) const;
   bool operator != (const AlterPartitionsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -19217,7 +13976,7 @@ class AlterPartitionsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterPartitionsResponse &a, AlterPartitionsResponse &b);
+void swap(AlterPartitionsResponse &a, AlterPartitionsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterPartitionsResponse& obj);
 
@@ -19234,14 +13993,7 @@ class RenamePartitionRequest : public virtual ::apache::thrift::TBase {
 
   RenamePartitionRequest(const RenamePartitionRequest&);
   RenamePartitionRequest& operator=(const RenamePartitionRequest&);
-  RenamePartitionRequest() noexcept
-                         : catName(),
-                           dbName(),
-                           tableName(),
-                           validWriteIdList(),
-                           txnId(0),
-                           clonePart(0) {
-  }
+  RenamePartitionRequest() noexcept;
 
   virtual ~RenamePartitionRequest() noexcept;
   std::string catName;
@@ -19271,34 +14023,7 @@ class RenamePartitionRequest : public virtual ::apache::thrift::TBase {
 
   void __set_clonePart(const bool val);
 
-  bool operator == (const RenamePartitionRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(partVals == rhs.partVals))
-      return false;
-    if (!(newPart == rhs.newPart))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.txnId != rhs.__isset.txnId)
-      return false;
-    else if (__isset.txnId && !(txnId == rhs.txnId))
-      return false;
-    if (__isset.clonePart != rhs.__isset.clonePart)
-      return false;
-    else if (__isset.clonePart && !(clonePart == rhs.clonePart))
-      return false;
-    return true;
-  }
+  bool operator == (const RenamePartitionRequest & rhs) const;
   bool operator != (const RenamePartitionRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -19311,7 +14036,7 @@ class RenamePartitionRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(RenamePartitionRequest &a, RenamePartitionRequest &b);
+void swap(RenamePartitionRequest &a, RenamePartitionRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const RenamePartitionRequest& obj);
 
@@ -19321,15 +14046,11 @@ class RenamePartitionResponse : public virtual ::apache::thrift::TBase {
 
   RenamePartitionResponse(const RenamePartitionResponse&) noexcept;
   RenamePartitionResponse& operator=(const RenamePartitionResponse&) noexcept;
-  RenamePartitionResponse() noexcept {
-  }
+  RenamePartitionResponse() noexcept;
 
   virtual ~RenamePartitionResponse() noexcept;
 
-  bool operator == (const RenamePartitionResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const RenamePartitionResponse & /* rhs */) const;
   bool operator != (const RenamePartitionResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -19342,7 +14063,7 @@ class RenamePartitionResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(RenamePartitionResponse &a, RenamePartitionResponse &b);
+void swap(RenamePartitionResponse &a, RenamePartitionResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const RenamePartitionResponse& obj);
 
@@ -19363,16 +14084,7 @@ class AlterTableRequest : public virtual ::apache::thrift::TBase {
 
   AlterTableRequest(const AlterTableRequest&);
   AlterTableRequest& operator=(const AlterTableRequest&);
-  AlterTableRequest() noexcept
-                    : catName(),
-                      dbName(),
-                      tableName(),
-                      writeId(-1LL),
-                      validWriteIdList(),
-                      processorIdentifier(),
-                      expectedParameterKey(),
-                      expectedParameterValue() {
-  }
+  AlterTableRequest() noexcept;
 
   virtual ~AlterTableRequest() noexcept;
   std::string catName;
@@ -19411,48 +14123,7 @@ class AlterTableRequest : public virtual ::apache::thrift::TBase {
 
   void __set_expectedParameterValue(const std::string& val);
 
-  bool operator == (const AlterTableRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tableName == rhs.tableName))
-      return false;
-    if (!(table == rhs.table))
-      return false;
-    if (__isset.environmentContext != rhs.__isset.environmentContext)
-      return false;
-    else if (__isset.environmentContext && !(environmentContext == rhs.environmentContext))
-      return false;
-    if (__isset.writeId != rhs.__isset.writeId)
-      return false;
-    else if (__isset.writeId && !(writeId == rhs.writeId))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    if (__isset.expectedParameterKey != rhs.__isset.expectedParameterKey)
-      return false;
-    else if (__isset.expectedParameterKey && !(expectedParameterKey == rhs.expectedParameterKey))
-      return false;
-    if (__isset.expectedParameterValue != rhs.__isset.expectedParameterValue)
-      return false;
-    else if (__isset.expectedParameterValue && !(expectedParameterValue == rhs.expectedParameterValue))
-      return false;
-    return true;
-  }
+  bool operator == (const AlterTableRequest & rhs) const;
   bool operator != (const AlterTableRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -19465,7 +14136,7 @@ class AlterTableRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterTableRequest &a, AlterTableRequest &b);
+void swap(AlterTableRequest &a, AlterTableRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterTableRequest& obj);
 
@@ -19475,15 +14146,11 @@ class AlterTableResponse : public virtual ::apache::thrift::TBase {
 
   AlterTableResponse(const AlterTableResponse&) noexcept;
   AlterTableResponse& operator=(const AlterTableResponse&) noexcept;
-  AlterTableResponse() noexcept {
-  }
+  AlterTableResponse() noexcept;
 
   virtual ~AlterTableResponse() noexcept;
 
-  bool operator == (const AlterTableResponse & /* rhs */) const
-  {
-    return true;
-  }
+  bool operator == (const AlterTableResponse & /* rhs */) const;
   bool operator != (const AlterTableResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -19496,7 +14163,7 @@ class AlterTableResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AlterTableResponse &a, AlterTableResponse &b);
+void swap(AlterTableResponse &a, AlterTableResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlterTableResponse& obj);
 
@@ -19512,13 +14179,7 @@ class TableParamsUpdate : public virtual ::apache::thrift::TBase {
 
   TableParamsUpdate(const TableParamsUpdate&);
   TableParamsUpdate& operator=(const TableParamsUpdate&);
-  TableParamsUpdate() noexcept
-                    : cat_name(),
-                      db_name(),
-                      table_name(),
-                      expected_param_key(),
-                      expected_param_value() {
-  }
+  TableParamsUpdate() noexcept;
 
   virtual ~TableParamsUpdate() noexcept;
   std::string cat_name;
@@ -19542,28 +14203,7 @@ class TableParamsUpdate : public virtual ::apache::thrift::TBase {
 
   void __set_expected_param_value(const std::string& val);
 
-  bool operator == (const TableParamsUpdate & rhs) const
-  {
-    if (__isset.cat_name != rhs.__isset.cat_name)
-      return false;
-    else if (__isset.cat_name && !(cat_name == rhs.cat_name))
-      return false;
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(table_name == rhs.table_name))
-      return false;
-    if (!(params == rhs.params))
-      return false;
-    if (__isset.expected_param_key != rhs.__isset.expected_param_key)
-      return false;
-    else if (__isset.expected_param_key && !(expected_param_key == rhs.expected_param_key))
-      return false;
-    if (__isset.expected_param_value != rhs.__isset.expected_param_value)
-      return false;
-    else if (__isset.expected_param_value && !(expected_param_value == rhs.expected_param_value))
-      return false;
-    return true;
-  }
+  bool operator == (const TableParamsUpdate & rhs) const;
   bool operator != (const TableParamsUpdate &rhs) const {
     return !(*this == rhs);
   }
@@ -19576,7 +14216,7 @@ class TableParamsUpdate : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(TableParamsUpdate &a, TableParamsUpdate &b);
+void swap(TableParamsUpdate &a, TableParamsUpdate &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TableParamsUpdate& obj);
 
@@ -19591,9 +14231,7 @@ class GetPartitionsFilterSpec : public virtual ::apache::thrift::TBase {
 
   GetPartitionsFilterSpec(const GetPartitionsFilterSpec&);
   GetPartitionsFilterSpec& operator=(const GetPartitionsFilterSpec&);
-  GetPartitionsFilterSpec() noexcept
-                          : filterMode(static_cast<PartitionFilterMode::type>(0)) {
-  }
+  GetPartitionsFilterSpec() noexcept;
 
   virtual ~GetPartitionsFilterSpec() noexcept;
   /**
@@ -19609,18 +14247,7 @@ class GetPartitionsFilterSpec : public virtual ::apache::thrift::TBase {
 
   void __set_filters(const std::vector<std::string> & val);
 
-  bool operator == (const GetPartitionsFilterSpec & rhs) const
-  {
-    if (__isset.filterMode != rhs.__isset.filterMode)
-      return false;
-    else if (__isset.filterMode && !(filterMode == rhs.filterMode))
-      return false;
-    if (__isset.filters != rhs.__isset.filters)
-      return false;
-    else if (__isset.filters && !(filters == rhs.filters))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsFilterSpec & rhs) const;
   bool operator != (const GetPartitionsFilterSpec &rhs) const {
     return !(*this == rhs);
   }
@@ -19633,7 +14260,7 @@ class GetPartitionsFilterSpec : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsFilterSpec &a, GetPartitionsFilterSpec &b);
+void swap(GetPartitionsFilterSpec &a, GetPartitionsFilterSpec &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsFilterSpec& obj);
 
@@ -19647,8 +14274,7 @@ class GetPartitionsResponse : public virtual ::apache::thrift::TBase {
 
   GetPartitionsResponse(const GetPartitionsResponse&);
   GetPartitionsResponse& operator=(const GetPartitionsResponse&);
-  GetPartitionsResponse() noexcept {
-  }
+  GetPartitionsResponse() noexcept;
 
   virtual ~GetPartitionsResponse() noexcept;
   std::vector<PartitionSpec>  partitionSpec;
@@ -19657,12 +14283,7 @@ class GetPartitionsResponse : public virtual ::apache::thrift::TBase {
 
   void __set_partitionSpec(const std::vector<PartitionSpec> & val);
 
-  bool operator == (const GetPartitionsResponse & rhs) const
-  {
-    if (!(partitionSpec == rhs.partitionSpec))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsResponse & rhs) const;
   bool operator != (const GetPartitionsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -19675,7 +14296,7 @@ class GetPartitionsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsResponse &a, GetPartitionsResponse &b);
+void swap(GetPartitionsResponse &a, GetPartitionsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsResponse& obj);
 
@@ -19699,15 +14320,7 @@ class GetPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   GetPartitionsRequest(const GetPartitionsRequest&);
   GetPartitionsRequest& operator=(const GetPartitionsRequest&);
-  GetPartitionsRequest() noexcept
-                       : catName(),
-                         dbName(),
-                         tblName(),
-                         withAuth(0),
-                         user(),
-                         processorIdentifier(),
-                         validWriteIdList() {
-  }
+  GetPartitionsRequest() noexcept;
 
   virtual ~GetPartitionsRequest() noexcept;
   std::string catName;
@@ -19746,46 +14359,7 @@ class GetPartitionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_validWriteIdList(const std::string& val);
 
-  bool operator == (const GetPartitionsRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.withAuth != rhs.__isset.withAuth)
-      return false;
-    else if (__isset.withAuth && !(withAuth == rhs.withAuth))
-      return false;
-    if (__isset.user != rhs.__isset.user)
-      return false;
-    else if (__isset.user && !(user == rhs.user))
-      return false;
-    if (__isset.groupNames != rhs.__isset.groupNames)
-      return false;
-    else if (__isset.groupNames && !(groupNames == rhs.groupNames))
-      return false;
-    if (!(projectionSpec == rhs.projectionSpec))
-      return false;
-    if (!(filterSpec == rhs.filterSpec))
-      return false;
-    if (__isset.processorCapabilities != rhs.__isset.processorCapabilities)
-      return false;
-    else if (__isset.processorCapabilities && !(processorCapabilities == rhs.processorCapabilities))
-      return false;
-    if (__isset.processorIdentifier != rhs.__isset.processorIdentifier)
-      return false;
-    else if (__isset.processorIdentifier && !(processorIdentifier == rhs.processorIdentifier))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsRequest & rhs) const;
   bool operator != (const GetPartitionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -19798,7 +14372,7 @@ class GetPartitionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsRequest &a, GetPartitionsRequest &b);
+void swap(GetPartitionsRequest &a, GetPartitionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsRequest& obj);
 
@@ -19815,13 +14389,7 @@ class GetFieldsRequest : public virtual ::apache::thrift::TBase {
 
   GetFieldsRequest(const GetFieldsRequest&);
   GetFieldsRequest& operator=(const GetFieldsRequest&);
-  GetFieldsRequest() noexcept
-                   : catName(),
-                     dbName(),
-                     tblName(),
-                     validWriteIdList(),
-                     id(-1LL) {
-  }
+  GetFieldsRequest() noexcept;
 
   virtual ~GetFieldsRequest() noexcept;
   std::string catName;
@@ -19845,30 +14413,7 @@ class GetFieldsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_id(const int64_t val);
 
-  bool operator == (const GetFieldsRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.envContext != rhs.__isset.envContext)
-      return false;
-    else if (__isset.envContext && !(envContext == rhs.envContext))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFieldsRequest & rhs) const;
   bool operator != (const GetFieldsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -19881,7 +14426,7 @@ class GetFieldsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFieldsRequest &a, GetFieldsRequest &b);
+void swap(GetFieldsRequest &a, GetFieldsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFieldsRequest& obj);
 
@@ -19891,20 +14436,14 @@ class GetFieldsResponse : public virtual ::apache::thrift::TBase {
 
   GetFieldsResponse(const GetFieldsResponse&);
   GetFieldsResponse& operator=(const GetFieldsResponse&);
-  GetFieldsResponse() noexcept {
-  }
+  GetFieldsResponse() noexcept;
 
   virtual ~GetFieldsResponse() noexcept;
   std::vector<FieldSchema>  fields;
 
   void __set_fields(const std::vector<FieldSchema> & val);
 
-  bool operator == (const GetFieldsResponse & rhs) const
-  {
-    if (!(fields == rhs.fields))
-      return false;
-    return true;
-  }
+  bool operator == (const GetFieldsResponse & rhs) const;
   bool operator != (const GetFieldsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -19917,7 +14456,7 @@ class GetFieldsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetFieldsResponse &a, GetFieldsResponse &b);
+void swap(GetFieldsResponse &a, GetFieldsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetFieldsResponse& obj);
 
@@ -19934,13 +14473,7 @@ class GetSchemaRequest : public virtual ::apache::thrift::TBase {
 
   GetSchemaRequest(const GetSchemaRequest&);
   GetSchemaRequest& operator=(const GetSchemaRequest&);
-  GetSchemaRequest() noexcept
-                   : catName(),
-                     dbName(),
-                     tblName(),
-                     validWriteIdList(),
-                     id(-1LL) {
-  }
+  GetSchemaRequest() noexcept;
 
   virtual ~GetSchemaRequest() noexcept;
   std::string catName;
@@ -19964,30 +14497,7 @@ class GetSchemaRequest : public virtual ::apache::thrift::TBase {
 
   void __set_id(const int64_t val);
 
-  bool operator == (const GetSchemaRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.envContext != rhs.__isset.envContext)
-      return false;
-    else if (__isset.envContext && !(envContext == rhs.envContext))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    return true;
-  }
+  bool operator == (const GetSchemaRequest & rhs) const;
   bool operator != (const GetSchemaRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20000,7 +14510,7 @@ class GetSchemaRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetSchemaRequest &a, GetSchemaRequest &b);
+void swap(GetSchemaRequest &a, GetSchemaRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetSchemaRequest& obj);
 
@@ -20010,20 +14520,14 @@ class GetSchemaResponse : public virtual ::apache::thrift::TBase {
 
   GetSchemaResponse(const GetSchemaResponse&);
   GetSchemaResponse& operator=(const GetSchemaResponse&);
-  GetSchemaResponse() noexcept {
-  }
+  GetSchemaResponse() noexcept;
 
   virtual ~GetSchemaResponse() noexcept;
   std::vector<FieldSchema>  fields;
 
   void __set_fields(const std::vector<FieldSchema> & val);
 
-  bool operator == (const GetSchemaResponse & rhs) const
-  {
-    if (!(fields == rhs.fields))
-      return false;
-    return true;
-  }
+  bool operator == (const GetSchemaResponse & rhs) const;
   bool operator != (const GetSchemaResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -20036,7 +14540,7 @@ class GetSchemaResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetSchemaResponse &a, GetSchemaResponse &b);
+void swap(GetSchemaResponse &a, GetSchemaResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetSchemaResponse& obj);
 
@@ -20052,13 +14556,7 @@ class GetPartitionRequest : public virtual ::apache::thrift::TBase {
 
   GetPartitionRequest(const GetPartitionRequest&);
   GetPartitionRequest& operator=(const GetPartitionRequest&);
-  GetPartitionRequest() noexcept
-                      : catName(),
-                        dbName(),
-                        tblName(),
-                        validWriteIdList(),
-                        id(-1LL) {
-  }
+  GetPartitionRequest() noexcept;
 
   virtual ~GetPartitionRequest() noexcept;
   std::string catName;
@@ -20082,28 +14580,7 @@ class GetPartitionRequest : public virtual ::apache::thrift::TBase {
 
   void __set_id(const int64_t val);
 
-  bool operator == (const GetPartitionRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(partVals == rhs.partVals))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionRequest & rhs) const;
   bool operator != (const GetPartitionRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20116,7 +14593,7 @@ class GetPartitionRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionRequest &a, GetPartitionRequest &b);
+void swap(GetPartitionRequest &a, GetPartitionRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionRequest& obj);
 
@@ -20126,20 +14603,14 @@ class GetPartitionResponse : public virtual ::apache::thrift::TBase {
 
   GetPartitionResponse(const GetPartitionResponse&);
   GetPartitionResponse& operator=(const GetPartitionResponse&);
-  GetPartitionResponse() noexcept {
-  }
+  GetPartitionResponse() noexcept;
 
   virtual ~GetPartitionResponse() noexcept;
   Partition partition;
 
   void __set_partition(const Partition& val);
 
-  bool operator == (const GetPartitionResponse & rhs) const
-  {
-    if (!(partition == rhs.partition))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionResponse & rhs) const;
   bool operator != (const GetPartitionResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -20152,7 +14623,7 @@ class GetPartitionResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionResponse &a, GetPartitionResponse &b);
+void swap(GetPartitionResponse &a, GetPartitionResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionResponse& obj);
 
@@ -20172,17 +14643,7 @@ class PartitionsRequest : public virtual ::apache::thrift::TBase {
 
   PartitionsRequest(const PartitionsRequest&);
   PartitionsRequest& operator=(const PartitionsRequest&);
-  PartitionsRequest() noexcept
-                    : catName(),
-                      dbName(),
-                      tblName(),
-                      maxParts(-1),
-                      validWriteIdList(),
-                      id(-1LL),
-                      skipColumnSchemaForPartition(0),
-                      includeParamKeyPattern(),
-                      excludeParamKeyPattern() {
-  }
+  PartitionsRequest() noexcept;
 
   virtual ~PartitionsRequest() noexcept;
   std::string catName;
@@ -20215,42 +14676,7 @@ class PartitionsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_excludeParamKeyPattern(const std::string& val);
 
-  bool operator == (const PartitionsRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.maxParts != rhs.__isset.maxParts)
-      return false;
-    else if (__isset.maxParts && !(maxParts == rhs.maxParts))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
-      return false;
-    else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
-      return false;
-    else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsRequest & rhs) const;
   bool operator != (const PartitionsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20263,7 +14689,7 @@ class PartitionsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsRequest &a, PartitionsRequest &b);
+void swap(PartitionsRequest &a, PartitionsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsRequest& obj);
 
@@ -20273,20 +14699,14 @@ class PartitionsResponse : public virtual ::apache::thrift::TBase {
 
   PartitionsResponse(const PartitionsResponse&);
   PartitionsResponse& operator=(const PartitionsResponse&);
-  PartitionsResponse() noexcept {
-  }
+  PartitionsResponse() noexcept;
 
   virtual ~PartitionsResponse() noexcept;
   std::vector<Partition>  partitions;
 
   void __set_partitions(const std::vector<Partition> & val);
 
-  bool operator == (const PartitionsResponse & rhs) const
-  {
-    if (!(partitions == rhs.partitions))
-      return false;
-    return true;
-  }
+  bool operator == (const PartitionsResponse & rhs) const;
   bool operator != (const PartitionsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -20299,7 +14719,7 @@ class PartitionsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(PartitionsResponse &a, PartitionsResponse &b);
+void swap(PartitionsResponse &a, PartitionsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const PartitionsResponse& obj);
 
@@ -20320,16 +14740,7 @@ class GetPartitionsByFilterRequest : public virtual ::apache::thrift::TBase {
 
   GetPartitionsByFilterRequest(const GetPartitionsByFilterRequest&);
   GetPartitionsByFilterRequest& operator=(const GetPartitionsByFilterRequest&);
-  GetPartitionsByFilterRequest() noexcept
-                               : catName(),
-                                 dbName(),
-                                 tblName(),
-                                 filter(),
-                                 maxParts(-1),
-                                 skipColumnSchemaForPartition(0),
-                                 includeParamKeyPattern(),
-                                 excludeParamKeyPattern() {
-  }
+  GetPartitionsByFilterRequest() noexcept;
 
   virtual ~GetPartitionsByFilterRequest() noexcept;
   std::string catName;
@@ -20359,36 +14770,7 @@ class GetPartitionsByFilterRequest : public virtual ::apache::thrift::TBase {
 
   void __set_excludeParamKeyPattern(const std::string& val);
 
-  bool operator == (const GetPartitionsByFilterRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (!(filter == rhs.filter))
-      return false;
-    if (__isset.maxParts != rhs.__isset.maxParts)
-      return false;
-    else if (__isset.maxParts && !(maxParts == rhs.maxParts))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
-      return false;
-    else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
-      return false;
-    else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsByFilterRequest & rhs) const;
   bool operator != (const GetPartitionsByFilterRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20401,7 +14783,7 @@ class GetPartitionsByFilterRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsByFilterRequest &a, GetPartitionsByFilterRequest &b);
+void swap(GetPartitionsByFilterRequest &a, GetPartitionsByFilterRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsByFilterRequest& obj);
 
@@ -20419,14 +14801,7 @@ class GetPartitionNamesPsRequest : public virtual ::apache::thrift::TBase {
 
   GetPartitionNamesPsRequest(const GetPartitionNamesPsRequest&);
   GetPartitionNamesPsRequest& operator=(const GetPartitionNamesPsRequest&);
-  GetPartitionNamesPsRequest() noexcept
-                             : catName(),
-                               dbName(),
-                               tblName(),
-                               maxParts(-1),
-                               validWriteIdList(),
-                               id(-1LL) {
-  }
+  GetPartitionNamesPsRequest() noexcept;
 
   virtual ~GetPartitionNamesPsRequest() noexcept;
   std::string catName;
@@ -20453,34 +14828,7 @@ class GetPartitionNamesPsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_id(const int64_t val);
 
-  bool operator == (const GetPartitionNamesPsRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.partValues != rhs.__isset.partValues)
-      return false;
-    else if (__isset.partValues && !(partValues == rhs.partValues))
-      return false;
-    if (__isset.maxParts != rhs.__isset.maxParts)
-      return false;
-    else if (__isset.maxParts && !(maxParts == rhs.maxParts))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionNamesPsRequest & rhs) const;
   bool operator != (const GetPartitionNamesPsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20493,7 +14841,7 @@ class GetPartitionNamesPsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionNamesPsRequest &a, GetPartitionNamesPsRequest &b);
+void swap(GetPartitionNamesPsRequest &a, GetPartitionNamesPsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionNamesPsRequest& obj);
 
@@ -20503,20 +14851,14 @@ class GetPartitionNamesPsResponse : public virtual ::apache::thrift::TBase {
 
   GetPartitionNamesPsResponse(const GetPartitionNamesPsResponse&);
   GetPartitionNamesPsResponse& operator=(const GetPartitionNamesPsResponse&);
-  GetPartitionNamesPsResponse() noexcept {
-  }
+  GetPartitionNamesPsResponse() noexcept;
 
   virtual ~GetPartitionNamesPsResponse() noexcept;
   std::vector<std::string>  names;
 
   void __set_names(const std::vector<std::string> & val);
 
-  bool operator == (const GetPartitionNamesPsResponse & rhs) const
-  {
-    if (!(names == rhs.names))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionNamesPsResponse & rhs) const;
   bool operator != (const GetPartitionNamesPsResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -20529,7 +14871,7 @@ class GetPartitionNamesPsResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionNamesPsResponse &a, GetPartitionNamesPsResponse &b);
+void swap(GetPartitionNamesPsResponse &a, GetPartitionNamesPsResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionNamesPsResponse& obj);
 
@@ -20553,18 +14895,7 @@ class GetPartitionsPsWithAuthRequest : public virtual ::apache::thrift::TBase {
 
   GetPartitionsPsWithAuthRequest(const GetPartitionsPsWithAuthRequest&);
   GetPartitionsPsWithAuthRequest& operator=(const GetPartitionsPsWithAuthRequest&);
-  GetPartitionsPsWithAuthRequest() noexcept
-                                 : catName(),
-                                   dbName(),
-                                   tblName(),
-                                   maxParts(-1),
-                                   userName(),
-                                   validWriteIdList(),
-                                   id(-1LL),
-                                   skipColumnSchemaForPartition(0),
-                                   includeParamKeyPattern(),
-                                   excludeParamKeyPattern() {
-  }
+  GetPartitionsPsWithAuthRequest() noexcept;
 
   virtual ~GetPartitionsPsWithAuthRequest() noexcept;
   std::string catName;
@@ -20609,58 +14940,7 @@ class GetPartitionsPsWithAuthRequest : public virtual ::apache::thrift::TBase {
 
   void __set_partNames(const std::vector<std::string> & val);
 
-  bool operator == (const GetPartitionsPsWithAuthRequest & rhs) const
-  {
-    if (__isset.catName != rhs.__isset.catName)
-      return false;
-    else if (__isset.catName && !(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(tblName == rhs.tblName))
-      return false;
-    if (__isset.partVals != rhs.__isset.partVals)
-      return false;
-    else if (__isset.partVals && !(partVals == rhs.partVals))
-      return false;
-    if (__isset.maxParts != rhs.__isset.maxParts)
-      return false;
-    else if (__isset.maxParts && !(maxParts == rhs.maxParts))
-      return false;
-    if (__isset.userName != rhs.__isset.userName)
-      return false;
-    else if (__isset.userName && !(userName == rhs.userName))
-      return false;
-    if (__isset.groupNames != rhs.__isset.groupNames)
-      return false;
-    else if (__isset.groupNames && !(groupNames == rhs.groupNames))
-      return false;
-    if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
-      return false;
-    else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
-      return false;
-    if (__isset.id != rhs.__isset.id)
-      return false;
-    else if (__isset.id && !(id == rhs.id))
-      return false;
-    if (__isset.skipColumnSchemaForPartition != rhs.__isset.skipColumnSchemaForPartition)
-      return false;
-    else if (__isset.skipColumnSchemaForPartition && !(skipColumnSchemaForPartition == rhs.skipColumnSchemaForPartition))
-      return false;
-    if (__isset.includeParamKeyPattern != rhs.__isset.includeParamKeyPattern)
-      return false;
-    else if (__isset.includeParamKeyPattern && !(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (__isset.excludeParamKeyPattern != rhs.__isset.excludeParamKeyPattern)
-      return false;
-    else if (__isset.excludeParamKeyPattern && !(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    if (__isset.partNames != rhs.__isset.partNames)
-      return false;
-    else if (__isset.partNames && !(partNames == rhs.partNames))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsPsWithAuthRequest & rhs) const;
   bool operator != (const GetPartitionsPsWithAuthRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20673,7 +14953,7 @@ class GetPartitionsPsWithAuthRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsPsWithAuthRequest &a, GetPartitionsPsWithAuthRequest &b);
+void swap(GetPartitionsPsWithAuthRequest &a, GetPartitionsPsWithAuthRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsPsWithAuthRequest& obj);
 
@@ -20683,20 +14963,14 @@ class GetPartitionsPsWithAuthResponse : public virtual ::apache::thrift::TBase {
 
   GetPartitionsPsWithAuthResponse(const GetPartitionsPsWithAuthResponse&);
   GetPartitionsPsWithAuthResponse& operator=(const GetPartitionsPsWithAuthResponse&);
-  GetPartitionsPsWithAuthResponse() noexcept {
-  }
+  GetPartitionsPsWithAuthResponse() noexcept;
 
   virtual ~GetPartitionsPsWithAuthResponse() noexcept;
   std::vector<Partition>  partitions;
 
   void __set_partitions(const std::vector<Partition> & val);
 
-  bool operator == (const GetPartitionsPsWithAuthResponse & rhs) const
-  {
-    if (!(partitions == rhs.partitions))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPartitionsPsWithAuthResponse & rhs) const;
   bool operator != (const GetPartitionsPsWithAuthResponse &rhs) const {
     return !(*this == rhs);
   }
@@ -20709,7 +14983,7 @@ class GetPartitionsPsWithAuthResponse : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPartitionsPsWithAuthResponse &a, GetPartitionsPsWithAuthResponse &b);
+void swap(GetPartitionsPsWithAuthResponse &a, GetPartitionsPsWithAuthResponse &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPartitionsPsWithAuthResponse& obj);
 
@@ -20725,14 +14999,7 @@ class ReplicationMetrics : public virtual ::apache::thrift::TBase {
 
   ReplicationMetrics(const ReplicationMetrics&);
   ReplicationMetrics& operator=(const ReplicationMetrics&);
-  ReplicationMetrics() noexcept
-                     : scheduledExecutionId(0),
-                       policy(),
-                       dumpExecutionId(0),
-                       metadata(),
-                       progress(),
-                       messageFormat() {
-  }
+  ReplicationMetrics() noexcept;
 
   virtual ~ReplicationMetrics() noexcept;
   int64_t scheduledExecutionId;
@@ -20756,28 +15023,7 @@ class ReplicationMetrics : public virtual ::apache::thrift::TBase {
 
   void __set_messageFormat(const std::string& val);
 
-  bool operator == (const ReplicationMetrics & rhs) const
-  {
-    if (!(scheduledExecutionId == rhs.scheduledExecutionId))
-      return false;
-    if (!(policy == rhs.policy))
-      return false;
-    if (!(dumpExecutionId == rhs.dumpExecutionId))
-      return false;
-    if (__isset.metadata != rhs.__isset.metadata)
-      return false;
-    else if (__isset.metadata && !(metadata == rhs.metadata))
-      return false;
-    if (__isset.progress != rhs.__isset.progress)
-      return false;
-    else if (__isset.progress && !(progress == rhs.progress))
-      return false;
-    if (__isset.messageFormat != rhs.__isset.messageFormat)
-      return false;
-    else if (__isset.messageFormat && !(messageFormat == rhs.messageFormat))
-      return false;
-    return true;
-  }
+  bool operator == (const ReplicationMetrics & rhs) const;
   bool operator != (const ReplicationMetrics &rhs) const {
     return !(*this == rhs);
   }
@@ -20790,7 +15036,7 @@ class ReplicationMetrics : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ReplicationMetrics &a, ReplicationMetrics &b);
+void swap(ReplicationMetrics &a, ReplicationMetrics &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ReplicationMetrics& obj);
 
@@ -20800,20 +15046,14 @@ class ReplicationMetricList : public virtual ::apache::thrift::TBase {
 
   ReplicationMetricList(const ReplicationMetricList&);
   ReplicationMetricList& operator=(const ReplicationMetricList&);
-  ReplicationMetricList() noexcept {
-  }
+  ReplicationMetricList() noexcept;
 
   virtual ~ReplicationMetricList() noexcept;
   std::vector<ReplicationMetrics>  replicationMetricList;
 
   void __set_replicationMetricList(const std::vector<ReplicationMetrics> & val);
 
-  bool operator == (const ReplicationMetricList & rhs) const
-  {
-    if (!(replicationMetricList == rhs.replicationMetricList))
-      return false;
-    return true;
-  }
+  bool operator == (const ReplicationMetricList & rhs) const;
   bool operator != (const ReplicationMetricList &rhs) const {
     return !(*this == rhs);
   }
@@ -20826,7 +15066,7 @@ class ReplicationMetricList : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ReplicationMetricList &a, ReplicationMetricList &b);
+void swap(ReplicationMetricList &a, ReplicationMetricList &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ReplicationMetricList& obj);
 
@@ -20842,11 +15082,7 @@ class GetReplicationMetricsRequest : public virtual ::apache::thrift::TBase {
 
   GetReplicationMetricsRequest(const GetReplicationMetricsRequest&);
   GetReplicationMetricsRequest& operator=(const GetReplicationMetricsRequest&);
-  GetReplicationMetricsRequest() noexcept
-                               : scheduledExecutionId(0),
-                                 policy(),
-                                 dumpExecutionId(0) {
-  }
+  GetReplicationMetricsRequest() noexcept;
 
   virtual ~GetReplicationMetricsRequest() noexcept;
   int64_t scheduledExecutionId;
@@ -20861,22 +15097,7 @@ class GetReplicationMetricsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_dumpExecutionId(const int64_t val);
 
-  bool operator == (const GetReplicationMetricsRequest & rhs) const
-  {
-    if (__isset.scheduledExecutionId != rhs.__isset.scheduledExecutionId)
-      return false;
-    else if (__isset.scheduledExecutionId && !(scheduledExecutionId == rhs.scheduledExecutionId))
-      return false;
-    if (__isset.policy != rhs.__isset.policy)
-      return false;
-    else if (__isset.policy && !(policy == rhs.policy))
-      return false;
-    if (__isset.dumpExecutionId != rhs.__isset.dumpExecutionId)
-      return false;
-    else if (__isset.dumpExecutionId && !(dumpExecutionId == rhs.dumpExecutionId))
-      return false;
-    return true;
-  }
+  bool operator == (const GetReplicationMetricsRequest & rhs) const;
   bool operator != (const GetReplicationMetricsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20889,7 +15110,7 @@ class GetReplicationMetricsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetReplicationMetricsRequest &a, GetReplicationMetricsRequest &b);
+void swap(GetReplicationMetricsRequest &a, GetReplicationMetricsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetReplicationMetricsRequest& obj);
 
@@ -20903,8 +15124,7 @@ class GetOpenTxnsRequest : public virtual ::apache::thrift::TBase {
 
   GetOpenTxnsRequest(const GetOpenTxnsRequest&);
   GetOpenTxnsRequest& operator=(const GetOpenTxnsRequest&);
-  GetOpenTxnsRequest() noexcept {
-  }
+  GetOpenTxnsRequest() noexcept;
 
   virtual ~GetOpenTxnsRequest() noexcept;
   std::vector<TxnType::type>  excludeTxnTypes;
@@ -20913,14 +15133,7 @@ class GetOpenTxnsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_excludeTxnTypes(const std::vector<TxnType::type> & val);
 
-  bool operator == (const GetOpenTxnsRequest & rhs) const
-  {
-    if (__isset.excludeTxnTypes != rhs.__isset.excludeTxnTypes)
-      return false;
-    else if (__isset.excludeTxnTypes && !(excludeTxnTypes == rhs.excludeTxnTypes))
-      return false;
-    return true;
-  }
+  bool operator == (const GetOpenTxnsRequest & rhs) const;
   bool operator != (const GetOpenTxnsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20933,7 +15146,7 @@ class GetOpenTxnsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetOpenTxnsRequest &a, GetOpenTxnsRequest &b);
+void swap(GetOpenTxnsRequest &a, GetOpenTxnsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetOpenTxnsRequest& obj);
 
@@ -20943,11 +15156,7 @@ class StoredProcedureRequest : public virtual ::apache::thrift::TBase {
 
   StoredProcedureRequest(const StoredProcedureRequest&);
   StoredProcedureRequest& operator=(const StoredProcedureRequest&);
-  StoredProcedureRequest() noexcept
-                         : catName(),
-                           dbName(),
-                           procName() {
-  }
+  StoredProcedureRequest() noexcept;
 
   virtual ~StoredProcedureRequest() noexcept;
   std::string catName;
@@ -20960,16 +15169,7 @@ class StoredProcedureRequest : public virtual ::apache::thrift::TBase {
 
   void __set_procName(const std::string& val);
 
-  bool operator == (const StoredProcedureRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(procName == rhs.procName))
-      return false;
-    return true;
-  }
+  bool operator == (const StoredProcedureRequest & rhs) const;
   bool operator != (const StoredProcedureRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -20982,7 +15182,7 @@ class StoredProcedureRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(StoredProcedureRequest &a, StoredProcedureRequest &b);
+void swap(StoredProcedureRequest &a, StoredProcedureRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const StoredProcedureRequest& obj);
 
@@ -20996,10 +15196,7 @@ class ListStoredProcedureRequest : public virtual ::apache::thrift::TBase {
 
   ListStoredProcedureRequest(const ListStoredProcedureRequest&);
   ListStoredProcedureRequest& operator=(const ListStoredProcedureRequest&);
-  ListStoredProcedureRequest() noexcept
-                             : catName(),
-                               dbName() {
-  }
+  ListStoredProcedureRequest() noexcept;
 
   virtual ~ListStoredProcedureRequest() noexcept;
   std::string catName;
@@ -21011,16 +15208,7 @@ class ListStoredProcedureRequest : public virtual ::apache::thrift::TBase {
 
   void __set_dbName(const std::string& val);
 
-  bool operator == (const ListStoredProcedureRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    return true;
-  }
+  bool operator == (const ListStoredProcedureRequest & rhs) const;
   bool operator != (const ListStoredProcedureRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21033,7 +15221,7 @@ class ListStoredProcedureRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ListStoredProcedureRequest &a, ListStoredProcedureRequest &b);
+void swap(ListStoredProcedureRequest &a, ListStoredProcedureRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ListStoredProcedureRequest& obj);
 
@@ -21051,13 +15239,7 @@ class StoredProcedure : public virtual ::apache::thrift::TBase {
 
   StoredProcedure(const StoredProcedure&);
   StoredProcedure& operator=(const StoredProcedure&);
-  StoredProcedure() noexcept
-                  : name(),
-                    dbName(),
-                    catName(),
-                    ownerName(),
-                    source() {
-  }
+  StoredProcedure() noexcept;
 
   virtual ~StoredProcedure() noexcept;
   std::string name;
@@ -21078,20 +15260,7 @@ class StoredProcedure : public virtual ::apache::thrift::TBase {
 
   void __set_source(const std::string& val);
 
-  bool operator == (const StoredProcedure & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(ownerName == rhs.ownerName))
-      return false;
-    if (!(source == rhs.source))
-      return false;
-    return true;
-  }
+  bool operator == (const StoredProcedure & rhs) const;
   bool operator != (const StoredProcedure &rhs) const {
     return !(*this == rhs);
   }
@@ -21104,7 +15273,7 @@ class StoredProcedure : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(StoredProcedure &a, StoredProcedure &b);
+void swap(StoredProcedure &a, StoredProcedure &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const StoredProcedure& obj);
 
@@ -21123,14 +15292,7 @@ class AddPackageRequest : public virtual ::apache::thrift::TBase {
 
   AddPackageRequest(const AddPackageRequest&);
   AddPackageRequest& operator=(const AddPackageRequest&);
-  AddPackageRequest() noexcept
-                    : catName(),
-                      dbName(),
-                      packageName(),
-                      ownerName(),
-                      header(),
-                      body() {
-  }
+  AddPackageRequest() noexcept;
 
   virtual ~AddPackageRequest() noexcept;
   std::string catName;
@@ -21154,22 +15316,7 @@ class AddPackageRequest : public virtual ::apache::thrift::TBase {
 
   void __set_body(const std::string& val);
 
-  bool operator == (const AddPackageRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(packageName == rhs.packageName))
-      return false;
-    if (!(ownerName == rhs.ownerName))
-      return false;
-    if (!(header == rhs.header))
-      return false;
-    if (!(body == rhs.body))
-      return false;
-    return true;
-  }
+  bool operator == (const AddPackageRequest & rhs) const;
   bool operator != (const AddPackageRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21182,7 +15329,7 @@ class AddPackageRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(AddPackageRequest &a, AddPackageRequest &b);
+void swap(AddPackageRequest &a, AddPackageRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AddPackageRequest& obj);
 
@@ -21192,11 +15339,7 @@ class GetPackageRequest : public virtual ::apache::thrift::TBase {
 
   GetPackageRequest(const GetPackageRequest&);
   GetPackageRequest& operator=(const GetPackageRequest&);
-  GetPackageRequest() noexcept
-                    : catName(),
-                      dbName(),
-                      packageName() {
-  }
+  GetPackageRequest() noexcept;
 
   virtual ~GetPackageRequest() noexcept;
   std::string catName;
@@ -21209,16 +15352,7 @@ class GetPackageRequest : public virtual ::apache::thrift::TBase {
 
   void __set_packageName(const std::string& val);
 
-  bool operator == (const GetPackageRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(packageName == rhs.packageName))
-      return false;
-    return true;
-  }
+  bool operator == (const GetPackageRequest & rhs) const;
   bool operator != (const GetPackageRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21231,7 +15365,7 @@ class GetPackageRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetPackageRequest &a, GetPackageRequest &b);
+void swap(GetPackageRequest &a, GetPackageRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetPackageRequest& obj);
 
@@ -21241,11 +15375,7 @@ class DropPackageRequest : public virtual ::apache::thrift::TBase {
 
   DropPackageRequest(const DropPackageRequest&);
   DropPackageRequest& operator=(const DropPackageRequest&);
-  DropPackageRequest() noexcept
-                     : catName(),
-                       dbName(),
-                       packageName() {
-  }
+  DropPackageRequest() noexcept;
 
   virtual ~DropPackageRequest() noexcept;
   std::string catName;
@@ -21258,16 +15388,7 @@ class DropPackageRequest : public virtual ::apache::thrift::TBase {
 
   void __set_packageName(const std::string& val);
 
-  bool operator == (const DropPackageRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(packageName == rhs.packageName))
-      return false;
-    return true;
-  }
+  bool operator == (const DropPackageRequest & rhs) const;
   bool operator != (const DropPackageRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21280,7 +15401,7 @@ class DropPackageRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DropPackageRequest &a, DropPackageRequest &b);
+void swap(DropPackageRequest &a, DropPackageRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DropPackageRequest& obj);
 
@@ -21294,10 +15415,7 @@ class ListPackageRequest : public virtual ::apache::thrift::TBase {
 
   ListPackageRequest(const ListPackageRequest&);
   ListPackageRequest& operator=(const ListPackageRequest&);
-  ListPackageRequest() noexcept
-                     : catName(),
-                       dbName() {
-  }
+  ListPackageRequest() noexcept;
 
   virtual ~ListPackageRequest() noexcept;
   std::string catName;
@@ -21309,16 +15427,7 @@ class ListPackageRequest : public virtual ::apache::thrift::TBase {
 
   void __set_dbName(const std::string& val);
 
-  bool operator == (const ListPackageRequest & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    return true;
-  }
+  bool operator == (const ListPackageRequest & rhs) const;
   bool operator != (const ListPackageRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21331,7 +15440,7 @@ class ListPackageRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ListPackageRequest &a, ListPackageRequest &b);
+void swap(ListPackageRequest &a, ListPackageRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ListPackageRequest& obj);
 
@@ -21350,14 +15459,7 @@ class Package : public virtual ::apache::thrift::TBase {
 
   Package(const Package&);
   Package& operator=(const Package&);
-  Package() noexcept
-          : catName(),
-            dbName(),
-            packageName(),
-            ownerName(),
-            header(),
-            body() {
-  }
+  Package() noexcept;
 
   virtual ~Package() noexcept;
   std::string catName;
@@ -21381,22 +15483,7 @@ class Package : public virtual ::apache::thrift::TBase {
 
   void __set_body(const std::string& val);
 
-  bool operator == (const Package & rhs) const
-  {
-    if (!(catName == rhs.catName))
-      return false;
-    if (!(dbName == rhs.dbName))
-      return false;
-    if (!(packageName == rhs.packageName))
-      return false;
-    if (!(ownerName == rhs.ownerName))
-      return false;
-    if (!(header == rhs.header))
-      return false;
-    if (!(body == rhs.body))
-      return false;
-    return true;
-  }
+  bool operator == (const Package & rhs) const;
   bool operator != (const Package &rhs) const {
     return !(*this == rhs);
   }
@@ -21409,7 +15496,7 @@ class Package : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Package &a, Package &b);
+void swap(Package &a, Package &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const Package& obj);
 
@@ -21424,11 +15511,7 @@ class GetAllWriteEventInfoRequest : public virtual ::apache::thrift::TBase {
 
   GetAllWriteEventInfoRequest(const GetAllWriteEventInfoRequest&);
   GetAllWriteEventInfoRequest& operator=(const GetAllWriteEventInfoRequest&);
-  GetAllWriteEventInfoRequest() noexcept
-                              : txnId(0),
-                                dbName(),
-                                tableName() {
-  }
+  GetAllWriteEventInfoRequest() noexcept;
 
   virtual ~GetAllWriteEventInfoRequest() noexcept;
   int64_t txnId;
@@ -21443,20 +15526,7 @@ class GetAllWriteEventInfoRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tableName(const std::string& val);
 
-  bool operator == (const GetAllWriteEventInfoRequest & rhs) const
-  {
-    if (!(txnId == rhs.txnId))
-      return false;
-    if (__isset.dbName != rhs.__isset.dbName)
-      return false;
-    else if (__isset.dbName && !(dbName == rhs.dbName))
-      return false;
-    if (__isset.tableName != rhs.__isset.tableName)
-      return false;
-    else if (__isset.tableName && !(tableName == rhs.tableName))
-      return false;
-    return true;
-  }
+  bool operator == (const GetAllWriteEventInfoRequest & rhs) const;
   bool operator != (const GetAllWriteEventInfoRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21469,7 +15539,7 @@ class GetAllWriteEventInfoRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(GetAllWriteEventInfoRequest &a, GetAllWriteEventInfoRequest &b);
+void swap(GetAllWriteEventInfoRequest &a, GetAllWriteEventInfoRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const GetAllWriteEventInfoRequest& obj);
 
@@ -21487,12 +15557,7 @@ class DeleteColumnStatisticsRequest : public virtual ::apache::thrift::TBase {
 
   DeleteColumnStatisticsRequest(const DeleteColumnStatisticsRequest&);
   DeleteColumnStatisticsRequest& operator=(const DeleteColumnStatisticsRequest&);
-  DeleteColumnStatisticsRequest() : cat_name(),
-                                    db_name(),
-                                    tbl_name(),
-                                    engine("hive"),
-                                    tableLevel(false) {
-  }
+  DeleteColumnStatisticsRequest();
 
   virtual ~DeleteColumnStatisticsRequest() noexcept;
   std::string cat_name;
@@ -21519,34 +15584,7 @@ class DeleteColumnStatisticsRequest : public virtual ::apache::thrift::TBase {
 
   void __set_tableLevel(const bool val);
 
-  bool operator == (const DeleteColumnStatisticsRequest & rhs) const
-  {
-    if (__isset.cat_name != rhs.__isset.cat_name)
-      return false;
-    else if (__isset.cat_name && !(cat_name == rhs.cat_name))
-      return false;
-    if (!(db_name == rhs.db_name))
-      return false;
-    if (!(tbl_name == rhs.tbl_name))
-      return false;
-    if (__isset.part_names != rhs.__isset.part_names)
-      return false;
-    else if (__isset.part_names && !(part_names == rhs.part_names))
-      return false;
-    if (__isset.col_names != rhs.__isset.col_names)
-      return false;
-    else if (__isset.col_names && !(col_names == rhs.col_names))
-      return false;
-    if (__isset.engine != rhs.__isset.engine)
-      return false;
-    else if (__isset.engine && !(engine == rhs.engine))
-      return false;
-    if (__isset.tableLevel != rhs.__isset.tableLevel)
-      return false;
-    else if (__isset.tableLevel && !(tableLevel == rhs.tableLevel))
-      return false;
-    return true;
-  }
+  bool operator == (const DeleteColumnStatisticsRequest & rhs) const;
   bool operator != (const DeleteColumnStatisticsRequest &rhs) const {
     return !(*this == rhs);
   }
@@ -21559,7 +15597,7 @@ class DeleteColumnStatisticsRequest : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(DeleteColumnStatisticsRequest &a, DeleteColumnStatisticsRequest &b);
+void swap(DeleteColumnStatisticsRequest &a, DeleteColumnStatisticsRequest &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const DeleteColumnStatisticsRequest& obj);
 
@@ -21573,8 +15611,7 @@ class ReplayedTxnsForPolicyResult : public virtual ::apache::thrift::TBase {
 
   ReplayedTxnsForPolicyResult(const ReplayedTxnsForPolicyResult&);
   ReplayedTxnsForPolicyResult& operator=(const ReplayedTxnsForPolicyResult&);
-  ReplayedTxnsForPolicyResult() noexcept {
-  }
+  ReplayedTxnsForPolicyResult() noexcept;
 
   virtual ~ReplayedTxnsForPolicyResult() noexcept;
   std::map<std::string, std::string>  replTxnMapEntry;
@@ -21583,12 +15620,7 @@ class ReplayedTxnsForPolicyResult : public virtual ::apache::thrift::TBase {
 
   void __set_replTxnMapEntry(const std::map<std::string, std::string> & val);
 
-  bool operator == (const ReplayedTxnsForPolicyResult & rhs) const
-  {
-    if (!(replTxnMapEntry == rhs.replTxnMapEntry))
-      return false;
-    return true;
-  }
+  bool operator == (const ReplayedTxnsForPolicyResult & rhs) const;
   bool operator != (const ReplayedTxnsForPolicyResult &rhs) const {
     return !(*this == rhs);
   }
@@ -21601,7 +15633,7 @@ class ReplayedTxnsForPolicyResult : public virtual ::apache::thrift::TBase {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(ReplayedTxnsForPolicyResult &a, ReplayedTxnsForPolicyResult &b);
+void swap(ReplayedTxnsForPolicyResult &a, ReplayedTxnsForPolicyResult &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ReplayedTxnsForPolicyResult& obj);
 
@@ -21615,9 +15647,7 @@ class MetaException : public ::apache::thrift::TException {
 
   MetaException(const MetaException&);
   MetaException& operator=(const MetaException&);
-  MetaException() noexcept
-                : message() {
-  }
+  MetaException() noexcept;
 
   virtual ~MetaException() noexcept;
   std::string message;
@@ -21626,12 +15656,7 @@ class MetaException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const MetaException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const MetaException & rhs) const;
   bool operator != (const MetaException &rhs) const {
     return !(*this == rhs);
   }
@@ -21646,7 +15671,7 @@ class MetaException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(MetaException &a, MetaException &b);
+void swap(MetaException &a, MetaException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const MetaException& obj);
 
@@ -21660,9 +15685,7 @@ class UnknownTableException : public ::apache::thrift::TException {
 
   UnknownTableException(const UnknownTableException&);
   UnknownTableException& operator=(const UnknownTableException&);
-  UnknownTableException() noexcept
-                        : message() {
-  }
+  UnknownTableException() noexcept;
 
   virtual ~UnknownTableException() noexcept;
   std::string message;
@@ -21671,12 +15694,7 @@ class UnknownTableException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const UnknownTableException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const UnknownTableException & rhs) const;
   bool operator != (const UnknownTableException &rhs) const {
     return !(*this == rhs);
   }
@@ -21691,7 +15709,7 @@ class UnknownTableException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(UnknownTableException &a, UnknownTableException &b);
+void swap(UnknownTableException &a, UnknownTableException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UnknownTableException& obj);
 
@@ -21705,9 +15723,7 @@ class UnknownDBException : public ::apache::thrift::TException {
 
   UnknownDBException(const UnknownDBException&);
   UnknownDBException& operator=(const UnknownDBException&);
-  UnknownDBException() noexcept
-                     : message() {
-  }
+  UnknownDBException() noexcept;
 
   virtual ~UnknownDBException() noexcept;
   std::string message;
@@ -21716,12 +15732,7 @@ class UnknownDBException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const UnknownDBException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const UnknownDBException & rhs) const;
   bool operator != (const UnknownDBException &rhs) const {
     return !(*this == rhs);
   }
@@ -21736,7 +15747,7 @@ class UnknownDBException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(UnknownDBException &a, UnknownDBException &b);
+void swap(UnknownDBException &a, UnknownDBException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UnknownDBException& obj);
 
@@ -21750,9 +15761,7 @@ class AlreadyExistsException : public ::apache::thrift::TException {
 
   AlreadyExistsException(const AlreadyExistsException&);
   AlreadyExistsException& operator=(const AlreadyExistsException&);
-  AlreadyExistsException() noexcept
-                         : message() {
-  }
+  AlreadyExistsException() noexcept;
 
   virtual ~AlreadyExistsException() noexcept;
   std::string message;
@@ -21761,12 +15770,7 @@ class AlreadyExistsException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const AlreadyExistsException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const AlreadyExistsException & rhs) const;
   bool operator != (const AlreadyExistsException &rhs) const {
     return !(*this == rhs);
   }
@@ -21781,7 +15785,7 @@ class AlreadyExistsException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(AlreadyExistsException &a, AlreadyExistsException &b);
+void swap(AlreadyExistsException &a, AlreadyExistsException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const AlreadyExistsException& obj);
 
@@ -21795,9 +15799,7 @@ class InvalidPartitionException : public ::apache::thrift::TException {
 
   InvalidPartitionException(const InvalidPartitionException&);
   InvalidPartitionException& operator=(const InvalidPartitionException&);
-  InvalidPartitionException() noexcept
-                            : message() {
-  }
+  InvalidPartitionException() noexcept;
 
   virtual ~InvalidPartitionException() noexcept;
   std::string message;
@@ -21806,12 +15808,7 @@ class InvalidPartitionException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const InvalidPartitionException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const InvalidPartitionException & rhs) const;
   bool operator != (const InvalidPartitionException &rhs) const {
     return !(*this == rhs);
   }
@@ -21826,7 +15823,7 @@ class InvalidPartitionException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(InvalidPartitionException &a, InvalidPartitionException &b);
+void swap(InvalidPartitionException &a, InvalidPartitionException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const InvalidPartitionException& obj);
 
@@ -21840,9 +15837,7 @@ class UnknownPartitionException : public ::apache::thrift::TException {
 
   UnknownPartitionException(const UnknownPartitionException&);
   UnknownPartitionException& operator=(const UnknownPartitionException&);
-  UnknownPartitionException() noexcept
-                            : message() {
-  }
+  UnknownPartitionException() noexcept;
 
   virtual ~UnknownPartitionException() noexcept;
   std::string message;
@@ -21851,12 +15846,7 @@ class UnknownPartitionException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const UnknownPartitionException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const UnknownPartitionException & rhs) const;
   bool operator != (const UnknownPartitionException &rhs) const {
     return !(*this == rhs);
   }
@@ -21871,7 +15861,7 @@ class UnknownPartitionException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(UnknownPartitionException &a, UnknownPartitionException &b);
+void swap(UnknownPartitionException &a, UnknownPartitionException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const UnknownPartitionException& obj);
 
@@ -21885,9 +15875,7 @@ class InvalidObjectException : public ::apache::thrift::TException {
 
   InvalidObjectException(const InvalidObjectException&);
   InvalidObjectException& operator=(const InvalidObjectException&);
-  InvalidObjectException() noexcept
-                         : message() {
-  }
+  InvalidObjectException() noexcept;
 
   virtual ~InvalidObjectException() noexcept;
   std::string message;
@@ -21896,12 +15884,7 @@ class InvalidObjectException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const InvalidObjectException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const InvalidObjectException & rhs) const;
   bool operator != (const InvalidObjectException &rhs) const {
     return !(*this == rhs);
   }
@@ -21916,7 +15899,7 @@ class InvalidObjectException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(InvalidObjectException &a, InvalidObjectException &b);
+void swap(InvalidObjectException &a, InvalidObjectException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const InvalidObjectException& obj);
 
@@ -21930,9 +15913,7 @@ class NoSuchObjectException : public ::apache::thrift::TException {
 
   NoSuchObjectException(const NoSuchObjectException&);
   NoSuchObjectException& operator=(const NoSuchObjectException&);
-  NoSuchObjectException() noexcept
-                        : message() {
-  }
+  NoSuchObjectException() noexcept;
 
   virtual ~NoSuchObjectException() noexcept;
   std::string message;
@@ -21941,12 +15922,7 @@ class NoSuchObjectException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const NoSuchObjectException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const NoSuchObjectException & rhs) const;
   bool operator != (const NoSuchObjectException &rhs) const {
     return !(*this == rhs);
   }
@@ -21961,7 +15937,7 @@ class NoSuchObjectException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(NoSuchObjectException &a, NoSuchObjectException &b);
+void swap(NoSuchObjectException &a, NoSuchObjectException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NoSuchObjectException& obj);
 
@@ -21975,9 +15951,7 @@ class InvalidOperationException : public ::apache::thrift::TException {
 
   InvalidOperationException(const InvalidOperationException&);
   InvalidOperationException& operator=(const InvalidOperationException&);
-  InvalidOperationException() noexcept
-                            : message() {
-  }
+  InvalidOperationException() noexcept;
 
   virtual ~InvalidOperationException() noexcept;
   std::string message;
@@ -21986,12 +15960,7 @@ class InvalidOperationException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const InvalidOperationException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const InvalidOperationException & rhs) const;
   bool operator != (const InvalidOperationException &rhs) const {
     return !(*this == rhs);
   }
@@ -22006,7 +15975,7 @@ class InvalidOperationException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(InvalidOperationException &a, InvalidOperationException &b);
+void swap(InvalidOperationException &a, InvalidOperationException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const InvalidOperationException& obj);
 
@@ -22020,9 +15989,7 @@ class ConfigValSecurityException : public ::apache::thrift::TException {
 
   ConfigValSecurityException(const ConfigValSecurityException&);
   ConfigValSecurityException& operator=(const ConfigValSecurityException&);
-  ConfigValSecurityException() noexcept
-                             : message() {
-  }
+  ConfigValSecurityException() noexcept;
 
   virtual ~ConfigValSecurityException() noexcept;
   std::string message;
@@ -22031,12 +15998,7 @@ class ConfigValSecurityException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const ConfigValSecurityException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const ConfigValSecurityException & rhs) const;
   bool operator != (const ConfigValSecurityException &rhs) const {
     return !(*this == rhs);
   }
@@ -22051,7 +16013,7 @@ class ConfigValSecurityException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(ConfigValSecurityException &a, ConfigValSecurityException &b);
+void swap(ConfigValSecurityException &a, ConfigValSecurityException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const ConfigValSecurityException& obj);
 
@@ -22065,9 +16027,7 @@ class InvalidInputException : public ::apache::thrift::TException {
 
   InvalidInputException(const InvalidInputException&);
   InvalidInputException& operator=(const InvalidInputException&);
-  InvalidInputException() noexcept
-                        : message() {
-  }
+  InvalidInputException() noexcept;
 
   virtual ~InvalidInputException() noexcept;
   std::string message;
@@ -22076,12 +16036,7 @@ class InvalidInputException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const InvalidInputException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const InvalidInputException & rhs) const;
   bool operator != (const InvalidInputException &rhs) const {
     return !(*this == rhs);
   }
@@ -22096,7 +16051,7 @@ class InvalidInputException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(InvalidInputException &a, InvalidInputException &b);
+void swap(InvalidInputException &a, InvalidInputException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const InvalidInputException& obj);
 
@@ -22110,9 +16065,7 @@ class NoSuchTxnException : public ::apache::thrift::TException {
 
   NoSuchTxnException(const NoSuchTxnException&);
   NoSuchTxnException& operator=(const NoSuchTxnException&);
-  NoSuchTxnException() noexcept
-                     : message() {
-  }
+  NoSuchTxnException() noexcept;
 
   virtual ~NoSuchTxnException() noexcept;
   std::string message;
@@ -22121,12 +16074,7 @@ class NoSuchTxnException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const NoSuchTxnException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const NoSuchTxnException & rhs) const;
   bool operator != (const NoSuchTxnException &rhs) const {
     return !(*this == rhs);
   }
@@ -22141,7 +16089,7 @@ class NoSuchTxnException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(NoSuchTxnException &a, NoSuchTxnException &b);
+void swap(NoSuchTxnException &a, NoSuchTxnException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NoSuchTxnException& obj);
 
@@ -22155,9 +16103,7 @@ class TxnAbortedException : public ::apache::thrift::TException {
 
   TxnAbortedException(const TxnAbortedException&);
   TxnAbortedException& operator=(const TxnAbortedException&);
-  TxnAbortedException() noexcept
-                      : message() {
-  }
+  TxnAbortedException() noexcept;
 
   virtual ~TxnAbortedException() noexcept;
   std::string message;
@@ -22166,12 +16112,7 @@ class TxnAbortedException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const TxnAbortedException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const TxnAbortedException & rhs) const;
   bool operator != (const TxnAbortedException &rhs) const {
     return !(*this == rhs);
   }
@@ -22186,7 +16127,7 @@ class TxnAbortedException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(TxnAbortedException &a, TxnAbortedException &b);
+void swap(TxnAbortedException &a, TxnAbortedException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TxnAbortedException& obj);
 
@@ -22200,9 +16141,7 @@ class TxnOpenException : public ::apache::thrift::TException {
 
   TxnOpenException(const TxnOpenException&);
   TxnOpenException& operator=(const TxnOpenException&);
-  TxnOpenException() noexcept
-                   : message() {
-  }
+  TxnOpenException() noexcept;
 
   virtual ~TxnOpenException() noexcept;
   std::string message;
@@ -22211,12 +16150,7 @@ class TxnOpenException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const TxnOpenException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const TxnOpenException & rhs) const;
   bool operator != (const TxnOpenException &rhs) const {
     return !(*this == rhs);
   }
@@ -22231,7 +16165,7 @@ class TxnOpenException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(TxnOpenException &a, TxnOpenException &b);
+void swap(TxnOpenException &a, TxnOpenException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const TxnOpenException& obj);
 
@@ -22245,9 +16179,7 @@ class NoSuchLockException : public ::apache::thrift::TException {
 
   NoSuchLockException(const NoSuchLockException&);
   NoSuchLockException& operator=(const NoSuchLockException&);
-  NoSuchLockException() noexcept
-                      : message() {
-  }
+  NoSuchLockException() noexcept;
 
   virtual ~NoSuchLockException() noexcept;
   std::string message;
@@ -22256,12 +16188,7 @@ class NoSuchLockException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const NoSuchLockException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const NoSuchLockException & rhs) const;
   bool operator != (const NoSuchLockException &rhs) const {
     return !(*this == rhs);
   }
@@ -22276,7 +16203,7 @@ class NoSuchLockException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(NoSuchLockException &a, NoSuchLockException &b);
+void swap(NoSuchLockException &a, NoSuchLockException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NoSuchLockException& obj);
 
@@ -22290,9 +16217,7 @@ class CompactionAbortedException : public ::apache::thrift::TException {
 
   CompactionAbortedException(const CompactionAbortedException&);
   CompactionAbortedException& operator=(const CompactionAbortedException&);
-  CompactionAbortedException() noexcept
-                             : message() {
-  }
+  CompactionAbortedException() noexcept;
 
   virtual ~CompactionAbortedException() noexcept;
   std::string message;
@@ -22301,12 +16226,7 @@ class CompactionAbortedException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const CompactionAbortedException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const CompactionAbortedException & rhs) const;
   bool operator != (const CompactionAbortedException &rhs) const {
     return !(*this == rhs);
   }
@@ -22321,7 +16241,7 @@ class CompactionAbortedException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(CompactionAbortedException &a, CompactionAbortedException &b);
+void swap(CompactionAbortedException &a, CompactionAbortedException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const CompactionAbortedException& obj);
 
@@ -22335,9 +16255,7 @@ class NoSuchCompactionException : public ::apache::thrift::TException {
 
   NoSuchCompactionException(const NoSuchCompactionException&);
   NoSuchCompactionException& operator=(const NoSuchCompactionException&);
-  NoSuchCompactionException() noexcept
-                            : message() {
-  }
+  NoSuchCompactionException() noexcept;
 
   virtual ~NoSuchCompactionException() noexcept;
   std::string message;
@@ -22346,12 +16264,7 @@ class NoSuchCompactionException : public ::apache::thrift::TException {
 
   void __set_message(const std::string& val);
 
-  bool operator == (const NoSuchCompactionException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
+  bool operator == (const NoSuchCompactionException & rhs) const;
   bool operator != (const NoSuchCompactionException &rhs) const {
     return !(*this == rhs);
   }
@@ -22366,7 +16279,7 @@ class NoSuchCompactionException : public ::apache::thrift::TException {
   const char* what() const noexcept override;
 };
 
-void swap(NoSuchCompactionException &a, NoSuchCompactionException &b);
+void swap(NoSuchCompactionException &a, NoSuchCompactionException &b) noexcept;
 
 std::ostream& operator<<(std::ostream& out, const NoSuchCompactionException& obj);
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/com/facebook/fb303/FacebookService.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/com/facebook/fb303/FacebookService.java
new file mode 100644
index 000000000000..1880a412ab1e
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/com/facebook/fb303/FacebookService.java
@@ -0,0 +1,10592 @@
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package com.facebook.fb303;
+
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+public class FacebookService {
+
+  /**
+   * Standard base service
+   */
+  public interface Iface {
+
+    /**
+     * Returns a descriptive name of the service
+     */
+    public java.lang.String getName() throws org.apache.thrift.TException;
+
+    /**
+     * Returns the version of the service
+     */
+    public java.lang.String getVersion() throws org.apache.thrift.TException;
+
+    /**
+     * Gets the status of this service
+     */
+    public fb_status getStatus() throws org.apache.thrift.TException;
+
+    /**
+     * User friendly description of status, such as why the service is in
+     * the dead or warning state, or what is being started or stopped.
+     */
+    public java.lang.String getStatusDetails() throws org.apache.thrift.TException;
+
+    /**
+     * Gets the counters for this service
+     */
+    public java.util.Map<java.lang.String,java.lang.Long> getCounters() throws org.apache.thrift.TException;
+
+    /**
+     * Gets the value of a single counter
+     * 
+     * @param key
+     */
+    public long getCounter(java.lang.String key) throws org.apache.thrift.TException;
+
+    /**
+     * Sets an option
+     * 
+     * @param key
+     * @param value
+     */
+    public void setOption(java.lang.String key, java.lang.String value) throws org.apache.thrift.TException;
+
+    /**
+     * Gets an option
+     * 
+     * @param key
+     */
+    public java.lang.String getOption(java.lang.String key) throws org.apache.thrift.TException;
+
+    /**
+     * Gets all options
+     */
+    public java.util.Map<java.lang.String,java.lang.String> getOptions() throws org.apache.thrift.TException;
+
+    /**
+     * Returns a CPU profile over the given time interval (client and server
+     * must agree on the profile format).
+     * 
+     * @param profileDurationInSec
+     */
+    public java.lang.String getCpuProfile(int profileDurationInSec) throws org.apache.thrift.TException;
+
+    /**
+     * Returns the unix time that the server has been running since
+     */
+    public long aliveSince() throws org.apache.thrift.TException;
+
+    /**
+     * Tell the server to reload its configuration, reopen log files, etc
+     */
+    public void reinitialize() throws org.apache.thrift.TException;
+
+    /**
+     * Suggest a shutdown to the server
+     */
+    public void shutdown() throws org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+    public void getName(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+
+    public void getVersion(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+
+    public void getStatus(org.apache.thrift.async.AsyncMethodCallback<fb_status> resultHandler) throws org.apache.thrift.TException;
+
+    public void getStatusDetails(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+
+    public void getCounters(org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.Long>> resultHandler) throws org.apache.thrift.TException;
+
+    public void getCounter(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException;
+
+    public void setOption(java.lang.String key, java.lang.String value, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+
+    public void getOption(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+
+    public void getOptions(org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> resultHandler) throws org.apache.thrift.TException;
+
+    public void getCpuProfile(int profileDurationInSec, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+
+    public void aliveSince(org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException;
+
+    public void reinitialize(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+
+    public void shutdown(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+      public Factory() {}
+      @Override
+      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+        return new Client(prot);
+      }
+      @Override
+      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+        return new Client(iprot, oprot);
+      }
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol prot)
+    {
+      super(prot, prot);
+    }
+
+    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      super(iprot, oprot);
+    }
+
+    @Override
+    public java.lang.String getName() throws org.apache.thrift.TException
+    {
+      send_getName();
+      return recv_getName();
+    }
+
+    public void send_getName() throws org.apache.thrift.TException
+    {
+      getName_args args = new getName_args();
+      sendBase("getName", args);
+    }
+
+    public java.lang.String recv_getName() throws org.apache.thrift.TException
+    {
+      getName_result result = new getName_result();
+      receiveBase(result, "getName");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getName failed: unknown result");
+    }
+
+    @Override
+    public java.lang.String getVersion() throws org.apache.thrift.TException
+    {
+      send_getVersion();
+      return recv_getVersion();
+    }
+
+    public void send_getVersion() throws org.apache.thrift.TException
+    {
+      getVersion_args args = new getVersion_args();
+      sendBase("getVersion", args);
+    }
+
+    public java.lang.String recv_getVersion() throws org.apache.thrift.TException
+    {
+      getVersion_result result = new getVersion_result();
+      receiveBase(result, "getVersion");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVersion failed: unknown result");
+    }
+
+    @Override
+    public fb_status getStatus() throws org.apache.thrift.TException
+    {
+      send_getStatus();
+      return recv_getStatus();
+    }
+
+    public void send_getStatus() throws org.apache.thrift.TException
+    {
+      getStatus_args args = new getStatus_args();
+      sendBase("getStatus", args);
+    }
+
+    public fb_status recv_getStatus() throws org.apache.thrift.TException
+    {
+      getStatus_result result = new getStatus_result();
+      receiveBase(result, "getStatus");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getStatus failed: unknown result");
+    }
+
+    @Override
+    public java.lang.String getStatusDetails() throws org.apache.thrift.TException
+    {
+      send_getStatusDetails();
+      return recv_getStatusDetails();
+    }
+
+    public void send_getStatusDetails() throws org.apache.thrift.TException
+    {
+      getStatusDetails_args args = new getStatusDetails_args();
+      sendBase("getStatusDetails", args);
+    }
+
+    public java.lang.String recv_getStatusDetails() throws org.apache.thrift.TException
+    {
+      getStatusDetails_result result = new getStatusDetails_result();
+      receiveBase(result, "getStatusDetails");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getStatusDetails failed: unknown result");
+    }
+
+    @Override
+    public java.util.Map<java.lang.String,java.lang.Long> getCounters() throws org.apache.thrift.TException
+    {
+      send_getCounters();
+      return recv_getCounters();
+    }
+
+    public void send_getCounters() throws org.apache.thrift.TException
+    {
+      getCounters_args args = new getCounters_args();
+      sendBase("getCounters", args);
+    }
+
+    public java.util.Map<java.lang.String,java.lang.Long> recv_getCounters() throws org.apache.thrift.TException
+    {
+      getCounters_result result = new getCounters_result();
+      receiveBase(result, "getCounters");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCounters failed: unknown result");
+    }
+
+    @Override
+    public long getCounter(java.lang.String key) throws org.apache.thrift.TException
+    {
+      send_getCounter(key);
+      return recv_getCounter();
+    }
+
+    public void send_getCounter(java.lang.String key) throws org.apache.thrift.TException
+    {
+      getCounter_args args = new getCounter_args();
+      args.setKey(key);
+      sendBase("getCounter", args);
+    }
+
+    public long recv_getCounter() throws org.apache.thrift.TException
+    {
+      getCounter_result result = new getCounter_result();
+      receiveBase(result, "getCounter");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCounter failed: unknown result");
+    }
+
+    @Override
+    public void setOption(java.lang.String key, java.lang.String value) throws org.apache.thrift.TException
+    {
+      send_setOption(key, value);
+      recv_setOption();
+    }
+
+    public void send_setOption(java.lang.String key, java.lang.String value) throws org.apache.thrift.TException
+    {
+      setOption_args args = new setOption_args();
+      args.setKey(key);
+      args.setValue(value);
+      sendBase("setOption", args);
+    }
+
+    public void recv_setOption() throws org.apache.thrift.TException
+    {
+      setOption_result result = new setOption_result();
+      receiveBase(result, "setOption");
+      return;
+    }
+
+    @Override
+    public java.lang.String getOption(java.lang.String key) throws org.apache.thrift.TException
+    {
+      send_getOption(key);
+      return recv_getOption();
+    }
+
+    public void send_getOption(java.lang.String key) throws org.apache.thrift.TException
+    {
+      getOption_args args = new getOption_args();
+      args.setKey(key);
+      sendBase("getOption", args);
+    }
+
+    public java.lang.String recv_getOption() throws org.apache.thrift.TException
+    {
+      getOption_result result = new getOption_result();
+      receiveBase(result, "getOption");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOption failed: unknown result");
+    }
+
+    @Override
+    public java.util.Map<java.lang.String,java.lang.String> getOptions() throws org.apache.thrift.TException
+    {
+      send_getOptions();
+      return recv_getOptions();
+    }
+
+    public void send_getOptions() throws org.apache.thrift.TException
+    {
+      getOptions_args args = new getOptions_args();
+      sendBase("getOptions", args);
+    }
+
+    public java.util.Map<java.lang.String,java.lang.String> recv_getOptions() throws org.apache.thrift.TException
+    {
+      getOptions_result result = new getOptions_result();
+      receiveBase(result, "getOptions");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOptions failed: unknown result");
+    }
+
+    @Override
+    public java.lang.String getCpuProfile(int profileDurationInSec) throws org.apache.thrift.TException
+    {
+      send_getCpuProfile(profileDurationInSec);
+      return recv_getCpuProfile();
+    }
+
+    public void send_getCpuProfile(int profileDurationInSec) throws org.apache.thrift.TException
+    {
+      getCpuProfile_args args = new getCpuProfile_args();
+      args.setProfileDurationInSec(profileDurationInSec);
+      sendBase("getCpuProfile", args);
+    }
+
+    public java.lang.String recv_getCpuProfile() throws org.apache.thrift.TException
+    {
+      getCpuProfile_result result = new getCpuProfile_result();
+      receiveBase(result, "getCpuProfile");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCpuProfile failed: unknown result");
+    }
+
+    @Override
+    public long aliveSince() throws org.apache.thrift.TException
+    {
+      send_aliveSince();
+      return recv_aliveSince();
+    }
+
+    public void send_aliveSince() throws org.apache.thrift.TException
+    {
+      aliveSince_args args = new aliveSince_args();
+      sendBase("aliveSince", args);
+    }
+
+    public long recv_aliveSince() throws org.apache.thrift.TException
+    {
+      aliveSince_result result = new aliveSince_result();
+      receiveBase(result, "aliveSince");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "aliveSince failed: unknown result");
+    }
+
+    @Override
+    public void reinitialize() throws org.apache.thrift.TException
+    {
+      send_reinitialize();
+    }
+
+    public void send_reinitialize() throws org.apache.thrift.TException
+    {
+      reinitialize_args args = new reinitialize_args();
+      sendBaseOneway("reinitialize", args);
+    }
+
+    @Override
+    public void shutdown() throws org.apache.thrift.TException
+    {
+      send_shutdown();
+    }
+
+    public void send_shutdown() throws org.apache.thrift.TException
+    {
+      shutdown_args args = new shutdown_args();
+      sendBaseOneway("shutdown", args);
+    }
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+        this.clientManager = clientManager;
+        this.protocolFactory = protocolFactory;
+      }
+    @Override
+      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+        return new AsyncClient(protocolFactory, clientManager, transport);
+      }
+    }
+
+    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+      super(protocolFactory, clientManager, transport);
+    }
+
+    @Override
+    public void getName(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getName_call method_call = new getName_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getName_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public getName_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getName", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getName_args args = new getName_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.String getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getName();
+      }
+    }
+
+    @Override
+    public void getVersion(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getVersion_call method_call = new getVersion_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getVersion_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public getVersion_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getVersion", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getVersion_args args = new getVersion_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.String getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getVersion();
+      }
+    }
+
+    @Override
+    public void getStatus(org.apache.thrift.async.AsyncMethodCallback<fb_status> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getStatus_call method_call = new getStatus_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getStatus_call extends org.apache.thrift.async.TAsyncMethodCall<fb_status> {
+      public getStatus_call(org.apache.thrift.async.AsyncMethodCallback<fb_status> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getStatus_args args = new getStatus_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public fb_status getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getStatus();
+      }
+    }
+
+    @Override
+    public void getStatusDetails(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getStatusDetails_call method_call = new getStatusDetails_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getStatusDetails_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public getStatusDetails_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getStatusDetails", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getStatusDetails_args args = new getStatusDetails_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.String getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getStatusDetails();
+      }
+    }
+
+    @Override
+    public void getCounters(org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.Long>> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getCounters_call method_call = new getCounters_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getCounters_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.Map<java.lang.String,java.lang.Long>> {
+      public getCounters_call(org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.Long>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getCounters", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getCounters_args args = new getCounters_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.util.Map<java.lang.String,java.lang.Long> getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getCounters();
+      }
+    }
+
+    @Override
+    public void getCounter(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getCounter_call method_call = new getCounter_call(key, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getCounter_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Long> {
+      private java.lang.String key;
+      public getCounter_call(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.key = key;
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getCounter", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getCounter_args args = new getCounter_args();
+        args.setKey(key);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.Long getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getCounter();
+      }
+    }
+
+    @Override
+    public void setOption(java.lang.String key, java.lang.String value, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      setOption_call method_call = new setOption_call(key, value, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class setOption_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String key;
+      private java.lang.String value;
+      public setOption_call(java.lang.String key, java.lang.String value, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.key = key;
+        this.value = value;
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setOption", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        setOption_args args = new setOption_args();
+        args.setKey(key);
+        args.setValue(value);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public Void getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_setOption();
+        return null;
+      }
+    }
+
+    @Override
+    public void getOption(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getOption_call method_call = new getOption_call(key, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getOption_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      private java.lang.String key;
+      public getOption_call(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.key = key;
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getOption", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getOption_args args = new getOption_args();
+        args.setKey(key);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.String getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getOption();
+      }
+    }
+
+    @Override
+    public void getOptions(org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getOptions_call method_call = new getOptions_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getOptions_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.Map<java.lang.String,java.lang.String>> {
+      public getOptions_call(org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getOptions", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getOptions_args args = new getOptions_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.util.Map<java.lang.String,java.lang.String> getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getOptions();
+      }
+    }
+
+    @Override
+    public void getCpuProfile(int profileDurationInSec, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getCpuProfile_call method_call = new getCpuProfile_call(profileDurationInSec, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getCpuProfile_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      private int profileDurationInSec;
+      public getCpuProfile_call(int profileDurationInSec, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.profileDurationInSec = profileDurationInSec;
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getCpuProfile", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getCpuProfile_args args = new getCpuProfile_args();
+        args.setProfileDurationInSec(profileDurationInSec);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.String getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getCpuProfile();
+      }
+    }
+
+    @Override
+    public void aliveSince(org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      aliveSince_call method_call = new aliveSince_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class aliveSince_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Long> {
+      public aliveSince_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("aliveSince", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        aliveSince_args args = new aliveSince_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public java.lang.Long getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_aliveSince();
+      }
+    }
+
+    @Override
+    public void reinitialize(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      reinitialize_call method_call = new reinitialize_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class reinitialize_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      public reinitialize_call(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, true);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("reinitialize", org.apache.thrift.protocol.TMessageType.ONEWAY, 0));
+        reinitialize_args args = new reinitialize_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public Void getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return null;
+      }
+    }
+
+    @Override
+    public void shutdown(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      shutdown_call method_call = new shutdown_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class shutdown_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      public shutdown_call(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, true);
+      }
+
+      @Override
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("shutdown", org.apache.thrift.protocol.TMessageType.ONEWAY, 0));
+        shutdown_args args = new shutdown_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      @Override
+      public Void getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new java.lang.IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return null;
+      }
+    }
+
+  }
+
+  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
+    private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
+    public Processor(I iface) {
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
+      processMap.put("getName", new getName());
+      processMap.put("getVersion", new getVersion());
+      processMap.put("getStatus", new getStatus());
+      processMap.put("getStatusDetails", new getStatusDetails());
+      processMap.put("getCounters", new getCounters());
+      processMap.put("getCounter", new getCounter());
+      processMap.put("setOption", new setOption());
+      processMap.put("getOption", new getOption());
+      processMap.put("getOptions", new getOptions());
+      processMap.put("getCpuProfile", new getCpuProfile());
+      processMap.put("aliveSince", new aliveSince());
+      processMap.put("reinitialize", new reinitialize());
+      processMap.put("shutdown", new shutdown());
+      return processMap;
+    }
+
+    public static class getName<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getName_args, getName_result> {
+      public getName() {
+        super("getName");
+      }
+
+      @Override
+      public getName_args getEmptyArgsInstance() {
+        return new getName_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getName_result getEmptyResultInstance() {
+        return new getName_result();
+      }
+
+      @Override
+      public getName_result getResult(I iface, getName_args args) throws org.apache.thrift.TException {
+        getName_result result = getEmptyResultInstance();
+        result.success = iface.getName();
+        return result;
+      }
+    }
+
+    public static class getVersion<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getVersion_args, getVersion_result> {
+      public getVersion() {
+        super("getVersion");
+      }
+
+      @Override
+      public getVersion_args getEmptyArgsInstance() {
+        return new getVersion_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getVersion_result getEmptyResultInstance() {
+        return new getVersion_result();
+      }
+
+      @Override
+      public getVersion_result getResult(I iface, getVersion_args args) throws org.apache.thrift.TException {
+        getVersion_result result = getEmptyResultInstance();
+        result.success = iface.getVersion();
+        return result;
+      }
+    }
+
+    public static class getStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStatus_args, getStatus_result> {
+      public getStatus() {
+        super("getStatus");
+      }
+
+      @Override
+      public getStatus_args getEmptyArgsInstance() {
+        return new getStatus_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getStatus_result getEmptyResultInstance() {
+        return new getStatus_result();
+      }
+
+      @Override
+      public getStatus_result getResult(I iface, getStatus_args args) throws org.apache.thrift.TException {
+        getStatus_result result = getEmptyResultInstance();
+        result.success = iface.getStatus();
+        return result;
+      }
+    }
+
+    public static class getStatusDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStatusDetails_args, getStatusDetails_result> {
+      public getStatusDetails() {
+        super("getStatusDetails");
+      }
+
+      @Override
+      public getStatusDetails_args getEmptyArgsInstance() {
+        return new getStatusDetails_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getStatusDetails_result getEmptyResultInstance() {
+        return new getStatusDetails_result();
+      }
+
+      @Override
+      public getStatusDetails_result getResult(I iface, getStatusDetails_args args) throws org.apache.thrift.TException {
+        getStatusDetails_result result = getEmptyResultInstance();
+        result.success = iface.getStatusDetails();
+        return result;
+      }
+    }
+
+    public static class getCounters<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCounters_args, getCounters_result> {
+      public getCounters() {
+        super("getCounters");
+      }
+
+      @Override
+      public getCounters_args getEmptyArgsInstance() {
+        return new getCounters_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getCounters_result getEmptyResultInstance() {
+        return new getCounters_result();
+      }
+
+      @Override
+      public getCounters_result getResult(I iface, getCounters_args args) throws org.apache.thrift.TException {
+        getCounters_result result = getEmptyResultInstance();
+        result.success = iface.getCounters();
+        return result;
+      }
+    }
+
+    public static class getCounter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCounter_args, getCounter_result> {
+      public getCounter() {
+        super("getCounter");
+      }
+
+      @Override
+      public getCounter_args getEmptyArgsInstance() {
+        return new getCounter_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getCounter_result getEmptyResultInstance() {
+        return new getCounter_result();
+      }
+
+      @Override
+      public getCounter_result getResult(I iface, getCounter_args args) throws org.apache.thrift.TException {
+        getCounter_result result = getEmptyResultInstance();
+        result.success = iface.getCounter(args.key);
+        result.setSuccessIsSet(true);
+        return result;
+      }
+    }
+
+    public static class setOption<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setOption_args, setOption_result> {
+      public setOption() {
+        super("setOption");
+      }
+
+      @Override
+      public setOption_args getEmptyArgsInstance() {
+        return new setOption_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public setOption_result getEmptyResultInstance() {
+        return new setOption_result();
+      }
+
+      @Override
+      public setOption_result getResult(I iface, setOption_args args) throws org.apache.thrift.TException {
+        setOption_result result = getEmptyResultInstance();
+        iface.setOption(args.key, args.value);
+        return result;
+      }
+    }
+
+    public static class getOption<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getOption_args, getOption_result> {
+      public getOption() {
+        super("getOption");
+      }
+
+      @Override
+      public getOption_args getEmptyArgsInstance() {
+        return new getOption_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getOption_result getEmptyResultInstance() {
+        return new getOption_result();
+      }
+
+      @Override
+      public getOption_result getResult(I iface, getOption_args args) throws org.apache.thrift.TException {
+        getOption_result result = getEmptyResultInstance();
+        result.success = iface.getOption(args.key);
+        return result;
+      }
+    }
+
+    public static class getOptions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getOptions_args, getOptions_result> {
+      public getOptions() {
+        super("getOptions");
+      }
+
+      @Override
+      public getOptions_args getEmptyArgsInstance() {
+        return new getOptions_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getOptions_result getEmptyResultInstance() {
+        return new getOptions_result();
+      }
+
+      @Override
+      public getOptions_result getResult(I iface, getOptions_args args) throws org.apache.thrift.TException {
+        getOptions_result result = getEmptyResultInstance();
+        result.success = iface.getOptions();
+        return result;
+      }
+    }
+
+    public static class getCpuProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCpuProfile_args, getCpuProfile_result> {
+      public getCpuProfile() {
+        super("getCpuProfile");
+      }
+
+      @Override
+      public getCpuProfile_args getEmptyArgsInstance() {
+        return new getCpuProfile_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public getCpuProfile_result getEmptyResultInstance() {
+        return new getCpuProfile_result();
+      }
+
+      @Override
+      public getCpuProfile_result getResult(I iface, getCpuProfile_args args) throws org.apache.thrift.TException {
+        getCpuProfile_result result = getEmptyResultInstance();
+        result.success = iface.getCpuProfile(args.profileDurationInSec);
+        return result;
+      }
+    }
+
+    public static class aliveSince<I extends Iface> extends org.apache.thrift.ProcessFunction<I, aliveSince_args, aliveSince_result> {
+      public aliveSince() {
+        super("aliveSince");
+      }
+
+      @Override
+      public aliveSince_args getEmptyArgsInstance() {
+        return new aliveSince_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public aliveSince_result getEmptyResultInstance() {
+        return new aliveSince_result();
+      }
+
+      @Override
+      public aliveSince_result getResult(I iface, aliveSince_args args) throws org.apache.thrift.TException {
+        aliveSince_result result = getEmptyResultInstance();
+        result.success = iface.aliveSince();
+        result.setSuccessIsSet(true);
+        return result;
+      }
+    }
+
+    public static class reinitialize<I extends Iface> extends org.apache.thrift.ProcessFunction<I, reinitialize_args, org.apache.thrift.TBase> {
+      public reinitialize() {
+        super("reinitialize");
+      }
+
+      @Override
+      public reinitialize_args getEmptyArgsInstance() {
+        return new reinitialize_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return true;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public org.apache.thrift.TBase getEmptyResultInstance() {
+        return null;
+      }
+
+      @Override
+      public org.apache.thrift.TBase getResult(I iface, reinitialize_args args) throws org.apache.thrift.TException {
+        iface.reinitialize();
+        return null;
+      }
+    }
+
+    public static class shutdown<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shutdown_args, org.apache.thrift.TBase> {
+      public shutdown() {
+        super("shutdown");
+      }
+
+      @Override
+      public shutdown_args getEmptyArgsInstance() {
+        return new shutdown_args();
+      }
+
+      @Override
+      public boolean isOneway() {
+        return true;
+      }
+
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
+      @Override
+      public org.apache.thrift.TBase getEmptyResultInstance() {
+        return null;
+      }
+
+      @Override
+      public org.apache.thrift.TBase getResult(I iface, shutdown_args args) throws org.apache.thrift.TException {
+        iface.shutdown();
+        return null;
+      }
+    }
+
+  }
+
+  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+    private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
+    public AsyncProcessor(I iface) {
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>>()));
+    }
+
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
+      processMap.put("getName", new getName());
+      processMap.put("getVersion", new getVersion());
+      processMap.put("getStatus", new getStatus());
+      processMap.put("getStatusDetails", new getStatusDetails());
+      processMap.put("getCounters", new getCounters());
+      processMap.put("getCounter", new getCounter());
+      processMap.put("setOption", new setOption());
+      processMap.put("getOption", new getOption());
+      processMap.put("getOptions", new getOptions());
+      processMap.put("getCpuProfile", new getCpuProfile());
+      processMap.put("aliveSince", new aliveSince());
+      processMap.put("reinitialize", new reinitialize());
+      processMap.put("shutdown", new shutdown());
+      return processMap;
+    }
+
+    public static class getName<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getName_args, java.lang.String, getName_result> {
+      public getName() {
+        super("getName");
+      }
+
+      @Override
+      public getName_result getEmptyResultInstance() {
+        return new getName_result();
+      }
+
+      @Override
+      public getName_args getEmptyArgsInstance() {
+        return new getName_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
+          public void onComplete(java.lang.String o) {
+            getName_result result = new getName_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getName_result result = new getName_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getName_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+        iface.getName(resultHandler);
+      }
+    }
+
+    public static class getVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVersion_args, java.lang.String, getVersion_result> {
+      public getVersion() {
+        super("getVersion");
+      }
+
+      @Override
+      public getVersion_result getEmptyResultInstance() {
+        return new getVersion_result();
+      }
+
+      @Override
+      public getVersion_args getEmptyArgsInstance() {
+        return new getVersion_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
+          public void onComplete(java.lang.String o) {
+            getVersion_result result = new getVersion_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getVersion_result result = new getVersion_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getVersion_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+        iface.getVersion(resultHandler);
+      }
+    }
+
+    public static class getStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getStatus_args, fb_status, getStatus_result> {
+      public getStatus() {
+        super("getStatus");
+      }
+
+      @Override
+      public getStatus_result getEmptyResultInstance() {
+        return new getStatus_result();
+      }
+
+      @Override
+      public getStatus_args getEmptyArgsInstance() {
+        return new getStatus_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<fb_status> 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<fb_status>() { 
+          @Override
+          public void onComplete(fb_status o) {
+            getStatus_result result = new getStatus_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getStatus_result result = new getStatus_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getStatus_args args, org.apache.thrift.async.AsyncMethodCallback<fb_status> resultHandler) throws org.apache.thrift.TException {
+        iface.getStatus(resultHandler);
+      }
+    }
+
+    public static class getStatusDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getStatusDetails_args, java.lang.String, getStatusDetails_result> {
+      public getStatusDetails() {
+        super("getStatusDetails");
+      }
+
+      @Override
+      public getStatusDetails_result getEmptyResultInstance() {
+        return new getStatusDetails_result();
+      }
+
+      @Override
+      public getStatusDetails_args getEmptyArgsInstance() {
+        return new getStatusDetails_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
+          public void onComplete(java.lang.String o) {
+            getStatusDetails_result result = new getStatusDetails_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getStatusDetails_result result = new getStatusDetails_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getStatusDetails_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+        iface.getStatusDetails(resultHandler);
+      }
+    }
+
+    public static class getCounters<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCounters_args, java.util.Map<java.lang.String,java.lang.Long>, getCounters_result> {
+      public getCounters() {
+        super("getCounters");
+      }
+
+      @Override
+      public getCounters_result getEmptyResultInstance() {
+        return new getCounters_result();
+      }
+
+      @Override
+      public getCounters_args getEmptyArgsInstance() {
+        return new getCounters_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.Long>> 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<java.util.Map<java.lang.String,java.lang.Long>>() { 
+          @Override
+          public void onComplete(java.util.Map<java.lang.String,java.lang.Long> o) {
+            getCounters_result result = new getCounters_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getCounters_result result = new getCounters_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getCounters_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.Long>> resultHandler) throws org.apache.thrift.TException {
+        iface.getCounters(resultHandler);
+      }
+    }
+
+    public static class getCounter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCounter_args, java.lang.Long, getCounter_result> {
+      public getCounter() {
+        super("getCounter");
+      }
+
+      @Override
+      public getCounter_result getEmptyResultInstance() {
+        return new getCounter_result();
+      }
+
+      @Override
+      public getCounter_args getEmptyArgsInstance() {
+        return new getCounter_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> 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<java.lang.Long>() { 
+          @Override
+          public void onComplete(java.lang.Long o) {
+            getCounter_result result = new getCounter_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getCounter_result result = new getCounter_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getCounter_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
+        iface.getCounter(args.key,resultHandler);
+      }
+    }
+
+    public static class setOption<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setOption_args, Void, setOption_result> {
+      public setOption() {
+        super("setOption");
+      }
+
+      @Override
+      public setOption_result getEmptyResultInstance() {
+        return new setOption_result();
+      }
+
+      @Override
+      public setOption_args getEmptyArgsInstance() {
+        return new setOption_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
+          public void onComplete(Void o) {
+            setOption_result result = new setOption_result();
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            setOption_result result = new setOption_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, setOption_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+        iface.setOption(args.key, args.value,resultHandler);
+      }
+    }
+
+    public static class getOption<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOption_args, java.lang.String, getOption_result> {
+      public getOption() {
+        super("getOption");
+      }
+
+      @Override
+      public getOption_result getEmptyResultInstance() {
+        return new getOption_result();
+      }
+
+      @Override
+      public getOption_args getEmptyArgsInstance() {
+        return new getOption_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
+          public void onComplete(java.lang.String o) {
+            getOption_result result = new getOption_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getOption_result result = new getOption_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getOption_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+        iface.getOption(args.key,resultHandler);
+      }
+    }
+
+    public static class getOptions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOptions_args, java.util.Map<java.lang.String,java.lang.String>, getOptions_result> {
+      public getOptions() {
+        super("getOptions");
+      }
+
+      @Override
+      public getOptions_result getEmptyResultInstance() {
+        return new getOptions_result();
+      }
+
+      @Override
+      public getOptions_args getEmptyArgsInstance() {
+        return new getOptions_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> 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<java.util.Map<java.lang.String,java.lang.String>>() { 
+          @Override
+          public void onComplete(java.util.Map<java.lang.String,java.lang.String> o) {
+            getOptions_result result = new getOptions_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getOptions_result result = new getOptions_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getOptions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> resultHandler) throws org.apache.thrift.TException {
+        iface.getOptions(resultHandler);
+      }
+    }
+
+    public static class getCpuProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCpuProfile_args, java.lang.String, getCpuProfile_result> {
+      public getCpuProfile() {
+        super("getCpuProfile");
+      }
+
+      @Override
+      public getCpuProfile_result getEmptyResultInstance() {
+        return new getCpuProfile_result();
+      }
+
+      @Override
+      public getCpuProfile_args getEmptyArgsInstance() {
+        return new getCpuProfile_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
+          public void onComplete(java.lang.String o) {
+            getCpuProfile_result result = new getCpuProfile_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getCpuProfile_result result = new getCpuProfile_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, getCpuProfile_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+        iface.getCpuProfile(args.profileDurationInSec,resultHandler);
+      }
+    }
+
+    public static class aliveSince<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, aliveSince_args, java.lang.Long, aliveSince_result> {
+      public aliveSince() {
+        super("aliveSince");
+      }
+
+      @Override
+      public aliveSince_result getEmptyResultInstance() {
+        return new aliveSince_result();
+      }
+
+      @Override
+      public aliveSince_args getEmptyArgsInstance() {
+        return new aliveSince_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> 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<java.lang.Long>() { 
+          @Override
+          public void onComplete(java.lang.Long o) {
+            aliveSince_result result = new aliveSince_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            aliveSince_result result = new aliveSince_result();
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return false;
+      }
+
+      @Override
+      public void start(I iface, aliveSince_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
+        iface.aliveSince(resultHandler);
+      }
+    }
+
+    public static class reinitialize<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, reinitialize_args, Void, org.apache.thrift.TBase> {
+      public reinitialize() {
+        super("reinitialize");
+      }
+
+      @Override
+      public org.apache.thrift.TBase getEmptyResultInstance() {
+        return null;
+      }
+
+      @Override
+      public reinitialize_args getEmptyArgsInstance() {
+        return new reinitialize_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
+          public void onComplete(Void o) {
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+            } else {
+              _LOGGER.error("Exception inside oneway handler", e);
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return true;
+      }
+
+      @Override
+      public void start(I iface, reinitialize_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+        iface.reinitialize(resultHandler);
+      }
+    }
+
+    public static class shutdown<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, shutdown_args, Void, org.apache.thrift.TBase> {
+      public shutdown() {
+        super("shutdown");
+      }
+
+      @Override
+      public org.apache.thrift.TBase getEmptyResultInstance() {
+        return null;
+      }
+
+      @Override
+      public shutdown_args getEmptyArgsInstance() {
+        return new shutdown_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
+          public void onComplete(Void o) {
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+            } else {
+              _LOGGER.error("Exception inside oneway handler", e);
+            }
+          }
+        };
+      }
+
+      @Override
+      public boolean isOneway() {
+        return true;
+      }
+
+      @Override
+      public void start(I iface, shutdown_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+        iface.shutdown(resultHandler);
+      }
+    }
+
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getName_args implements org.apache.thrift.TBase<getName_args, getName_args._Fields>, java.io.Serializable, Cloneable, Comparable<getName_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getName_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getName_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getName_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getName_args.class, metaDataMap);
+    }
+
+    public getName_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getName_args(getName_args other) {
+    }
+
+    @Override
+    public getName_args deepCopy() {
+      return new getName_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getName_args)
+        return this.equals((getName_args)that);
+      return false;
+    }
+
+    public boolean equals(getName_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getName_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getName_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getName_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getName_argsStandardScheme getScheme() {
+        return new getName_argsStandardScheme();
+      }
+    }
+
+    private static class getName_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getName_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getName_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getName_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getName_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getName_argsTupleScheme getScheme() {
+        return new getName_argsTupleScheme();
+      }
+    }
+
+    private static class getName_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getName_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getName_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getName_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getName_result implements org.apache.thrift.TBase<getName_result, getName_result._Fields>, java.io.Serializable, Cloneable, Comparable<getName_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getName_result");
+
+    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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getName_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getName_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getName_result.class, metaDataMap);
+    }
+
+    public getName_result() {
+    }
+
+    public getName_result(
+      java.lang.String success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getName_result(getName_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+    }
+
+    @Override
+    public getName_result deepCopy() {
+      return new getName_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String 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;
+      }
+    }
+
+    @Override
+    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.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getName_result)
+        return this.equals((getName_result)that);
+      return false;
+    }
+
+    public boolean equals(getName_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getName_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getName_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getName_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getName_resultStandardScheme getScheme() {
+        return new getName_resultStandardScheme();
+      }
+    }
+
+    private static class getName_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getName_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getName_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getName_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeString(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getName_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getName_resultTupleScheme getScheme() {
+        return new getName_resultTupleScheme();
+      }
+    }
+
+    private static class getName_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getName_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getName_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeString(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getName_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getVersion_args implements org.apache.thrift.TBase<getVersion_args, getVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<getVersion_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVersion_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersion_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersion_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVersion_args.class, metaDataMap);
+    }
+
+    public getVersion_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getVersion_args(getVersion_args other) {
+    }
+
+    @Override
+    public getVersion_args deepCopy() {
+      return new getVersion_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getVersion_args)
+        return this.equals((getVersion_args)that);
+      return false;
+    }
+
+    public boolean equals(getVersion_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getVersion_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getVersion_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getVersion_argsStandardScheme getScheme() {
+        return new getVersion_argsStandardScheme();
+      }
+    }
+
+    private static class getVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVersion_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getVersion_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getVersion_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getVersion_argsTupleScheme getScheme() {
+        return new getVersion_argsTupleScheme();
+      }
+    }
+
+    private static class getVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVersion_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getVersion_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getVersion_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getVersion_result implements org.apache.thrift.TBase<getVersion_result, getVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<getVersion_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVersion_result");
+
+    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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersion_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersion_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVersion_result.class, metaDataMap);
+    }
+
+    public getVersion_result() {
+    }
+
+    public getVersion_result(
+      java.lang.String success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getVersion_result(getVersion_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+    }
+
+    @Override
+    public getVersion_result deepCopy() {
+      return new getVersion_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String 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;
+      }
+    }
+
+    @Override
+    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.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getVersion_result)
+        return this.equals((getVersion_result)that);
+      return false;
+    }
+
+    public boolean equals(getVersion_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getVersion_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getVersion_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getVersion_resultStandardScheme getScheme() {
+        return new getVersion_resultStandardScheme();
+      }
+    }
+
+    private static class getVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVersion_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getVersion_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getVersion_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeString(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getVersion_resultTupleScheme getScheme() {
+        return new getVersion_resultTupleScheme();
+      }
+    }
+
+    private static class getVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVersion_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getVersion_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeString(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getVersion_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getStatus_args implements org.apache.thrift.TBase<getStatus_args, getStatus_args._Fields>, java.io.Serializable, Cloneable, Comparable<getStatus_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getStatus_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getStatus_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getStatus_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatus_args.class, metaDataMap);
+    }
+
+    public getStatus_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getStatus_args(getStatus_args other) {
+    }
+
+    @Override
+    public getStatus_args deepCopy() {
+      return new getStatus_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getStatus_args)
+        return this.equals((getStatus_args)that);
+      return false;
+    }
+
+    public boolean equals(getStatus_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getStatus_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getStatus_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getStatus_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatus_argsStandardScheme getScheme() {
+        return new getStatus_argsStandardScheme();
+      }
+    }
+
+    private static class getStatus_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getStatus_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getStatus_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getStatus_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getStatus_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatus_argsTupleScheme getScheme() {
+        return new getStatus_argsTupleScheme();
+      }
+    }
+
+    private static class getStatus_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getStatus_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getStatus_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getStatus_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getStatus_result implements org.apache.thrift.TBase<getStatus_result, getStatus_result._Fields>, java.io.Serializable, Cloneable, Comparable<getStatus_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getStatus_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getStatus_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getStatus_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable fb_status 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 {
+      /**
+       * 
+       * @see fb_status
+       */
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, fb_status.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatus_result.class, metaDataMap);
+    }
+
+    public getStatus_result() {
+    }
+
+    public getStatus_result(
+      fb_status success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getStatus_result(getStatus_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+    }
+
+    @Override
+    public getStatus_result deepCopy() {
+      return new getStatus_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    /**
+     * 
+     * @see fb_status
+     */
+    @org.apache.thrift.annotation.Nullable
+    public fb_status getSuccess() {
+      return this.success;
+    }
+
+    /**
+     * 
+     * @see fb_status
+     */
+    public void setSuccess(@org.apache.thrift.annotation.Nullable fb_status 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;
+      }
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((fb_status)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getStatus_result)
+        return this.equals((getStatus_result)that);
+      return false;
+    }
+
+    public boolean equals(getStatus_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.getValue();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getStatus_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getStatus_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getStatus_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatus_resultStandardScheme getScheme() {
+        return new getStatus_resultStandardScheme();
+      }
+    }
+
+    private static class getStatus_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getStatus_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getStatus_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.I32) {
+                  struct.success = com.facebook.fb303.fb_status.findByValue(iprot.readI32());
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getStatus_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeI32(struct.success.getValue());
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getStatus_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatus_resultTupleScheme getScheme() {
+        return new getStatus_resultTupleScheme();
+      }
+    }
+
+    private static class getStatus_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getStatus_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getStatus_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeI32(struct.success.getValue());
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getStatus_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = com.facebook.fb303.fb_status.findByValue(iprot.readI32());
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getStatusDetails_args implements org.apache.thrift.TBase<getStatusDetails_args, getStatusDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<getStatusDetails_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getStatusDetails_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getStatusDetails_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getStatusDetails_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatusDetails_args.class, metaDataMap);
+    }
+
+    public getStatusDetails_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getStatusDetails_args(getStatusDetails_args other) {
+    }
+
+    @Override
+    public getStatusDetails_args deepCopy() {
+      return new getStatusDetails_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getStatusDetails_args)
+        return this.equals((getStatusDetails_args)that);
+      return false;
+    }
+
+    public boolean equals(getStatusDetails_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getStatusDetails_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getStatusDetails_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getStatusDetails_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatusDetails_argsStandardScheme getScheme() {
+        return new getStatusDetails_argsStandardScheme();
+      }
+    }
+
+    private static class getStatusDetails_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getStatusDetails_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getStatusDetails_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getStatusDetails_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getStatusDetails_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatusDetails_argsTupleScheme getScheme() {
+        return new getStatusDetails_argsTupleScheme();
+      }
+    }
+
+    private static class getStatusDetails_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getStatusDetails_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getStatusDetails_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getStatusDetails_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getStatusDetails_result implements org.apache.thrift.TBase<getStatusDetails_result, getStatusDetails_result._Fields>, java.io.Serializable, Cloneable, Comparable<getStatusDetails_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getStatusDetails_result");
+
+    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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getStatusDetails_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getStatusDetails_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatusDetails_result.class, metaDataMap);
+    }
+
+    public getStatusDetails_result() {
+    }
+
+    public getStatusDetails_result(
+      java.lang.String success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getStatusDetails_result(getStatusDetails_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+    }
+
+    @Override
+    public getStatusDetails_result deepCopy() {
+      return new getStatusDetails_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String 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;
+      }
+    }
+
+    @Override
+    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.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getStatusDetails_result)
+        return this.equals((getStatusDetails_result)that);
+      return false;
+    }
+
+    public boolean equals(getStatusDetails_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getStatusDetails_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getStatusDetails_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getStatusDetails_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatusDetails_resultStandardScheme getScheme() {
+        return new getStatusDetails_resultStandardScheme();
+      }
+    }
+
+    private static class getStatusDetails_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getStatusDetails_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getStatusDetails_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getStatusDetails_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeString(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getStatusDetails_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getStatusDetails_resultTupleScheme getScheme() {
+        return new getStatusDetails_resultTupleScheme();
+      }
+    }
+
+    private static class getStatusDetails_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getStatusDetails_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getStatusDetails_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeString(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getStatusDetails_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getCounters_args implements org.apache.thrift.TBase<getCounters_args, getCounters_args._Fields>, java.io.Serializable, Cloneable, Comparable<getCounters_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCounters_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCounters_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCounters_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCounters_args.class, metaDataMap);
+    }
+
+    public getCounters_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getCounters_args(getCounters_args other) {
+    }
+
+    @Override
+    public getCounters_args deepCopy() {
+      return new getCounters_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getCounters_args)
+        return this.equals((getCounters_args)that);
+      return false;
+    }
+
+    public boolean equals(getCounters_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getCounters_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getCounters_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getCounters_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounters_argsStandardScheme getScheme() {
+        return new getCounters_argsStandardScheme();
+      }
+    }
+
+    private static class getCounters_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getCounters_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getCounters_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getCounters_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getCounters_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounters_argsTupleScheme getScheme() {
+        return new getCounters_argsTupleScheme();
+      }
+    }
+
+    private static class getCounters_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getCounters_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getCounters_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getCounters_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getCounters_result implements org.apache.thrift.TBase<getCounters_result, getCounters_result._Fields>, java.io.Serializable, Cloneable, Comparable<getCounters_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCounters_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.MAP, (short)0);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCounters_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCounters_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Long> success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCounters_result.class, metaDataMap);
+    }
+
+    public getCounters_result() {
+    }
+
+    public getCounters_result(
+      java.util.Map<java.lang.String,java.lang.Long> success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getCounters_result(getCounters_result other) {
+      if (other.isSetSuccess()) {
+        java.util.Map<java.lang.String,java.lang.Long> __this__success = new java.util.HashMap<java.lang.String,java.lang.Long>(other.success);
+        this.success = __this__success;
+      }
+    }
+
+    @Override
+    public getCounters_result deepCopy() {
+      return new getCounters_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public void putToSuccess(java.lang.String key, long val) {
+      if (this.success == null) {
+        this.success = new java.util.HashMap<java.lang.String,java.lang.Long>();
+      }
+      this.success.put(key, val);
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Map<java.lang.String,java.lang.Long> getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Long> 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;
+      }
+    }
+
+    @Override
+    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.Map<java.lang.String,java.lang.Long>)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getCounters_result)
+        return this.equals((getCounters_result)that);
+      return false;
+    }
+
+    public boolean equals(getCounters_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getCounters_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getCounters_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getCounters_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounters_resultStandardScheme getScheme() {
+        return new getCounters_resultStandardScheme();
+      }
+    }
+
+    private static class getCounters_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getCounters_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getCounters_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.MAP) {
+                  {
+                    org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
+                    struct.success = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map0.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key1;
+                    long _val2;
+                    for (int _i3 = 0; _i3 < _map0.size; ++_i3)
+                    {
+                      _key1 = iprot.readString();
+                      _val2 = iprot.readI64();
+                      struct.success.put(_key1, _val2);
+                    }
+                    iprot.readMapEnd();
+                  }
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getCounters_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          {
+            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.success.size()));
+            for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter4 : struct.success.entrySet())
+            {
+              oprot.writeString(_iter4.getKey());
+              oprot.writeI64(_iter4.getValue());
+            }
+            oprot.writeMapEnd();
+          }
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getCounters_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounters_resultTupleScheme getScheme() {
+        return new getCounters_resultTupleScheme();
+      }
+    }
+
+    private static class getCounters_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getCounters_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getCounters_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          {
+            oprot.writeI32(struct.success.size());
+            for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter5 : struct.success.entrySet())
+            {
+              oprot.writeString(_iter5.getKey());
+              oprot.writeI64(_iter5.getValue());
+            }
+          }
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getCounters_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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.TMap _map6 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64); 
+              struct.success = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map6.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key7;
+              long _val8;
+              for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+              {
+                _key7 = iprot.readString();
+                _val8 = iprot.readI64();
+                struct.success.put(_key7, _val8);
+              }
+            }
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getCounter_args implements org.apache.thrift.TBase<getCounter_args, getCounter_args._Fields>, java.io.Serializable, Cloneable, Comparable<getCounter_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCounter_args");
+
+    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 getCounter_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCounter_argsTupleSchemeFactory();
+
+    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 {
+      KEY((short)1, "key");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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: // 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!");
+        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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.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(getCounter_args.class, metaDataMap);
+    }
+
+    public getCounter_args() {
+    }
+
+    public getCounter_args(
+      java.lang.String key)
+    {
+      this();
+      this.key = key;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getCounter_args(getCounter_args other) {
+      if (other.isSetKey()) {
+        this.key = other.key;
+      }
+    }
+
+    @Override
+    public getCounter_args deepCopy() {
+      return new getCounter_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.key = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getKey() {
+      return this.key;
+    }
+
+    public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) {
+      this.key = key;
+    }
+
+    public void unsetKey() {
+      this.key = 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 setKeyIsSet(boolean value) {
+      if (!value) {
+        this.key = null;
+      }
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      case KEY:
+        if (value == null) {
+          unsetKey();
+        } else {
+          setKey((java.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case KEY:
+        return getKey();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case KEY:
+        return isSetKey();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getCounter_args)
+        return this.equals((getCounter_args)that);
+      return false;
+    }
+
+    public boolean equals(getCounter_args 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))
+          return false;
+        if (!this.key.equals(that.key))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287);
+      if (isSetKey())
+        hashCode = hashCode * 8191 + key.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getCounter_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetKey()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getCounter_args(");
+      boolean first = true;
+
+      sb.append("key:");
+      if (this.key == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.key);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getCounter_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounter_argsStandardScheme getScheme() {
+        return new getCounter_argsStandardScheme();
+      }
+    }
+
+    private static class getCounter_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getCounter_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getCounter_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getCounter_args 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);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getCounter_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounter_argsTupleScheme getScheme() {
+        return new getCounter_argsTupleScheme();
+      }
+    }
+
+    private static class getCounter_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getCounter_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getCounter_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.isSetKey()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetKey()) {
+          oprot.writeString(struct.key);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getCounter_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getCounter_result implements org.apache.thrift.TBase<getCounter_result, getCounter_result._Fields>, java.io.Serializable, Cloneable, Comparable<getCounter_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCounter_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I64, (short)0);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCounter_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCounter_resultTupleSchemeFactory();
+
+    private long success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private byte __isset_bitfield = 0;
+    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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCounter_result.class, metaDataMap);
+    }
+
+    public getCounter_result() {
+    }
+
+    public getCounter_result(
+      long success)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getCounter_result(getCounter_result other) {
+      __isset_bitfield = other.__isset_bitfield;
+      this.success = other.success;
+    }
+
+    @Override
+    public getCounter_result deepCopy() {
+      return new getCounter_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = 0;
+    }
+
+    public long getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(long success) {
+      this.success = success;
+      setSuccessIsSet(true);
+    }
+
+    public void unsetSuccess() {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+    }
+
+    @Override
+    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.lang.Long)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getCounter_result)
+        return this.equals((getCounter_result)that);
+      return false;
+    }
+
+    public boolean equals(getCounter_result that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success);
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getCounter_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getCounter_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
+        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 getCounter_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounter_resultStandardScheme getScheme() {
+        return new getCounter_resultStandardScheme();
+      }
+    }
+
+    private static class getCounter_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getCounter_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getCounter_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.I64) {
+                  struct.success = iprot.readI64();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getCounter_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.isSetSuccess()) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeI64(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getCounter_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCounter_resultTupleScheme getScheme() {
+        return new getCounter_resultTupleScheme();
+      }
+    }
+
+    private static class getCounter_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getCounter_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getCounter_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeI64(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getCounter_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readI64();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class setOption_args implements org.apache.thrift.TBase<setOption_args, setOption_args._Fields>, java.io.Serializable, Cloneable, Comparable<setOption_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setOption_args");
+
+    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 VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setOption_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setOption_argsTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.lang.String key; // required
+    private @org.apache.thrift.annotation.Nullable java.lang.String value; // 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"),
+      VALUE((short)2, "value");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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: // KEY
+            return KEY;
+          case 2: // VALUE
+            return VALUE;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.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.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", 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(setOption_args.class, metaDataMap);
+    }
+
+    public setOption_args() {
+    }
+
+    public setOption_args(
+      java.lang.String key,
+      java.lang.String value)
+    {
+      this();
+      this.key = key;
+      this.value = value;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setOption_args(setOption_args other) {
+      if (other.isSetKey()) {
+        this.key = other.key;
+      }
+      if (other.isSetValue()) {
+        this.value = other.value;
+      }
+    }
+
+    @Override
+    public setOption_args deepCopy() {
+      return new setOption_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.key = null;
+      this.value = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getKey() {
+      return this.key;
+    }
+
+    public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) {
+      this.key = key;
+    }
+
+    public void unsetKey() {
+      this.key = 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 setKeyIsSet(boolean value) {
+      if (!value) {
+        this.key = null;
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getValue() {
+      return this.value;
+    }
+
+    public void setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) {
+      this.value = value;
+    }
+
+    public void unsetValue() {
+      this.value = null;
+    }
+
+    /** Returns true if field value is set (has been assigned a value) and false otherwise */
+    public boolean isSetValue() {
+      return this.value != null;
+    }
+
+    public void setValueIsSet(boolean value) {
+      if (!value) {
+        this.value = null;
+      }
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      case KEY:
+        if (value == null) {
+          unsetKey();
+        } else {
+          setKey((java.lang.String)value);
+        }
+        break;
+
+      case VALUE:
+        if (value == null) {
+          unsetValue();
+        } else {
+          setValue((java.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case KEY:
+        return getKey();
+
+      case VALUE:
+        return getValue();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case KEY:
+        return isSetKey();
+      case VALUE:
+        return isSetValue();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof setOption_args)
+        return this.equals((setOption_args)that);
+      return false;
+    }
+
+    public boolean equals(setOption_args 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))
+          return false;
+        if (!this.key.equals(that.key))
+          return false;
+      }
+
+      boolean this_present_value = true && this.isSetValue();
+      boolean that_present_value = true && that.isSetValue();
+      if (this_present_value || that_present_value) {
+        if (!(this_present_value && that_present_value))
+          return false;
+        if (!this.value.equals(that.value))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287);
+      if (isSetKey())
+        hashCode = hashCode * 8191 + key.hashCode();
+
+      hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+      if (isSetValue())
+        hashCode = hashCode * 8191 + value.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(setOption_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetKey()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetValue()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("setOption_args(");
+      boolean first = true;
+
+      sb.append("key:");
+      if (this.key == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.key);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("value:");
+      if (this.value == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.value);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 setOption_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public setOption_argsStandardScheme getScheme() {
+        return new setOption_argsStandardScheme();
+      }
+    }
+
+    private static class setOption_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setOption_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, setOption_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // VALUE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.value = iprot.readString();
+                  struct.setValueIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, setOption_args 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);
+          oprot.writeFieldEnd();
+        }
+        if (struct.value != null) {
+          oprot.writeFieldBegin(VALUE_FIELD_DESC);
+          oprot.writeString(struct.value);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class setOption_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public setOption_argsTupleScheme getScheme() {
+        return new setOption_argsTupleScheme();
+      }
+    }
+
+    private static class setOption_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setOption_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, setOption_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.isSetKey()) {
+          optionals.set(0);
+        }
+        if (struct.isSetValue()) {
+          optionals.set(1);
+        }
+        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetKey()) {
+          oprot.writeString(struct.key);
+        }
+        if (struct.isSetValue()) {
+          oprot.writeString(struct.value);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, setOption_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.key = iprot.readString();
+            struct.setKeyIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.value = iprot.readString();
+            struct.setValueIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class setOption_result implements org.apache.thrift.TBase<setOption_result, setOption_result._Fields>, java.io.Serializable, Cloneable, Comparable<setOption_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setOption_result");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setOption_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setOption_resultTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setOption_result.class, metaDataMap);
+    }
+
+    public setOption_result() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public setOption_result(setOption_result other) {
+    }
+
+    @Override
+    public setOption_result deepCopy() {
+      return new setOption_result(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof setOption_result)
+        return this.equals((setOption_result)that);
+      return false;
+    }
+
+    public boolean equals(setOption_result that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(setOption_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("setOption_result(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 setOption_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public setOption_resultStandardScheme getScheme() {
+        return new setOption_resultStandardScheme();
+      }
+    }
+
+    private static class setOption_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setOption_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, setOption_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, setOption_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class setOption_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public setOption_resultTupleScheme getScheme() {
+        return new setOption_resultTupleScheme();
+      }
+    }
+
+    private static class setOption_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setOption_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, setOption_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, setOption_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getOption_args implements org.apache.thrift.TBase<getOption_args, getOption_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOption_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOption_args");
+
+    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 getOption_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOption_argsTupleSchemeFactory();
+
+    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 {
+      KEY((short)1, "key");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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: // 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!");
+        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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.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(getOption_args.class, metaDataMap);
+    }
+
+    public getOption_args() {
+    }
+
+    public getOption_args(
+      java.lang.String key)
+    {
+      this();
+      this.key = key;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getOption_args(getOption_args other) {
+      if (other.isSetKey()) {
+        this.key = other.key;
+      }
+    }
+
+    @Override
+    public getOption_args deepCopy() {
+      return new getOption_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.key = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getKey() {
+      return this.key;
+    }
+
+    public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) {
+      this.key = key;
+    }
+
+    public void unsetKey() {
+      this.key = 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 setKeyIsSet(boolean value) {
+      if (!value) {
+        this.key = null;
+      }
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      case KEY:
+        if (value == null) {
+          unsetKey();
+        } else {
+          setKey((java.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case KEY:
+        return getKey();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case KEY:
+        return isSetKey();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getOption_args)
+        return this.equals((getOption_args)that);
+      return false;
+    }
+
+    public boolean equals(getOption_args 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))
+          return false;
+        if (!this.key.equals(that.key))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287);
+      if (isSetKey())
+        hashCode = hashCode * 8191 + key.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getOption_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetKey()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getOption_args(");
+      boolean first = true;
+
+      sb.append("key:");
+      if (this.key == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.key);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getOption_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOption_argsStandardScheme getScheme() {
+        return new getOption_argsStandardScheme();
+      }
+    }
+
+    private static class getOption_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOption_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getOption_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getOption_args 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);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getOption_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOption_argsTupleScheme getScheme() {
+        return new getOption_argsTupleScheme();
+      }
+    }
+
+    private static class getOption_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOption_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getOption_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.isSetKey()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetKey()) {
+          oprot.writeString(struct.key);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getOption_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getOption_result implements org.apache.thrift.TBase<getOption_result, getOption_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOption_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOption_result");
+
+    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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOption_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOption_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOption_result.class, metaDataMap);
+    }
+
+    public getOption_result() {
+    }
+
+    public getOption_result(
+      java.lang.String success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getOption_result(getOption_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+    }
+
+    @Override
+    public getOption_result deepCopy() {
+      return new getOption_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String 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;
+      }
+    }
+
+    @Override
+    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.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getOption_result)
+        return this.equals((getOption_result)that);
+      return false;
+    }
+
+    public boolean equals(getOption_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getOption_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getOption_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getOption_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOption_resultStandardScheme getScheme() {
+        return new getOption_resultStandardScheme();
+      }
+    }
+
+    private static class getOption_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOption_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getOption_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getOption_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeString(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getOption_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOption_resultTupleScheme getScheme() {
+        return new getOption_resultTupleScheme();
+      }
+    }
+
+    private static class getOption_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOption_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getOption_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeString(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getOption_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getOptions_args implements org.apache.thrift.TBase<getOptions_args, getOptions_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOptions_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOptions_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOptions_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOptions_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOptions_args.class, metaDataMap);
+    }
+
+    public getOptions_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getOptions_args(getOptions_args other) {
+    }
+
+    @Override
+    public getOptions_args deepCopy() {
+      return new getOptions_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getOptions_args)
+        return this.equals((getOptions_args)that);
+      return false;
+    }
+
+    public boolean equals(getOptions_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getOptions_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getOptions_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getOptions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOptions_argsStandardScheme getScheme() {
+        return new getOptions_argsStandardScheme();
+      }
+    }
+
+    private static class getOptions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOptions_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getOptions_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getOptions_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getOptions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOptions_argsTupleScheme getScheme() {
+        return new getOptions_argsTupleScheme();
+      }
+    }
+
+    private static class getOptions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOptions_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getOptions_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getOptions_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getOptions_result implements org.apache.thrift.TBase<getOptions_result, getOptions_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOptions_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOptions_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.MAP, (short)0);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOptions_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOptions_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+              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(getOptions_result.class, metaDataMap);
+    }
+
+    public getOptions_result() {
+    }
+
+    public getOptions_result(
+      java.util.Map<java.lang.String,java.lang.String> success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getOptions_result(getOptions_result other) {
+      if (other.isSetSuccess()) {
+        java.util.Map<java.lang.String,java.lang.String> __this__success = new java.util.HashMap<java.lang.String,java.lang.String>(other.success);
+        this.success = __this__success;
+      }
+    }
+
+    @Override
+    public getOptions_result deepCopy() {
+      return new getOptions_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public void putToSuccess(java.lang.String key, java.lang.String val) {
+      if (this.success == null) {
+        this.success = new java.util.HashMap<java.lang.String,java.lang.String>();
+      }
+      this.success.put(key, val);
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Map<java.lang.String,java.lang.String> getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> 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;
+      }
+    }
+
+    @Override
+    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.Map<java.lang.String,java.lang.String>)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getOptions_result)
+        return this.equals((getOptions_result)that);
+      return false;
+    }
+
+    public boolean equals(getOptions_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getOptions_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getOptions_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getOptions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOptions_resultStandardScheme getScheme() {
+        return new getOptions_resultStandardScheme();
+      }
+    }
+
+    private static class getOptions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOptions_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getOptions_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.MAP) {
+                  {
+                    org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin();
+                    struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map10.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key11;
+                    @org.apache.thrift.annotation.Nullable java.lang.String _val12;
+                    for (int _i13 = 0; _i13 < _map10.size; ++_i13)
+                    {
+                      _key11 = iprot.readString();
+                      _val12 = iprot.readString();
+                      struct.success.put(_key11, _val12);
+                    }
+                    iprot.readMapEnd();
+                  }
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getOptions_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          {
+            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.success.size()));
+            for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter14 : struct.success.entrySet())
+            {
+              oprot.writeString(_iter14.getKey());
+              oprot.writeString(_iter14.getValue());
+            }
+            oprot.writeMapEnd();
+          }
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getOptions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getOptions_resultTupleScheme getScheme() {
+        return new getOptions_resultTupleScheme();
+      }
+    }
+
+    private static class getOptions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOptions_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getOptions_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          {
+            oprot.writeI32(struct.success.size());
+            for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter15 : struct.success.entrySet())
+            {
+              oprot.writeString(_iter15.getKey());
+              oprot.writeString(_iter15.getValue());
+            }
+          }
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getOptions_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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.TMap _map16 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+              struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map16.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key17;
+              @org.apache.thrift.annotation.Nullable java.lang.String _val18;
+              for (int _i19 = 0; _i19 < _map16.size; ++_i19)
+              {
+                _key17 = iprot.readString();
+                _val18 = iprot.readString();
+                struct.success.put(_key17, _val18);
+              }
+            }
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getCpuProfile_args implements org.apache.thrift.TBase<getCpuProfile_args, getCpuProfile_args._Fields>, java.io.Serializable, Cloneable, Comparable<getCpuProfile_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCpuProfile_args");
+
+    private static final org.apache.thrift.protocol.TField PROFILE_DURATION_IN_SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("profileDurationInSec", org.apache.thrift.protocol.TType.I32, (short)1);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCpuProfile_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCpuProfile_argsTupleSchemeFactory();
+
+    private int profileDurationInSec; // 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 {
+      PROFILE_DURATION_IN_SEC((short)1, "profileDurationInSec");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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: // PROFILE_DURATION_IN_SEC
+            return PROFILE_DURATION_IN_SEC;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __PROFILEDURATIONINSEC_ISSET_ID = 0;
+    private byte __isset_bitfield = 0;
+    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.PROFILE_DURATION_IN_SEC, new org.apache.thrift.meta_data.FieldMetaData("profileDurationInSec", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCpuProfile_args.class, metaDataMap);
+    }
+
+    public getCpuProfile_args() {
+    }
+
+    public getCpuProfile_args(
+      int profileDurationInSec)
+    {
+      this();
+      this.profileDurationInSec = profileDurationInSec;
+      setProfileDurationInSecIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getCpuProfile_args(getCpuProfile_args other) {
+      __isset_bitfield = other.__isset_bitfield;
+      this.profileDurationInSec = other.profileDurationInSec;
+    }
+
+    @Override
+    public getCpuProfile_args deepCopy() {
+      return new getCpuProfile_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setProfileDurationInSecIsSet(false);
+      this.profileDurationInSec = 0;
+    }
+
+    public int getProfileDurationInSec() {
+      return this.profileDurationInSec;
+    }
+
+    public void setProfileDurationInSec(int profileDurationInSec) {
+      this.profileDurationInSec = profileDurationInSec;
+      setProfileDurationInSecIsSet(true);
+    }
+
+    public void unsetProfileDurationInSec() {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PROFILEDURATIONINSEC_ISSET_ID);
+    }
+
+    /** Returns true if field profileDurationInSec is set (has been assigned a value) and false otherwise */
+    public boolean isSetProfileDurationInSec() {
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PROFILEDURATIONINSEC_ISSET_ID);
+    }
+
+    public void setProfileDurationInSecIsSet(boolean value) {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PROFILEDURATIONINSEC_ISSET_ID, value);
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      case PROFILE_DURATION_IN_SEC:
+        if (value == null) {
+          unsetProfileDurationInSec();
+        } else {
+          setProfileDurationInSec((java.lang.Integer)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PROFILE_DURATION_IN_SEC:
+        return getProfileDurationInSec();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case PROFILE_DURATION_IN_SEC:
+        return isSetProfileDurationInSec();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getCpuProfile_args)
+        return this.equals((getCpuProfile_args)that);
+      return false;
+    }
+
+    public boolean equals(getCpuProfile_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      boolean this_present_profileDurationInSec = true;
+      boolean that_present_profileDurationInSec = true;
+      if (this_present_profileDurationInSec || that_present_profileDurationInSec) {
+        if (!(this_present_profileDurationInSec && that_present_profileDurationInSec))
+          return false;
+        if (this.profileDurationInSec != that.profileDurationInSec)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + profileDurationInSec;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getCpuProfile_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = java.lang.Boolean.compare(isSetProfileDurationInSec(), other.isSetProfileDurationInSec());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetProfileDurationInSec()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.profileDurationInSec, other.profileDurationInSec);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("getCpuProfile_args(");
+      boolean first = true;
+
+      sb.append("profileDurationInSec:");
+      sb.append(this.profileDurationInSec);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
+        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 getCpuProfile_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCpuProfile_argsStandardScheme getScheme() {
+        return new getCpuProfile_argsStandardScheme();
+      }
+    }
+
+    private static class getCpuProfile_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getCpuProfile_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getCpuProfile_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PROFILE_DURATION_IN_SEC
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.profileDurationInSec = iprot.readI32();
+                  struct.setProfileDurationInSecIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getCpuProfile_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldBegin(PROFILE_DURATION_IN_SEC_FIELD_DESC);
+        oprot.writeI32(struct.profileDurationInSec);
+        oprot.writeFieldEnd();
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getCpuProfile_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCpuProfile_argsTupleScheme getScheme() {
+        return new getCpuProfile_argsTupleScheme();
+      }
+    }
+
+    private static class getCpuProfile_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getCpuProfile_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getCpuProfile_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.isSetProfileDurationInSec()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetProfileDurationInSec()) {
+          oprot.writeI32(struct.profileDurationInSec);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getCpuProfile_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.profileDurationInSec = iprot.readI32();
+            struct.setProfileDurationInSecIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class getCpuProfile_result implements org.apache.thrift.TBase<getCpuProfile_result, getCpuProfile_result._Fields>, java.io.Serializable, Cloneable, Comparable<getCpuProfile_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCpuProfile_result");
+
+    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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCpuProfile_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCpuProfile_resultTupleSchemeFactory();
+
+    private @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCpuProfile_result.class, metaDataMap);
+    }
+
+    public getCpuProfile_result() {
+    }
+
+    public getCpuProfile_result(
+      java.lang.String success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getCpuProfile_result(getCpuProfile_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+    }
+
+    @Override
+    public getCpuProfile_result deepCopy() {
+      return new getCpuProfile_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String 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;
+      }
+    }
+
+    @Override
+    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.lang.String)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof getCpuProfile_result)
+        return this.equals((getCpuProfile_result)that);
+      return false;
+    }
+
+    public boolean equals(getCpuProfile_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;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(getCpuProfile_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("getCpuProfile_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 getCpuProfile_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCpuProfile_resultStandardScheme getScheme() {
+        return new getCpuProfile_resultStandardScheme();
+      }
+    }
+
+    private static class getCpuProfile_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getCpuProfile_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getCpuProfile_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getCpuProfile_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeString(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getCpuProfile_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public getCpuProfile_resultTupleScheme getScheme() {
+        return new getCpuProfile_resultTupleScheme();
+      }
+    }
+
+    private static class getCpuProfile_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getCpuProfile_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getCpuProfile_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeString(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getCpuProfile_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class aliveSince_args implements org.apache.thrift.TBase<aliveSince_args, aliveSince_args._Fields>, java.io.Serializable, Cloneable, Comparable<aliveSince_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("aliveSince_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new aliveSince_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new aliveSince_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(aliveSince_args.class, metaDataMap);
+    }
+
+    public aliveSince_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public aliveSince_args(aliveSince_args other) {
+    }
+
+    @Override
+    public aliveSince_args deepCopy() {
+      return new aliveSince_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof aliveSince_args)
+        return this.equals((aliveSince_args)that);
+      return false;
+    }
+
+    public boolean equals(aliveSince_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(aliveSince_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("aliveSince_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 aliveSince_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public aliveSince_argsStandardScheme getScheme() {
+        return new aliveSince_argsStandardScheme();
+      }
+    }
+
+    private static class aliveSince_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<aliveSince_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, aliveSince_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, aliveSince_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class aliveSince_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public aliveSince_argsTupleScheme getScheme() {
+        return new aliveSince_argsTupleScheme();
+      }
+    }
+
+    private static class aliveSince_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<aliveSince_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, aliveSince_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, aliveSince_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class aliveSince_result implements org.apache.thrift.TBase<aliveSince_result, aliveSince_result._Fields>, java.io.Serializable, Cloneable, Comparable<aliveSince_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("aliveSince_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I64, (short)0);
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new aliveSince_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new aliveSince_resultTupleSchemeFactory();
+
+    private long success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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;
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private byte __isset_bitfield = 0;
+    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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(aliveSince_result.class, metaDataMap);
+    }
+
+    public aliveSince_result() {
+    }
+
+    public aliveSince_result(
+      long success)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public aliveSince_result(aliveSince_result other) {
+      __isset_bitfield = other.__isset_bitfield;
+      this.success = other.success;
+    }
+
+    @Override
+    public aliveSince_result deepCopy() {
+      return new aliveSince_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = 0;
+    }
+
+    public long getSuccess() {
+      return this.success;
+    }
+
+    public void setSuccess(long success) {
+      this.success = success;
+      setSuccessIsSet(true);
+    }
+
+    public void unsetSuccess() {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+    }
+
+    @Override
+    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.lang.Long)value);
+        }
+        break;
+
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof aliveSince_result)
+        return this.equals((aliveSince_result)that);
+      return false;
+    }
+
+    public boolean equals(aliveSince_result that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success);
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(aliveSince_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;
+        }
+      }
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    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("aliveSince_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
+        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 aliveSince_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public aliveSince_resultStandardScheme getScheme() {
+        return new aliveSince_resultStandardScheme();
+      }
+    }
+
+    private static class aliveSince_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<aliveSince_result> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, aliveSince_result struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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.I64) {
+                  struct.success = iprot.readI64();
+                  struct.setSuccessIsSet(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();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, aliveSince_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.isSetSuccess()) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeI64(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class aliveSince_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public aliveSince_resultTupleScheme getScheme() {
+        return new aliveSince_resultTupleScheme();
+      }
+    }
+
+    private static class aliveSince_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<aliveSince_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, aliveSince_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);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeI64(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, aliveSince_result struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readI64();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class reinitialize_args implements org.apache.thrift.TBase<reinitialize_args, reinitialize_args._Fields>, java.io.Serializable, Cloneable, Comparable<reinitialize_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("reinitialize_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new reinitialize_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new reinitialize_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(reinitialize_args.class, metaDataMap);
+    }
+
+    public reinitialize_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public reinitialize_args(reinitialize_args other) {
+    }
+
+    @Override
+    public reinitialize_args deepCopy() {
+      return new reinitialize_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof reinitialize_args)
+        return this.equals((reinitialize_args)that);
+      return false;
+    }
+
+    public boolean equals(reinitialize_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(reinitialize_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("reinitialize_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 reinitialize_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public reinitialize_argsStandardScheme getScheme() {
+        return new reinitialize_argsStandardScheme();
+      }
+    }
+
+    private static class reinitialize_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<reinitialize_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, reinitialize_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, reinitialize_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class reinitialize_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public reinitialize_argsTupleScheme getScheme() {
+        return new reinitialize_argsTupleScheme();
+      }
+    }
+
+    private static class reinitialize_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<reinitialize_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, reinitialize_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, reinitialize_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+  public static class shutdown_args implements org.apache.thrift.TBase<shutdown_args, shutdown_args._Fields>, java.io.Serializable, Cloneable, Comparable<shutdown_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_args");
+
+
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdown_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdown_argsTupleSchemeFactory();
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+      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) {
+          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;
+      }
+
+      @Override
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      @Override
+      public java.lang.String getFieldName() {
+        return _fieldName;
+      }
+    }
+    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);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_args.class, metaDataMap);
+    }
+
+    public shutdown_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public shutdown_args(shutdown_args other) {
+    }
+
+    @Override
+    public shutdown_args deepCopy() {
+      return new shutdown_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+      switch (field) {
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public java.lang.Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new java.lang.IllegalArgumentException();
+      }
+
+      switch (field) {
+      }
+      throw new java.lang.IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(java.lang.Object that) {
+      if (that instanceof shutdown_args)
+        return this.equals((shutdown_args)that);
+      return false;
+    }
+
+    public boolean equals(shutdown_args that) {
+      if (that == null)
+        return false;
+      if (this == that)
+        return true;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int hashCode = 1;
+
+      return hashCode;
+    }
+
+    @Override
+    public int compareTo(shutdown_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      return 0;
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    @Override
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      scheme(iprot).read(iprot, this);
+    }
+
+    @Override
+    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("shutdown_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    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 shutdown_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public shutdown_argsStandardScheme getScheme() {
+        return new shutdown_argsStandardScheme();
+      }
+    }
+
+    private static class shutdown_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<shutdown_args> {
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_args struct) throws org.apache.thrift.TException {
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
+          }
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
+        }
+      }
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class shutdown_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
+      public shutdown_argsTupleScheme getScheme() {
+        return new shutdown_argsTupleScheme();
+      }
+    }
+
+    private static class shutdown_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<shutdown_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct) throws org.apache.thrift.TException {
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
+      }
+    }
+
+    private static <S extends org.apache.thrift.scheme.IScheme> 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();
+    }
+  }
+
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/com/facebook/fb303/fb_status.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/com/facebook/fb303/fb_status.java
new file mode 100644
index 000000000000..4ea02fc574aa
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/com/facebook/fb303/fb_status.java
@@ -0,0 +1,59 @@
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package com.facebook.fb303;
+
+
+/**
+ * Common status reporting mechanism across all services
+ */
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
+public enum fb_status implements org.apache.thrift.TEnum {
+  DEAD(0),
+  STARTING(1),
+  ALIVE(2),
+  STOPPING(3),
+  STOPPED(4),
+  WARNING(5);
+
+  private final int value;
+
+  private fb_status(int value) {
+    this.value = value;
+  }
+
+  /**
+   * Get the integer value of this enum value, as defined in the Thrift IDL.
+   */
+  @Override
+  public int getValue() {
+    return value;
+  }
+
+  /**
+   * Find a the enum type by its integer value, as defined in the Thrift IDL.
+   * @return null if the value is not found.
+   */
+  @org.apache.thrift.annotation.Nullable
+  public static fb_status findByValue(int value) { 
+    switch (value) {
+      case 0:
+        return DEAD;
+      case 1:
+        return STARTING;
+      case 2:
+        return ALIVE;
+      case 3:
+        return STOPPING;
+      case 4:
+        return STOPPED;
+      case 5:
+        return WARNING;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactResponse.java
index 50b90d299593..25cb95bf8c48 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AbortCompactResponse implements org.apache.thrift.TBase<AbortCompactResponse, AbortCompactResponse._Fields>, java.io.Serializable, Cloneable, Comparable<AbortCompactResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AbortCompactResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public AbortCompactResponse(AbortCompactResponse other) {
     }
   }
 
+  @Override
   public AbortCompactResponse deepCopy() {
     return new AbortCompactResponse(this);
   }
@@ -165,6 +168,7 @@ public void setAbortedcompactsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ABORTEDCOMPACTS:
@@ -179,6 +183,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ABORTEDCOMPACTS:
@@ -189,6 +194,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -259,14 +265,17 @@ public int compareTo(AbortCompactResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -313,6 +322,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AbortCompactResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortCompactResponseStandardScheme getScheme() {
       return new AbortCompactResponseStandardScheme();
     }
@@ -320,46 +330,53 @@ public AbortCompactResponseStandardScheme getScheme() {
 
   private static class AbortCompactResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<AbortCompactResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AbortCompactResponse 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 1: // ABORTEDCOMPACTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map960 = iprot.readMapBegin();
-                struct.abortedcompacts = new java.util.HashMap<java.lang.Long,AbortCompactionResponseElement>(2*_map960.size);
-                long _key961;
-                @org.apache.thrift.annotation.Nullable AbortCompactionResponseElement _val962;
-                for (int _i963 = 0; _i963 < _map960.size; ++_i963)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // ABORTEDCOMPACTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key961 = iprot.readI64();
-                  _val962 = new AbortCompactionResponseElement();
-                  _val962.read(iprot);
-                  struct.abortedcompacts.put(_key961, _val962);
+                  org.apache.thrift.protocol.TMap _map960 = iprot.readMapBegin();
+                  struct.abortedcompacts = new java.util.HashMap<java.lang.Long,AbortCompactionResponseElement>(2*_map960.size);
+                  long _key961;
+                  @org.apache.thrift.annotation.Nullable AbortCompactionResponseElement _val962;
+                  for (int _i963 = 0; _i963 < _map960.size; ++_i963)
+                  {
+                    _key961 = iprot.readI64();
+                    _val962 = new AbortCompactionResponseElement();
+                    _val962.read(iprot);
+                    struct.abortedcompacts.put(_key961, _val962);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setAbortedcompactsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setAbortedcompactsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AbortCompactResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -384,6 +401,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AbortCompactRespon
   }
 
   private static class AbortCompactResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortCompactResponseTupleScheme getScheme() {
       return new AbortCompactResponseTupleScheme();
     }
@@ -406,21 +424,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AbortCompactRespons
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AbortCompactResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map966 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRUCT); 
-        struct.abortedcompacts = new java.util.HashMap<java.lang.Long,AbortCompactionResponseElement>(2*_map966.size);
-        long _key967;
-        @org.apache.thrift.annotation.Nullable AbortCompactionResponseElement _val968;
-        for (int _i969 = 0; _i969 < _map966.size; ++_i969)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key967 = iprot.readI64();
-          _val968 = new AbortCompactionResponseElement();
-          _val968.read(iprot);
-          struct.abortedcompacts.put(_key967, _val968);
+          org.apache.thrift.protocol.TMap _map966 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRUCT); 
+          struct.abortedcompacts = new java.util.HashMap<java.lang.Long,AbortCompactionResponseElement>(2*_map966.size);
+          long _key967;
+          @org.apache.thrift.annotation.Nullable AbortCompactionResponseElement _val968;
+          for (int _i969 = 0; _i969 < _map966.size; ++_i969)
+          {
+            _key967 = iprot.readI64();
+            _val968 = new AbortCompactionResponseElement();
+            _val968.read(iprot);
+            struct.abortedcompacts.put(_key967, _val968);
+          }
         }
+        struct.setAbortedcompactsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setAbortedcompactsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionRequest.java
index 0239b7947643..db2c2d56ce9f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AbortCompactionRequest implements org.apache.thrift.TBase<AbortCompactionRequest, AbortCompactionRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AbortCompactionRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AbortCompactionRequest");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TYPE,_Fields.POOL_NAME};
+  private static final _Fields[] optionals = {_Fields.TYPE,_Fields.POOL_NAME};
   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);
@@ -130,6 +132,7 @@ public AbortCompactionRequest(AbortCompactionRequest other) {
     }
   }
 
+  @Override
   public AbortCompactionRequest deepCopy() {
     return new AbortCompactionRequest(this);
   }
@@ -229,6 +232,7 @@ public void setPoolNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPACTION_IDS:
@@ -259,6 +263,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPACTION_IDS:
@@ -275,6 +280,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -395,14 +401,17 @@ public int compareTo(AbortCompactionRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -469,6 +478,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AbortCompactionRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortCompactionRequestStandardScheme getScheme() {
       return new AbortCompactionRequestStandardScheme();
     }
@@ -476,59 +486,66 @@ public AbortCompactionRequestStandardScheme getScheme() {
 
   private static class AbortCompactionRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AbortCompactionRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AbortCompactionRequest 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 1: // COMPACTION_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list952 = iprot.readListBegin();
-                struct.compactionIds = new java.util.ArrayList<java.lang.Long>(_list952.size);
-                long _elem953;
-                for (int _i954 = 0; _i954 < _list952.size; ++_i954)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COMPACTION_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem953 = iprot.readI64();
-                  struct.compactionIds.add(_elem953);
+                  org.apache.thrift.protocol.TList _list952 = iprot.readListBegin();
+                  struct.compactionIds = new java.util.ArrayList<java.lang.Long>(_list952.size);
+                  long _elem953;
+                  for (int _i954 = 0; _i954 < _list952.size; ++_i954)
+                  {
+                    _elem953 = iprot.readI64();
+                    struct.compactionIds.add(_elem953);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCompactionIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCompactionIdsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.type = iprot.readString();
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // POOL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolName = iprot.readString();
-              struct.setPoolNameIsSet(true);
-            } else { 
+              break;
+            case 2: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.type = iprot.readString();
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // POOL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolName = iprot.readString();
+                struct.setPoolNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AbortCompactionRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -566,6 +583,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AbortCompactionReq
   }
 
   private static class AbortCompactionRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortCompactionRequestTupleScheme getScheme() {
       return new AbortCompactionRequestTupleScheme();
     }
@@ -601,26 +619,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AbortCompactionRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AbortCompactionRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list957 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.compactionIds = new java.util.ArrayList<java.lang.Long>(_list957.size);
-        long _elem958;
-        for (int _i959 = 0; _i959 < _list957.size; ++_i959)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem958 = iprot.readI64();
-          struct.compactionIds.add(_elem958);
+          org.apache.thrift.protocol.TList _list957 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.compactionIds = new java.util.ArrayList<java.lang.Long>(_list957.size);
+          long _elem958;
+          for (int _i959 = 0; _i959 < _list957.size; ++_i959)
+          {
+            _elem958 = iprot.readI64();
+            struct.compactionIds.add(_elem958);
+          }
         }
-      }
-      struct.setCompactionIdsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.type = iprot.readString();
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.poolName = iprot.readString();
-        struct.setPoolNameIsSet(true);
+        struct.setCompactionIdsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.type = iprot.readString();
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.poolName = iprot.readString();
+          struct.setPoolNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionResponseElement.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionResponseElement.java
index 296efe87f365..4ccb566c9be6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionResponseElement.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortCompactionResponseElement.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AbortCompactionResponseElement implements org.apache.thrift.TBase<AbortCompactionResponseElement, AbortCompactionResponseElement._Fields>, java.io.Serializable, Cloneable, Comparable<AbortCompactionResponseElement> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AbortCompactionResponseElement");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -91,7 +93,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __COMPACTIONID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.STATUS,_Fields.MESSAGE};
+  private static final _Fields[] optionals = {_Fields.STATUS,_Fields.MESSAGE};
   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);
@@ -130,6 +132,7 @@ public AbortCompactionResponseElement(AbortCompactionResponseElement other) {
     }
   }
 
+  @Override
   public AbortCompactionResponseElement deepCopy() {
     return new AbortCompactionResponseElement(this);
   }
@@ -212,6 +215,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPACTION_ID:
@@ -242,6 +246,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPACTION_ID:
@@ -258,6 +263,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -376,14 +382,17 @@ public int compareTo(AbortCompactionResponseElement other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -448,6 +457,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AbortCompactionResponseElementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortCompactionResponseElementStandardScheme getScheme() {
       return new AbortCompactionResponseElementStandardScheme();
     }
@@ -455,49 +465,56 @@ public AbortCompactionResponseElementStandardScheme getScheme() {
 
   private static class AbortCompactionResponseElementStandardScheme extends org.apache.thrift.scheme.StandardScheme<AbortCompactionResponseElement> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AbortCompactionResponseElement 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 1: // COMPACTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.compactionId = iprot.readI64();
-              struct.setCompactionIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.status = iprot.readString();
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // COMPACTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.compactionId = iprot.readI64();
+                struct.setCompactionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.status = iprot.readString();
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AbortCompactionResponseElement struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -526,6 +543,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AbortCompactionRes
   }
 
   private static class AbortCompactionResponseElementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortCompactionResponseElementTupleScheme getScheme() {
       return new AbortCompactionResponseElementTupleScheme();
     }
@@ -555,17 +573,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AbortCompactionResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AbortCompactionResponseElement struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.compactionId = iprot.readI64();
-      struct.setCompactionIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.status = iprot.readString();
-        struct.setStatusIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.compactionId = iprot.readI64();
+        struct.setCompactionIdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.status = iprot.readString();
+          struct.setStatusIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java
index a45233e0281c..c035d880684a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AbortTxnRequest implements org.apache.thrift.TBase<AbortTxnRequest, AbortTxnRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AbortTxnRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AbortTxnRequest");
 
@@ -88,10 +88,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   private static final int __TXNID_ISSET_ID = 0;
   private static final int __ERRORCODE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.REPL_POLICY,_Fields.TXN_TYPE,_Fields.ERROR_CODE};
+  private static final _Fields[] optionals = {_Fields.REPL_POLICY,_Fields.TXN_TYPE,_Fields.ERROR_CODE};
   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);
@@ -143,6 +145,7 @@ public AbortTxnRequest(AbortTxnRequest other) {
     this.errorCode = other.errorCode;
   }
 
+  @Override
   public AbortTxnRequest deepCopy() {
     return new AbortTxnRequest(this);
   }
@@ -257,6 +260,7 @@ public void setErrorCodeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ERRORCODE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXNID:
@@ -295,6 +299,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXNID:
@@ -314,6 +319,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -457,14 +463,17 @@ public int compareTo(AbortTxnRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -535,6 +544,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AbortTxnRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortTxnRequestStandardScheme getScheme() {
       return new AbortTxnRequestStandardScheme();
     }
@@ -542,57 +552,64 @@ public AbortTxnRequestStandardScheme getScheme() {
 
   private static class AbortTxnRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AbortTxnRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AbortTxnRequest 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 1: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // REPL_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.replPolicy = iprot.readString();
-              struct.setReplPolicyIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // REPL_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.replPolicy = iprot.readString();
+                struct.setReplPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TXN_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+                struct.setTxn_typeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ERROR_CODE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.errorCode = iprot.readI64();
+                struct.setErrorCodeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TXN_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-              struct.setTxn_typeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ERROR_CODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.errorCode = iprot.readI64();
-              struct.setErrorCodeIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AbortTxnRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -626,6 +643,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AbortTxnRequest st
   }
 
   private static class AbortTxnRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortTxnRequestTupleScheme getScheme() {
       return new AbortTxnRequestTupleScheme();
     }
@@ -661,21 +679,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AbortTxnRequest str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AbortTxnRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txnid = iprot.readI64();
-      struct.setTxnidIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.replPolicy = iprot.readString();
-        struct.setReplPolicyIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-        struct.setTxn_typeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.errorCode = iprot.readI64();
-        struct.setErrorCodeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txnid = iprot.readI64();
+        struct.setTxnidIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.replPolicy = iprot.readString();
+          struct.setReplPolicyIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+          struct.setTxn_typeIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.errorCode = iprot.readI64();
+          struct.setErrorCodeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java
index 48ea1136d16a..43af2a1fdf2f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AbortTxnsRequest implements org.apache.thrift.TBase<AbortTxnsRequest, AbortTxnsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AbortTxnsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AbortTxnsRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ERRORCODE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ERROR_CODE};
+  private static final _Fields[] optionals = {_Fields.ERROR_CODE};
   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);
@@ -121,6 +123,7 @@ public AbortTxnsRequest(AbortTxnsRequest other) {
     this.errorCode = other.errorCode;
   }
 
+  @Override
   public AbortTxnsRequest deepCopy() {
     return new AbortTxnsRequest(this);
   }
@@ -194,6 +197,7 @@ public void setErrorCodeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ERRORCODE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_IDS:
@@ -216,6 +220,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_IDS:
@@ -229,6 +234,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -324,14 +330,17 @@ public int compareTo(AbortTxnsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -386,6 +395,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AbortTxnsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortTxnsRequestStandardScheme getScheme() {
       return new AbortTxnsRequestStandardScheme();
     }
@@ -393,51 +403,58 @@ public AbortTxnsRequestStandardScheme getScheme() {
 
   private static class AbortTxnsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AbortTxnsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AbortTxnsRequest 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 1: // TXN_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list822 = iprot.readListBegin();
-                struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list822.size);
-                long _elem823;
-                for (int _i824 = 0; _i824 < _list822.size; ++_i824)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TXN_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem823 = iprot.readI64();
-                  struct.txn_ids.add(_elem823);
+                  org.apache.thrift.protocol.TList _list822 = iprot.readListBegin();
+                  struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list822.size);
+                  long _elem823;
+                  for (int _i824 = 0; _i824 < _list822.size; ++_i824)
+                  {
+                    _elem823 = iprot.readI64();
+                    struct.txn_ids.add(_elem823);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTxn_idsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTxn_idsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ERROR_CODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.errorCode = iprot.readI64();
-              struct.setErrorCodeIsSet(true);
-            } else { 
+              break;
+            case 2: // ERROR_CODE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.errorCode = iprot.readI64();
+                struct.setErrorCodeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AbortTxnsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -466,6 +483,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AbortTxnsRequest s
   }
 
   private static class AbortTxnsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AbortTxnsRequestTupleScheme getScheme() {
       return new AbortTxnsRequestTupleScheme();
     }
@@ -495,22 +513,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AbortTxnsRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AbortTxnsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list827 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list827.size);
-        long _elem828;
-        for (int _i829 = 0; _i829 < _list827.size; ++_i829)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem828 = iprot.readI64();
-          struct.txn_ids.add(_elem828);
+          org.apache.thrift.protocol.TList _list827 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list827.size);
+          long _elem828;
+          for (int _i829 = 0; _i829 < _list827.size; ++_i829)
+          {
+            _elem828 = iprot.readI64();
+            struct.txn_ids.add(_elem828);
+          }
         }
-      }
-      struct.setTxn_idsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.errorCode = iprot.readI64();
-        struct.setErrorCodeIsSet(true);
+        struct.setTxn_idsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.errorCode = iprot.readI64();
+          struct.setErrorCodeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java
index 1a2f067932c5..d0eeb733ad0e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddCheckConstraintRequest implements org.apache.thrift.TBase<AddCheckConstraintRequest, AddCheckConstraintRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddCheckConstraintRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddCheckConstraintRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AddCheckConstraintRequest(AddCheckConstraintRequest other) {
     }
   }
 
+  @Override
   public AddCheckConstraintRequest deepCopy() {
     return new AddCheckConstraintRequest(this);
   }
@@ -161,6 +164,7 @@ public void setCheckConstraintColsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CHECK_CONSTRAINT_COLS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CHECK_CONSTRAINT_COLS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AddCheckConstraintRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddCheckConstraintRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddCheckConstraintRequestStandardScheme getScheme() {
       return new AddCheckConstraintRequestStandardScheme();
     }
@@ -316,44 +326,51 @@ public AddCheckConstraintRequestStandardScheme getScheme() {
 
   private static class AddCheckConstraintRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddCheckConstraintRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddCheckConstraintRequest 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 1: // CHECK_CONSTRAINT_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list578 = iprot.readListBegin();
-                struct.checkConstraintCols = new java.util.ArrayList<SQLCheckConstraint>(_list578.size);
-                @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem579;
-                for (int _i580 = 0; _i580 < _list578.size; ++_i580)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // CHECK_CONSTRAINT_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem579 = new SQLCheckConstraint();
-                  _elem579.read(iprot);
-                  struct.checkConstraintCols.add(_elem579);
+                  org.apache.thrift.protocol.TList _list578 = iprot.readListBegin();
+                  struct.checkConstraintCols = new java.util.ArrayList<SQLCheckConstraint>(_list578.size);
+                  @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem579;
+                  for (int _i580 = 0; _i580 < _list578.size; ++_i580)
+                  {
+                    _elem579 = new SQLCheckConstraint();
+                    _elem579.read(iprot);
+                    struct.checkConstraintCols.add(_elem579);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCheckConstraintColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCheckConstraintColsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddCheckConstraintRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddCheckConstraint
   }
 
   private static class AddCheckConstraintRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddCheckConstraintRequestTupleScheme getScheme() {
       return new AddCheckConstraintRequestTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddCheckConstraintR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddCheckConstraintRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list583 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.checkConstraintCols = new java.util.ArrayList<SQLCheckConstraint>(_list583.size);
-        @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem584;
-        for (int _i585 = 0; _i585 < _list583.size; ++_i585)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem584 = new SQLCheckConstraint();
-          _elem584.read(iprot);
-          struct.checkConstraintCols.add(_elem584);
+          org.apache.thrift.protocol.TList _list583 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.checkConstraintCols = new java.util.ArrayList<SQLCheckConstraint>(_list583.size);
+          @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem584;
+          for (int _i585 = 0; _i585 < _list583.size; ++_i585)
+          {
+            _elem584 = new SQLCheckConstraint();
+            _elem584.read(iprot);
+            struct.checkConstraintCols.add(_elem584);
+          }
         }
+        struct.setCheckConstraintColsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setCheckConstraintColsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java
index 38a799c31e6f..6c6175f30b0f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddDefaultConstraintRequest implements org.apache.thrift.TBase<AddDefaultConstraintRequest, AddDefaultConstraintRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddDefaultConstraintRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddDefaultConstraintRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AddDefaultConstraintRequest(AddDefaultConstraintRequest other) {
     }
   }
 
+  @Override
   public AddDefaultConstraintRequest deepCopy() {
     return new AddDefaultConstraintRequest(this);
   }
@@ -161,6 +164,7 @@ public void setDefaultConstraintColsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DEFAULT_CONSTRAINT_COLS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DEFAULT_CONSTRAINT_COLS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AddDefaultConstraintRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddDefaultConstraintRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddDefaultConstraintRequestStandardScheme getScheme() {
       return new AddDefaultConstraintRequestStandardScheme();
     }
@@ -316,44 +326,51 @@ public AddDefaultConstraintRequestStandardScheme getScheme() {
 
   private static class AddDefaultConstraintRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddDefaultConstraintRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddDefaultConstraintRequest 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 1: // DEFAULT_CONSTRAINT_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list570 = iprot.readListBegin();
-                struct.defaultConstraintCols = new java.util.ArrayList<SQLDefaultConstraint>(_list570.size);
-                @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem571;
-                for (int _i572 = 0; _i572 < _list570.size; ++_i572)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // DEFAULT_CONSTRAINT_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem571 = new SQLDefaultConstraint();
-                  _elem571.read(iprot);
-                  struct.defaultConstraintCols.add(_elem571);
+                  org.apache.thrift.protocol.TList _list570 = iprot.readListBegin();
+                  struct.defaultConstraintCols = new java.util.ArrayList<SQLDefaultConstraint>(_list570.size);
+                  @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem571;
+                  for (int _i572 = 0; _i572 < _list570.size; ++_i572)
+                  {
+                    _elem571 = new SQLDefaultConstraint();
+                    _elem571.read(iprot);
+                    struct.defaultConstraintCols.add(_elem571);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setDefaultConstraintColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDefaultConstraintColsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddDefaultConstraintRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddDefaultConstrai
   }
 
   private static class AddDefaultConstraintRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddDefaultConstraintRequestTupleScheme getScheme() {
       return new AddDefaultConstraintRequestTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddDefaultConstrain
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddDefaultConstraintRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list575 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.defaultConstraintCols = new java.util.ArrayList<SQLDefaultConstraint>(_list575.size);
-        @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem576;
-        for (int _i577 = 0; _i577 < _list575.size; ++_i577)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem576 = new SQLDefaultConstraint();
-          _elem576.read(iprot);
-          struct.defaultConstraintCols.add(_elem576);
+          org.apache.thrift.protocol.TList _list575 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.defaultConstraintCols = new java.util.ArrayList<SQLDefaultConstraint>(_list575.size);
+          @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem576;
+          for (int _i577 = 0; _i577 < _list575.size; ++_i577)
+          {
+            _elem576 = new SQLDefaultConstraint();
+            _elem576.read(iprot);
+            struct.defaultConstraintCols.add(_elem576);
+          }
         }
+        struct.setDefaultConstraintColsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setDefaultConstraintColsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java
index 886070d049c8..07e2ec139589 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddDynamicPartitions implements org.apache.thrift.TBase<AddDynamicPartitions, AddDynamicPartitions._Fields>, java.io.Serializable, Cloneable, Comparable<AddDynamicPartitions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddDynamicPartitions");
 
@@ -98,10 +98,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -111,7 +113,7 @@ public java.lang.String getFieldName() {
   private static final int __TXNID_ISSET_ID = 0;
   private static final int __WRITEID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.OPERATION_TYPE};
+  private static final _Fields[] optionals = {_Fields.OPERATION_TYPE};
   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);
@@ -176,6 +178,7 @@ public AddDynamicPartitions(AddDynamicPartitions other) {
     }
   }
 
+  @Override
   public AddDynamicPartitions deepCopy() {
     return new AddDynamicPartitions(this);
   }
@@ -357,6 +360,7 @@ public void setOperationTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXNID:
@@ -411,6 +415,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXNID:
@@ -436,6 +441,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -627,14 +633,17 @@ public int compareTo(AddDynamicPartitions other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -733,6 +742,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddDynamicPartitionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddDynamicPartitionsStandardScheme getScheme() {
       return new AddDynamicPartitionsStandardScheme();
     }
@@ -740,83 +750,90 @@ public AddDynamicPartitionsStandardScheme getScheme() {
 
   private static class AddDynamicPartitionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddDynamicPartitions> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddDynamicPartitions 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 1: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WRITEID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeid = iprot.readI64();
-              struct.setWriteidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // 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 4: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PARTITIONNAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list986 = iprot.readListBegin();
-                struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list986.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem987;
-                for (int _i988 = 0; _i988 < _list986.size; ++_i988)
+          }
+          switch (schemeField.id) {
+            case 1: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // WRITEID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeid = iprot.readI64();
+                struct.setWriteidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // 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 4: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARTITIONNAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem987 = iprot.readString();
-                  struct.partitionnames.add(_elem987);
+                  org.apache.thrift.protocol.TList _list986 = iprot.readListBegin();
+                  struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list986.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem987;
+                  for (int _i988 = 0; _i988 < _list986.size; ++_i988)
+                  {
+                    _elem987 = iprot.readString();
+                    struct.partitionnames.add(_elem987);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionnamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionnamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // OPERATION_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
-              struct.setOperationTypeIsSet(true);
-            } else { 
+              break;
+            case 6: // OPERATION_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
+                struct.setOperationTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddDynamicPartitions struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -863,6 +880,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddDynamicPartitio
   }
 
   private static class AddDynamicPartitionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddDynamicPartitionsTupleScheme getScheme() {
       return new AddDynamicPartitionsTupleScheme();
     }
@@ -896,30 +914,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddDynamicPartition
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddDynamicPartitions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txnid = iprot.readI64();
-      struct.setTxnidIsSet(true);
-      struct.writeid = iprot.readI64();
-      struct.setWriteidIsSet(true);
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tablename = iprot.readString();
-      struct.setTablenameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list991 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list991.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem992;
-        for (int _i993 = 0; _i993 < _list991.size; ++_i993)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txnid = iprot.readI64();
+        struct.setTxnidIsSet(true);
+        struct.writeid = iprot.readI64();
+        struct.setWriteidIsSet(true);
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tablename = iprot.readString();
+        struct.setTablenameIsSet(true);
         {
-          _elem992 = iprot.readString();
-          struct.partitionnames.add(_elem992);
+          org.apache.thrift.protocol.TList _list991 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list991.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem992;
+          for (int _i993 = 0; _i993 < _list991.size; ++_i993)
+          {
+            _elem992 = iprot.readString();
+            struct.partitionnames.add(_elem992);
+          }
         }
-      }
-      struct.setPartitionnamesIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
-        struct.setOperationTypeIsSet(true);
+        struct.setPartitionnamesIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
+          struct.setOperationTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java
index aa99516e0f29..6d9ba362e872 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddForeignKeyRequest implements org.apache.thrift.TBase<AddForeignKeyRequest, AddForeignKeyRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddForeignKeyRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddForeignKeyRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AddForeignKeyRequest(AddForeignKeyRequest other) {
     }
   }
 
+  @Override
   public AddForeignKeyRequest deepCopy() {
     return new AddForeignKeyRequest(this);
   }
@@ -161,6 +164,7 @@ public void setForeignKeyColsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FOREIGN_KEY_COLS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FOREIGN_KEY_COLS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AddForeignKeyRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddForeignKeyRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddForeignKeyRequestStandardScheme getScheme() {
       return new AddForeignKeyRequestStandardScheme();
     }
@@ -316,44 +326,51 @@ public AddForeignKeyRequestStandardScheme getScheme() {
 
   private static class AddForeignKeyRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddForeignKeyRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddForeignKeyRequest 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 1: // FOREIGN_KEY_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list546 = iprot.readListBegin();
-                struct.foreignKeyCols = new java.util.ArrayList<SQLForeignKey>(_list546.size);
-                @org.apache.thrift.annotation.Nullable SQLForeignKey _elem547;
-                for (int _i548 = 0; _i548 < _list546.size; ++_i548)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FOREIGN_KEY_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem547 = new SQLForeignKey();
-                  _elem547.read(iprot);
-                  struct.foreignKeyCols.add(_elem547);
+                  org.apache.thrift.protocol.TList _list546 = iprot.readListBegin();
+                  struct.foreignKeyCols = new java.util.ArrayList<SQLForeignKey>(_list546.size);
+                  @org.apache.thrift.annotation.Nullable SQLForeignKey _elem547;
+                  for (int _i548 = 0; _i548 < _list546.size; ++_i548)
+                  {
+                    _elem547 = new SQLForeignKey();
+                    _elem547.read(iprot);
+                    struct.foreignKeyCols.add(_elem547);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setForeignKeyColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setForeignKeyColsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddForeignKeyRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddForeignKeyReque
   }
 
   private static class AddForeignKeyRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddForeignKeyRequestTupleScheme getScheme() {
       return new AddForeignKeyRequestTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddForeignKeyReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddForeignKeyRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list551 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.foreignKeyCols = new java.util.ArrayList<SQLForeignKey>(_list551.size);
-        @org.apache.thrift.annotation.Nullable SQLForeignKey _elem552;
-        for (int _i553 = 0; _i553 < _list551.size; ++_i553)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem552 = new SQLForeignKey();
-          _elem552.read(iprot);
-          struct.foreignKeyCols.add(_elem552);
+          org.apache.thrift.protocol.TList _list551 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.foreignKeyCols = new java.util.ArrayList<SQLForeignKey>(_list551.size);
+          @org.apache.thrift.annotation.Nullable SQLForeignKey _elem552;
+          for (int _i553 = 0; _i553 < _list551.size; ++_i553)
+          {
+            _elem552 = new SQLForeignKey();
+            _elem552.read(iprot);
+            struct.foreignKeyCols.add(_elem552);
+          }
         }
+        struct.setForeignKeyColsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setForeignKeyColsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java
index 76f78548ecdc..9469e4fed4a2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddNotNullConstraintRequest implements org.apache.thrift.TBase<AddNotNullConstraintRequest, AddNotNullConstraintRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddNotNullConstraintRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddNotNullConstraintRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AddNotNullConstraintRequest(AddNotNullConstraintRequest other) {
     }
   }
 
+  @Override
   public AddNotNullConstraintRequest deepCopy() {
     return new AddNotNullConstraintRequest(this);
   }
@@ -161,6 +164,7 @@ public void setNotNullConstraintColsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NOT_NULL_CONSTRAINT_COLS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NOT_NULL_CONSTRAINT_COLS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AddNotNullConstraintRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddNotNullConstraintRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddNotNullConstraintRequestStandardScheme getScheme() {
       return new AddNotNullConstraintRequestStandardScheme();
     }
@@ -316,44 +326,51 @@ public AddNotNullConstraintRequestStandardScheme getScheme() {
 
   private static class AddNotNullConstraintRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddNotNullConstraintRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddNotNullConstraintRequest 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 1: // NOT_NULL_CONSTRAINT_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list562 = iprot.readListBegin();
-                struct.notNullConstraintCols = new java.util.ArrayList<SQLNotNullConstraint>(_list562.size);
-                @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem563;
-                for (int _i564 = 0; _i564 < _list562.size; ++_i564)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // NOT_NULL_CONSTRAINT_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem563 = new SQLNotNullConstraint();
-                  _elem563.read(iprot);
-                  struct.notNullConstraintCols.add(_elem563);
+                  org.apache.thrift.protocol.TList _list562 = iprot.readListBegin();
+                  struct.notNullConstraintCols = new java.util.ArrayList<SQLNotNullConstraint>(_list562.size);
+                  @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem563;
+                  for (int _i564 = 0; _i564 < _list562.size; ++_i564)
+                  {
+                    _elem563 = new SQLNotNullConstraint();
+                    _elem563.read(iprot);
+                    struct.notNullConstraintCols.add(_elem563);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNotNullConstraintColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNotNullConstraintColsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddNotNullConstraintRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddNotNullConstrai
   }
 
   private static class AddNotNullConstraintRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddNotNullConstraintRequestTupleScheme getScheme() {
       return new AddNotNullConstraintRequestTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddNotNullConstrain
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddNotNullConstraintRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list567 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.notNullConstraintCols = new java.util.ArrayList<SQLNotNullConstraint>(_list567.size);
-        @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem568;
-        for (int _i569 = 0; _i569 < _list567.size; ++_i569)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem568 = new SQLNotNullConstraint();
-          _elem568.read(iprot);
-          struct.notNullConstraintCols.add(_elem568);
+          org.apache.thrift.protocol.TList _list567 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.notNullConstraintCols = new java.util.ArrayList<SQLNotNullConstraint>(_list567.size);
+          @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem568;
+          for (int _i569 = 0; _i569 < _list567.size; ++_i569)
+          {
+            _elem568 = new SQLNotNullConstraint();
+            _elem568.read(iprot);
+            struct.notNullConstraintCols.add(_elem568);
+          }
         }
+        struct.setNotNullConstraintColsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setNotNullConstraintColsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPackageRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPackageRequest.java
index 81c789851728..594308d4d041 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPackageRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPackageRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddPackageRequest implements org.apache.thrift.TBase<AddPackageRequest, AddPackageRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddPackageRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddPackageRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -167,6 +169,7 @@ public AddPackageRequest(AddPackageRequest other) {
     }
   }
 
+  @Override
   public AddPackageRequest deepCopy() {
     return new AddPackageRequest(this);
   }
@@ -325,6 +328,7 @@ public void setBodyIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -379,6 +383,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -404,6 +409,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -599,14 +605,17 @@ public int compareTo(AddPackageRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -689,6 +698,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddPackageRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPackageRequestStandardScheme getScheme() {
       return new AddPackageRequestStandardScheme();
     }
@@ -696,73 +706,80 @@ public AddPackageRequestStandardScheme getScheme() {
 
   private static class AddPackageRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddPackageRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddPackageRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PACKAGE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.packageName = iprot.readString();
-              struct.setPackageNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // PACKAGE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.packageName = iprot.readString();
+                struct.setPackageNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // HEADER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.header = iprot.readString();
+                struct.setHeaderIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // BODY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.body = iprot.readString();
+                struct.setBodyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // HEADER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.header = iprot.readString();
-              struct.setHeaderIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // BODY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.body = iprot.readString();
-              struct.setBodyIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddPackageRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -804,6 +821,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddPackageRequest
   }
 
   private static class AddPackageRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPackageRequestTupleScheme getScheme() {
       return new AddPackageRequestTupleScheme();
     }
@@ -856,31 +874,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddPackageRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddPackageRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.packageName = iprot.readString();
-        struct.setPackageNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.header = iprot.readString();
-        struct.setHeaderIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.body = iprot.readString();
-        struct.setBodyIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.packageName = iprot.readString();
+          struct.setPackageNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.header = iprot.readString();
+          struct.setHeaderIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.body = iprot.readString();
+          struct.setBodyIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
index 350cc3bae75d..a76db41ccdb5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddPartitionsRequest implements org.apache.thrift.TBase<AddPartitionsRequest, AddPartitionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddPartitionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddPartitionsRequest");
 
@@ -114,10 +114,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -128,7 +130,7 @@ public java.lang.String getFieldName() {
   private static final int __NEEDRESULT_ISSET_ID = 1;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.NEED_RESULT,_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.PARTITION_COL_SCHEMA,_Fields.ENVIRONMENT_CONTEXT};
+  private static final _Fields[] optionals = {_Fields.NEED_RESULT,_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.PARTITION_COL_SCHEMA,_Fields.ENVIRONMENT_CONTEXT};
   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);
@@ -216,6 +218,7 @@ public AddPartitionsRequest(AddPartitionsRequest other) {
     }
   }
 
+  @Override
   public AddPartitionsRequest deepCopy() {
     return new AddPartitionsRequest(this);
   }
@@ -503,6 +506,7 @@ public void setEnvironmentContextIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -589,6 +593,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -626,6 +631,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -919,14 +925,17 @@ public int compareTo(AddPartitionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1062,6 +1071,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddPartitionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPartitionsRequestStandardScheme getScheme() {
       return new AddPartitionsRequestStandardScheme();
     }
@@ -1069,128 +1079,135 @@ public AddPartitionsRequestStandardScheme getScheme() {
 
   private static class AddPartitionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddPartitionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddPartitionsRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list668 = iprot.readListBegin();
-                struct.parts = new java.util.ArrayList<Partition>(_list668.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem669;
-                for (int _i670 = 0; _i670 < _list668.size; ++_i670)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem669 = new Partition();
-                  _elem669.read(iprot);
-                  struct.parts.add(_elem669);
+                  org.apache.thrift.protocol.TList _list668 = iprot.readListBegin();
+                  struct.parts = new java.util.ArrayList<Partition>(_list668.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem669;
+                  for (int _i670 = 0; _i670 < _list668.size; ++_i670)
+                  {
+                    _elem669 = new Partition();
+                    _elem669.read(iprot);
+                    struct.parts.add(_elem669);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // IF_NOT_EXISTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ifNotExists = iprot.readBool();
-              struct.setIfNotExistsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // NEED_RESULT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.needResult = iprot.readBool();
-              struct.setNeedResultIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PARTITION_COL_SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list671 = iprot.readListBegin();
-                struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list671.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem672;
-                for (int _i673 = 0; _i673 < _list671.size; ++_i673)
+              break;
+            case 4: // IF_NOT_EXISTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ifNotExists = iprot.readBool();
+                struct.setIfNotExistsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // NEED_RESULT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.needResult = iprot.readBool();
+                struct.setNeedResultIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // PARTITION_COL_SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem672 = new FieldSchema();
-                  _elem672.read(iprot);
-                  struct.partitionColSchema.add(_elem672);
+                  org.apache.thrift.protocol.TList _list671 = iprot.readListBegin();
+                  struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list671.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem672;
+                  for (int _i673 = 0; _i673 < _list671.size; ++_i673)
+                  {
+                    _elem672 = new FieldSchema();
+                    _elem672.read(iprot);
+                    struct.partitionColSchema.add(_elem672);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionColSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionColSchemaIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
+              break;
+            case 10: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddPartitionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1272,6 +1289,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddPartitionsReque
   }
 
   private static class AddPartitionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPartitionsRequestTupleScheme getScheme() {
       return new AddPartitionsRequestTupleScheme();
     }
@@ -1340,60 +1358,65 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddPartitionsReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddPartitionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list678 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.parts = new java.util.ArrayList<Partition>(_list678.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem679;
-        for (int _i680 = 0; _i680 < _list678.size; ++_i680)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
         {
-          _elem679 = new Partition();
-          _elem679.read(iprot);
-          struct.parts.add(_elem679);
+          org.apache.thrift.protocol.TList _list678 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.parts = new java.util.ArrayList<Partition>(_list678.size);
+          @org.apache.thrift.annotation.Nullable Partition _elem679;
+          for (int _i680 = 0; _i680 < _list678.size; ++_i680)
+          {
+            _elem679 = new Partition();
+            _elem679.read(iprot);
+            struct.parts.add(_elem679);
+          }
         }
-      }
-      struct.setPartsIsSet(true);
-      struct.ifNotExists = iprot.readBool();
-      struct.setIfNotExistsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.needResult = iprot.readBool();
-        struct.setNeedResultIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list681 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list681.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem682;
-          for (int _i683 = 0; _i683 < _list681.size; ++_i683)
+        struct.setPartsIsSet(true);
+        struct.ifNotExists = iprot.readBool();
+        struct.setIfNotExistsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.needResult = iprot.readBool();
+          struct.setNeedResultIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _elem682 = new FieldSchema();
-            _elem682.read(iprot);
-            struct.partitionColSchema.add(_elem682);
+            org.apache.thrift.protocol.TList _list681 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list681.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem682;
+            for (int _i683 = 0; _i683 < _list681.size; ++_i683)
+            {
+              _elem682 = new FieldSchema();
+              _elem682.read(iprot);
+              struct.partitionColSchema.add(_elem682);
+            }
           }
+          struct.setPartitionColSchemaIsSet(true);
         }
-        struct.setPartitionColSchemaIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
+        if (incoming.get(5)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
index dad26e585652..d4a75c9c4b7c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddPartitionsResult implements org.apache.thrift.TBase<AddPartitionsResult, AddPartitionsResult._Fields>, java.io.Serializable, Cloneable, Comparable<AddPartitionsResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddPartitionsResult");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -91,7 +93,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITIONS,_Fields.IS_STATS_COMPLIANT,_Fields.PARTITION_COL_SCHEMA};
+  private static final _Fields[] optionals = {_Fields.PARTITIONS,_Fields.IS_STATS_COMPLIANT,_Fields.PARTITION_COL_SCHEMA};
   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);
@@ -132,6 +134,7 @@ public AddPartitionsResult(AddPartitionsResult other) {
     }
   }
 
+  @Override
   public AddPartitionsResult deepCopy() {
     return new AddPartitionsResult(this);
   }
@@ -246,6 +249,7 @@ public void setPartitionColSchemaIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -276,6 +280,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -292,6 +297,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -412,14 +418,17 @@ public int compareTo(AddPartitionsResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -482,6 +491,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddPartitionsResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPartitionsResultStandardScheme getScheme() {
       return new AddPartitionsResultStandardScheme();
     }
@@ -489,71 +499,78 @@ public AddPartitionsResultStandardScheme getScheme() {
 
   private static class AddPartitionsResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddPartitionsResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddPartitionsResult 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list652 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list652.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem653;
-                for (int _i654 = 0; _i654 < _list652.size; ++_i654)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem653 = new Partition();
-                  _elem653.read(iprot);
-                  struct.partitions.add(_elem653);
+                  org.apache.thrift.protocol.TList _list652 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list652.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem653;
+                  for (int _i654 = 0; _i654 < _list652.size; ++_i654)
+                  {
+                    _elem653 = new Partition();
+                    _elem653.read(iprot);
+                    struct.partitions.add(_elem653);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARTITION_COL_SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list655 = iprot.readListBegin();
-                struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list655.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem656;
-                for (int _i657 = 0; _i657 < _list655.size; ++_i657)
+              break;
+            case 2: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITION_COL_SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem656 = new FieldSchema();
-                  _elem656.read(iprot);
-                  struct.partitionColSchema.add(_elem656);
+                  org.apache.thrift.protocol.TList _list655 = iprot.readListBegin();
+                  struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list655.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem656;
+                  for (int _i657 = 0; _i657 < _list655.size; ++_i657)
+                  {
+                    _elem656 = new FieldSchema();
+                    _elem656.read(iprot);
+                    struct.partitionColSchema.add(_elem656);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionColSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionColSchemaIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddPartitionsResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -598,6 +615,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddPartitionsResul
   }
 
   private static class AddPartitionsResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPartitionsResultTupleScheme getScheme() {
       return new AddPartitionsResultTupleScheme();
     }
@@ -644,39 +662,44 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddPartitionsResult
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddPartitionsResult 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)) {
-        {
-          org.apache.thrift.protocol.TList _list662 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitions = new java.util.ArrayList<Partition>(_list662.size);
-          @org.apache.thrift.annotation.Nullable Partition _elem663;
-          for (int _i664 = 0; _i664 < _list662.size; ++_i664)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _elem663 = new Partition();
-            _elem663.read(iprot);
-            struct.partitions.add(_elem663);
+            org.apache.thrift.protocol.TList _list662 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitions = new java.util.ArrayList<Partition>(_list662.size);
+            @org.apache.thrift.annotation.Nullable Partition _elem663;
+            for (int _i664 = 0; _i664 < _list662.size; ++_i664)
+            {
+              _elem663 = new Partition();
+              _elem663.read(iprot);
+              struct.partitions.add(_elem663);
+            }
           }
+          struct.setPartitionsIsSet(true);
         }
-        struct.setPartitionsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list665 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list665.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem666;
-          for (int _i667 = 0; _i667 < _list665.size; ++_i667)
+        if (incoming.get(1)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem666 = new FieldSchema();
-            _elem666.read(iprot);
-            struct.partitionColSchema.add(_elem666);
+            org.apache.thrift.protocol.TList _list665 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list665.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem666;
+            for (int _i667 = 0; _i667 < _list665.size; ++_i667)
+            {
+              _elem666 = new FieldSchema();
+              _elem666.read(iprot);
+              struct.partitionColSchema.add(_elem666);
+            }
           }
+          struct.setPartitionColSchemaIsSet(true);
         }
-        struct.setPartitionColSchemaIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java
index f1e46afc14a6..04e73d75bbf6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddPrimaryKeyRequest implements org.apache.thrift.TBase<AddPrimaryKeyRequest, AddPrimaryKeyRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddPrimaryKeyRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddPrimaryKeyRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AddPrimaryKeyRequest(AddPrimaryKeyRequest other) {
     }
   }
 
+  @Override
   public AddPrimaryKeyRequest deepCopy() {
     return new AddPrimaryKeyRequest(this);
   }
@@ -161,6 +164,7 @@ public void setPrimaryKeyColsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRIMARY_KEY_COLS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIMARY_KEY_COLS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AddPrimaryKeyRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddPrimaryKeyRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPrimaryKeyRequestStandardScheme getScheme() {
       return new AddPrimaryKeyRequestStandardScheme();
     }
@@ -316,44 +326,51 @@ public AddPrimaryKeyRequestStandardScheme getScheme() {
 
   private static class AddPrimaryKeyRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddPrimaryKeyRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddPrimaryKeyRequest 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 1: // PRIMARY_KEY_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list538 = iprot.readListBegin();
-                struct.primaryKeyCols = new java.util.ArrayList<SQLPrimaryKey>(_list538.size);
-                @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem539;
-                for (int _i540 = 0; _i540 < _list538.size; ++_i540)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PRIMARY_KEY_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem539 = new SQLPrimaryKey();
-                  _elem539.read(iprot);
-                  struct.primaryKeyCols.add(_elem539);
+                  org.apache.thrift.protocol.TList _list538 = iprot.readListBegin();
+                  struct.primaryKeyCols = new java.util.ArrayList<SQLPrimaryKey>(_list538.size);
+                  @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem539;
+                  for (int _i540 = 0; _i540 < _list538.size; ++_i540)
+                  {
+                    _elem539 = new SQLPrimaryKey();
+                    _elem539.read(iprot);
+                    struct.primaryKeyCols.add(_elem539);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrimaryKeyColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrimaryKeyColsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddPrimaryKeyRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddPrimaryKeyReque
   }
 
   private static class AddPrimaryKeyRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddPrimaryKeyRequestTupleScheme getScheme() {
       return new AddPrimaryKeyRequestTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddPrimaryKeyReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddPrimaryKeyRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list543 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.primaryKeyCols = new java.util.ArrayList<SQLPrimaryKey>(_list543.size);
-        @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem544;
-        for (int _i545 = 0; _i545 < _list543.size; ++_i545)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem544 = new SQLPrimaryKey();
-          _elem544.read(iprot);
-          struct.primaryKeyCols.add(_elem544);
+          org.apache.thrift.protocol.TList _list543 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.primaryKeyCols = new java.util.ArrayList<SQLPrimaryKey>(_list543.size);
+          @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem544;
+          for (int _i545 = 0; _i545 < _list543.size; ++_i545)
+          {
+            _elem544 = new SQLPrimaryKey();
+            _elem544.read(iprot);
+            struct.primaryKeyCols.add(_elem544);
+          }
         }
+        struct.setPrimaryKeyColsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPrimaryKeyColsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java
index 5268d972fea7..33028d34fb79 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AddUniqueConstraintRequest implements org.apache.thrift.TBase<AddUniqueConstraintRequest, AddUniqueConstraintRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AddUniqueConstraintRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddUniqueConstraintRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AddUniqueConstraintRequest(AddUniqueConstraintRequest other) {
     }
   }
 
+  @Override
   public AddUniqueConstraintRequest deepCopy() {
     return new AddUniqueConstraintRequest(this);
   }
@@ -161,6 +164,7 @@ public void setUniqueConstraintColsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case UNIQUE_CONSTRAINT_COLS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case UNIQUE_CONSTRAINT_COLS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AddUniqueConstraintRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AddUniqueConstraintRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddUniqueConstraintRequestStandardScheme getScheme() {
       return new AddUniqueConstraintRequestStandardScheme();
     }
@@ -316,44 +326,51 @@ public AddUniqueConstraintRequestStandardScheme getScheme() {
 
   private static class AddUniqueConstraintRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AddUniqueConstraintRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AddUniqueConstraintRequest 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 1: // UNIQUE_CONSTRAINT_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list554 = iprot.readListBegin();
-                struct.uniqueConstraintCols = new java.util.ArrayList<SQLUniqueConstraint>(_list554.size);
-                @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem555;
-                for (int _i556 = 0; _i556 < _list554.size; ++_i556)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // UNIQUE_CONSTRAINT_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem555 = new SQLUniqueConstraint();
-                  _elem555.read(iprot);
-                  struct.uniqueConstraintCols.add(_elem555);
+                  org.apache.thrift.protocol.TList _list554 = iprot.readListBegin();
+                  struct.uniqueConstraintCols = new java.util.ArrayList<SQLUniqueConstraint>(_list554.size);
+                  @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem555;
+                  for (int _i556 = 0; _i556 < _list554.size; ++_i556)
+                  {
+                    _elem555 = new SQLUniqueConstraint();
+                    _elem555.read(iprot);
+                    struct.uniqueConstraintCols.add(_elem555);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setUniqueConstraintColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setUniqueConstraintColsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AddUniqueConstraintRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AddUniqueConstrain
   }
 
   private static class AddUniqueConstraintRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AddUniqueConstraintRequestTupleScheme getScheme() {
       return new AddUniqueConstraintRequestTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AddUniqueConstraint
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AddUniqueConstraintRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list559 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.uniqueConstraintCols = new java.util.ArrayList<SQLUniqueConstraint>(_list559.size);
-        @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem560;
-        for (int _i561 = 0; _i561 < _list559.size; ++_i561)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem560 = new SQLUniqueConstraint();
-          _elem560.read(iprot);
-          struct.uniqueConstraintCols.add(_elem560);
+          org.apache.thrift.protocol.TList _list559 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.uniqueConstraintCols = new java.util.ArrayList<SQLUniqueConstraint>(_list559.size);
+          @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem560;
+          for (int _i561 = 0; _i561 < _list559.size; ++_i561)
+          {
+            _elem560 = new SQLUniqueConstraint();
+            _elem560.read(iprot);
+            struct.uniqueConstraintCols.add(_elem560);
+          }
         }
+        struct.setUniqueConstraintColsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setUniqueConstraintColsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
index 5a5ed529c3ab..4dc25a7cbd31 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AggrStats implements org.apache.thrift.TBase<AggrStats, AggrStats._Fields>, java.io.Serializable, Cloneable, Comparable<AggrStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AggrStats");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -92,7 +94,7 @@ public java.lang.String getFieldName() {
   private static final int __PARTSFOUND_ISSET_ID = 0;
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
+  private static final _Fields[] optionals = {_Fields.IS_STATS_COMPLIANT};
   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);
@@ -136,6 +138,7 @@ public AggrStats(AggrStats other) {
     this.isStatsCompliant = other.isStatsCompliant;
   }
 
+  @Override
   public AggrStats deepCopy() {
     return new AggrStats(this);
   }
@@ -233,6 +236,7 @@ public void setIsStatsCompliantIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COL_STATS:
@@ -263,6 +267,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_STATS:
@@ -279,6 +284,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -397,14 +403,17 @@ public int compareTo(AggrStats other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -467,6 +476,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AggrStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AggrStatsStandardScheme getScheme() {
       return new AggrStatsStandardScheme();
     }
@@ -474,60 +484,67 @@ public AggrStatsStandardScheme getScheme() {
 
   private static class AggrStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<AggrStats> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AggrStats 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 1: // COL_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list456 = iprot.readListBegin();
-                struct.colStats = new java.util.ArrayList<ColumnStatisticsObj>(_list456.size);
-                @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem457;
-                for (int _i458 = 0; _i458 < _list456.size; ++_i458)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COL_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem457 = new ColumnStatisticsObj();
-                  _elem457.read(iprot);
-                  struct.colStats.add(_elem457);
+                  org.apache.thrift.protocol.TList _list456 = iprot.readListBegin();
+                  struct.colStats = new java.util.ArrayList<ColumnStatisticsObj>(_list456.size);
+                  @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem457;
+                  for (int _i458 = 0; _i458 < _list456.size; ++_i458)
+                  {
+                    _elem457 = new ColumnStatisticsObj();
+                    _elem457.read(iprot);
+                    struct.colStats.add(_elem457);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PARTS_FOUND
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.partsFound = iprot.readI64();
-              struct.setPartsFoundIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
+              break;
+            case 2: // PARTS_FOUND
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.partsFound = iprot.readI64();
+                struct.setPartsFoundIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AggrStats struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -559,6 +576,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AggrStats struct)
   }
 
   private static class AggrStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AggrStatsTupleScheme getScheme() {
       return new AggrStatsTupleScheme();
     }
@@ -589,25 +607,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AggrStats struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AggrStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list461 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.colStats = new java.util.ArrayList<ColumnStatisticsObj>(_list461.size);
-        @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem462;
-        for (int _i463 = 0; _i463 < _list461.size; ++_i463)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem462 = new ColumnStatisticsObj();
-          _elem462.read(iprot);
-          struct.colStats.add(_elem462);
+          org.apache.thrift.protocol.TList _list461 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.colStats = new java.util.ArrayList<ColumnStatisticsObj>(_list461.size);
+          @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem462;
+          for (int _i463 = 0; _i463 < _list461.size; ++_i463)
+          {
+            _elem462 = new ColumnStatisticsObj();
+            _elem462.read(iprot);
+            struct.colStats.add(_elem462);
+          }
         }
-      }
-      struct.setColStatsIsSet(true);
-      struct.partsFound = iprot.readI64();
-      struct.setPartsFoundIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
+        struct.setColStatsIsSet(true);
+        struct.partsFound = iprot.readI64();
+        struct.setPartsFoundIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java
index e3e057a768d1..7dc16874ac58 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AllTableConstraintsRequest implements org.apache.thrift.TBase<AllTableConstraintsRequest, AllTableConstraintsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AllTableConstraintsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AllTableConstraintsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public AllTableConstraintsRequest(AllTableConstraintsRequest other) {
     }
   }
 
+  @Override
   public AllTableConstraintsRequest deepCopy() {
     return new AllTableConstraintsRequest(this);
   }
@@ -214,6 +217,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(AllTableConstraintsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AllTableConstraintsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllTableConstraintsRequestStandardScheme getScheme() {
       return new AllTableConstraintsRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public AllTableConstraintsRequestStandardScheme getScheme() {
 
   private static class AllTableConstraintsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AllTableConstraintsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AllTableConstraintsRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AllTableConstraintsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AllTableConstraint
   }
 
   private static class AllTableConstraintsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllTableConstraintsRequestTupleScheme getScheme() {
       return new AllTableConstraintsRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AllTableConstraints
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AllTableConstraintsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsResponse.java
index 0bb114d90c5a..9f1b956696b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AllTableConstraintsResponse implements org.apache.thrift.TBase<AllTableConstraintsResponse, AllTableConstraintsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<AllTableConstraintsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AllTableConstraintsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public AllTableConstraintsResponse(AllTableConstraintsResponse other) {
     }
   }
 
+  @Override
   public AllTableConstraintsResponse deepCopy() {
     return new AllTableConstraintsResponse(this);
   }
@@ -140,6 +143,7 @@ public void setAllTableConstraintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ALL_TABLE_CONSTRAINTS:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ALL_TABLE_CONSTRAINTS:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(AllTableConstraintsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AllTableConstraintsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllTableConstraintsResponseStandardScheme getScheme() {
       return new AllTableConstraintsResponseStandardScheme();
     }
@@ -298,34 +308,41 @@ public AllTableConstraintsResponseStandardScheme getScheme() {
 
   private static class AllTableConstraintsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<AllTableConstraintsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AllTableConstraintsResponse 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 1: // ALL_TABLE_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.allTableConstraints = new SQLAllTableConstraints();
-              struct.allTableConstraints.read(iprot);
-              struct.setAllTableConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // ALL_TABLE_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.allTableConstraints = new SQLAllTableConstraints();
+                struct.allTableConstraints.read(iprot);
+                struct.setAllTableConstraintsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AllTableConstraintsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AllTableConstraint
   }
 
   private static class AllTableConstraintsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllTableConstraintsResponseTupleScheme getScheme() {
       return new AllTableConstraintsResponseTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AllTableConstraints
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AllTableConstraintsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.allTableConstraints = new SQLAllTableConstraints();
-      struct.allTableConstraints.read(iprot);
-      struct.setAllTableConstraintsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.allTableConstraints = new SQLAllTableConstraints();
+        struct.allTableConstraints.read(iprot);
+        struct.setAllTableConstraintsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java
index 30b90b796a15..784182677234 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AllocateTableWriteIdsRequest implements org.apache.thrift.TBase<AllocateTableWriteIdsRequest, AllocateTableWriteIdsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AllocateTableWriteIdsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AllocateTableWriteIdsRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __REALLOCATE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TXN_IDS,_Fields.REPL_POLICY,_Fields.SRC_TXN_TO_WRITE_ID_LIST,_Fields.REALLOCATE};
+  private static final _Fields[] optionals = {_Fields.TXN_IDS,_Fields.REPL_POLICY,_Fields.SRC_TXN_TO_WRITE_ID_LIST,_Fields.REALLOCATE};
   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);
@@ -170,6 +172,7 @@ public AllocateTableWriteIdsRequest(AllocateTableWriteIdsRequest other) {
     this.reallocate = other.reallocate;
   }
 
+  @Override
   public AllocateTableWriteIdsRequest deepCopy() {
     return new AllocateTableWriteIdsRequest(this);
   }
@@ -359,6 +362,7 @@ public void setReallocateIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REALLOCATE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -413,6 +417,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -438,6 +443,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -633,14 +639,17 @@ public int compareTo(AllocateTableWriteIdsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -737,6 +746,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AllocateTableWriteIdsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllocateTableWriteIdsRequestStandardScheme getScheme() {
       return new AllocateTableWriteIdsRequestStandardScheme();
     }
@@ -744,94 +754,101 @@ public AllocateTableWriteIdsRequestStandardScheme getScheme() {
 
   private static class AllocateTableWriteIdsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AllocateTableWriteIdsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AllocateTableWriteIdsRequest 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 1: // DB_NAME
-            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: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TXN_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list878 = iprot.readListBegin();
-                struct.txnIds = new java.util.ArrayList<java.lang.Long>(_list878.size);
-                long _elem879;
-                for (int _i880 = 0; _i880 < _list878.size; ++_i880)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TXN_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem879 = iprot.readI64();
-                  struct.txnIds.add(_elem879);
+                  org.apache.thrift.protocol.TList _list878 = iprot.readListBegin();
+                  struct.txnIds = new java.util.ArrayList<java.lang.Long>(_list878.size);
+                  long _elem879;
+                  for (int _i880 = 0; _i880 < _list878.size; ++_i880)
+                  {
+                    _elem879 = iprot.readI64();
+                    struct.txnIds.add(_elem879);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTxnIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTxnIdsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // REPL_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.replPolicy = iprot.readString();
-              struct.setReplPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // SRC_TXN_TO_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list881 = iprot.readListBegin();
-                struct.srcTxnToWriteIdList = new java.util.ArrayList<TxnToWriteId>(_list881.size);
-                @org.apache.thrift.annotation.Nullable TxnToWriteId _elem882;
-                for (int _i883 = 0; _i883 < _list881.size; ++_i883)
+              break;
+            case 4: // REPL_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.replPolicy = iprot.readString();
+                struct.setReplPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // SRC_TXN_TO_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem882 = new TxnToWriteId();
-                  _elem882.read(iprot);
-                  struct.srcTxnToWriteIdList.add(_elem882);
+                  org.apache.thrift.protocol.TList _list881 = iprot.readListBegin();
+                  struct.srcTxnToWriteIdList = new java.util.ArrayList<TxnToWriteId>(_list881.size);
+                  @org.apache.thrift.annotation.Nullable TxnToWriteId _elem882;
+                  for (int _i883 = 0; _i883 < _list881.size; ++_i883)
+                  {
+                    _elem882 = new TxnToWriteId();
+                    _elem882.read(iprot);
+                    struct.srcTxnToWriteIdList.add(_elem882);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSrcTxnToWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSrcTxnToWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // REALLOCATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.reallocate = iprot.readBool();
-              struct.setReallocateIsSet(true);
-            } else { 
+              break;
+            case 6: // REALLOCATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.reallocate = iprot.readBool();
+                struct.setReallocateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AllocateTableWriteIdsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -893,6 +910,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AllocateTableWrite
   }
 
   private static class AllocateTableWriteIdsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllocateTableWriteIdsRequestTupleScheme getScheme() {
       return new AllocateTableWriteIdsRequestTupleScheme();
     }
@@ -947,46 +965,51 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AllocateTableWriteI
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AllocateTableWriteIdsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list888 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-          struct.txnIds = new java.util.ArrayList<java.lang.Long>(_list888.size);
-          long _elem889;
-          for (int _i890 = 0; _i890 < _list888.size; ++_i890)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
           {
-            _elem889 = iprot.readI64();
-            struct.txnIds.add(_elem889);
+            org.apache.thrift.protocol.TList _list888 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+            struct.txnIds = new java.util.ArrayList<java.lang.Long>(_list888.size);
+            long _elem889;
+            for (int _i890 = 0; _i890 < _list888.size; ++_i890)
+            {
+              _elem889 = iprot.readI64();
+              struct.txnIds.add(_elem889);
+            }
           }
+          struct.setTxnIdsIsSet(true);
         }
-        struct.setTxnIdsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.replPolicy = iprot.readString();
-        struct.setReplPolicyIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list891 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.srcTxnToWriteIdList = new java.util.ArrayList<TxnToWriteId>(_list891.size);
-          @org.apache.thrift.annotation.Nullable TxnToWriteId _elem892;
-          for (int _i893 = 0; _i893 < _list891.size; ++_i893)
+        if (incoming.get(1)) {
+          struct.replPolicy = iprot.readString();
+          struct.setReplPolicyIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem892 = new TxnToWriteId();
-            _elem892.read(iprot);
-            struct.srcTxnToWriteIdList.add(_elem892);
+            org.apache.thrift.protocol.TList _list891 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.srcTxnToWriteIdList = new java.util.ArrayList<TxnToWriteId>(_list891.size);
+            @org.apache.thrift.annotation.Nullable TxnToWriteId _elem892;
+            for (int _i893 = 0; _i893 < _list891.size; ++_i893)
+            {
+              _elem892 = new TxnToWriteId();
+              _elem892.read(iprot);
+              struct.srcTxnToWriteIdList.add(_elem892);
+            }
           }
+          struct.setSrcTxnToWriteIdListIsSet(true);
         }
-        struct.setSrcTxnToWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.reallocate = iprot.readBool();
-        struct.setReallocateIsSet(true);
+        if (incoming.get(3)) {
+          struct.reallocate = iprot.readBool();
+          struct.setReallocateIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java
index 576c7f032780..25eccf3ee211 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AllocateTableWriteIdsResponse implements org.apache.thrift.TBase<AllocateTableWriteIdsResponse, AllocateTableWriteIdsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<AllocateTableWriteIdsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AllocateTableWriteIdsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public AllocateTableWriteIdsResponse(AllocateTableWriteIdsResponse other) {
     }
   }
 
+  @Override
   public AllocateTableWriteIdsResponse deepCopy() {
     return new AllocateTableWriteIdsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setTxnToWriteIdsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_TO_WRITE_IDS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_TO_WRITE_IDS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(AllocateTableWriteIdsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AllocateTableWriteIdsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllocateTableWriteIdsResponseStandardScheme getScheme() {
       return new AllocateTableWriteIdsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public AllocateTableWriteIdsResponseStandardScheme getScheme() {
 
   private static class AllocateTableWriteIdsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<AllocateTableWriteIdsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AllocateTableWriteIdsResponse 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 1: // TXN_TO_WRITE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list894 = iprot.readListBegin();
-                struct.txnToWriteIds = new java.util.ArrayList<TxnToWriteId>(_list894.size);
-                @org.apache.thrift.annotation.Nullable TxnToWriteId _elem895;
-                for (int _i896 = 0; _i896 < _list894.size; ++_i896)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TXN_TO_WRITE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem895 = new TxnToWriteId();
-                  _elem895.read(iprot);
-                  struct.txnToWriteIds.add(_elem895);
+                  org.apache.thrift.protocol.TList _list894 = iprot.readListBegin();
+                  struct.txnToWriteIds = new java.util.ArrayList<TxnToWriteId>(_list894.size);
+                  @org.apache.thrift.annotation.Nullable TxnToWriteId _elem895;
+                  for (int _i896 = 0; _i896 < _list894.size; ++_i896)
+                  {
+                    _elem895 = new TxnToWriteId();
+                    _elem895.read(iprot);
+                    struct.txnToWriteIds.add(_elem895);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTxnToWriteIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTxnToWriteIdsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AllocateTableWriteIdsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AllocateTableWrite
   }
 
   private static class AllocateTableWriteIdsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AllocateTableWriteIdsResponseTupleScheme getScheme() {
       return new AllocateTableWriteIdsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AllocateTableWriteI
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AllocateTableWriteIdsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list899 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.txnToWriteIds = new java.util.ArrayList<TxnToWriteId>(_list899.size);
-        @org.apache.thrift.annotation.Nullable TxnToWriteId _elem900;
-        for (int _i901 = 0; _i901 < _list899.size; ++_i901)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem900 = new TxnToWriteId();
-          _elem900.read(iprot);
-          struct.txnToWriteIds.add(_elem900);
+          org.apache.thrift.protocol.TList _list899 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.txnToWriteIds = new java.util.ArrayList<TxnToWriteId>(_list899.size);
+          @org.apache.thrift.annotation.Nullable TxnToWriteId _elem900;
+          for (int _i901 = 0; _i901 < _list899.size; ++_i901)
+          {
+            _elem900 = new TxnToWriteId();
+            _elem900.read(iprot);
+            struct.txnToWriteIds.add(_elem900);
+          }
         }
+        struct.setTxnToWriteIdsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setTxnToWriteIdsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java
index 3a3b99677115..db1f233013a8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlreadyExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AlreadyExistsException, AlreadyExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyExistsException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyExistsException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public AlreadyExistsException(AlreadyExistsException other) {
     }
   }
 
+  @Override
   public AlreadyExistsException deepCopy() {
     return new AlreadyExistsException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(AlreadyExistsException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlreadyExistsExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlreadyExistsExceptionStandardScheme getScheme() {
       return new AlreadyExistsExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public AlreadyExistsExceptionStandardScheme getScheme() {
 
   private static class AlreadyExistsExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlreadyExistsException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlreadyExistsException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlreadyExistsException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlreadyExistsExcep
   }
 
   private static class AlreadyExistsExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlreadyExistsExceptionTupleScheme getScheme() {
       return new AlreadyExistsExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlreadyExistsExcept
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlreadyExistsException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java
index 6bcf3012d923..8c6e6a61c397 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterCatalogRequest implements org.apache.thrift.TBase<AlterCatalogRequest, AlterCatalogRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AlterCatalogRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterCatalogRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public AlterCatalogRequest(AlterCatalogRequest other) {
     }
   }
 
+  @Override
   public AlterCatalogRequest deepCopy() {
     return new AlterCatalogRequest(this);
   }
@@ -177,6 +180,7 @@ public void setNewCatIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(AlterCatalogRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -368,6 +377,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterCatalogRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterCatalogRequestStandardScheme getScheme() {
       return new AlterCatalogRequestStandardScheme();
     }
@@ -375,42 +385,49 @@ public AlterCatalogRequestStandardScheme getScheme() {
 
   private static class AlterCatalogRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterCatalogRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterCatalogRequest 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NEW_CAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.newCat = new Catalog();
-              struct.newCat.read(iprot);
-              struct.setNewCatIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NEW_CAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.newCat = new Catalog();
+                struct.newCat.read(iprot);
+                struct.setNewCatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterCatalogRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -432,6 +449,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterCatalogReques
   }
 
   private static class AlterCatalogRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterCatalogRequestTupleScheme getScheme() {
       return new AlterCatalogRequestTupleScheme();
     }
@@ -460,16 +478,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterCatalogRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterCatalogRequest 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.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.newCat = new Catalog();
-        struct.newCat.read(iprot);
-        struct.setNewCatIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.newCat = new Catalog();
+          struct.newCat.read(iprot);
+          struct.setNewCatIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDataConnectorRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDataConnectorRequest.java
index 1685f3a443a2..ec4dc60671f8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDataConnectorRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDataConnectorRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterDataConnectorRequest implements org.apache.thrift.TBase<AlterDataConnectorRequest, AlterDataConnectorRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AlterDataConnectorRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterDataConnectorRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public AlterDataConnectorRequest(AlterDataConnectorRequest other) {
     }
   }
 
+  @Override
   public AlterDataConnectorRequest deepCopy() {
     return new AlterDataConnectorRequest(this);
   }
@@ -177,6 +180,7 @@ public void setNewConnectorIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CONNECTOR_NAME:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CONNECTOR_NAME:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(AlterDataConnectorRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterDataConnectorRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterDataConnectorRequestStandardScheme getScheme() {
       return new AlterDataConnectorRequestStandardScheme();
     }
@@ -383,42 +393,49 @@ public AlterDataConnectorRequestStandardScheme getScheme() {
 
   private static class AlterDataConnectorRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterDataConnectorRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterDataConnectorRequest 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 1: // CONNECTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.connectorName = iprot.readString();
-              struct.setConnectorNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NEW_CONNECTOR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.newConnector = new DataConnector();
-              struct.newConnector.read(iprot);
-              struct.setNewConnectorIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CONNECTOR_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.connectorName = iprot.readString();
+                struct.setConnectorNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NEW_CONNECTOR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.newConnector = new DataConnector();
+                struct.newConnector.read(iprot);
+                struct.setNewConnectorIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterDataConnectorRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -440,6 +457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterDataConnector
   }
 
   private static class AlterDataConnectorRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterDataConnectorRequestTupleScheme getScheme() {
       return new AlterDataConnectorRequestTupleScheme();
     }
@@ -456,12 +474,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterDataConnectorR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterDataConnectorRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.connectorName = iprot.readString();
-      struct.setConnectorNameIsSet(true);
-      struct.newConnector = new DataConnector();
-      struct.newConnector.read(iprot);
-      struct.setNewConnectorIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.connectorName = iprot.readString();
+        struct.setConnectorNameIsSet(true);
+        struct.newConnector = new DataConnector();
+        struct.newConnector.read(iprot);
+        struct.setNewConnectorIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDatabaseRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDatabaseRequest.java
index 53d315853a08..fd75d73aaad2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDatabaseRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterDatabaseRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterDatabaseRequest implements org.apache.thrift.TBase<AlterDatabaseRequest, AlterDatabaseRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AlterDatabaseRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterDatabaseRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public AlterDatabaseRequest(AlterDatabaseRequest other) {
     }
   }
 
+  @Override
   public AlterDatabaseRequest deepCopy() {
     return new AlterDatabaseRequest(this);
   }
@@ -177,6 +180,7 @@ public void setNewDbIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OLD_DB_NAME:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OLD_DB_NAME:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(AlterDatabaseRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -376,6 +385,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterDatabaseRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterDatabaseRequestStandardScheme getScheme() {
       return new AlterDatabaseRequestStandardScheme();
     }
@@ -383,42 +393,49 @@ public AlterDatabaseRequestStandardScheme getScheme() {
 
   private static class AlterDatabaseRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterDatabaseRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterDatabaseRequest 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 1: // OLD_DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.oldDbName = iprot.readString();
-              struct.setOldDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NEW_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.newDb = new Database();
-              struct.newDb.read(iprot);
-              struct.setNewDbIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // OLD_DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.oldDbName = iprot.readString();
+                struct.setOldDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NEW_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.newDb = new Database();
+                struct.newDb.read(iprot);
+                struct.setNewDbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterDatabaseRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -440,6 +457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterDatabaseReque
   }
 
   private static class AlterDatabaseRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterDatabaseRequestTupleScheme getScheme() {
       return new AlterDatabaseRequestTupleScheme();
     }
@@ -456,12 +474,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterDatabaseReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterDatabaseRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.oldDbName = iprot.readString();
-      struct.setOldDbNameIsSet(true);
-      struct.newDb = new Database();
-      struct.newDb.read(iprot);
-      struct.setNewDbIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.oldDbName = iprot.readString();
+        struct.setOldDbNameIsSet(true);
+        struct.newDb = new Database();
+        struct.newDb.read(iprot);
+        struct.setNewDbIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java
index 1b1a5cc6d3ba..69971d6cc547 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterISchemaRequest implements org.apache.thrift.TBase<AlterISchemaRequest, AlterISchemaRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AlterISchemaRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterISchemaRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public AlterISchemaRequest(AlterISchemaRequest other) {
     }
   }
 
+  @Override
   public AlterISchemaRequest deepCopy() {
     return new AlterISchemaRequest(this);
   }
@@ -177,6 +180,7 @@ public void setNewSchemaIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(AlterISchemaRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -371,6 +380,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterISchemaRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterISchemaRequestStandardScheme getScheme() {
       return new AlterISchemaRequestStandardScheme();
     }
@@ -378,43 +388,50 @@ public AlterISchemaRequestStandardScheme getScheme() {
 
   private static class AlterISchemaRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterISchemaRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterISchemaRequest 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.name = new ISchemaName();
-              struct.name.read(iprot);
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NEW_SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.newSchema = new ISchema();
-              struct.newSchema.read(iprot);
-              struct.setNewSchemaIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.name = new ISchemaName();
+                struct.name.read(iprot);
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NEW_SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.newSchema = new ISchema();
+                struct.newSchema.read(iprot);
+                struct.setNewSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterISchemaRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -436,6 +453,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterISchemaReques
   }
 
   private static class AlterISchemaRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterISchemaRequestTupleScheme getScheme() {
       return new AlterISchemaRequestTupleScheme();
     }
@@ -464,17 +482,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterISchemaRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterISchemaRequest 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.name = new ISchemaName();
-        struct.name.read(iprot);
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.newSchema = new ISchema();
-        struct.newSchema.read(iprot);
-        struct.setNewSchemaIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.name = new ISchemaName();
+          struct.name.read(iprot);
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.newSchema = new ISchema();
+          struct.newSchema.read(iprot);
+          struct.setNewSchemaIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
index 27eeee645051..4d887c3af416 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterPartitionsRequest implements org.apache.thrift.TBase<AlterPartitionsRequest, AlterPartitionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AlterPartitionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterPartitionsRequest");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -122,7 +124,7 @@ public java.lang.String getFieldName() {
   private static final int __WRITEID_ISSET_ID = 0;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.ENVIRONMENT_CONTEXT,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.PARTITION_COL_SCHEMA};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.ENVIRONMENT_CONTEXT,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.PARTITION_COL_SCHEMA};
   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);
@@ -204,6 +206,7 @@ public AlterPartitionsRequest(AlterPartitionsRequest other) {
     }
   }
 
+  @Override
   public AlterPartitionsRequest deepCopy() {
     return new AlterPartitionsRequest(this);
   }
@@ -467,6 +470,7 @@ public void setPartitionColSchemaIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -545,6 +549,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -579,6 +584,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -849,14 +855,17 @@ public int compareTo(AlterPartitionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -984,6 +993,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterPartitionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterPartitionsRequestStandardScheme getScheme() {
       return new AlterPartitionsRequestStandardScheme();
     }
@@ -991,120 +1001,127 @@ public AlterPartitionsRequestStandardScheme getScheme() {
 
   private static class AlterPartitionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterPartitionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterPartitionsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1442 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list1442.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem1443;
-                for (int _i1444 = 0; _i1444 < _list1442.size; ++_i1444)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1443 = new Partition();
-                  _elem1443.read(iprot);
-                  struct.partitions.add(_elem1443);
+                  org.apache.thrift.protocol.TList _list1442 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list1442.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem1443;
+                  for (int _i1444 = 0; _i1444 < _list1442.size; ++_i1444)
+                  {
+                    _elem1443 = new Partition();
+                    _elem1443.read(iprot);
+                    struct.partitions.add(_elem1443);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PARTITION_COL_SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1445 = iprot.readListBegin();
-                struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list1445.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem1446;
-                for (int _i1447 = 0; _i1447 < _list1445.size; ++_i1447)
+              break;
+            case 5: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // PARTITION_COL_SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1446 = new FieldSchema();
-                  _elem1446.read(iprot);
-                  struct.partitionColSchema.add(_elem1446);
+                  org.apache.thrift.protocol.TList _list1445 = iprot.readListBegin();
+                  struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list1445.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1446;
+                  for (int _i1447 = 0; _i1447 < _list1445.size; ++_i1447)
+                  {
+                    _elem1446 = new FieldSchema();
+                    _elem1446.read(iprot);
+                    struct.partitionColSchema.add(_elem1446);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionColSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionColSchemaIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterPartitionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1183,6 +1200,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterPartitionsReq
   }
 
   private static class AlterPartitionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterPartitionsRequestTupleScheme getScheme() {
       return new AlterPartitionsRequestTupleScheme();
     }
@@ -1250,58 +1268,63 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterPartitionsRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterPartitionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list1452 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitions = new java.util.ArrayList<Partition>(_list1452.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem1453;
-        for (int _i1454 = 0; _i1454 < _list1452.size; ++_i1454)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
         {
-          _elem1453 = new Partition();
-          _elem1453.read(iprot);
-          struct.partitions.add(_elem1453);
+          org.apache.thrift.protocol.TList _list1452 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitions = new java.util.ArrayList<Partition>(_list1452.size);
+          @org.apache.thrift.annotation.Nullable Partition _elem1453;
+          for (int _i1454 = 0; _i1454 < _list1452.size; ++_i1454)
+          {
+            _elem1453 = new Partition();
+            _elem1453.read(iprot);
+            struct.partitions.add(_elem1453);
+          }
         }
-      }
-      struct.setPartitionsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list1455 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list1455.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem1456;
-          for (int _i1457 = 0; _i1457 < _list1455.size; ++_i1457)
+        struct.setPartitionsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(5)) {
           {
-            _elem1456 = new FieldSchema();
-            _elem1456.read(iprot);
-            struct.partitionColSchema.add(_elem1456);
+            org.apache.thrift.protocol.TList _list1455 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitionColSchema = new java.util.ArrayList<FieldSchema>(_list1455.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem1456;
+            for (int _i1457 = 0; _i1457 < _list1455.size; ++_i1457)
+            {
+              _elem1456 = new FieldSchema();
+              _elem1456.read(iprot);
+              struct.partitionColSchema.add(_elem1456);
+            }
           }
+          struct.setPartitionColSchemaIsSet(true);
         }
-        struct.setPartitionColSchemaIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsResponse.java
index 323ad024f07d..bd5148cc2a17 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterPartitionsResponse implements org.apache.thrift.TBase<AlterPartitionsResponse, AlterPartitionsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<AlterPartitionsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterPartitionsResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public AlterPartitionsResponse() {
   public AlterPartitionsResponse(AlterPartitionsResponse other) {
   }
 
+  @Override
   public AlterPartitionsResponse deepCopy() {
     return new AlterPartitionsResponse(this);
   }
@@ -97,12 +100,14 @@ public AlterPartitionsResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(AlterPartitionsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterPartitionsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterPartitionsResponseStandardScheme getScheme() {
       return new AlterPartitionsResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public AlterPartitionsResponseStandardScheme getScheme() {
 
   private static class AlterPartitionsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterPartitionsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterPartitionsResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterPartitionsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterPartitionsRes
   }
 
   private static class AlterPartitionsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterPartitionsResponseTupleScheme getScheme() {
       return new AlterPartitionsResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterPartitionsResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterPartitionsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
index 9f2b11f6c16a..3f80a1c7c49c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterTableRequest implements org.apache.thrift.TBase<AlterTableRequest, AlterTableRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AlterTableRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterTableRequest");
 
@@ -119,10 +119,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,7 +133,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __WRITEID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.ENVIRONMENT_CONTEXT,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.EXPECTED_PARAMETER_KEY,_Fields.EXPECTED_PARAMETER_VALUE};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.ENVIRONMENT_CONTEXT,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.EXPECTED_PARAMETER_KEY,_Fields.EXPECTED_PARAMETER_VALUE};
   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);
@@ -217,6 +219,7 @@ public AlterTableRequest(AlterTableRequest other) {
     }
   }
 
+  @Override
   public AlterTableRequest deepCopy() {
     return new AlterTableRequest(this);
   }
@@ -515,6 +518,7 @@ public void setExpectedParameterValueIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -609,6 +613,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -649,6 +654,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -969,14 +975,17 @@ public int compareTo(AlterTableRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1131,6 +1140,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterTableRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterTableRequestStandardScheme getScheme() {
       return new AlterTableRequestStandardScheme();
     }
@@ -1138,125 +1148,132 @@ public AlterTableRequestStandardScheme getScheme() {
 
   private static class AlterTableRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterTableRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterTableRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.table = new Table();
-              struct.table.read(iprot);
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1474 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1474.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1475;
-                for (int _i1476 = 0; _i1476 < _list1474.size; ++_i1476)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.table = new Table();
+                struct.table.read(iprot);
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1475 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1475);
+                  org.apache.thrift.protocol.TList _list1474 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1474.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1475;
+                  for (int _i1476 = 0; _i1476 < _list1474.size; ++_i1476)
+                  {
+                    _elem1475 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1475);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // EXPECTED_PARAMETER_KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expectedParameterKey = iprot.readString();
-              struct.setExpectedParameterKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // EXPECTED_PARAMETER_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expectedParameterValue = iprot.readString();
-              struct.setExpectedParameterValueIsSet(true);
-            } else { 
+              break;
+            case 9: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // EXPECTED_PARAMETER_KEY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expectedParameterKey = iprot.readString();
+                struct.setExpectedParameterKeyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // EXPECTED_PARAMETER_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expectedParameterValue = iprot.readString();
+                struct.setExpectedParameterValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterTableRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1344,6 +1361,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterTableRequest
   }
 
   private static class AlterTableRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterTableRequestTupleScheme getScheme() {
       return new AlterTableRequestTupleScheme();
     }
@@ -1417,56 +1435,61 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterTableRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterTableRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      struct.table = new Table();
-      struct.table.read(iprot);
-      struct.setTableIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list1479 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1479.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1480;
-          for (int _i1481 = 0; _i1481 < _list1479.size; ++_i1481)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        struct.table = new Table();
+        struct.table.read(iprot);
+        struct.setTableIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _elem1480 = iprot.readString();
-            struct.processorCapabilities.add(_elem1480);
+            org.apache.thrift.protocol.TList _list1479 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1479.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1480;
+            for (int _i1481 = 0; _i1481 < _list1479.size; ++_i1481)
+            {
+              _elem1480 = iprot.readString();
+              struct.processorCapabilities.add(_elem1480);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.expectedParameterKey = iprot.readString();
-        struct.setExpectedParameterKeyIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.expectedParameterValue = iprot.readString();
-        struct.setExpectedParameterValueIsSet(true);
+        if (incoming.get(5)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.expectedParameterKey = iprot.readString();
+          struct.setExpectedParameterKeyIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.expectedParameterValue = iprot.readString();
+          struct.setExpectedParameterValueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableResponse.java
index aa07e2c373ec..f358c886c335 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AlterTableResponse implements org.apache.thrift.TBase<AlterTableResponse, AlterTableResponse._Fields>, java.io.Serializable, Cloneable, Comparable<AlterTableResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlterTableResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public AlterTableResponse() {
   public AlterTableResponse(AlterTableResponse other) {
   }
 
+  @Override
   public AlterTableResponse deepCopy() {
     return new AlterTableResponse(this);
   }
@@ -97,12 +100,14 @@ public AlterTableResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(AlterTableResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AlterTableResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterTableResponseStandardScheme getScheme() {
       return new AlterTableResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public AlterTableResponseStandardScheme getScheme() {
 
   private static class AlterTableResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlterTableResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AlterTableResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AlterTableResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AlterTableResponse
   }
 
   private static class AlterTableResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AlterTableResponseTupleScheme getScheme() {
       return new AlterTableResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AlterTableResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AlterTableResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AppendPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AppendPartitionsRequest.java
index 396f4d98fdbc..033d93c06099 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AppendPartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AppendPartitionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AppendPartitionsRequest implements org.apache.thrift.TBase<AppendPartitionsRequest, AppendPartitionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AppendPartitionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AppendPartitionsRequest");
 
@@ -94,17 +94,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.NAME,_Fields.PART_VALS,_Fields.ENVIRONMENT_CONTEXT};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.NAME,_Fields.PART_VALS,_Fields.ENVIRONMENT_CONTEXT};
   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);
@@ -162,6 +164,7 @@ public AppendPartitionsRequest(AppendPartitionsRequest other) {
     }
   }
 
+  @Override
   public AppendPartitionsRequest deepCopy() {
     return new AppendPartitionsRequest(this);
   }
@@ -336,6 +339,7 @@ public void setEnvironmentContextIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG_NAME:
@@ -390,6 +394,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG_NAME:
@@ -415,6 +420,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -610,14 +616,17 @@ public int compareTo(AppendPartitionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -719,6 +728,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AppendPartitionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AppendPartitionsRequestStandardScheme getScheme() {
       return new AppendPartitionsRequestStandardScheme();
     }
@@ -726,84 +736,91 @@ public AppendPartitionsRequestStandardScheme getScheme() {
 
   private static class AppendPartitionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<AppendPartitionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AppendPartitionsRequest 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 1: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PART_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1458 = iprot.readListBegin();
-                struct.partVals = new java.util.ArrayList<java.lang.String>(_list1458.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1459;
-                for (int _i1460 = 0; _i1460 < _list1458.size; ++_i1460)
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PART_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1459 = iprot.readString();
-                  struct.partVals.add(_elem1459);
+                  org.apache.thrift.protocol.TList _list1458 = iprot.readListBegin();
+                  struct.partVals = new java.util.ArrayList<java.lang.String>(_list1458.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1459;
+                  for (int _i1460 = 0; _i1460 < _list1458.size; ++_i1460)
+                  {
+                    _elem1459 = iprot.readString();
+                    struct.partVals.add(_elem1459);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
+              break;
+            case 6: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AppendPartitionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -860,6 +877,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AppendPartitionsRe
   }
 
   private static class AppendPartitionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AppendPartitionsRequestTupleScheme getScheme() {
       return new AppendPartitionsRequestTupleScheme();
     }
@@ -908,37 +926,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AppendPartitionsReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AppendPartitionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1463 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partVals = new java.util.ArrayList<java.lang.String>(_list1463.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1464;
-          for (int _i1465 = 0; _i1465 < _list1463.size; ++_i1465)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem1464 = iprot.readString();
-            struct.partVals.add(_elem1464);
+            org.apache.thrift.protocol.TList _list1463 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partVals = new java.util.ArrayList<java.lang.String>(_list1463.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1464;
+            for (int _i1465 = 0; _i1465 < _list1463.size; ++_i1465)
+            {
+              _elem1464 = iprot.readString();
+              struct.partVals.add(_elem1464);
+            }
           }
+          struct.setPartValsIsSet(true);
         }
-        struct.setPartValsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
+        if (incoming.get(3)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AsyncOperationResp.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AsyncOperationResp.java
index 3ee830a11a8b..f563f1c277ca 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AsyncOperationResp.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AsyncOperationResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class AsyncOperationResp implements org.apache.thrift.TBase<AsyncOperationResp, AsyncOperationResp._Fields>, java.io.Serializable, Cloneable, Comparable<AsyncOperationResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AsyncOperationResp");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -91,7 +93,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __FINISHED_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MESSAGE,_Fields.FINISHED};
+  private static final _Fields[] optionals = {_Fields.MESSAGE,_Fields.FINISHED};
   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);
@@ -129,6 +131,7 @@ public AsyncOperationResp(AsyncOperationResp other) {
     this.finished = other.finished;
   }
 
+  @Override
   public AsyncOperationResp deepCopy() {
     return new AsyncOperationResp(this);
   }
@@ -211,6 +214,7 @@ public void setFinishedIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FINISHED_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ID:
@@ -241,6 +245,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
@@ -257,6 +262,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -377,14 +383,17 @@ public int compareTo(AsyncOperationResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -449,6 +458,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class AsyncOperationRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AsyncOperationRespStandardScheme getScheme() {
       return new AsyncOperationRespStandardScheme();
     }
@@ -456,49 +466,56 @@ public AsyncOperationRespStandardScheme getScheme() {
 
   private static class AsyncOperationRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<AsyncOperationResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, AsyncOperationResp 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 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // FINISHED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.finished = iprot.readBool();
-              struct.setFinishedIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.id = iprot.readString();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // FINISHED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.finished = iprot.readBool();
+                struct.setFinishedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, AsyncOperationResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -527,6 +544,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AsyncOperationResp
   }
 
   private static class AsyncOperationRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public AsyncOperationRespTupleScheme getScheme() {
       return new AsyncOperationRespTupleScheme();
     }
@@ -556,17 +574,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AsyncOperationResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, AsyncOperationResp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.id = iprot.readString();
-      struct.setIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.message = iprot.readString();
-        struct.setMessageIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.finished = iprot.readBool();
-        struct.setFinishedIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.id = iprot.readString();
+        struct.setIdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.finished = iprot.readBool();
+          struct.setFinishedIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java
index bea0aa6587c0..aa60a6308e3b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class BasicTxnInfo implements org.apache.thrift.TBase<BasicTxnInfo, BasicTxnInfo._Fields>, java.io.Serializable, Cloneable, Comparable<BasicTxnInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BasicTxnInfo");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -108,7 +110,7 @@ public java.lang.String getFieldName() {
   private static final int __TIME_ISSET_ID = 1;
   private static final int __TXNID_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TIME,_Fields.TXNID,_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTITIONNAME};
+  private static final _Fields[] optionals = {_Fields.TIME,_Fields.TXNID,_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTITIONNAME};
   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);
@@ -158,6 +160,7 @@ public BasicTxnInfo(BasicTxnInfo other) {
     }
   }
 
+  @Override
   public BasicTxnInfo deepCopy() {
     return new BasicTxnInfo(this);
   }
@@ -313,6 +316,7 @@ public void setPartitionnameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ISNULL:
@@ -367,6 +371,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ISNULL:
@@ -392,6 +397,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -585,14 +591,17 @@ public int compareTo(BasicTxnInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -679,6 +688,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class BasicTxnInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public BasicTxnInfoStandardScheme getScheme() {
       return new BasicTxnInfoStandardScheme();
     }
@@ -686,73 +696,80 @@ public BasicTxnInfoStandardScheme getScheme() {
 
   private static class BasicTxnInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<BasicTxnInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, BasicTxnInfo 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 1: // ISNULL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isnull = iprot.readBool();
-              struct.setIsnullIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.time = iprot.readI64();
-              struct.setTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ISNULL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isnull = iprot.readBool();
+                struct.setIsnullIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.time = iprot.readI64();
+                struct.setTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // 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 5: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // PARTITIONNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionname = iprot.readString();
+                struct.setPartitionnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // 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 5: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // PARTITIONNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionname = iprot.readString();
-              struct.setPartitionnameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, BasicTxnInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -798,6 +815,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BasicTxnInfo struc
   }
 
   private static class BasicTxnInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public BasicTxnInfoTupleScheme getScheme() {
       return new BasicTxnInfoTupleScheme();
     }
@@ -845,29 +863,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, BasicTxnInfo struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, BasicTxnInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.isnull = iprot.readBool();
-      struct.setIsnullIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.time = iprot.readI64();
-        struct.setTimeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.txnid = iprot.readI64();
-        struct.setTxnidIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.dbname = iprot.readString();
-        struct.setDbnameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.tablename = iprot.readString();
-        struct.setTablenameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.partitionname = iprot.readString();
-        struct.setPartitionnameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.isnull = iprot.readBool();
+        struct.setIsnullIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.time = iprot.readI64();
+          struct.setTimeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.txnid = iprot.readI64();
+          struct.setTxnidIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.dbname = iprot.readString();
+          struct.setDbnameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.tablename = iprot.readString();
+          struct.setTablenameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.partitionname = iprot.readString();
+          struct.setPartitionnameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java
index 5ba49af0ec5f..d9e29c29d776 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class BinaryColumnStatsData implements org.apache.thrift.TBase<BinaryColumnStatsData, BinaryColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<BinaryColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BinaryColumnStatsData");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -98,7 +100,7 @@ public java.lang.String getFieldName() {
   private static final int __AVGCOLLEN_ISSET_ID = 1;
   private static final int __NUMNULLS_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.BIT_VECTORS};
+  private static final _Fields[] optionals = {_Fields.BIT_VECTORS};
   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);
@@ -144,6 +146,7 @@ public BinaryColumnStatsData(BinaryColumnStatsData other) {
     }
   }
 
+  @Override
   public BinaryColumnStatsData deepCopy() {
     return new BinaryColumnStatsData(this);
   }
@@ -257,6 +260,7 @@ public void setBitVectorsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MAX_COL_LEN:
@@ -299,6 +303,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MAX_COL_LEN:
@@ -318,6 +323,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -457,14 +463,17 @@ public int compareTo(BinaryColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -535,6 +544,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class BinaryColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public BinaryColumnStatsDataStandardScheme getScheme() {
       return new BinaryColumnStatsDataStandardScheme();
     }
@@ -542,57 +552,64 @@ public BinaryColumnStatsDataStandardScheme getScheme() {
 
   private static class BinaryColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<BinaryColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, BinaryColumnStatsData 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 1: // MAX_COL_LEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.maxColLen = iprot.readI64();
-              struct.setMaxColLenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // AVG_COL_LEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.avgColLen = iprot.readDouble();
-              struct.setAvgColLenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MAX_COL_LEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.maxColLen = iprot.readI64();
+                struct.setMaxColLenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // AVG_COL_LEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.avgColLen = iprot.readDouble();
+                struct.setAvgColLenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, BinaryColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -620,6 +637,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BinaryColumnStatsD
   }
 
   private static class BinaryColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public BinaryColumnStatsDataTupleScheme getScheme() {
       return new BinaryColumnStatsDataTupleScheme();
     }
@@ -645,17 +663,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, BinaryColumnStatsDa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, BinaryColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.maxColLen = iprot.readI64();
-      struct.setMaxColLenIsSet(true);
-      struct.avgColLen = iprot.readDouble();
-      struct.setAvgColLenIsSet(true);
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.maxColLen = iprot.readI64();
+        struct.setMaxColLenIsSet(true);
+        struct.avgColLen = iprot.readDouble();
+        struct.setAvgColLenIsSet(true);
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java
index 98eaed67f1d9..65f5b60ec8d4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class BooleanColumnStatsData implements org.apache.thrift.TBase<BooleanColumnStatsData, BooleanColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<BooleanColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BooleanColumnStatsData");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -98,7 +100,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMFALSES_ISSET_ID = 1;
   private static final int __NUMNULLS_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.BIT_VECTORS};
+  private static final _Fields[] optionals = {_Fields.BIT_VECTORS};
   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);
@@ -144,6 +146,7 @@ public BooleanColumnStatsData(BooleanColumnStatsData other) {
     }
   }
 
+  @Override
   public BooleanColumnStatsData deepCopy() {
     return new BooleanColumnStatsData(this);
   }
@@ -257,6 +260,7 @@ public void setBitVectorsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUM_TRUES:
@@ -299,6 +303,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUM_TRUES:
@@ -318,6 +323,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -457,14 +463,17 @@ public int compareTo(BooleanColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -535,6 +544,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class BooleanColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public BooleanColumnStatsDataStandardScheme getScheme() {
       return new BooleanColumnStatsDataStandardScheme();
     }
@@ -542,57 +552,64 @@ public BooleanColumnStatsDataStandardScheme getScheme() {
 
   private static class BooleanColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<BooleanColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, BooleanColumnStatsData 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 1: // NUM_TRUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numTrues = iprot.readI64();
-              struct.setNumTruesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NUM_FALSES
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numFalses = iprot.readI64();
-              struct.setNumFalsesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NUM_TRUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numTrues = iprot.readI64();
+                struct.setNumTruesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NUM_FALSES
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numFalses = iprot.readI64();
+                struct.setNumFalsesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, BooleanColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -620,6 +637,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BooleanColumnStats
   }
 
   private static class BooleanColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public BooleanColumnStatsDataTupleScheme getScheme() {
       return new BooleanColumnStatsDataTupleScheme();
     }
@@ -645,17 +663,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, BooleanColumnStatsD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, BooleanColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.numTrues = iprot.readI64();
-      struct.setNumTruesIsSet(true);
-      struct.numFalses = iprot.readI64();
-      struct.setNumFalsesIsSet(true);
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.numTrues = iprot.readI64();
+        struct.setNumTruesIsSet(true);
+        struct.numFalses = iprot.readI64();
+        struct.setNumFalsesIsSet(true);
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java
index 32acd6082c76..173031bafc47 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CacheFileMetadataRequest implements org.apache.thrift.TBase<CacheFileMetadataRequest, CacheFileMetadataRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CacheFileMetadataRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CacheFileMetadataRequest");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISALLPARTS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PART_NAME,_Fields.IS_ALL_PARTS};
+  private static final _Fields[] optionals = {_Fields.PART_NAME,_Fields.IS_ALL_PARTS};
   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);
@@ -141,6 +143,7 @@ public CacheFileMetadataRequest(CacheFileMetadataRequest other) {
     this.isAllParts = other.isAllParts;
   }
 
+  @Override
   public CacheFileMetadataRequest deepCopy() {
     return new CacheFileMetadataRequest(this);
   }
@@ -248,6 +251,7 @@ public void setIsAllPartsIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISALLPARTS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -286,6 +290,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -305,6 +310,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -450,14 +456,17 @@ public int compareTo(CacheFileMetadataRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -534,6 +543,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CacheFileMetadataRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CacheFileMetadataRequestStandardScheme getScheme() {
       return new CacheFileMetadataRequestStandardScheme();
     }
@@ -541,57 +551,64 @@ public CacheFileMetadataRequestStandardScheme getScheme() {
 
   private static class CacheFileMetadataRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CacheFileMetadataRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CacheFileMetadataRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PART_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partName = iprot.readString();
-              struct.setPartNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PART_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partName = iprot.readString();
+                struct.setPartNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // IS_ALL_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isAllParts = iprot.readBool();
+                struct.setIsAllPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // IS_ALL_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isAllParts = iprot.readBool();
-              struct.setIsAllPartsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CacheFileMetadataRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -625,6 +642,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CacheFileMetadataR
   }
 
   private static class CacheFileMetadataRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CacheFileMetadataRequestTupleScheme getScheme() {
       return new CacheFileMetadataRequestTupleScheme();
     }
@@ -655,19 +673,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CacheFileMetadataRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CacheFileMetadataRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.partName = iprot.readString();
-        struct.setPartNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.isAllParts = iprot.readBool();
-        struct.setIsAllPartsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.partName = iprot.readString();
+          struct.setPartNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.isAllParts = iprot.readBool();
+          struct.setIsAllPartsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java
index fec1d2f47aeb..1565ab0e1cb5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CacheFileMetadataResult implements org.apache.thrift.TBase<CacheFileMetadataResult, CacheFileMetadataResult._Fields>, java.io.Serializable, Cloneable, Comparable<CacheFileMetadataResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CacheFileMetadataResult");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public CacheFileMetadataResult(CacheFileMetadataResult other) {
     this.isSupported = other.isSupported;
   }
 
+  @Override
   public CacheFileMetadataResult deepCopy() {
     return new CacheFileMetadataResult(this);
   }
@@ -141,6 +144,7 @@ public void setIsSupportedIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSUPPORTED_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IS_SUPPORTED:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IS_SUPPORTED:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(CacheFileMetadataResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CacheFileMetadataResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CacheFileMetadataResultStandardScheme getScheme() {
       return new CacheFileMetadataResultStandardScheme();
     }
@@ -292,33 +302,40 @@ public CacheFileMetadataResultStandardScheme getScheme() {
 
   private static class CacheFileMetadataResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<CacheFileMetadataResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CacheFileMetadataResult 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 1: // IS_SUPPORTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isSupported = iprot.readBool();
-              struct.setIsSupportedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // IS_SUPPORTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isSupported = iprot.readBool();
+                struct.setIsSupportedIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CacheFileMetadataResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CacheFileMetadataR
   }
 
   private static class CacheFileMetadataResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CacheFileMetadataResultTupleScheme getScheme() {
       return new CacheFileMetadataResultTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CacheFileMetadataRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CacheFileMetadataResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.isSupported = iprot.readBool();
-      struct.setIsSupportedIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.isSupported = iprot.readBool();
+        struct.setIsSupportedIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java
index a80bc994a416..fec0027ba523 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Catalog implements org.apache.thrift.TBase<Catalog, Catalog._Fields>, java.io.Serializable, Cloneable, Comparable<Catalog> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Catalog");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __CREATETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DESCRIPTION,_Fields.CREATE_TIME,_Fields.PARAMETERS};
+  private static final _Fields[] optionals = {_Fields.DESCRIPTION,_Fields.CREATE_TIME,_Fields.PARAMETERS};
   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);
@@ -154,6 +156,7 @@ public Catalog(Catalog other) {
     }
   }
 
+  @Override
   public Catalog deepCopy() {
     return new Catalog(this);
   }
@@ -297,6 +300,7 @@ public void setParametersIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -343,6 +347,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -365,6 +370,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -535,14 +541,17 @@ public int compareTo(Catalog other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -621,6 +630,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CatalogStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CatalogStandardScheme getScheme() {
       return new CatalogStandardScheme();
     }
@@ -628,77 +638,84 @@ public CatalogStandardScheme getScheme() {
 
   private static class CatalogStandardScheme extends org.apache.thrift.scheme.StandardScheme<Catalog> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Catalog 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // LOCATION_URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.locationUri = iprot.readString();
-              struct.setLocationUriIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map198 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map198.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key199;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val200;
-                for (int _i201 = 0; _i201 < _map198.size; ++_i201)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // LOCATION_URI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.locationUri = iprot.readString();
+                struct.setLocationUriIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key199 = iprot.readString();
-                  _val200 = iprot.readString();
-                  struct.parameters.put(_key199, _val200);
+                  org.apache.thrift.protocol.TMap _map198 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map198.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key199;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val200;
+                  for (int _i201 = 0; _i201 < _map198.size; ++_i201)
+                  {
+                    _key199 = iprot.readString();
+                    _val200 = iprot.readString();
+                    struct.parameters.put(_key199, _val200);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParametersIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Catalog struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -747,6 +764,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Catalog struct) th
   }
 
   private static class CatalogTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CatalogTupleScheme getScheme() {
       return new CatalogTupleScheme();
     }
@@ -800,38 +818,43 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Catalog struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Catalog struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.locationUri = iprot.readString();
-        struct.setLocationUriIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TMap _map204 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map204.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key205;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val206;
-          for (int _i207 = 0; _i207 < _map204.size; ++_i207)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.locationUri = iprot.readString();
+          struct.setLocationUriIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _key205 = iprot.readString();
-            _val206 = iprot.readString();
-            struct.parameters.put(_key205, _val206);
+            org.apache.thrift.protocol.TMap _map204 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map204.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key205;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val206;
+            for (int _i207 = 0; _i207 < _map204.size; ++_i207)
+            {
+              _key205 = iprot.readString();
+              _val206 = iprot.readString();
+              struct.parameters.put(_key205, _val206);
+            }
           }
+          struct.setParametersIsSet(true);
         }
-        struct.setParametersIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java
index 8ddc8ff8c823..38172303d50e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CheckConstraintsRequest implements org.apache.thrift.TBase<CheckConstraintsRequest, CheckConstraintsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CheckConstraintsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CheckConstraintsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public CheckConstraintsRequest(CheckConstraintsRequest other) {
     }
   }
 
+  @Override
   public CheckConstraintsRequest deepCopy() {
     return new CheckConstraintsRequest(this);
   }
@@ -214,6 +217,7 @@ public void setTbl_nameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(CheckConstraintsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CheckConstraintsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CheckConstraintsRequestStandardScheme getScheme() {
       return new CheckConstraintsRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public CheckConstraintsRequestStandardScheme getScheme() {
 
   private static class CheckConstraintsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CheckConstraintsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CheckConstraintsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CheckConstraintsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CheckConstraintsRe
   }
 
   private static class CheckConstraintsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CheckConstraintsRequestTupleScheme getScheme() {
       return new CheckConstraintsRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CheckConstraintsReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CheckConstraintsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java
index 9f2933ef7c8a..0f78c968d9c7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CheckConstraintsResponse implements org.apache.thrift.TBase<CheckConstraintsResponse, CheckConstraintsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<CheckConstraintsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CheckConstraintsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public CheckConstraintsResponse(CheckConstraintsResponse other) {
     }
   }
 
+  @Override
   public CheckConstraintsResponse deepCopy() {
     return new CheckConstraintsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setCheckConstraintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CHECK_CONSTRAINTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CHECK_CONSTRAINTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(CheckConstraintsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CheckConstraintsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CheckConstraintsResponseStandardScheme getScheme() {
       return new CheckConstraintsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public CheckConstraintsResponseStandardScheme getScheme() {
 
   private static class CheckConstraintsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<CheckConstraintsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CheckConstraintsResponse 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 1: // CHECK_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list530 = iprot.readListBegin();
-                struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list530.size);
-                @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem531;
-                for (int _i532 = 0; _i532 < _list530.size; ++_i532)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // CHECK_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem531 = new SQLCheckConstraint();
-                  _elem531.read(iprot);
-                  struct.checkConstraints.add(_elem531);
+                  org.apache.thrift.protocol.TList _list530 = iprot.readListBegin();
+                  struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list530.size);
+                  @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem531;
+                  for (int _i532 = 0; _i532 < _list530.size; ++_i532)
+                  {
+                    _elem531 = new SQLCheckConstraint();
+                    _elem531.read(iprot);
+                    struct.checkConstraints.add(_elem531);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCheckConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCheckConstraintsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CheckConstraintsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CheckConstraintsRe
   }
 
   private static class CheckConstraintsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CheckConstraintsResponseTupleScheme getScheme() {
       return new CheckConstraintsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CheckConstraintsRes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CheckConstraintsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list535 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list535.size);
-        @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem536;
-        for (int _i537 = 0; _i537 < _list535.size; ++_i537)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem536 = new SQLCheckConstraint();
-          _elem536.read(iprot);
-          struct.checkConstraints.add(_elem536);
+          org.apache.thrift.protocol.TList _list535 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list535.size);
+          @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem536;
+          for (int _i537 = 0; _i537 < _list535.size; ++_i537)
+          {
+            _elem536 = new SQLCheckConstraint();
+            _elem536.read(iprot);
+            struct.checkConstraints.add(_elem536);
+          }
         }
+        struct.setCheckConstraintsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setCheckConstraintsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java
index 0f8c1621d9bd..1720ceea1b6e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CheckLockRequest implements org.apache.thrift.TBase<CheckLockRequest, CheckLockRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CheckLockRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CheckLockRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -93,7 +95,7 @@ public java.lang.String getFieldName() {
   private static final int __TXNID_ISSET_ID = 1;
   private static final int __ELAPSED_MS_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TXNID,_Fields.ELAPSED_MS};
+  private static final _Fields[] optionals = {_Fields.TXNID,_Fields.ELAPSED_MS};
   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);
@@ -128,6 +130,7 @@ public CheckLockRequest(CheckLockRequest other) {
     this.elapsed_ms = other.elapsed_ms;
   }
 
+  @Override
   public CheckLockRequest deepCopy() {
     return new CheckLockRequest(this);
   }
@@ -208,6 +211,7 @@ public void setElapsed_msIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ELAPSED_MS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCKID:
@@ -238,6 +242,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCKID:
@@ -254,6 +259,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -372,14 +378,17 @@ public int compareTo(CheckLockRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -436,6 +445,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CheckLockRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CheckLockRequestStandardScheme getScheme() {
       return new CheckLockRequestStandardScheme();
     }
@@ -443,49 +453,56 @@ public CheckLockRequestStandardScheme getScheme() {
 
   private static class CheckLockRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CheckLockRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CheckLockRequest 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 1: // LOCKID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lockid = iprot.readI64();
-              struct.setLockidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // ELAPSED_MS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.elapsed_ms = iprot.readI64();
-              struct.setElapsed_msIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOCKID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lockid = iprot.readI64();
+                struct.setLockidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ELAPSED_MS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.elapsed_ms = iprot.readI64();
+                struct.setElapsed_msIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CheckLockRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -510,6 +527,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CheckLockRequest s
   }
 
   private static class CheckLockRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CheckLockRequestTupleScheme getScheme() {
       return new CheckLockRequestTupleScheme();
     }
@@ -539,17 +557,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CheckLockRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CheckLockRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.lockid = iprot.readI64();
-      struct.setLockidIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.txnid = iprot.readI64();
-        struct.setTxnidIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.elapsed_ms = iprot.readI64();
-        struct.setElapsed_msIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.lockid = iprot.readI64();
+        struct.setLockidIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.txnid = iprot.readI64();
+          struct.setTxnidIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.elapsed_ms = iprot.readI64();
+          struct.setElapsed_msIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java
index 4109386006f8..79e2fd1eb29b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ClearFileMetadataRequest implements org.apache.thrift.TBase<ClearFileMetadataRequest, ClearFileMetadataRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ClearFileMetadataRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClearFileMetadataRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public ClearFileMetadataRequest(ClearFileMetadataRequest other) {
     }
   }
 
+  @Override
   public ClearFileMetadataRequest deepCopy() {
     return new ClearFileMetadataRequest(this);
   }
@@ -158,6 +161,7 @@ public void setFileIdsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FILE_IDS:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FILE_IDS:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(ClearFileMetadataRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -306,6 +315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ClearFileMetadataRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ClearFileMetadataRequestStandardScheme getScheme() {
       return new ClearFileMetadataRequestStandardScheme();
     }
@@ -313,43 +323,50 @@ public ClearFileMetadataRequestStandardScheme getScheme() {
 
   private static class ClearFileMetadataRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ClearFileMetadataRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ClearFileMetadataRequest 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 1: // FILE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1184 = iprot.readListBegin();
-                struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1184.size);
-                long _elem1185;
-                for (int _i1186 = 0; _i1186 < _list1184.size; ++_i1186)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FILE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1185 = iprot.readI64();
-                  struct.fileIds.add(_elem1185);
+                  org.apache.thrift.protocol.TList _list1184 = iprot.readListBegin();
+                  struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1184.size);
+                  long _elem1185;
+                  for (int _i1186 = 0; _i1186 < _list1184.size; ++_i1186)
+                  {
+                    _elem1185 = iprot.readI64();
+                    struct.fileIds.add(_elem1185);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFileIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFileIdsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ClearFileMetadataRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClearFileMetadataR
   }
 
   private static class ClearFileMetadataRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ClearFileMetadataRequestTupleScheme getScheme() {
       return new ClearFileMetadataRequestTupleScheme();
     }
@@ -394,18 +412,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClearFileMetadataRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ClearFileMetadataRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1189 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1189.size);
-        long _elem1190;
-        for (int _i1191 = 0; _i1191 < _list1189.size; ++_i1191)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1190 = iprot.readI64();
-          struct.fileIds.add(_elem1190);
+          org.apache.thrift.protocol.TList _list1189 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1189.size);
+          long _elem1190;
+          for (int _i1191 = 0; _i1191 < _list1189.size; ++_i1191)
+          {
+            _elem1190 = iprot.readI64();
+            struct.fileIds.add(_elem1190);
+          }
         }
+        struct.setFileIdsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setFileIdsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java
index d565b990c9fa..10fd21b1464b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ClearFileMetadataResult implements org.apache.thrift.TBase<ClearFileMetadataResult, ClearFileMetadataResult._Fields>, java.io.Serializable, Cloneable, Comparable<ClearFileMetadataResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClearFileMetadataResult");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public ClearFileMetadataResult() {
   public ClearFileMetadataResult(ClearFileMetadataResult other) {
   }
 
+  @Override
   public ClearFileMetadataResult deepCopy() {
     return new ClearFileMetadataResult(this);
   }
@@ -97,12 +100,14 @@ public ClearFileMetadataResult deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(ClearFileMetadataResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ClearFileMetadataResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ClearFileMetadataResultStandardScheme getScheme() {
       return new ClearFileMetadataResultStandardScheme();
     }
@@ -205,25 +215,32 @@ public ClearFileMetadataResultStandardScheme getScheme() {
 
   private static class ClearFileMetadataResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<ClearFileMetadataResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ClearFileMetadataResult 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ClearFileMetadataResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClearFileMetadataR
   }
 
   private static class ClearFileMetadataResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ClearFileMetadataResultTupleScheme getScheme() {
       return new ClearFileMetadataResultTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClearFileMetadataRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ClearFileMetadataResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java
index b86ff3049211..c9e458001e74 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ClientCapabilities implements org.apache.thrift.TBase<ClientCapabilities, ClientCapabilities._Fields>, java.io.Serializable, Cloneable, Comparable<ClientCapabilities> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClientCapabilities");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public ClientCapabilities(ClientCapabilities other) {
     }
   }
 
+  @Override
   public ClientCapabilities deepCopy() {
     return new ClientCapabilities(this);
   }
@@ -161,6 +164,7 @@ public void setValuesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(ClientCapabilities other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ClientCapabilitiesStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ClientCapabilitiesStandardScheme getScheme() {
       return new ClientCapabilitiesStandardScheme();
     }
@@ -316,46 +326,53 @@ public ClientCapabilitiesStandardScheme getScheme() {
 
   private static class ClientCapabilitiesStandardScheme extends org.apache.thrift.scheme.StandardScheme<ClientCapabilities> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ClientCapabilities 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1200 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<ClientCapability>(_list1200.size);
-                @org.apache.thrift.annotation.Nullable ClientCapability _elem1201;
-                for (int _i1202 = 0; _i1202 < _list1200.size; ++_i1202)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1201 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32());
-                  if (_elem1201 != null)
+                  org.apache.thrift.protocol.TList _list1200 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<ClientCapability>(_list1200.size);
+                  @org.apache.thrift.annotation.Nullable ClientCapability _elem1201;
+                  for (int _i1202 = 0; _i1202 < _list1200.size; ++_i1202)
                   {
-                    struct.values.add(_elem1201);
+                    _elem1201 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32());
+                    if (_elem1201 != null)
+                    {
+                      struct.values.add(_elem1201);
+                    }
                   }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ClientCapabilities struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -379,6 +396,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClientCapabilities
   }
 
   private static class ClientCapabilitiesTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ClientCapabilitiesTupleScheme getScheme() {
       return new ClientCapabilitiesTupleScheme();
     }
@@ -400,21 +418,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClientCapabilities
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ClientCapabilities struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1205 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
-        struct.values = new java.util.ArrayList<ClientCapability>(_list1205.size);
-        @org.apache.thrift.annotation.Nullable ClientCapability _elem1206;
-        for (int _i1207 = 0; _i1207 < _list1205.size; ++_i1207)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1206 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32());
-          if (_elem1206 != null)
+          org.apache.thrift.protocol.TList _list1205 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.values = new java.util.ArrayList<ClientCapability>(_list1205.size);
+          @org.apache.thrift.annotation.Nullable ClientCapability _elem1206;
+          for (int _i1207 = 0; _i1207 < _list1205.size; ++_i1207)
           {
-            struct.values.add(_elem1206);
+            _elem1206 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32());
+            if (_elem1206 != null)
+            {
+              struct.values.add(_elem1206);
+            }
           }
         }
+        struct.setValuesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java
index ecd2b7599743..1ba3203db304 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum ClientCapability implements org.apache.thrift.TEnum {
   TEST_CAPABILITY(1),
   INSERT_ONLY_TABLES(2);
@@ -21,6 +21,7 @@ private ClientCapability(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java
index c60a2670070a..d433f0796ebd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CmRecycleRequest implements org.apache.thrift.TBase<CmRecycleRequest, CmRecycleRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CmRecycleRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CmRecycleRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public CmRecycleRequest(CmRecycleRequest other) {
     this.purge = other.purge;
   }
 
+  @Override
   public CmRecycleRequest deepCopy() {
     return new CmRecycleRequest(this);
   }
@@ -178,6 +181,7 @@ public void setPurgeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PURGE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DATA_PATH:
@@ -200,6 +204,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATA_PATH:
@@ -213,6 +218,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(CmRecycleRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -370,6 +379,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CmRecycleRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CmRecycleRequestStandardScheme getScheme() {
       return new CmRecycleRequestStandardScheme();
     }
@@ -377,41 +387,48 @@ public CmRecycleRequestStandardScheme getScheme() {
 
   private static class CmRecycleRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CmRecycleRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CmRecycleRequest 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 1: // DATA_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataPath = iprot.readString();
-              struct.setDataPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // PURGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.purge = iprot.readBool();
-              struct.setPurgeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DATA_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dataPath = iprot.readString();
+                struct.setDataPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PURGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.purge = iprot.readBool();
+                struct.setPurgeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CmRecycleRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -431,6 +448,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CmRecycleRequest s
   }
 
   private static class CmRecycleRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CmRecycleRequestTupleScheme getScheme() {
       return new CmRecycleRequestTupleScheme();
     }
@@ -447,11 +465,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CmRecycleRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CmRecycleRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dataPath = iprot.readString();
-      struct.setDataPathIsSet(true);
-      struct.purge = iprot.readBool();
-      struct.setPurgeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dataPath = iprot.readString();
+        struct.setDataPathIsSet(true);
+        struct.purge = iprot.readBool();
+        struct.setPurgeIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java
index b0327cad2c1a..b52ad69cbae7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CmRecycleResponse implements org.apache.thrift.TBase<CmRecycleResponse, CmRecycleResponse._Fields>, java.io.Serializable, Cloneable, Comparable<CmRecycleResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CmRecycleResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public CmRecycleResponse() {
   public CmRecycleResponse(CmRecycleResponse other) {
   }
 
+  @Override
   public CmRecycleResponse deepCopy() {
     return new CmRecycleResponse(this);
   }
@@ -97,12 +100,14 @@ public CmRecycleResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(CmRecycleResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CmRecycleResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CmRecycleResponseStandardScheme getScheme() {
       return new CmRecycleResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public CmRecycleResponseStandardScheme getScheme() {
 
   private static class CmRecycleResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<CmRecycleResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CmRecycleResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CmRecycleResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CmRecycleResponse
   }
 
   private static class CmRecycleResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CmRecycleResponseTupleScheme getScheme() {
       return new CmRecycleResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CmRecycleResponse s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CmRecycleResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
index af17f161807e..da3799fbe300 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ColumnStatistics implements org.apache.thrift.TBase<ColumnStatistics, ColumnStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnStatistics> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnStatistics");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT,_Fields.ENGINE};
+  private static final _Fields[] optionals = {_Fields.IS_STATS_COMPLIANT,_Fields.ENGINE};
   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);
@@ -148,6 +150,7 @@ public ColumnStatistics(ColumnStatistics other) {
     }
   }
 
+  @Override
   public ColumnStatistics deepCopy() {
     return new ColumnStatistics(this);
   }
@@ -272,6 +275,7 @@ public void setEngineIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case STATS_DESC:
@@ -310,6 +314,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case STATS_DESC:
@@ -329,6 +334,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -474,14 +480,17 @@ public int compareTo(ColumnStatistics other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -561,6 +570,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ColumnStatisticsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ColumnStatisticsStandardScheme getScheme() {
       return new ColumnStatisticsStandardScheme();
     }
@@ -568,69 +578,76 @@ public ColumnStatisticsStandardScheme getScheme() {
 
   private static class ColumnStatisticsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ColumnStatistics> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnStatistics 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 1: // STATS_DESC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.statsDesc = new ColumnStatisticsDesc();
-              struct.statsDesc.read(iprot);
-              struct.setStatsDescIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // STATS_OBJ
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list336 = iprot.readListBegin();
-                struct.statsObj = new java.util.ArrayList<ColumnStatisticsObj>(_list336.size);
-                @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem337;
-                for (int _i338 = 0; _i338 < _list336.size; ++_i338)
+          }
+          switch (schemeField.id) {
+            case 1: // STATS_DESC
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.statsDesc = new ColumnStatisticsDesc();
+                struct.statsDesc.read(iprot);
+                struct.setStatsDescIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATS_OBJ
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem337 = new ColumnStatisticsObj();
-                  _elem337.read(iprot);
-                  struct.statsObj.add(_elem337);
+                  org.apache.thrift.protocol.TList _list336 = iprot.readListBegin();
+                  struct.statsObj = new java.util.ArrayList<ColumnStatisticsObj>(_list336.size);
+                  @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem337;
+                  for (int _i338 = 0; _i338 < _list336.size; ++_i338)
+                  {
+                    _elem337 = new ColumnStatisticsObj();
+                    _elem337.read(iprot);
+                    struct.statsObj.add(_elem337);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setStatsObjIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setStatsObjIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
+              break;
+            case 3: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnStatistics struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -671,6 +688,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnStatistics s
   }
 
   private static class ColumnStatisticsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ColumnStatisticsTupleScheme getScheme() {
       return new ColumnStatisticsTupleScheme();
     }
@@ -707,30 +725,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ColumnStatistics st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ColumnStatistics struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.statsDesc = new ColumnStatisticsDesc();
-      struct.statsDesc.read(iprot);
-      struct.setStatsDescIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list341 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.statsObj = new java.util.ArrayList<ColumnStatisticsObj>(_list341.size);
-        @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem342;
-        for (int _i343 = 0; _i343 < _list341.size; ++_i343)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.statsDesc = new ColumnStatisticsDesc();
+        struct.statsDesc.read(iprot);
+        struct.setStatsDescIsSet(true);
         {
-          _elem342 = new ColumnStatisticsObj();
-          _elem342.read(iprot);
-          struct.statsObj.add(_elem342);
+          org.apache.thrift.protocol.TList _list341 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.statsObj = new java.util.ArrayList<ColumnStatisticsObj>(_list341.size);
+          @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem342;
+          for (int _i343 = 0; _i343 < _list341.size; ++_i343)
+          {
+            _elem342 = new ColumnStatisticsObj();
+            _elem342.read(iprot);
+            struct.statsObj.add(_elem342);
+          }
         }
-      }
-      struct.setStatsObjIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
+        struct.setStatsObjIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java
index d754a2082ac1..81f9eef5a9c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ColumnStatisticsData extends org.apache.thrift.TUnion<ColumnStatisticsData, ColumnStatisticsData._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnStatisticsData");
   private static final org.apache.thrift.protocol.TField BOOLEAN_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("booleanStats", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -91,10 +91,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -134,6 +136,7 @@ public ColumnStatisticsData(_Fields setField, java.lang.Object value) {
   public ColumnStatisticsData(ColumnStatisticsData other) {
     super(other);
   }
+  @Override
   public ColumnStatisticsData deepCopy() {
     return new ColumnStatisticsData(this);
   }
@@ -497,6 +500,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java
index 991e6faabae7..4804a9f003bd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStatisticsDesc, ColumnStatisticsDesc._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnStatisticsDesc> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnStatisticsDesc");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __ISTBLLEVEL_ISSET_ID = 0;
   private static final int __LASTANALYZED_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PART_NAME,_Fields.LAST_ANALYZED,_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.PART_NAME,_Fields.LAST_ANALYZED,_Fields.CAT_NAME};
   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);
@@ -163,6 +165,7 @@ public ColumnStatisticsDesc(ColumnStatisticsDesc other) {
     }
   }
 
+  @Override
   public ColumnStatisticsDesc deepCopy() {
     return new ColumnStatisticsDesc(this);
   }
@@ -319,6 +322,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IS_TBL_LEVEL:
@@ -373,6 +377,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IS_TBL_LEVEL:
@@ -398,6 +403,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -591,14 +597,17 @@ public int compareTo(ColumnStatisticsDesc other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -693,6 +702,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ColumnStatisticsDescStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ColumnStatisticsDescStandardScheme getScheme() {
       return new ColumnStatisticsDescStandardScheme();
     }
@@ -700,73 +710,80 @@ public ColumnStatisticsDescStandardScheme getScheme() {
 
   private static class ColumnStatisticsDescStandardScheme extends org.apache.thrift.scheme.StandardScheme<ColumnStatisticsDesc> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnStatisticsDesc 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 1: // IS_TBL_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isTblLevel = iprot.readBool();
-              struct.setIsTblLevelIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setTableNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // IS_TBL_LEVEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isTblLevel = iprot.readBool();
+                struct.setIsTblLevelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partName = iprot.readString();
+                struct.setPartNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // LAST_ANALYZED
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lastAnalyzed = iprot.readI64();
+                struct.setLastAnalyzedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PART_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partName = iprot.readString();
-              struct.setPartNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // LAST_ANALYZED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastAnalyzed = iprot.readI64();
-              struct.setLastAnalyzedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setCatNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnStatisticsDesc struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -810,6 +827,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnStatisticsDe
   }
 
   private static class ColumnStatisticsDescTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ColumnStatisticsDescTupleScheme getScheme() {
       return new ColumnStatisticsDescTupleScheme();
     }
@@ -847,25 +865,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ColumnStatisticsDes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ColumnStatisticsDesc struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.isTblLevel = iprot.readBool();
-      struct.setIsTblLevelIsSet(true);
-      struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-      struct.setDbNameIsSet(true);
-      struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-      struct.setTableNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.partName = iprot.readString();
-        struct.setPartNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.lastAnalyzed = iprot.readI64();
-        struct.setLastAnalyzedIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.isTblLevel = iprot.readBool();
+        struct.setIsTblLevelIsSet(true);
+        struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+        struct.setDbNameIsSet(true);
+        struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+        struct.setTableNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.partName = iprot.readString();
+          struct.setPartNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.lastAnalyzed = iprot.readI64();
+          struct.setLastAnalyzedIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java
index d32139f96559..d6b76cd53a87 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatisticsObj, ColumnStatisticsObj._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnStatisticsObj> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnStatisticsObj");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public ColumnStatisticsObj(ColumnStatisticsObj other) {
     }
   }
 
+  @Override
   public ColumnStatisticsObj deepCopy() {
     return new ColumnStatisticsObj(this);
   }
@@ -214,6 +217,7 @@ public void setStatsDataIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COL_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(ColumnStatisticsObj other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ColumnStatisticsObjStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ColumnStatisticsObjStandardScheme getScheme() {
       return new ColumnStatisticsObjStandardScheme();
     }
@@ -465,50 +475,57 @@ public ColumnStatisticsObjStandardScheme getScheme() {
 
   private static class ColumnStatisticsObjStandardScheme extends org.apache.thrift.scheme.StandardScheme<ColumnStatisticsObj> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnStatisticsObj 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 1: // COL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.colName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setColNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.colType = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setColTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // STATS_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.statsData = new ColumnStatisticsData();
-              struct.statsData.read(iprot);
-              struct.setStatsDataIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // COL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.colName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setColNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // COL_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.colType = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setColTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // STATS_DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.statsData = new ColumnStatisticsData();
+                struct.statsData.read(iprot);
+                struct.setStatsDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnStatisticsObj struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -535,6 +552,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnStatisticsOb
   }
 
   private static class ColumnStatisticsObjTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ColumnStatisticsObjTupleScheme getScheme() {
       return new ColumnStatisticsObjTupleScheme();
     }
@@ -552,14 +570,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ColumnStatisticsObj
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ColumnStatisticsObj struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.colName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-      struct.setColNameIsSet(true);
-      struct.colType = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-      struct.setColTypeIsSet(true);
-      struct.statsData = new ColumnStatisticsData();
-      struct.statsData.read(iprot);
-      struct.setStatsDataIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.colName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+        struct.setColNameIsSet(true);
+        struct.colType = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+        struct.setColTypeIsSet(true);
+        struct.statsData = new ColumnStatisticsData();
+        struct.statsData.read(iprot);
+        struct.setStatsDataIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnKeyValue.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnKeyValue.java
index f1d6f6a62981..626dd1b7275e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnKeyValue.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnKeyValue.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CommitTxnKeyValue implements org.apache.thrift.TBase<CommitTxnKeyValue, CommitTxnKeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<CommitTxnKeyValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommitTxnKeyValue");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -133,6 +135,7 @@ public CommitTxnKeyValue(CommitTxnKeyValue other) {
     }
   }
 
+  @Override
   public CommitTxnKeyValue deepCopy() {
     return new CommitTxnKeyValue(this);
   }
@@ -215,6 +218,7 @@ public void setValueIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE_ID:
@@ -245,6 +249,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE_ID:
@@ -261,6 +266,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -379,14 +385,17 @@ public int compareTo(CommitTxnKeyValue other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -455,6 +464,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CommitTxnKeyValueStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CommitTxnKeyValueStandardScheme getScheme() {
       return new CommitTxnKeyValueStandardScheme();
     }
@@ -462,49 +472,56 @@ public CommitTxnKeyValueStandardScheme getScheme() {
 
   private static class CommitTxnKeyValueStandardScheme extends org.apache.thrift.scheme.StandardScheme<CommitTxnKeyValue> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CommitTxnKeyValue 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 1: // TABLE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.tableId = iprot.readI64();
-              struct.setTableIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.key = iprot.readString();
-              struct.setKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.value = iprot.readString();
-              struct.setValueIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.tableId = iprot.readI64();
+                struct.setTableIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // KEY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.key = iprot.readString();
+                struct.setKeyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.value = iprot.readString();
+                struct.setValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CommitTxnKeyValue struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -529,6 +546,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CommitTxnKeyValue
   }
 
   private static class CommitTxnKeyValueTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CommitTxnKeyValueTupleScheme getScheme() {
       return new CommitTxnKeyValueTupleScheme();
     }
@@ -546,13 +564,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CommitTxnKeyValue s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CommitTxnKeyValue struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.tableId = iprot.readI64();
-      struct.setTableIdIsSet(true);
-      struct.key = iprot.readString();
-      struct.setKeyIsSet(true);
-      struct.value = iprot.readString();
-      struct.setValueIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.tableId = iprot.readI64();
+        struct.setTableIdIsSet(true);
+        struct.key = iprot.readString();
+        struct.setKeyIsSet(true);
+        struct.value = iprot.readString();
+        struct.setValueIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java
index d867a9f04927..95cb6392b0f1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CommitTxnRequest implements org.apache.thrift.TBase<CommitTxnRequest, CommitTxnRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CommitTxnRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommitTxnRequest");
 
@@ -103,10 +103,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -116,7 +118,7 @@ public java.lang.String getFieldName() {
   private static final int __TXNID_ISSET_ID = 0;
   private static final int __EXCLWRITEENABLED_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.REPL_POLICY,_Fields.WRITE_EVENT_INFOS,_Fields.REPL_LAST_ID_INFO,_Fields.KEY_VALUE,_Fields.EXCL_WRITE_ENABLED,_Fields.TXN_TYPE};
+  private static final _Fields[] optionals = {_Fields.REPL_POLICY,_Fields.WRITE_EVENT_INFOS,_Fields.REPL_LAST_ID_INFO,_Fields.KEY_VALUE,_Fields.EXCL_WRITE_ENABLED,_Fields.TXN_TYPE};
   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);
@@ -180,6 +182,7 @@ public CommitTxnRequest(CommitTxnRequest other) {
     }
   }
 
+  @Override
   public CommitTxnRequest deepCopy() {
     return new CommitTxnRequest(this);
   }
@@ -385,6 +388,7 @@ public void setTxn_typeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXNID:
@@ -447,6 +451,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXNID:
@@ -475,6 +480,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -693,14 +699,17 @@ public int compareTo(CommitTxnRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -807,6 +816,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CommitTxnRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CommitTxnRequestStandardScheme getScheme() {
       return new CommitTxnRequestStandardScheme();
     }
@@ -814,94 +824,101 @@ public CommitTxnRequestStandardScheme getScheme() {
 
   private static class CommitTxnRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CommitTxnRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CommitTxnRequest 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 1: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // REPL_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.replPolicy = iprot.readString();
-              struct.setReplPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // WRITE_EVENT_INFOS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list838 = iprot.readListBegin();
-                struct.writeEventInfos = new java.util.ArrayList<WriteEventInfo>(_list838.size);
-                @org.apache.thrift.annotation.Nullable WriteEventInfo _elem839;
-                for (int _i840 = 0; _i840 < _list838.size; ++_i840)
+          }
+          switch (schemeField.id) {
+            case 1: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // REPL_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.replPolicy = iprot.readString();
+                struct.setReplPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // WRITE_EVENT_INFOS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem839 = new WriteEventInfo();
-                  _elem839.read(iprot);
-                  struct.writeEventInfos.add(_elem839);
+                  org.apache.thrift.protocol.TList _list838 = iprot.readListBegin();
+                  struct.writeEventInfos = new java.util.ArrayList<WriteEventInfo>(_list838.size);
+                  @org.apache.thrift.annotation.Nullable WriteEventInfo _elem839;
+                  for (int _i840 = 0; _i840 < _list838.size; ++_i840)
+                  {
+                    _elem839 = new WriteEventInfo();
+                    _elem839.read(iprot);
+                    struct.writeEventInfos.add(_elem839);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setWriteEventInfosIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setWriteEventInfosIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // REPL_LAST_ID_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.replLastIdInfo = new ReplLastIdInfo();
-              struct.replLastIdInfo.read(iprot);
-              struct.setReplLastIdInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // KEY_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.keyValue = new CommitTxnKeyValue();
-              struct.keyValue.read(iprot);
-              struct.setKeyValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // EXCL_WRITE_ENABLED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.exclWriteEnabled = iprot.readBool();
-              struct.setExclWriteEnabledIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TXN_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-              struct.setTxn_typeIsSet(true);
-            } else { 
+              break;
+            case 4: // REPL_LAST_ID_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.replLastIdInfo = new ReplLastIdInfo();
+                struct.replLastIdInfo.read(iprot);
+                struct.setReplLastIdInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // KEY_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.keyValue = new CommitTxnKeyValue();
+                struct.keyValue.read(iprot);
+                struct.setKeyValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // EXCL_WRITE_ENABLED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.exclWriteEnabled = iprot.readBool();
+                struct.setExclWriteEnabledIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // TXN_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+                struct.setTxn_typeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CommitTxnRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -963,6 +980,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CommitTxnRequest s
   }
 
   private static class CommitTxnRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CommitTxnRequestTupleScheme getScheme() {
       return new CommitTxnRequestTupleScheme();
     }
@@ -1022,45 +1040,50 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CommitTxnRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CommitTxnRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txnid = iprot.readI64();
-      struct.setTxnidIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.replPolicy = iprot.readString();
-        struct.setReplPolicyIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list843 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.writeEventInfos = new java.util.ArrayList<WriteEventInfo>(_list843.size);
-          @org.apache.thrift.annotation.Nullable WriteEventInfo _elem844;
-          for (int _i845 = 0; _i845 < _list843.size; ++_i845)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txnid = iprot.readI64();
+        struct.setTxnidIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.replPolicy = iprot.readString();
+          struct.setReplPolicyIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem844 = new WriteEventInfo();
-            _elem844.read(iprot);
-            struct.writeEventInfos.add(_elem844);
+            org.apache.thrift.protocol.TList _list843 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.writeEventInfos = new java.util.ArrayList<WriteEventInfo>(_list843.size);
+            @org.apache.thrift.annotation.Nullable WriteEventInfo _elem844;
+            for (int _i845 = 0; _i845 < _list843.size; ++_i845)
+            {
+              _elem844 = new WriteEventInfo();
+              _elem844.read(iprot);
+              struct.writeEventInfos.add(_elem844);
+            }
           }
+          struct.setWriteEventInfosIsSet(true);
         }
-        struct.setWriteEventInfosIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.replLastIdInfo = new ReplLastIdInfo();
-        struct.replLastIdInfo.read(iprot);
-        struct.setReplLastIdInfoIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.keyValue = new CommitTxnKeyValue();
-        struct.keyValue.read(iprot);
-        struct.setKeyValueIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.exclWriteEnabled = iprot.readBool();
-        struct.setExclWriteEnabledIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-        struct.setTxn_typeIsSet(true);
+        if (incoming.get(2)) {
+          struct.replLastIdInfo = new ReplLastIdInfo();
+          struct.replLastIdInfo.read(iprot);
+          struct.setReplLastIdInfoIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.keyValue = new CommitTxnKeyValue();
+          struct.keyValue.read(iprot);
+          struct.setKeyValueIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.exclWriteEnabled = iprot.readBool();
+          struct.setExclWriteEnabledIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+          struct.setTxn_typeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionAbortedException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionAbortedException.java
index d2804c6b0a01..6fad53e5df35 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionAbortedException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionAbortedException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionAbortedException extends org.apache.thrift.TException implements org.apache.thrift.TBase<CompactionAbortedException, CompactionAbortedException._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionAbortedException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionAbortedException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public CompactionAbortedException(CompactionAbortedException other) {
     }
   }
 
+  @Override
   public CompactionAbortedException deepCopy() {
     return new CompactionAbortedException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(CompactionAbortedException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionAbortedExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionAbortedExceptionStandardScheme getScheme() {
       return new CompactionAbortedExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public CompactionAbortedExceptionStandardScheme getScheme() {
 
   private static class CompactionAbortedExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionAbortedException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionAbortedException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionAbortedException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionAbortedE
   }
 
   private static class CompactionAbortedExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionAbortedExceptionTupleScheme getScheme() {
       return new CompactionAbortedExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionAbortedEx
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionAbortedException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionInfoStruct.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionInfoStruct.java
index cd6b544580b0..792814c2f0b2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionInfoStruct.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionInfoStruct.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionInfoStruct implements org.apache.thrift.TBase<CompactionInfoStruct, CompactionInfoStruct._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionInfoStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionInfoStruct");
 
@@ -163,10 +163,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -182,7 +184,7 @@ public java.lang.String getFieldName() {
   private static final int __RETRYRETENTION_ISSET_ID = 6;
   private static final int __NUMBEROFBUCKETS_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITIONNAME,_Fields.RUNAS,_Fields.PROPERTIES,_Fields.TOOMANYABORTS,_Fields.STATE,_Fields.WORKER_ID,_Fields.START,_Fields.HIGHEST_WRITE_ID,_Fields.ERROR_MESSAGE,_Fields.HASOLDABORT,_Fields.ENQUEUE_TIME,_Fields.RETRY_RETENTION,_Fields.POOLNAME,_Fields.NUMBER_OF_BUCKETS,_Fields.ORDER_BY_CLAUSE};
+  private static final _Fields[] optionals = {_Fields.PARTITIONNAME,_Fields.RUNAS,_Fields.PROPERTIES,_Fields.TOOMANYABORTS,_Fields.STATE,_Fields.WORKER_ID,_Fields.START,_Fields.HIGHEST_WRITE_ID,_Fields.ERROR_MESSAGE,_Fields.HASOLDABORT,_Fields.ENQUEUE_TIME,_Fields.RETRY_RETENTION,_Fields.POOLNAME,_Fields.NUMBER_OF_BUCKETS,_Fields.ORDER_BY_CLAUSE};
   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);
@@ -293,6 +295,7 @@ public CompactionInfoStruct(CompactionInfoStruct other) {
     }
   }
 
+  @Override
   public CompactionInfoStruct deepCopy() {
     return new CompactionInfoStruct(this);
   }
@@ -776,6 +779,7 @@ public void setOrderByClauseIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ID:
@@ -934,6 +938,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
@@ -998,6 +1003,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1516,14 +1522,17 @@ public int compareTo(CompactionInfoStruct other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1726,6 +1735,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionInfoStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionInfoStructStandardScheme getScheme() {
       return new CompactionInfoStructStandardScheme();
     }
@@ -1733,177 +1743,184 @@ public CompactionInfoStructStandardScheme getScheme() {
 
   private static class CompactionInfoStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionInfoStruct> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionInfoStruct 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 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // 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 3: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PARTITIONNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionname = iprot.readString();
-              struct.setPartitionnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // RUNAS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.runas = iprot.readString();
-              struct.setRunasIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // PROPERTIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.properties = iprot.readString();
-              struct.setPropertiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // TOOMANYABORTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.toomanyaborts = iprot.readBool();
-              struct.setToomanyabortsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.state = iprot.readString();
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // WORKER_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.workerId = iprot.readString();
-              struct.setWorkerIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // START
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.start = iprot.readI64();
-              struct.setStartIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 12: // HIGHEST_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.highestWriteId = iprot.readI64();
-              struct.setHighestWriteIdIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // 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 3: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARTITIONNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionname = iprot.readString();
+                struct.setPartitionnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // RUNAS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.runas = iprot.readString();
+                struct.setRunasIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.properties = iprot.readString();
+                struct.setPropertiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // TOOMANYABORTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.toomanyaborts = iprot.readBool();
+                struct.setToomanyabortsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.state = iprot.readString();
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // WORKER_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.workerId = iprot.readString();
+                struct.setWorkerIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // START
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.start = iprot.readI64();
+                struct.setStartIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // HIGHEST_WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.highestWriteId = iprot.readI64();
+                struct.setHighestWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // ERROR_MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errorMessage = iprot.readString();
+                struct.setErrorMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 14: // HASOLDABORT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.hasoldabort = iprot.readBool();
+                struct.setHasoldabortIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 15: // ENQUEUE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.enqueueTime = iprot.readI64();
+                struct.setEnqueueTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 16: // RETRY_RETENTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.retryRetention = iprot.readI64();
+                struct.setRetryRetentionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 17: // POOLNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolname = iprot.readString();
+                struct.setPoolnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 18: // NUMBER_OF_BUCKETS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.numberOfBuckets = iprot.readI32();
+                struct.setNumberOfBucketsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 19: // ORDER_BY_CLAUSE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.orderByClause = iprot.readString();
+                struct.setOrderByClauseIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // ERROR_MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errorMessage = iprot.readString();
-              struct.setErrorMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // HASOLDABORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.hasoldabort = iprot.readBool();
-              struct.setHasoldabortIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // ENQUEUE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.enqueueTime = iprot.readI64();
-              struct.setEnqueueTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 16: // RETRY_RETENTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.retryRetention = iprot.readI64();
-              struct.setRetryRetentionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 17: // POOLNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolname = iprot.readString();
-              struct.setPoolnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 18: // NUMBER_OF_BUCKETS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.numberOfBuckets = iprot.readI32();
-              struct.setNumberOfBucketsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 19: // ORDER_BY_CLAUSE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.orderByClause = iprot.readString();
-              struct.setOrderByClauseIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionInfoStruct struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -2024,6 +2041,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionInfoStru
   }
 
   private static class CompactionInfoStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionInfoStructTupleScheme getScheme() {
       return new CompactionInfoStructTupleScheme();
     }
@@ -2134,75 +2152,80 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionInfoStruc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionInfoStruct struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.id = iprot.readI64();
-      struct.setIdIsSet(true);
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tablename = iprot.readString();
-      struct.setTablenameIsSet(true);
-      struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(15);
-      if (incoming.get(0)) {
-        struct.partitionname = iprot.readString();
-        struct.setPartitionnameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.runas = iprot.readString();
-        struct.setRunasIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.properties = iprot.readString();
-        struct.setPropertiesIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.toomanyaborts = iprot.readBool();
-        struct.setToomanyabortsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.state = iprot.readString();
-        struct.setStateIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.workerId = iprot.readString();
-        struct.setWorkerIdIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.start = iprot.readI64();
-        struct.setStartIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.highestWriteId = iprot.readI64();
-        struct.setHighestWriteIdIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.errorMessage = iprot.readString();
-        struct.setErrorMessageIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.hasoldabort = iprot.readBool();
-        struct.setHasoldabortIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.enqueueTime = iprot.readI64();
-        struct.setEnqueueTimeIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.retryRetention = iprot.readI64();
-        struct.setRetryRetentionIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.poolname = iprot.readString();
-        struct.setPoolnameIsSet(true);
-      }
-      if (incoming.get(13)) {
-        struct.numberOfBuckets = iprot.readI32();
-        struct.setNumberOfBucketsIsSet(true);
-      }
-      if (incoming.get(14)) {
-        struct.orderByClause = iprot.readString();
-        struct.setOrderByClauseIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.id = iprot.readI64();
+        struct.setIdIsSet(true);
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tablename = iprot.readString();
+        struct.setTablenameIsSet(true);
+        struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(15);
+        if (incoming.get(0)) {
+          struct.partitionname = iprot.readString();
+          struct.setPartitionnameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.runas = iprot.readString();
+          struct.setRunasIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.properties = iprot.readString();
+          struct.setPropertiesIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.toomanyaborts = iprot.readBool();
+          struct.setToomanyabortsIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.state = iprot.readString();
+          struct.setStateIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.workerId = iprot.readString();
+          struct.setWorkerIdIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.start = iprot.readI64();
+          struct.setStartIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.highestWriteId = iprot.readI64();
+          struct.setHighestWriteIdIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.errorMessage = iprot.readString();
+          struct.setErrorMessageIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.hasoldabort = iprot.readBool();
+          struct.setHasoldabortIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.enqueueTime = iprot.readI64();
+          struct.setEnqueueTimeIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.retryRetention = iprot.readI64();
+          struct.setRetryRetentionIsSet(true);
+        }
+        if (incoming.get(12)) {
+          struct.poolname = iprot.readString();
+          struct.setPoolnameIsSet(true);
+        }
+        if (incoming.get(13)) {
+          struct.numberOfBuckets = iprot.readI32();
+          struct.setNumberOfBucketsIsSet(true);
+        }
+        if (incoming.get(14)) {
+          struct.orderByClause = iprot.readString();
+          struct.setOrderByClauseIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataRequest.java
index fd6d2098a4c3..4801c0b41f8c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionMetricsDataRequest implements org.apache.thrift.TBase<CompactionMetricsDataRequest, CompactionMetricsDataRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionMetricsDataRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionMetricsDataRequest");
 
@@ -88,17 +88,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.PARTITION_NAME};
+  private static final _Fields[] optionals = {_Fields.PARTITION_NAME};
   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);
@@ -146,6 +148,7 @@ public CompactionMetricsDataRequest(CompactionMetricsDataRequest other) {
     }
   }
 
+  @Override
   public CompactionMetricsDataRequest deepCopy() {
     return new CompactionMetricsDataRequest(this);
   }
@@ -262,6 +265,7 @@ public void setTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -300,6 +304,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -319,6 +324,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -464,14 +470,17 @@ public int compareTo(CompactionMetricsDataRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -552,6 +561,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionMetricsDataRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionMetricsDataRequestStandardScheme getScheme() {
       return new CompactionMetricsDataRequestStandardScheme();
     }
@@ -559,57 +569,64 @@ public CompactionMetricsDataRequestStandardScheme getScheme() {
 
   private static class CompactionMetricsDataRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionMetricsDataRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionMetricsDataRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARTITION_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionName = iprot.readString();
-              struct.setPartitionNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITION_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionName = iprot.readString();
+                struct.setPartitionNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionMetricsDataRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -643,6 +660,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionMetricsD
   }
 
   private static class CompactionMetricsDataRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionMetricsDataRequestTupleScheme getScheme() {
       return new CompactionMetricsDataRequestTupleScheme();
     }
@@ -668,17 +686,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionMetricsDa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionMetricsDataRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.partitionName = iprot.readString();
-        struct.setPartitionNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.partitionName = iprot.readString();
+          struct.setPartitionNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataResponse.java
index ba4344b784ba..eddc8ae36cbd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionMetricsDataResponse implements org.apache.thrift.TBase<CompactionMetricsDataResponse, CompactionMetricsDataResponse._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionMetricsDataResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionMetricsDataResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.DATA};
+  private static final _Fields[] optionals = {_Fields.DATA};
   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);
@@ -101,6 +103,7 @@ public CompactionMetricsDataResponse(CompactionMetricsDataResponse other) {
     }
   }
 
+  @Override
   public CompactionMetricsDataResponse deepCopy() {
     return new CompactionMetricsDataResponse(this);
   }
@@ -134,6 +137,7 @@ public void setDataIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DATA:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATA:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(CompactionMetricsDataResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionMetricsDataResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionMetricsDataResponseStandardScheme getScheme() {
       return new CompactionMetricsDataResponseStandardScheme();
     }
@@ -290,34 +300,41 @@ public CompactionMetricsDataResponseStandardScheme getScheme() {
 
   private static class CompactionMetricsDataResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionMetricsDataResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionMetricsDataResponse 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 1: // DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.data = new CompactionMetricsDataStruct();
-              struct.data.read(iprot);
-              struct.setDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.data = new CompactionMetricsDataStruct();
+                struct.data.read(iprot);
+                struct.setDataIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionMetricsDataResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionMetricsD
   }
 
   private static class CompactionMetricsDataResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionMetricsDataResponseTupleScheme getScheme() {
       return new CompactionMetricsDataResponseTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionMetricsDa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionMetricsDataResponse 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.data = new CompactionMetricsDataStruct();
-        struct.data.read(iprot);
-        struct.setDataIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.data = new CompactionMetricsDataStruct();
+          struct.data.read(iprot);
+          struct.setDataIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataStruct.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataStruct.java
index 3884473760d8..514f9219db38 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataStruct.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsDataStruct.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionMetricsDataStruct implements org.apache.thrift.TBase<CompactionMetricsDataStruct, CompactionMetricsDataStruct._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionMetricsDataStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionMetricsDataStruct");
 
@@ -103,10 +103,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -117,7 +119,7 @@ public java.lang.String getFieldName() {
   private static final int __VERSION_ISSET_ID = 1;
   private static final int __THRESHOLD_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITIONNAME};
+  private static final _Fields[] optionals = {_Fields.PARTITIONNAME};
   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);
@@ -184,6 +186,7 @@ public CompactionMetricsDataStruct(CompactionMetricsDataStruct other) {
     this.threshold = other.threshold;
   }
 
+  @Override
   public CompactionMetricsDataStruct deepCopy() {
     return new CompactionMetricsDataStruct(this);
   }
@@ -372,6 +375,7 @@ public void setThresholdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __THRESHOLD_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DBNAME:
@@ -434,6 +438,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DBNAME:
@@ -462,6 +467,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -676,14 +682,17 @@ public int compareTo(CompactionMetricsDataStruct other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -790,6 +799,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionMetricsDataStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionMetricsDataStructStandardScheme getScheme() {
       return new CompactionMetricsDataStructStandardScheme();
     }
@@ -797,81 +807,88 @@ public CompactionMetricsDataStructStandardScheme getScheme() {
 
   private static class CompactionMetricsDataStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionMetricsDataStruct> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionMetricsDataStruct 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 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: // TBLNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblname = iprot.readString();
-              struct.setTblnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARTITIONNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionname = iprot.readString();
-              struct.setPartitionnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // METRICVALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.metricvalue = iprot.readI32();
-              struct.setMetricvalueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.version = iprot.readI32();
-              struct.setVersionIsSet(true);
-            } else { 
+          }
+          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: // TBLNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblname = iprot.readString();
+                struct.setTblnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITIONNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionname = iprot.readString();
+                struct.setPartitionnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // METRICVALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.metricvalue = iprot.readI32();
+                struct.setMetricvalueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.version = iprot.readI32();
+                struct.setVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // THRESHOLD
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.threshold = iprot.readI32();
+                struct.setThresholdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // THRESHOLD
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.threshold = iprot.readI32();
-              struct.setThresholdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionMetricsDataStruct struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -914,6 +931,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionMetricsD
   }
 
   private static class CompactionMetricsDataStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionMetricsDataStructTupleScheme getScheme() {
       return new CompactionMetricsDataStructTupleScheme();
     }
@@ -942,23 +960,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionMetricsDa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionMetricsDataStruct struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tblname = iprot.readString();
-      struct.setTblnameIsSet(true);
-      struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      struct.metricvalue = iprot.readI32();
-      struct.setMetricvalueIsSet(true);
-      struct.version = iprot.readI32();
-      struct.setVersionIsSet(true);
-      struct.threshold = iprot.readI32();
-      struct.setThresholdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.partitionname = iprot.readString();
-        struct.setPartitionnameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tblname = iprot.readString();
+        struct.setTblnameIsSet(true);
+        struct.type = org.apache.hadoop.hive.metastore.api.CompactionMetricsMetricType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        struct.metricvalue = iprot.readI32();
+        struct.setMetricvalueIsSet(true);
+        struct.version = iprot.readI32();
+        struct.setVersionIsSet(true);
+        struct.threshold = iprot.readI32();
+        struct.setThresholdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.partitionname = iprot.readString();
+          struct.setPartitionnameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsMetricType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsMetricType.java
index 88bcb2ab55f8..2ae22f0c8a5d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsMetricType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionMetricsMetricType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum CompactionMetricsMetricType implements org.apache.thrift.TEnum {
   NUM_OBSOLETE_DELTAS(0),
   NUM_DELTAS(1),
@@ -22,6 +22,7 @@ private CompactionMetricsMetricType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java
index 7d6a08220c21..bdcbb1add2c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionRequest implements org.apache.thrift.TBase<CompactionRequest, CompactionRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionRequest");
 
@@ -123,10 +123,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -135,7 +137,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __NUMBEROFBUCKETS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITIONNAME,_Fields.RUNAS,_Fields.PROPERTIES,_Fields.INITIATOR_ID,_Fields.INITIATOR_VERSION,_Fields.POOL_NAME,_Fields.NUMBER_OF_BUCKETS,_Fields.ORDER_BY_CLAUSE};
+  private static final _Fields[] optionals = {_Fields.PARTITIONNAME,_Fields.RUNAS,_Fields.PROPERTIES,_Fields.INITIATOR_ID,_Fields.INITIATOR_VERSION,_Fields.POOL_NAME,_Fields.NUMBER_OF_BUCKETS,_Fields.ORDER_BY_CLAUSE};
   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);
@@ -220,6 +222,7 @@ public CompactionRequest(CompactionRequest other) {
     }
   }
 
+  @Override
   public CompactionRequest deepCopy() {
     return new CompactionRequest(this);
   }
@@ -521,6 +524,7 @@ public void setOrderByClauseIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DBNAME:
@@ -615,6 +619,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DBNAME:
@@ -655,6 +660,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -975,14 +981,17 @@ public int compareTo(CompactionRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1131,6 +1140,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionRequestStandardScheme getScheme() {
       return new CompactionRequestStandardScheme();
     }
@@ -1138,125 +1148,132 @@ public CompactionRequestStandardScheme getScheme() {
 
   private static class CompactionRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionRequest 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 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: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARTITIONNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionname = iprot.readString();
-              struct.setPartitionnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // RUNAS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.runas = iprot.readString();
-              struct.setRunasIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // PROPERTIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map934 = iprot.readMapBegin();
-                struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map934.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key935;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val936;
-                for (int _i937 = 0; _i937 < _map934.size; ++_i937)
+          }
+          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: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITIONNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionname = iprot.readString();
+                struct.setPartitionnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // RUNAS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.runas = iprot.readString();
+                struct.setRunasIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key935 = iprot.readString();
-                  _val936 = iprot.readString();
-                  struct.properties.put(_key935, _val936);
+                  org.apache.thrift.protocol.TMap _map934 = iprot.readMapBegin();
+                  struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map934.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key935;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val936;
+                  for (int _i937 = 0; _i937 < _map934.size; ++_i937)
+                  {
+                    _key935 = iprot.readString();
+                    _val936 = iprot.readString();
+                    struct.properties.put(_key935, _val936);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setPropertiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPropertiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // INITIATOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.initiatorId = iprot.readString();
-              struct.setInitiatorIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // INITIATOR_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.initiatorVersion = iprot.readString();
-              struct.setInitiatorVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // POOL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolName = iprot.readString();
-              struct.setPoolNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // NUMBER_OF_BUCKETS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.numberOfBuckets = iprot.readI32();
-              struct.setNumberOfBucketsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // ORDER_BY_CLAUSE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.orderByClause = iprot.readString();
-              struct.setOrderByClauseIsSet(true);
-            } else { 
+              break;
+            case 7: // INITIATOR_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.initiatorId = iprot.readString();
+                struct.setInitiatorIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // INITIATOR_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.initiatorVersion = iprot.readString();
+                struct.setInitiatorVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // POOL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolName = iprot.readString();
+                struct.setPoolNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // NUMBER_OF_BUCKETS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.numberOfBuckets = iprot.readI32();
+                struct.setNumberOfBucketsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // ORDER_BY_CLAUSE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.orderByClause = iprot.readString();
+                struct.setOrderByClauseIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1345,6 +1362,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionRequest
   }
 
   private static class CompactionRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionRequestTupleScheme getScheme() {
       return new CompactionRequestTupleScheme();
     }
@@ -1419,56 +1437,61 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tablename = iprot.readString();
-      struct.setTablenameIsSet(true);
-      struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.partitionname = iprot.readString();
-        struct.setPartitionnameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.runas = iprot.readString();
-        struct.setRunasIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map940 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map940.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key941;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val942;
-          for (int _i943 = 0; _i943 < _map940.size; ++_i943)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tablename = iprot.readString();
+        struct.setTablenameIsSet(true);
+        struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.partitionname = iprot.readString();
+          struct.setPartitionnameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.runas = iprot.readString();
+          struct.setRunasIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _key941 = iprot.readString();
-            _val942 = iprot.readString();
-            struct.properties.put(_key941, _val942);
+            org.apache.thrift.protocol.TMap _map940 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map940.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key941;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val942;
+            for (int _i943 = 0; _i943 < _map940.size; ++_i943)
+            {
+              _key941 = iprot.readString();
+              _val942 = iprot.readString();
+              struct.properties.put(_key941, _val942);
+            }
           }
+          struct.setPropertiesIsSet(true);
         }
-        struct.setPropertiesIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.initiatorId = iprot.readString();
-        struct.setInitiatorIdIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.initiatorVersion = iprot.readString();
-        struct.setInitiatorVersionIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.poolName = iprot.readString();
-        struct.setPoolNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.numberOfBuckets = iprot.readI32();
-        struct.setNumberOfBucketsIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.orderByClause = iprot.readString();
-        struct.setOrderByClauseIsSet(true);
+        if (incoming.get(3)) {
+          struct.initiatorId = iprot.readString();
+          struct.setInitiatorIdIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.initiatorVersion = iprot.readString();
+          struct.setInitiatorVersionIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.poolName = iprot.readString();
+          struct.setPoolNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.numberOfBuckets = iprot.readI32();
+          struct.setNumberOfBucketsIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.orderByClause = iprot.readString();
+          struct.setOrderByClauseIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java
index a91546f23780..ce8cb2dd61ce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CompactionResponse implements org.apache.thrift.TBase<CompactionResponse, CompactionResponse._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionResponse");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -97,7 +99,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 0;
   private static final int __ACCEPTED_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ERRORMESSAGE};
+  private static final _Fields[] optionals = {_Fields.ERRORMESSAGE};
   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);
@@ -144,6 +146,7 @@ public CompactionResponse(CompactionResponse other) {
     }
   }
 
+  @Override
   public CompactionResponse deepCopy() {
     return new CompactionResponse(this);
   }
@@ -250,6 +253,7 @@ public void setErrormessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ID:
@@ -288,6 +292,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
@@ -307,6 +312,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -448,14 +454,17 @@ public int compareTo(CompactionResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -530,6 +539,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CompactionResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionResponseStandardScheme getScheme() {
       return new CompactionResponseStandardScheme();
     }
@@ -537,57 +547,64 @@ public CompactionResponseStandardScheme getScheme() {
 
   private static class CompactionResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionResponse 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 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.state = iprot.readString();
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ACCEPTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.accepted = iprot.readBool();
-              struct.setAcceptedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // ERRORMESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errormessage = iprot.readString();
-              struct.setErrormessageIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.state = iprot.readString();
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ACCEPTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.accepted = iprot.readBool();
+                struct.setAcceptedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ERRORMESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errormessage = iprot.readString();
+                struct.setErrormessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -617,6 +634,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionResponse
   }
 
   private static class CompactionResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CompactionResponseTupleScheme getScheme() {
       return new CompactionResponseTupleScheme();
     }
@@ -642,17 +660,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CompactionResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CompactionResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.id = iprot.readI64();
-      struct.setIdIsSet(true);
-      struct.state = iprot.readString();
-      struct.setStateIsSet(true);
-      struct.accepted = iprot.readBool();
-      struct.setAcceptedIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.errormessage = iprot.readString();
-        struct.setErrormessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.id = iprot.readI64();
+        struct.setIdIsSet(true);
+        struct.state = iprot.readString();
+        struct.setStateIsSet(true);
+        struct.accepted = iprot.readBool();
+        struct.setAcceptedIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.errormessage = iprot.readString();
+          struct.setErrormessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java
index a64074e96c18..0871288317b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum CompactionType implements org.apache.thrift.TEnum {
   MINOR(1),
   MAJOR(2),
@@ -25,6 +25,7 @@ private CompactionType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java
index c21fa56d255b..95e11f64c3ca 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ConfigValSecurityException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ConfigValSecurityException, ConfigValSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<ConfigValSecurityException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConfigValSecurityException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public ConfigValSecurityException(ConfigValSecurityException other) {
     }
   }
 
+  @Override
   public ConfigValSecurityException deepCopy() {
     return new ConfigValSecurityException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(ConfigValSecurityException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ConfigValSecurityExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ConfigValSecurityExceptionStandardScheme getScheme() {
       return new ConfigValSecurityExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public ConfigValSecurityExceptionStandardScheme getScheme() {
 
   private static class ConfigValSecurityExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<ConfigValSecurityException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ConfigValSecurityException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ConfigValSecurityException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ConfigValSecurityE
   }
 
   private static class ConfigValSecurityExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ConfigValSecurityExceptionTupleScheme getScheme() {
       return new ConfigValSecurityExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ConfigValSecurityEx
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ConfigValSecurityException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java
index 1eaa810e6060..a3edd43c639b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CreateCatalogRequest implements org.apache.thrift.TBase<CreateCatalogRequest, CreateCatalogRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CreateCatalogRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CreateCatalogRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public CreateCatalogRequest(CreateCatalogRequest other) {
     }
   }
 
+  @Override
   public CreateCatalogRequest deepCopy() {
     return new CreateCatalogRequest(this);
   }
@@ -140,6 +143,7 @@ public void setCatalogIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(CreateCatalogRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -287,6 +296,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CreateCatalogRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateCatalogRequestStandardScheme getScheme() {
       return new CreateCatalogRequestStandardScheme();
     }
@@ -294,34 +304,41 @@ public CreateCatalogRequestStandardScheme getScheme() {
 
   private static class CreateCatalogRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CreateCatalogRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CreateCatalogRequest 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 1: // CATALOG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.catalog = new Catalog();
-              struct.catalog.read(iprot);
-              struct.setCatalogIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.catalog = new Catalog();
+                struct.catalog.read(iprot);
+                struct.setCatalogIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CreateCatalogRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CreateCatalogReque
   }
 
   private static class CreateCatalogRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateCatalogRequestTupleScheme getScheme() {
       return new CreateCatalogRequestTupleScheme();
     }
@@ -360,12 +378,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CreateCatalogReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CreateCatalogRequest 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.catalog = new Catalog();
-        struct.catalog.read(iprot);
-        struct.setCatalogIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.catalog = new Catalog();
+          struct.catalog.read(iprot);
+          struct.setCatalogIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDataConnectorRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDataConnectorRequest.java
index d197f526768e..ed95a252ef28 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDataConnectorRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDataConnectorRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CreateDataConnectorRequest implements org.apache.thrift.TBase<CreateDataConnectorRequest, CreateDataConnectorRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CreateDataConnectorRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CreateDataConnectorRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public CreateDataConnectorRequest(CreateDataConnectorRequest other) {
     }
   }
 
+  @Override
   public CreateDataConnectorRequest deepCopy() {
     return new CreateDataConnectorRequest(this);
   }
@@ -140,6 +143,7 @@ public void setConnectorIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CONNECTOR:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CONNECTOR:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(CreateDataConnectorRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CreateDataConnectorRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateDataConnectorRequestStandardScheme getScheme() {
       return new CreateDataConnectorRequestStandardScheme();
     }
@@ -298,34 +308,41 @@ public CreateDataConnectorRequestStandardScheme getScheme() {
 
   private static class CreateDataConnectorRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CreateDataConnectorRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CreateDataConnectorRequest 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 1: // CONNECTOR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.connector = new DataConnector();
-              struct.connector.read(iprot);
-              struct.setConnectorIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // CONNECTOR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.connector = new DataConnector();
+                struct.connector.read(iprot);
+                struct.setConnectorIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CreateDataConnectorRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CreateDataConnecto
   }
 
   private static class CreateDataConnectorRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateDataConnectorRequestTupleScheme getScheme() {
       return new CreateDataConnectorRequestTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CreateDataConnector
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CreateDataConnectorRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.connector = new DataConnector();
-      struct.connector.read(iprot);
-      struct.setConnectorIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.connector = new DataConnector();
+        struct.connector.read(iprot);
+        struct.setConnectorIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDatabaseRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDatabaseRequest.java
index 2b5cdf676e5c..3c0b15fb90b7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDatabaseRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateDatabaseRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CreateDatabaseRequest implements org.apache.thrift.TBase<CreateDatabaseRequest, CreateDatabaseRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CreateDatabaseRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CreateDatabaseRequest");
 
@@ -137,10 +137,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -149,7 +151,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __CREATETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DESCRIPTION,_Fields.LOCATION_URI,_Fields.PARAMETERS,_Fields.PRIVILEGES,_Fields.OWNER_NAME,_Fields.OWNER_TYPE,_Fields.CATALOG_NAME,_Fields.CREATE_TIME,_Fields.MANAGED_LOCATION_URI,_Fields.TYPE,_Fields.DATA_CONNECTOR_NAME,_Fields.REMOTE_DBNAME};
+  private static final _Fields[] optionals = {_Fields.DESCRIPTION,_Fields.LOCATION_URI,_Fields.PARAMETERS,_Fields.PRIVILEGES,_Fields.OWNER_NAME,_Fields.OWNER_TYPE,_Fields.CATALOG_NAME,_Fields.CREATE_TIME,_Fields.MANAGED_LOCATION_URI,_Fields.TYPE,_Fields.DATA_CONNECTOR_NAME,_Fields.REMOTE_DBNAME};
   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);
@@ -240,6 +242,7 @@ public CreateDatabaseRequest(CreateDatabaseRequest other) {
     }
   }
 
+  @Override
   public CreateDatabaseRequest deepCopy() {
     return new CreateDatabaseRequest(this);
   }
@@ -599,6 +602,7 @@ public void setRemote_dbnameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DATABASE_NAME:
@@ -709,6 +713,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATABASE_NAME:
@@ -755,6 +760,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1125,14 +1131,17 @@ public int compareTo(CreateDatabaseRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1300,6 +1309,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CreateDatabaseRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateDatabaseRequestStandardScheme getScheme() {
       return new CreateDatabaseRequestStandardScheme();
     }
@@ -1307,142 +1317,149 @@ public CreateDatabaseRequestStandardScheme getScheme() {
 
   private static class CreateDatabaseRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CreateDatabaseRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CreateDatabaseRequest 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 1: // DATABASE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.databaseName = iprot.readString();
-              struct.setDatabaseNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // LOCATION_URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.locationUri = iprot.readString();
-              struct.setLocationUriIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map1432 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1432.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1433;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val1434;
-                for (int _i1435 = 0; _i1435 < _map1432.size; ++_i1435)
+          }
+          switch (schemeField.id) {
+            case 1: // DATABASE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.databaseName = iprot.readString();
+                struct.setDatabaseNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // LOCATION_URI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.locationUri = iprot.readString();
+                struct.setLocationUriIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1433 = iprot.readString();
-                  _val1434 = iprot.readString();
-                  struct.parameters.put(_key1433, _val1434);
+                  org.apache.thrift.protocol.TMap _map1432 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1432.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1433;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val1434;
+                  for (int _i1435 = 0; _i1435 < _map1432.size; ++_i1435)
+                  {
+                    _key1433 = iprot.readString();
+                    _val1434 = iprot.readString();
+                    struct.parameters.put(_key1433, _val1434);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.privileges = new PrincipalPrivilegeSet();
-              struct.privileges.read(iprot);
-              struct.setPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // OWNER_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setOwnerTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // MANAGED_LOCATION_URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.managedLocationUri = iprot.readString();
-              struct.setManagedLocationUriIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // DATA_CONNECTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataConnectorName = iprot.readString();
-              struct.setDataConnectorNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // REMOTE_DBNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.remote_dbname = iprot.readString();
-              struct.setRemote_dbnameIsSet(true);
-            } else { 
+              break;
+            case 5: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.privileges = new PrincipalPrivilegeSet();
+                struct.privileges.read(iprot);
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // OWNER_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setOwnerTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // MANAGED_LOCATION_URI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.managedLocationUri = iprot.readString();
+                struct.setManagedLocationUriIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // DATA_CONNECTOR_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dataConnectorName = iprot.readString();
+                struct.setDataConnectorNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // REMOTE_DBNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.remote_dbname = iprot.readString();
+                struct.setRemote_dbnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CreateDatabaseRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1549,6 +1566,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CreateDatabaseRequ
   }
 
   private static class CreateDatabaseRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateDatabaseRequestTupleScheme getScheme() {
       return new CreateDatabaseRequestTupleScheme();
     }
@@ -1645,69 +1663,74 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CreateDatabaseReque
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CreateDatabaseRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.databaseName = iprot.readString();
-      struct.setDatabaseNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(12);
-      if (incoming.get(0)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.locationUri = iprot.readString();
-        struct.setLocationUriIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map1438 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1438.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key1439;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val1440;
-          for (int _i1441 = 0; _i1441 < _map1438.size; ++_i1441)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.databaseName = iprot.readString();
+        struct.setDatabaseNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(12);
+        if (incoming.get(0)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.locationUri = iprot.readString();
+          struct.setLocationUriIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _key1439 = iprot.readString();
-            _val1440 = iprot.readString();
-            struct.parameters.put(_key1439, _val1440);
+            org.apache.thrift.protocol.TMap _map1438 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1438.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key1439;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val1440;
+            for (int _i1441 = 0; _i1441 < _map1438.size; ++_i1441)
+            {
+              _key1439 = iprot.readString();
+              _val1440 = iprot.readString();
+              struct.parameters.put(_key1439, _val1440);
+            }
           }
+          struct.setParametersIsSet(true);
         }
-        struct.setParametersIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.privileges = new PrincipalPrivilegeSet();
-        struct.privileges.read(iprot);
-        struct.setPrivilegesIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setOwnerTypeIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.managedLocationUri = iprot.readString();
-        struct.setManagedLocationUriIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.dataConnectorName = iprot.readString();
-        struct.setDataConnectorNameIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.remote_dbname = iprot.readString();
-        struct.setRemote_dbnameIsSet(true);
+        if (incoming.get(3)) {
+          struct.privileges = new PrincipalPrivilegeSet();
+          struct.privileges.read(iprot);
+          struct.setPrivilegesIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setOwnerTypeIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.managedLocationUri = iprot.readString();
+          struct.setManagedLocationUriIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.dataConnectorName = iprot.readString();
+          struct.setDataConnectorNameIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.remote_dbname = iprot.readString();
+          struct.setRemote_dbnameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java
index 719ae8ea8626..6594046a376e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CreateTableRequest implements org.apache.thrift.TBase<CreateTableRequest, CreateTableRequest._Fields>, java.io.Serializable, Cloneable, Comparable<CreateTableRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CreateTableRequest");
 
@@ -114,17 +114,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.ENV_CONTEXT,_Fields.PRIMARY_KEYS,_Fields.FOREIGN_KEYS,_Fields.UNIQUE_CONSTRAINTS,_Fields.NOT_NULL_CONSTRAINTS,_Fields.DEFAULT_CONSTRAINTS,_Fields.CHECK_CONSTRAINTS,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER};
+  private static final _Fields[] optionals = {_Fields.ENV_CONTEXT,_Fields.PRIMARY_KEYS,_Fields.FOREIGN_KEYS,_Fields.UNIQUE_CONSTRAINTS,_Fields.NOT_NULL_CONSTRAINTS,_Fields.DEFAULT_CONSTRAINTS,_Fields.CHECK_CONSTRAINTS,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER};
   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);
@@ -230,6 +232,7 @@ public CreateTableRequest(CreateTableRequest other) {
     }
   }
 
+  @Override
   public CreateTableRequest deepCopy() {
     return new CreateTableRequest(this);
   }
@@ -600,6 +603,7 @@ public void setProcessorIdentifierIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE:
@@ -686,6 +690,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE:
@@ -723,6 +728,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1018,14 +1024,17 @@ public int compareTo(CreateTableRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1168,6 +1177,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CreateTableRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateTableRequestStandardScheme getScheme() {
       return new CreateTableRequestStandardScheme();
     }
@@ -1175,183 +1185,190 @@ public CreateTableRequestStandardScheme getScheme() {
 
   private static class CreateTableRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<CreateTableRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CreateTableRequest 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 1: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.table = new Table();
-              struct.table.read(iprot);
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ENV_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.envContext = new EnvironmentContext();
-              struct.envContext.read(iprot);
-              struct.setEnvContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PRIMARY_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1376 = iprot.readListBegin();
-                struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1376.size);
-                @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1377;
-                for (int _i1378 = 0; _i1378 < _list1376.size; ++_i1378)
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.table = new Table();
+                struct.table.read(iprot);
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ENV_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.envContext = new EnvironmentContext();
+                struct.envContext.read(iprot);
+                struct.setEnvContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PRIMARY_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1377 = new SQLPrimaryKey();
-                  _elem1377.read(iprot);
-                  struct.primaryKeys.add(_elem1377);
+                  org.apache.thrift.protocol.TList _list1376 = iprot.readListBegin();
+                  struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1376.size);
+                  @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1377;
+                  for (int _i1378 = 0; _i1378 < _list1376.size; ++_i1378)
+                  {
+                    _elem1377 = new SQLPrimaryKey();
+                    _elem1377.read(iprot);
+                    struct.primaryKeys.add(_elem1377);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrimaryKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrimaryKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FOREIGN_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1379 = iprot.readListBegin();
-                struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1379.size);
-                @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1380;
-                for (int _i1381 = 0; _i1381 < _list1379.size; ++_i1381)
+              break;
+            case 4: // FOREIGN_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1380 = new SQLForeignKey();
-                  _elem1380.read(iprot);
-                  struct.foreignKeys.add(_elem1380);
+                  org.apache.thrift.protocol.TList _list1379 = iprot.readListBegin();
+                  struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1379.size);
+                  @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1380;
+                  for (int _i1381 = 0; _i1381 < _list1379.size; ++_i1381)
+                  {
+                    _elem1380 = new SQLForeignKey();
+                    _elem1380.read(iprot);
+                    struct.foreignKeys.add(_elem1380);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setForeignKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setForeignKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // UNIQUE_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1382 = iprot.readListBegin();
-                struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1382.size);
-                @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1383;
-                for (int _i1384 = 0; _i1384 < _list1382.size; ++_i1384)
+              break;
+            case 5: // UNIQUE_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1383 = new SQLUniqueConstraint();
-                  _elem1383.read(iprot);
-                  struct.uniqueConstraints.add(_elem1383);
+                  org.apache.thrift.protocol.TList _list1382 = iprot.readListBegin();
+                  struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1382.size);
+                  @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1383;
+                  for (int _i1384 = 0; _i1384 < _list1382.size; ++_i1384)
+                  {
+                    _elem1383 = new SQLUniqueConstraint();
+                    _elem1383.read(iprot);
+                    struct.uniqueConstraints.add(_elem1383);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setUniqueConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setUniqueConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NOT_NULL_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1385 = iprot.readListBegin();
-                struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1385.size);
-                @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1386;
-                for (int _i1387 = 0; _i1387 < _list1385.size; ++_i1387)
+              break;
+            case 6: // NOT_NULL_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1386 = new SQLNotNullConstraint();
-                  _elem1386.read(iprot);
-                  struct.notNullConstraints.add(_elem1386);
+                  org.apache.thrift.protocol.TList _list1385 = iprot.readListBegin();
+                  struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1385.size);
+                  @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1386;
+                  for (int _i1387 = 0; _i1387 < _list1385.size; ++_i1387)
+                  {
+                    _elem1386 = new SQLNotNullConstraint();
+                    _elem1386.read(iprot);
+                    struct.notNullConstraints.add(_elem1386);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNotNullConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNotNullConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // DEFAULT_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1388 = iprot.readListBegin();
-                struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1388.size);
-                @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1389;
-                for (int _i1390 = 0; _i1390 < _list1388.size; ++_i1390)
+              break;
+            case 7: // DEFAULT_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1389 = new SQLDefaultConstraint();
-                  _elem1389.read(iprot);
-                  struct.defaultConstraints.add(_elem1389);
+                  org.apache.thrift.protocol.TList _list1388 = iprot.readListBegin();
+                  struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1388.size);
+                  @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1389;
+                  for (int _i1390 = 0; _i1390 < _list1388.size; ++_i1390)
+                  {
+                    _elem1389 = new SQLDefaultConstraint();
+                    _elem1389.read(iprot);
+                    struct.defaultConstraints.add(_elem1389);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setDefaultConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDefaultConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // CHECK_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1391 = iprot.readListBegin();
-                struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1391.size);
-                @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1392;
-                for (int _i1393 = 0; _i1393 < _list1391.size; ++_i1393)
+              break;
+            case 8: // CHECK_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1392 = new SQLCheckConstraint();
-                  _elem1392.read(iprot);
-                  struct.checkConstraints.add(_elem1392);
+                  org.apache.thrift.protocol.TList _list1391 = iprot.readListBegin();
+                  struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1391.size);
+                  @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1392;
+                  for (int _i1393 = 0; _i1393 < _list1391.size; ++_i1393)
+                  {
+                    _elem1392 = new SQLCheckConstraint();
+                    _elem1392.read(iprot);
+                    struct.checkConstraints.add(_elem1392);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCheckConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCheckConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1394 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1394.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1395;
-                for (int _i1396 = 0; _i1396 < _list1394.size; ++_i1396)
+              break;
+            case 9: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1395 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1395);
+                  org.apache.thrift.protocol.TList _list1394 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1394.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1395;
+                  for (int _i1396 = 0; _i1396 < _list1394.size; ++_i1396)
+                  {
+                    _elem1395 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1395);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
+              break;
+            case 10: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CreateTableRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1480,6 +1497,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CreateTableRequest
   }
 
   private static class CreateTableRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreateTableRequestTupleScheme getScheme() {
       return new CreateTableRequestTupleScheme();
     }
@@ -1593,116 +1611,121 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CreateTableRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CreateTableRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.table = new Table();
-      struct.table.read(iprot);
-      struct.setTableIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.envContext = new EnvironmentContext();
-        struct.envContext.read(iprot);
-        struct.setEnvContextIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1411 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1411.size);
-          @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1412;
-          for (int _i1413 = 0; _i1413 < _list1411.size; ++_i1413)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.table = new Table();
+        struct.table.read(iprot);
+        struct.setTableIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.envContext = new EnvironmentContext();
+          struct.envContext.read(iprot);
+          struct.setEnvContextIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1412 = new SQLPrimaryKey();
-            _elem1412.read(iprot);
-            struct.primaryKeys.add(_elem1412);
+            org.apache.thrift.protocol.TList _list1411 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1411.size);
+            @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1412;
+            for (int _i1413 = 0; _i1413 < _list1411.size; ++_i1413)
+            {
+              _elem1412 = new SQLPrimaryKey();
+              _elem1412.read(iprot);
+              struct.primaryKeys.add(_elem1412);
+            }
           }
+          struct.setPrimaryKeysIsSet(true);
         }
-        struct.setPrimaryKeysIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1414 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1414.size);
-          @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1415;
-          for (int _i1416 = 0; _i1416 < _list1414.size; ++_i1416)
+        if (incoming.get(2)) {
           {
-            _elem1415 = new SQLForeignKey();
-            _elem1415.read(iprot);
-            struct.foreignKeys.add(_elem1415);
+            org.apache.thrift.protocol.TList _list1414 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1414.size);
+            @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1415;
+            for (int _i1416 = 0; _i1416 < _list1414.size; ++_i1416)
+            {
+              _elem1415 = new SQLForeignKey();
+              _elem1415.read(iprot);
+              struct.foreignKeys.add(_elem1415);
+            }
           }
+          struct.setForeignKeysIsSet(true);
         }
-        struct.setForeignKeysIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list1417 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1417.size);
-          @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1418;
-          for (int _i1419 = 0; _i1419 < _list1417.size; ++_i1419)
+        if (incoming.get(3)) {
           {
-            _elem1418 = new SQLUniqueConstraint();
-            _elem1418.read(iprot);
-            struct.uniqueConstraints.add(_elem1418);
+            org.apache.thrift.protocol.TList _list1417 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1417.size);
+            @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1418;
+            for (int _i1419 = 0; _i1419 < _list1417.size; ++_i1419)
+            {
+              _elem1418 = new SQLUniqueConstraint();
+              _elem1418.read(iprot);
+              struct.uniqueConstraints.add(_elem1418);
+            }
           }
+          struct.setUniqueConstraintsIsSet(true);
         }
-        struct.setUniqueConstraintsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list1420 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1420.size);
-          @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1421;
-          for (int _i1422 = 0; _i1422 < _list1420.size; ++_i1422)
+        if (incoming.get(4)) {
           {
-            _elem1421 = new SQLNotNullConstraint();
-            _elem1421.read(iprot);
-            struct.notNullConstraints.add(_elem1421);
+            org.apache.thrift.protocol.TList _list1420 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1420.size);
+            @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1421;
+            for (int _i1422 = 0; _i1422 < _list1420.size; ++_i1422)
+            {
+              _elem1421 = new SQLNotNullConstraint();
+              _elem1421.read(iprot);
+              struct.notNullConstraints.add(_elem1421);
+            }
           }
+          struct.setNotNullConstraintsIsSet(true);
         }
-        struct.setNotNullConstraintsIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list1423 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1423.size);
-          @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1424;
-          for (int _i1425 = 0; _i1425 < _list1423.size; ++_i1425)
+        if (incoming.get(5)) {
           {
-            _elem1424 = new SQLDefaultConstraint();
-            _elem1424.read(iprot);
-            struct.defaultConstraints.add(_elem1424);
+            org.apache.thrift.protocol.TList _list1423 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1423.size);
+            @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1424;
+            for (int _i1425 = 0; _i1425 < _list1423.size; ++_i1425)
+            {
+              _elem1424 = new SQLDefaultConstraint();
+              _elem1424.read(iprot);
+              struct.defaultConstraints.add(_elem1424);
+            }
           }
+          struct.setDefaultConstraintsIsSet(true);
         }
-        struct.setDefaultConstraintsIsSet(true);
-      }
-      if (incoming.get(6)) {
-        {
-          org.apache.thrift.protocol.TList _list1426 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1426.size);
-          @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1427;
-          for (int _i1428 = 0; _i1428 < _list1426.size; ++_i1428)
+        if (incoming.get(6)) {
           {
-            _elem1427 = new SQLCheckConstraint();
-            _elem1427.read(iprot);
-            struct.checkConstraints.add(_elem1427);
+            org.apache.thrift.protocol.TList _list1426 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1426.size);
+            @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1427;
+            for (int _i1428 = 0; _i1428 < _list1426.size; ++_i1428)
+            {
+              _elem1427 = new SQLCheckConstraint();
+              _elem1427.read(iprot);
+              struct.checkConstraints.add(_elem1427);
+            }
           }
+          struct.setCheckConstraintsIsSet(true);
         }
-        struct.setCheckConstraintsIsSet(true);
-      }
-      if (incoming.get(7)) {
-        {
-          org.apache.thrift.protocol.TList _list1429 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1429.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1430;
-          for (int _i1431 = 0; _i1431 < _list1429.size; ++_i1431)
+        if (incoming.get(7)) {
           {
-            _elem1430 = iprot.readString();
-            struct.processorCapabilities.add(_elem1430);
+            org.apache.thrift.protocol.TList _list1429 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1429.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1430;
+            for (int _i1431 = 0; _i1431 < _list1429.size; ++_i1431)
+            {
+              _elem1430 = iprot.readString();
+              struct.processorCapabilities.add(_elem1430);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
+        if (incoming.get(8)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java
index 42df7bb86ea8..5849e4dbe611 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CreationMetadata implements org.apache.thrift.TBase<CreationMetadata, CreationMetadata._Fields>, java.io.Serializable, Cloneable, Comparable<CreationMetadata> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CreationMetadata");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -111,7 +113,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __MATERIALIZATIONTIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALID_TXN_LIST,_Fields.MATERIALIZATION_TIME,_Fields.SOURCE_TABLES};
+  private static final _Fields[] optionals = {_Fields.VALID_TXN_LIST,_Fields.MATERIALIZATION_TIME,_Fields.SOURCE_TABLES};
   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);
@@ -130,7 +132,7 @@ public java.lang.String getFieldName() {
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.SOURCE_TABLES, new org.apache.thrift.meta_data.FieldMetaData("sourceTables", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         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.STRUCT            , "SourceTable"))));
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SourceTable.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CreationMetadata.class, metaDataMap);
   }
@@ -182,6 +184,7 @@ public CreationMetadata(CreationMetadata other) {
     }
   }
 
+  @Override
   public CreationMetadata deepCopy() {
     return new CreationMetadata(this);
   }
@@ -396,6 +399,7 @@ public void setSourceTablesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -458,6 +462,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -486,6 +491,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -706,14 +712,17 @@ public int compareTo(CreationMetadata other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -824,6 +833,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CreationMetadataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreationMetadataStandardScheme getScheme() {
       return new CreationMetadataStandardScheme();
     }
@@ -831,102 +841,109 @@ public CreationMetadataStandardScheme getScheme() {
 
   private static class CreationMetadataStandardScheme extends org.apache.thrift.scheme.StandardScheme<CreationMetadata> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CreationMetadata 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // TABLES_USED
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set320 = iprot.readSetBegin();
-                struct.tablesUsed = new java.util.HashSet<java.lang.String>(2*_set320.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem321;
-                for (int _i322 = 0; _i322 < _set320.size; ++_i322)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TABLES_USED
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem321 = iprot.readString();
-                  struct.tablesUsed.add(_elem321);
+                  org.apache.thrift.protocol.TSet _set320 = iprot.readSetBegin();
+                  struct.tablesUsed = new java.util.HashSet<java.lang.String>(2*_set320.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem321;
+                  for (int _i322 = 0; _i322 < _set320.size; ++_i322)
+                  {
+                    _elem321 = iprot.readString();
+                    struct.tablesUsed.add(_elem321);
+                  }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setTablesUsedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTablesUsedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_TXN_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validTxnList = iprot.readString();
-              struct.setValidTxnListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // MATERIALIZATION_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.materializationTime = iprot.readI64();
-              struct.setMaterializationTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // SOURCE_TABLES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list323 = iprot.readListBegin();
-                struct.sourceTables = new java.util.ArrayList<SourceTable>(_list323.size);
-                @org.apache.thrift.annotation.Nullable SourceTable _elem324;
-                for (int _i325 = 0; _i325 < _list323.size; ++_i325)
+              break;
+            case 5: // VALID_TXN_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validTxnList = iprot.readString();
+                struct.setValidTxnListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // MATERIALIZATION_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.materializationTime = iprot.readI64();
+                struct.setMaterializationTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // SOURCE_TABLES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem324 = new SourceTable();
-                  _elem324.read(iprot);
-                  struct.sourceTables.add(_elem324);
+                  org.apache.thrift.protocol.TList _list323 = iprot.readListBegin();
+                  struct.sourceTables = new java.util.ArrayList<SourceTable>(_list323.size);
+                  @org.apache.thrift.annotation.Nullable SourceTable _elem324;
+                  for (int _i325 = 0; _i325 < _list323.size; ++_i325)
+                  {
+                    _elem324 = new SourceTable();
+                    _elem324.read(iprot);
+                    struct.sourceTables.add(_elem324);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSourceTablesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSourceTablesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CreationMetadata struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -991,6 +1008,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CreationMetadata s
   }
 
   private static class CreationMetadataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CreationMetadataTupleScheme getScheme() {
       return new CreationMetadataTupleScheme();
     }
@@ -1041,46 +1059,51 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CreationMetadata st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CreationMetadata struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TSet _set330 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.tablesUsed = new java.util.HashSet<java.lang.String>(2*_set330.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem331;
-        for (int _i332 = 0; _i332 < _set330.size; ++_i332)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
         {
-          _elem331 = iprot.readString();
-          struct.tablesUsed.add(_elem331);
+          org.apache.thrift.protocol.TSet _set330 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.tablesUsed = new java.util.HashSet<java.lang.String>(2*_set330.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem331;
+          for (int _i332 = 0; _i332 < _set330.size; ++_i332)
+          {
+            _elem331 = iprot.readString();
+            struct.tablesUsed.add(_elem331);
+          }
         }
-      }
-      struct.setTablesUsedIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.validTxnList = iprot.readString();
-        struct.setValidTxnListIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.materializationTime = iprot.readI64();
-        struct.setMaterializationTimeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list333 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.sourceTables = new java.util.ArrayList<SourceTable>(_list333.size);
-          @org.apache.thrift.annotation.Nullable SourceTable _elem334;
-          for (int _i335 = 0; _i335 < _list333.size; ++_i335)
+        struct.setTablesUsedIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.validTxnList = iprot.readString();
+          struct.setValidTxnListIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.materializationTime = iprot.readI64();
+          struct.setMaterializationTimeIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem334 = new SourceTable();
-            _elem334.read(iprot);
-            struct.sourceTables.add(_elem334);
+            org.apache.thrift.protocol.TList _list333 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.sourceTables = new java.util.ArrayList<SourceTable>(_list333.size);
+            @org.apache.thrift.annotation.Nullable SourceTable _elem334;
+            for (int _i335 = 0; _i335 < _list333.size; ++_i335)
+            {
+              _elem334 = new SourceTable();
+              _elem334.read(iprot);
+              struct.sourceTables.add(_elem334);
+            }
           }
+          struct.setSourceTablesIsSet(true);
         }
-        struct.setSourceTablesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java
index 6bcd56bfb3ec..c2b4f4c688d5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class CurrentNotificationEventId implements org.apache.thrift.TBase<CurrentNotificationEventId, CurrentNotificationEventId._Fields>, java.io.Serializable, Cloneable, Comparable<CurrentNotificationEventId> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CurrentNotificationEventId");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public CurrentNotificationEventId(CurrentNotificationEventId other) {
     this.eventId = other.eventId;
   }
 
+  @Override
   public CurrentNotificationEventId deepCopy() {
     return new CurrentNotificationEventId(this);
   }
@@ -141,6 +144,7 @@ public void setEventIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EVENTID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EVENT_ID:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EVENT_ID:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(CurrentNotificationEventId other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class CurrentNotificationEventIdStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CurrentNotificationEventIdStandardScheme getScheme() {
       return new CurrentNotificationEventIdStandardScheme();
     }
@@ -292,33 +302,40 @@ public CurrentNotificationEventIdStandardScheme getScheme() {
 
   private static class CurrentNotificationEventIdStandardScheme extends org.apache.thrift.scheme.StandardScheme<CurrentNotificationEventId> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, CurrentNotificationEventId 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 1: // EVENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.eventId = iprot.readI64();
-              struct.setEventIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // EVENT_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.eventId = iprot.readI64();
+                struct.setEventIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, CurrentNotificationEventId struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CurrentNotificatio
   }
 
   private static class CurrentNotificationEventIdTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public CurrentNotificationEventIdTupleScheme getScheme() {
       return new CurrentNotificationEventIdTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CurrentNotification
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CurrentNotificationEventId struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.eventId = iprot.readI64();
-      struct.setEventIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.eventId = iprot.readI64();
+        struct.setEventIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataConnector.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataConnector.java
index c596f9d8448a..1058794bad5d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataConnector.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataConnector.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DataConnector implements org.apache.thrift.TBase<DataConnector, DataConnector._Fields>, java.io.Serializable, Cloneable, Comparable<DataConnector> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataConnector");
 
@@ -108,10 +108,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -120,7 +122,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __CREATETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DESCRIPTION,_Fields.PARAMETERS,_Fields.OWNER_NAME,_Fields.OWNER_TYPE,_Fields.CREATE_TIME};
+  private static final _Fields[] optionals = {_Fields.DESCRIPTION,_Fields.PARAMETERS,_Fields.OWNER_NAME,_Fields.OWNER_TYPE,_Fields.CREATE_TIME};
   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);
@@ -190,6 +192,7 @@ public DataConnector(DataConnector other) {
     this.createTime = other.createTime;
   }
 
+  @Override
   public DataConnector deepCopy() {
     return new DataConnector(this);
   }
@@ -416,6 +419,7 @@ public void setCreateTimeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -486,6 +490,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -517,6 +522,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -762,14 +768,17 @@ public int compareTo(DataConnector other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -876,6 +885,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DataConnectorStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DataConnectorStandardScheme getScheme() {
       return new DataConnectorStandardScheme();
     }
@@ -883,101 +893,108 @@ public DataConnectorStandardScheme getScheme() {
 
   private static class DataConnectorStandardScheme extends org.apache.thrift.scheme.StandardScheme<DataConnector> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DataConnector 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.type = iprot.readString();
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // URL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.url = iprot.readString();
-              struct.setUrlIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map772 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map772.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key773;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val774;
-                for (int _i775 = 0; _i775 < _map772.size; ++_i775)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.type = iprot.readString();
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // URL
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.url = iprot.readString();
+                struct.setUrlIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key773 = iprot.readString();
-                  _val774 = iprot.readString();
-                  struct.parameters.put(_key773, _val774);
+                  org.apache.thrift.protocol.TMap _map772 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map772.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key773;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val774;
+                  for (int _i775 = 0; _i775 < _map772.size; ++_i775)
+                  {
+                    _key773 = iprot.readString();
+                    _val774 = iprot.readString();
+                    struct.parameters.put(_key773, _val774);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // OWNER_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setOwnerTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
+              break;
+            case 6: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // OWNER_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setOwnerTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DataConnector struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1045,6 +1062,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DataConnector stru
   }
 
   private static class DataConnectorTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DataConnectorTupleScheme getScheme() {
       return new DataConnectorTupleScheme();
     }
@@ -1116,50 +1134,55 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DataConnector struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DataConnector struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.type = iprot.readString();
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.url = iprot.readString();
-        struct.setUrlIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TMap _map778 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map778.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key779;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val780;
-          for (int _i781 = 0; _i781 < _map778.size; ++_i781)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.type = iprot.readString();
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.url = iprot.readString();
+          struct.setUrlIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _key779 = iprot.readString();
-            _val780 = iprot.readString();
-            struct.parameters.put(_key779, _val780);
+            org.apache.thrift.protocol.TMap _map778 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map778.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key779;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val780;
+            for (int _i781 = 0; _i781 < _map778.size; ++_i781)
+            {
+              _key779 = iprot.readString();
+              _val780 = iprot.readString();
+              struct.parameters.put(_key779, _val780);
+            }
           }
+          struct.setParametersIsSet(true);
         }
-        struct.setParametersIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setOwnerTypeIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
+        if (incoming.get(5)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setOwnerTypeIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java
index 7ae039d1dd11..756ee9bee7bf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum DataOperationType implements org.apache.thrift.TEnum {
   SELECT(1),
   INSERT(2),
@@ -25,6 +25,7 @@ private DataOperationType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
index ada36476f1e7..aa4f36ecd14f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Database implements org.apache.thrift.TBase<Database, Database._Fields>, java.io.Serializable, Cloneable, Comparable<Database> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Database");
 
@@ -137,10 +137,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -149,7 +151,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __CREATETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.OWNER_NAME,_Fields.OWNER_TYPE,_Fields.CATALOG_NAME,_Fields.CREATE_TIME,_Fields.MANAGED_LOCATION_URI,_Fields.TYPE,_Fields.CONNECTOR_NAME,_Fields.REMOTE_DBNAME};
+  private static final _Fields[] optionals = {_Fields.PRIVILEGES,_Fields.OWNER_NAME,_Fields.OWNER_TYPE,_Fields.CATALOG_NAME,_Fields.CREATE_TIME,_Fields.MANAGED_LOCATION_URI,_Fields.TYPE,_Fields.CONNECTOR_NAME,_Fields.REMOTE_DBNAME};
   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);
@@ -246,6 +248,7 @@ public Database(Database other) {
     }
   }
 
+  @Override
   public Database deepCopy() {
     return new Database(this);
   }
@@ -605,6 +608,7 @@ public void setRemote_dbnameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -715,6 +719,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -761,6 +766,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1131,14 +1137,17 @@ public int compareTo(Database other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1296,6 +1305,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DatabaseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DatabaseStandardScheme getScheme() {
       return new DatabaseStandardScheme();
     }
@@ -1303,142 +1313,149 @@ public DatabaseStandardScheme getScheme() {
 
   private static class DatabaseStandardScheme extends org.apache.thrift.scheme.StandardScheme<Database> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Database 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // LOCATION_URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.locationUri = iprot.readString();
-              struct.setLocationUriIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map216 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map216.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key217;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val218;
-                for (int _i219 = 0; _i219 < _map216.size; ++_i219)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // LOCATION_URI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.locationUri = iprot.readString();
+                struct.setLocationUriIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key217 = iprot.readString();
-                  _val218 = iprot.readString();
-                  struct.parameters.put(_key217, _val218);
+                  org.apache.thrift.protocol.TMap _map216 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map216.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key217;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val218;
+                  for (int _i219 = 0; _i219 < _map216.size; ++_i219)
+                  {
+                    _key217 = iprot.readString();
+                    _val218 = iprot.readString();
+                    struct.parameters.put(_key217, _val218);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.privileges = new PrincipalPrivilegeSet();
-              struct.privileges.read(iprot);
-              struct.setPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // OWNER_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setOwnerTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // MANAGED_LOCATION_URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.managedLocationUri = iprot.readString();
-              struct.setManagedLocationUriIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // CONNECTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.connector_name = iprot.readString();
-              struct.setConnector_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // REMOTE_DBNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.remote_dbname = iprot.readString();
-              struct.setRemote_dbnameIsSet(true);
-            } else { 
+              break;
+            case 5: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.privileges = new PrincipalPrivilegeSet();
+                struct.privileges.read(iprot);
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // OWNER_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setOwnerTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // MANAGED_LOCATION_URI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.managedLocationUri = iprot.readString();
+                struct.setManagedLocationUriIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // CONNECTOR_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.connector_name = iprot.readString();
+                struct.setConnector_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // REMOTE_DBNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.remote_dbname = iprot.readString();
+                struct.setRemote_dbnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Database struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1539,6 +1556,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Database struct) t
   }
 
   private static class DatabaseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DatabaseTupleScheme getScheme() {
       return new DatabaseTupleScheme();
     }
@@ -1640,71 +1658,76 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Database struct) th
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Database struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(13);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.locationUri = iprot.readString();
-        struct.setLocationUriIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TMap _map222 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map222.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key223;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val224;
-          for (int _i225 = 0; _i225 < _map222.size; ++_i225)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(13);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.locationUri = iprot.readString();
+          struct.setLocationUriIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _key223 = iprot.readString();
-            _val224 = iprot.readString();
-            struct.parameters.put(_key223, _val224);
+            org.apache.thrift.protocol.TMap _map222 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map222.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key223;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val224;
+            for (int _i225 = 0; _i225 < _map222.size; ++_i225)
+            {
+              _key223 = iprot.readString();
+              _val224 = iprot.readString();
+              struct.parameters.put(_key223, _val224);
+            }
           }
+          struct.setParametersIsSet(true);
         }
-        struct.setParametersIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.privileges = new PrincipalPrivilegeSet();
-        struct.privileges.read(iprot);
-        struct.setPrivilegesIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setOwnerTypeIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.managedLocationUri = iprot.readString();
-        struct.setManagedLocationUriIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.connector_name = iprot.readString();
-        struct.setConnector_nameIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.remote_dbname = iprot.readString();
-        struct.setRemote_dbnameIsSet(true);
+        if (incoming.get(4)) {
+          struct.privileges = new PrincipalPrivilegeSet();
+          struct.privileges.read(iprot);
+          struct.setPrivilegesIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setOwnerTypeIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.managedLocationUri = iprot.readString();
+          struct.setManagedLocationUriIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.type = org.apache.hadoop.hive.metastore.api.DatabaseType.findByValue(iprot.readI32());
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.connector_name = iprot.readString();
+          struct.setConnector_nameIsSet(true);
+        }
+        if (incoming.get(12)) {
+          struct.remote_dbname = iprot.readString();
+          struct.setRemote_dbnameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DatabaseType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DatabaseType.java
index 1e51b48c3656..de52de74c86f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DatabaseType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DatabaseType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum DatabaseType implements org.apache.thrift.TEnum {
   NATIVE(1),
   REMOTE(2);
@@ -21,6 +21,7 @@ private DatabaseType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java
index 52540d2be30d..12dc5df18d15 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Date implements org.apache.thrift.TBase<Date, Date._Fields>, java.io.Serializable, Cloneable, Comparable<Date> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Date");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public Date(Date other) {
     this.daysSinceEpoch = other.daysSinceEpoch;
   }
 
+  @Override
   public Date deepCopy() {
     return new Date(this);
   }
@@ -141,6 +144,7 @@ public void setDaysSinceEpochIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DAYSSINCEEPOCH_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DAYS_SINCE_EPOCH:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DAYS_SINCE_EPOCH:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(Date other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DateStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DateStandardScheme getScheme() {
       return new DateStandardScheme();
     }
@@ -292,33 +302,40 @@ public DateStandardScheme getScheme() {
 
   private static class DateStandardScheme extends org.apache.thrift.scheme.StandardScheme<Date> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Date 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 1: // DAYS_SINCE_EPOCH
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.daysSinceEpoch = iprot.readI64();
-              struct.setDaysSinceEpochIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // DAYS_SINCE_EPOCH
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.daysSinceEpoch = iprot.readI64();
+                struct.setDaysSinceEpochIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Date struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Date struct) throw
   }
 
   private static class DateTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DateTupleScheme getScheme() {
       return new DateTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Date struct) throws
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Date struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.daysSinceEpoch = iprot.readI64();
-      struct.setDaysSinceEpochIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.daysSinceEpoch = iprot.readI64();
+        struct.setDaysSinceEpochIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java
index 6d439d90298c..e0a68b4f61c3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DateColumnStatsData implements org.apache.thrift.TBase<DateColumnStatsData, DateColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<DateColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DateColumnStatsData");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMNULLS_ISSET_ID = 0;
   private static final int __NUMDVS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
+  private static final _Fields[] optionals = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
   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);
@@ -162,6 +164,7 @@ public DateColumnStatsData(DateColumnStatsData other) {
     }
   }
 
+  @Override
   public DateColumnStatsData deepCopy() {
     return new DateColumnStatsData(this);
   }
@@ -334,6 +337,7 @@ public void setHistogramIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOW_VALUE:
@@ -396,6 +400,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOW_VALUE:
@@ -421,6 +426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -612,14 +618,17 @@ public int compareTo(DateColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -718,6 +727,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DateColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DateColumnStatsDataStandardScheme getScheme() {
       return new DateColumnStatsDataStandardScheme();
     }
@@ -725,75 +735,82 @@ public DateColumnStatsDataStandardScheme getScheme() {
 
   private static class DateColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<DateColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DateColumnStatsData 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 1: // LOW_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.lowValue = new Date();
-              struct.lowValue.read(iprot);
-              struct.setLowValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HIGH_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.highValue = new Date();
-              struct.highValue.read(iprot);
-              struct.setHighValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOW_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.lowValue = new Date();
+                struct.lowValue.read(iprot);
+                struct.setLowValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // HIGH_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.highValue = new Date();
+                struct.highValue.read(iprot);
+                struct.setHighValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NUM_DVS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numDVs = iprot.readI64();
+                struct.setNumDVsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // HISTOGRAM
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.histogram = iprot.readBinary();
+                struct.setHistogramIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NUM_DVS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numDVs = iprot.readI64();
-              struct.setNumDVsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // HISTOGRAM
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.histogram = iprot.readBinary();
-              struct.setHistogramIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DateColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -839,6 +856,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DateColumnStatsDat
   }
 
   private static class DateColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DateColumnStatsDataTupleScheme getScheme() {
       return new DateColumnStatsDataTupleScheme();
     }
@@ -881,29 +899,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DateColumnStatsData
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DateColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      struct.numDVs = iprot.readI64();
-      struct.setNumDVsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.lowValue = new Date();
-        struct.lowValue.read(iprot);
-        struct.setLowValueIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.highValue = new Date();
-        struct.highValue.read(iprot);
-        struct.setHighValueIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.histogram = iprot.readBinary();
-        struct.setHistogramIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        struct.numDVs = iprot.readI64();
+        struct.setNumDVsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.lowValue = new Date();
+          struct.lowValue.read(iprot);
+          struct.setLowValueIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.highValue = new Date();
+          struct.highValue.read(iprot);
+          struct.setHighValueIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.histogram = iprot.readBinary();
+          struct.setHistogramIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java
index 8205f1458b3b..f5d027babe8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Decimal implements org.apache.thrift.TBase<Decimal, Decimal._Fields>, java.io.Serializable, Cloneable, Comparable<Decimal> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Decimal");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public Decimal(Decimal other) {
     }
   }
 
+  @Override
   public Decimal deepCopy() {
     return new Decimal(this);
   }
@@ -186,6 +189,7 @@ public void setUnscaledIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCALE:
@@ -212,6 +216,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCALE:
@@ -225,6 +230,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -318,14 +324,17 @@ public int compareTo(Decimal other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -382,6 +391,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DecimalStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DecimalStandardScheme getScheme() {
       return new DecimalStandardScheme();
     }
@@ -389,41 +399,48 @@ public DecimalStandardScheme getScheme() {
 
   private static class DecimalStandardScheme extends org.apache.thrift.scheme.StandardScheme<Decimal> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Decimal 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 3: // SCALE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.scale = iprot.readI16();
-              struct.setScaleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 1: // UNSCALED
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.unscaled = iprot.readBinary();
-              struct.setUnscaledIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 3: // SCALE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.scale = iprot.readI16();
+                struct.setScaleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 1: // UNSCALED
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.unscaled = iprot.readBinary();
+                struct.setUnscaledIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Decimal struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Decimal struct) th
   }
 
   private static class DecimalTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DecimalTupleScheme getScheme() {
       return new DecimalTupleScheme();
     }
@@ -459,11 +477,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Decimal struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Decimal struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.scale = iprot.readI16();
-      struct.setScaleIsSet(true);
-      struct.unscaled = iprot.readBinary();
-      struct.setUnscaledIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.scale = iprot.readI16();
+        struct.setScaleIsSet(true);
+        struct.unscaled = iprot.readBinary();
+        struct.setUnscaledIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java
index 13ab1f691c42..453730b576d0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DecimalColumnStatsData implements org.apache.thrift.TBase<DecimalColumnStatsData, DecimalColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<DecimalColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DecimalColumnStatsData");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMNULLS_ISSET_ID = 0;
   private static final int __NUMDVS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
+  private static final _Fields[] optionals = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
   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);
@@ -162,6 +164,7 @@ public DecimalColumnStatsData(DecimalColumnStatsData other) {
     }
   }
 
+  @Override
   public DecimalColumnStatsData deepCopy() {
     return new DecimalColumnStatsData(this);
   }
@@ -334,6 +337,7 @@ public void setHistogramIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOW_VALUE:
@@ -396,6 +400,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOW_VALUE:
@@ -421,6 +426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -612,14 +618,17 @@ public int compareTo(DecimalColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -718,6 +727,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DecimalColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DecimalColumnStatsDataStandardScheme getScheme() {
       return new DecimalColumnStatsDataStandardScheme();
     }
@@ -725,75 +735,82 @@ public DecimalColumnStatsDataStandardScheme getScheme() {
 
   private static class DecimalColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<DecimalColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DecimalColumnStatsData 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 1: // LOW_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.lowValue = new Decimal();
-              struct.lowValue.read(iprot);
-              struct.setLowValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HIGH_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.highValue = new Decimal();
-              struct.highValue.read(iprot);
-              struct.setHighValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOW_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.lowValue = new Decimal();
+                struct.lowValue.read(iprot);
+                struct.setLowValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // HIGH_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.highValue = new Decimal();
+                struct.highValue.read(iprot);
+                struct.setHighValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NUM_DVS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numDVs = iprot.readI64();
+                struct.setNumDVsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // HISTOGRAM
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.histogram = iprot.readBinary();
+                struct.setHistogramIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NUM_DVS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numDVs = iprot.readI64();
-              struct.setNumDVsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // HISTOGRAM
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.histogram = iprot.readBinary();
-              struct.setHistogramIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DecimalColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -839,6 +856,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DecimalColumnStats
   }
 
   private static class DecimalColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DecimalColumnStatsDataTupleScheme getScheme() {
       return new DecimalColumnStatsDataTupleScheme();
     }
@@ -881,29 +899,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DecimalColumnStatsD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DecimalColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      struct.numDVs = iprot.readI64();
-      struct.setNumDVsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.lowValue = new Decimal();
-        struct.lowValue.read(iprot);
-        struct.setLowValueIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.highValue = new Decimal();
-        struct.highValue.read(iprot);
-        struct.setHighValueIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.histogram = iprot.readBinary();
-        struct.setHistogramIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        struct.numDVs = iprot.readI64();
+        struct.setNumDVsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.lowValue = new Decimal();
+          struct.lowValue.read(iprot);
+          struct.setLowValueIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.highValue = new Decimal();
+          struct.highValue.read(iprot);
+          struct.setHighValueIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.histogram = iprot.readBinary();
+          struct.setHistogramIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java
index dbd4523d4e12..36c6871769eb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DefaultConstraintsRequest implements org.apache.thrift.TBase<DefaultConstraintsRequest, DefaultConstraintsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DefaultConstraintsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DefaultConstraintsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public DefaultConstraintsRequest(DefaultConstraintsRequest other) {
     }
   }
 
+  @Override
   public DefaultConstraintsRequest deepCopy() {
     return new DefaultConstraintsRequest(this);
   }
@@ -214,6 +217,7 @@ public void setTbl_nameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(DefaultConstraintsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DefaultConstraintsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DefaultConstraintsRequestStandardScheme getScheme() {
       return new DefaultConstraintsRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public DefaultConstraintsRequestStandardScheme getScheme() {
 
   private static class DefaultConstraintsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DefaultConstraintsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DefaultConstraintsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DefaultConstraintsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DefaultConstraints
   }
 
   private static class DefaultConstraintsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DefaultConstraintsRequestTupleScheme getScheme() {
       return new DefaultConstraintsRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DefaultConstraintsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DefaultConstraintsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java
index f2d2b64f6740..51e79225db11 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DefaultConstraintsResponse implements org.apache.thrift.TBase<DefaultConstraintsResponse, DefaultConstraintsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<DefaultConstraintsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DefaultConstraintsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public DefaultConstraintsResponse(DefaultConstraintsResponse other) {
     }
   }
 
+  @Override
   public DefaultConstraintsResponse deepCopy() {
     return new DefaultConstraintsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setDefaultConstraintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DEFAULT_CONSTRAINTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DEFAULT_CONSTRAINTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(DefaultConstraintsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DefaultConstraintsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DefaultConstraintsResponseStandardScheme getScheme() {
       return new DefaultConstraintsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public DefaultConstraintsResponseStandardScheme getScheme() {
 
   private static class DefaultConstraintsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<DefaultConstraintsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DefaultConstraintsResponse 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 1: // DEFAULT_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list522 = iprot.readListBegin();
-                struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list522.size);
-                @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem523;
-                for (int _i524 = 0; _i524 < _list522.size; ++_i524)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // DEFAULT_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem523 = new SQLDefaultConstraint();
-                  _elem523.read(iprot);
-                  struct.defaultConstraints.add(_elem523);
+                  org.apache.thrift.protocol.TList _list522 = iprot.readListBegin();
+                  struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list522.size);
+                  @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem523;
+                  for (int _i524 = 0; _i524 < _list522.size; ++_i524)
+                  {
+                    _elem523 = new SQLDefaultConstraint();
+                    _elem523.read(iprot);
+                    struct.defaultConstraints.add(_elem523);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setDefaultConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDefaultConstraintsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DefaultConstraintsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DefaultConstraints
   }
 
   private static class DefaultConstraintsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DefaultConstraintsResponseTupleScheme getScheme() {
       return new DefaultConstraintsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DefaultConstraintsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DefaultConstraintsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list527 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list527.size);
-        @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem528;
-        for (int _i529 = 0; _i529 < _list527.size; ++_i529)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem528 = new SQLDefaultConstraint();
-          _elem528.read(iprot);
-          struct.defaultConstraints.add(_elem528);
+          org.apache.thrift.protocol.TList _list527 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list527.size);
+          @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem528;
+          for (int _i529 = 0; _i529 < _list527.size; ++_i529)
+          {
+            _elem528 = new SQLDefaultConstraint();
+            _elem528.read(iprot);
+            struct.defaultConstraints.add(_elem528);
+          }
         }
+        struct.setDefaultConstraintsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setDefaultConstraintsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DeleteColumnStatisticsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DeleteColumnStatisticsRequest.java
index 3d525da424bb..256a4ea493c4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DeleteColumnStatisticsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DeleteColumnStatisticsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DeleteColumnStatisticsRequest implements org.apache.thrift.TBase<DeleteColumnStatisticsRequest, DeleteColumnStatisticsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DeleteColumnStatisticsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DeleteColumnStatisticsRequest");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -111,7 +113,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __TABLELEVEL_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.PART_NAMES,_Fields.COL_NAMES,_Fields.ENGINE,_Fields.TABLE_LEVEL};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.PART_NAMES,_Fields.COL_NAMES,_Fields.ENGINE,_Fields.TABLE_LEVEL};
   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);
@@ -179,6 +181,7 @@ public DeleteColumnStatisticsRequest(DeleteColumnStatisticsRequest other) {
     this.tableLevel = other.tableLevel;
   }
 
+  @Override
   public DeleteColumnStatisticsRequest deepCopy() {
     return new DeleteColumnStatisticsRequest(this);
   }
@@ -394,6 +397,7 @@ public void setTableLevelIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLELEVEL_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -456,6 +460,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -484,6 +489,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -704,14 +710,17 @@ public int compareTo(DeleteColumnStatisticsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -818,6 +827,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DeleteColumnStatisticsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DeleteColumnStatisticsRequestStandardScheme getScheme() {
       return new DeleteColumnStatisticsRequestStandardScheme();
     }
@@ -825,101 +835,108 @@ public DeleteColumnStatisticsRequestStandardScheme getScheme() {
 
   private static class DeleteColumnStatisticsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DeleteColumnStatisticsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DeleteColumnStatisticsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.cat_name = iprot.readString();
-              struct.setCat_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PART_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1620 = iprot.readListBegin();
-                struct.part_names = new java.util.ArrayList<java.lang.String>(_list1620.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1621;
-                for (int _i1622 = 0; _i1622 < _list1620.size; ++_i1622)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.cat_name = iprot.readString();
+                struct.setCat_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1621 = iprot.readString();
-                  struct.part_names.add(_elem1621);
+                  org.apache.thrift.protocol.TList _list1620 = iprot.readListBegin();
+                  struct.part_names = new java.util.ArrayList<java.lang.String>(_list1620.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1621;
+                  for (int _i1622 = 0; _i1622 < _list1620.size; ++_i1622)
+                  {
+                    _elem1621 = iprot.readString();
+                    struct.part_names.add(_elem1621);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPart_namesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPart_namesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COL_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1623 = iprot.readListBegin();
-                struct.col_names = new java.util.ArrayList<java.lang.String>(_list1623.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1624;
-                for (int _i1625 = 0; _i1625 < _list1623.size; ++_i1625)
+              break;
+            case 5: // COL_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1624 = iprot.readString();
-                  struct.col_names.add(_elem1624);
+                  org.apache.thrift.protocol.TList _list1623 = iprot.readListBegin();
+                  struct.col_names = new java.util.ArrayList<java.lang.String>(_list1623.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1624;
+                  for (int _i1625 = 0; _i1625 < _list1623.size; ++_i1625)
+                  {
+                    _elem1624 = iprot.readString();
+                    struct.col_names.add(_elem1624);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCol_namesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCol_namesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TABLE_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.tableLevel = iprot.readBool();
-              struct.setTableLevelIsSet(true);
-            } else { 
+              break;
+            case 6: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // TABLE_LEVEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.tableLevel = iprot.readBool();
+                struct.setTableLevelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DeleteColumnStatisticsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -988,6 +1005,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DeleteColumnStatis
   }
 
   private static class DeleteColumnStatisticsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DeleteColumnStatisticsRequestTupleScheme getScheme() {
       return new DeleteColumnStatisticsRequestTupleScheme();
     }
@@ -1048,49 +1066,54 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DeleteColumnStatist
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DeleteColumnStatisticsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.cat_name = iprot.readString();
-        struct.setCat_nameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1630 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.part_names = new java.util.ArrayList<java.lang.String>(_list1630.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1631;
-          for (int _i1632 = 0; _i1632 < _list1630.size; ++_i1632)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.cat_name = iprot.readString();
+          struct.setCat_nameIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1631 = iprot.readString();
-            struct.part_names.add(_elem1631);
+            org.apache.thrift.protocol.TList _list1630 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.part_names = new java.util.ArrayList<java.lang.String>(_list1630.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1631;
+            for (int _i1632 = 0; _i1632 < _list1630.size; ++_i1632)
+            {
+              _elem1631 = iprot.readString();
+              struct.part_names.add(_elem1631);
+            }
           }
+          struct.setPart_namesIsSet(true);
         }
-        struct.setPart_namesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1633 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.col_names = new java.util.ArrayList<java.lang.String>(_list1633.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1634;
-          for (int _i1635 = 0; _i1635 < _list1633.size; ++_i1635)
+        if (incoming.get(2)) {
           {
-            _elem1634 = iprot.readString();
-            struct.col_names.add(_elem1634);
+            org.apache.thrift.protocol.TList _list1633 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.col_names = new java.util.ArrayList<java.lang.String>(_list1633.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1634;
+            for (int _i1635 = 0; _i1635 < _list1633.size; ++_i1635)
+            {
+              _elem1634 = iprot.readString();
+              struct.col_names.add(_elem1634);
+            }
           }
+          struct.setCol_namesIsSet(true);
         }
-        struct.setCol_namesIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.tableLevel = iprot.readBool();
-        struct.setTableLevelIsSet(true);
+        if (incoming.get(3)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.tableLevel = iprot.readBool();
+          struct.setTableLevelIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java
index 18f9545c8e04..cc841c26cd2e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DoubleColumnStatsData implements org.apache.thrift.TBase<DoubleColumnStatsData, DoubleColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<DoubleColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DoubleColumnStatsData");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,7 +111,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMNULLS_ISSET_ID = 2;
   private static final int __NUMDVS_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
+  private static final _Fields[] optionals = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
   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);
@@ -160,6 +162,7 @@ public DoubleColumnStatsData(DoubleColumnStatsData other) {
     }
   }
 
+  @Override
   public DoubleColumnStatsData deepCopy() {
     return new DoubleColumnStatsData(this);
   }
@@ -330,6 +333,7 @@ public void setHistogramIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOW_VALUE:
@@ -392,6 +396,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOW_VALUE:
@@ -417,6 +422,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -608,14 +614,17 @@ public int compareTo(DoubleColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -700,6 +709,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DoubleColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DoubleColumnStatsDataStandardScheme getScheme() {
       return new DoubleColumnStatsDataStandardScheme();
     }
@@ -707,73 +717,80 @@ public DoubleColumnStatsDataStandardScheme getScheme() {
 
   private static class DoubleColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<DoubleColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DoubleColumnStatsData 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 1: // LOW_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.lowValue = iprot.readDouble();
-              struct.setLowValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HIGH_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.highValue = iprot.readDouble();
-              struct.setHighValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NUM_DVS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numDVs = iprot.readI64();
-              struct.setNumDVsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // HISTOGRAM
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.histogram = iprot.readBinary();
-              struct.setHistogramIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOW_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.lowValue = iprot.readDouble();
+                struct.setLowValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // HIGH_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.highValue = iprot.readDouble();
+                struct.setHighValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NUM_DVS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numDVs = iprot.readI64();
+                struct.setNumDVsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // HISTOGRAM
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.histogram = iprot.readBinary();
+                struct.setHistogramIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DoubleColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -815,6 +832,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DoubleColumnStatsD
   }
 
   private static class DoubleColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DoubleColumnStatsDataTupleScheme getScheme() {
       return new DoubleColumnStatsDataTupleScheme();
     }
@@ -857,27 +875,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DoubleColumnStatsDa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DoubleColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      struct.numDVs = iprot.readI64();
-      struct.setNumDVsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.lowValue = iprot.readDouble();
-        struct.setLowValueIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.highValue = iprot.readDouble();
-        struct.setHighValueIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.histogram = iprot.readBinary();
-        struct.setHistogramIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        struct.numDVs = iprot.readI64();
+        struct.setNumDVsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.lowValue = iprot.readDouble();
+          struct.setLowValueIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.highValue = iprot.readDouble();
+          struct.setHighValueIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.histogram = iprot.readBinary();
+          struct.setHistogramIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java
index 83896a66b02b..b4d9b49dbd26 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropCatalogRequest implements org.apache.thrift.TBase<DropCatalogRequest, DropCatalogRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropCatalogRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropCatalogRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __IFEXISTS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IF_EXISTS};
+  private static final _Fields[] optionals = {_Fields.IF_EXISTS};
   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);
@@ -121,6 +123,7 @@ public DropCatalogRequest(DropCatalogRequest other) {
     this.ifExists = other.ifExists;
   }
 
+  @Override
   public DropCatalogRequest deepCopy() {
     return new DropCatalogRequest(this);
   }
@@ -178,6 +181,7 @@ public void setIfExistsIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __IFEXISTS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -200,6 +204,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -213,6 +218,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -308,14 +314,17 @@ public int compareTo(DropCatalogRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -366,6 +375,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropCatalogRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropCatalogRequestStandardScheme getScheme() {
       return new DropCatalogRequestStandardScheme();
     }
@@ -373,41 +383,48 @@ public DropCatalogRequestStandardScheme getScheme() {
 
   private static class DropCatalogRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropCatalogRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropCatalogRequest 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // IF_EXISTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ifExists = iprot.readBool();
-              struct.setIfExistsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // IF_EXISTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ifExists = iprot.readBool();
+                struct.setIfExistsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropCatalogRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -429,6 +446,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropCatalogRequest
   }
 
   private static class DropCatalogRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropCatalogRequestTupleScheme getScheme() {
       return new DropCatalogRequestTupleScheme();
     }
@@ -457,15 +475,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropCatalogRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropCatalogRequest 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.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ifExists = iprot.readBool();
-        struct.setIfExistsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ifExists = iprot.readBool();
+          struct.setIfExistsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
index 4cf0f7fec173..5778269fec19 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropConstraintRequest implements org.apache.thrift.TBase<DropConstraintRequest, DropConstraintRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropConstraintRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropConstraintRequest");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -142,6 +144,7 @@ public DropConstraintRequest(DropConstraintRequest other) {
     }
   }
 
+  @Override
   public DropConstraintRequest deepCopy() {
     return new DropConstraintRequest(this);
   }
@@ -250,6 +253,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DBNAME:
@@ -288,6 +292,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DBNAME:
@@ -307,6 +312,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -452,14 +458,17 @@ public int compareTo(DropConstraintRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -540,6 +549,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropConstraintRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropConstraintRequestStandardScheme getScheme() {
       return new DropConstraintRequestStandardScheme();
     }
@@ -547,57 +557,64 @@ public DropConstraintRequestStandardScheme getScheme() {
 
   private static class DropConstraintRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropConstraintRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropConstraintRequest 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 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: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // CONSTRAINTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.constraintname = iprot.readString();
-              struct.setConstraintnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+          }
+          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: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CONSTRAINTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.constraintname = iprot.readString();
+                struct.setConstraintnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropConstraintRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -631,6 +648,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropConstraintRequ
   }
 
   private static class DropConstraintRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropConstraintRequestTupleScheme getScheme() {
       return new DropConstraintRequestTupleScheme();
     }
@@ -656,17 +674,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropConstraintReque
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropConstraintRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tablename = iprot.readString();
-      struct.setTablenameIsSet(true);
-      struct.constraintname = iprot.readString();
-      struct.setConstraintnameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tablename = iprot.readString();
+        struct.setTablenameIsSet(true);
+        struct.constraintname = iprot.readString();
+        struct.setConstraintnameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDataConnectorRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDataConnectorRequest.java
index 2f7bafbd7050..4f65a6e55876 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDataConnectorRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDataConnectorRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropDataConnectorRequest implements org.apache.thrift.TBase<DropDataConnectorRequest, DropDataConnectorRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropDataConnectorRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropDataConnectorRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -92,7 +94,7 @@ public java.lang.String getFieldName() {
   private static final int __IFNOTEXISTS_ISSET_ID = 0;
   private static final int __CHECKREFERENCES_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IF_NOT_EXISTS,_Fields.CHECK_REFERENCES};
+  private static final _Fields[] optionals = {_Fields.IF_NOT_EXISTS,_Fields.CHECK_REFERENCES};
   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);
@@ -128,6 +130,7 @@ public DropDataConnectorRequest(DropDataConnectorRequest other) {
     this.checkReferences = other.checkReferences;
   }
 
+  @Override
   public DropDataConnectorRequest deepCopy() {
     return new DropDataConnectorRequest(this);
   }
@@ -209,6 +212,7 @@ public void setCheckReferencesIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CHECKREFERENCES_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CONNECTOR_NAME:
@@ -239,6 +243,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CONNECTOR_NAME:
@@ -255,6 +260,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -375,14 +381,17 @@ public int compareTo(DropDataConnectorRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -443,6 +452,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropDataConnectorRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropDataConnectorRequestStandardScheme getScheme() {
       return new DropDataConnectorRequestStandardScheme();
     }
@@ -450,49 +460,56 @@ public DropDataConnectorRequestStandardScheme getScheme() {
 
   private static class DropDataConnectorRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropDataConnectorRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropDataConnectorRequest 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 1: // CONNECTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.connectorName = iprot.readString();
-              struct.setConnectorNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IF_NOT_EXISTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ifNotExists = iprot.readBool();
-              struct.setIfNotExistsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // CHECK_REFERENCES
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.checkReferences = iprot.readBool();
-              struct.setCheckReferencesIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CONNECTOR_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.connectorName = iprot.readString();
+                struct.setConnectorNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // IF_NOT_EXISTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ifNotExists = iprot.readBool();
+                struct.setIfNotExistsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CHECK_REFERENCES
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.checkReferences = iprot.readBool();
+                struct.setCheckReferencesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropDataConnectorRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -519,6 +536,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropDataConnectorR
   }
 
   private static class DropDataConnectorRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropDataConnectorRequestTupleScheme getScheme() {
       return new DropDataConnectorRequestTupleScheme();
     }
@@ -548,17 +566,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropDataConnectorRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropDataConnectorRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.connectorName = iprot.readString();
-      struct.setConnectorNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.ifNotExists = iprot.readBool();
-        struct.setIfNotExistsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.checkReferences = iprot.readBool();
-        struct.setCheckReferencesIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.connectorName = iprot.readString();
+        struct.setConnectorNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.ifNotExists = iprot.readBool();
+          struct.setIfNotExistsIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.checkReferences = iprot.readBool();
+          struct.setCheckReferencesIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDatabaseRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDatabaseRequest.java
index 4d6b90066fd6..2153cd12342b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDatabaseRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropDatabaseRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropDatabaseRequest implements org.apache.thrift.TBase<DropDatabaseRequest, DropDatabaseRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropDatabaseRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropDatabaseRequest");
 
@@ -119,10 +119,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,7 +140,7 @@ public java.lang.String getFieldName() {
   private static final int __ASYNCDROP_ISSET_ID = 6;
   private static final int __CANCEL_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.SOFT_DELETE,_Fields.TXN_ID,_Fields.DELETE_MANAGED_DIR,_Fields.ID,_Fields.ASYNC_DROP,_Fields.CANCEL};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.SOFT_DELETE,_Fields.TXN_ID,_Fields.DELETE_MANAGED_DIR,_Fields.ID,_Fields.ASYNC_DROP,_Fields.CANCEL};
   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);
@@ -217,6 +219,7 @@ public DropDatabaseRequest(DropDatabaseRequest other) {
     this.cancel = other.cancel;
   }
 
+  @Override
   public DropDatabaseRequest deepCopy() {
     return new DropDatabaseRequest(this);
   }
@@ -492,6 +495,7 @@ public void setCancelIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CANCEL_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -586,6 +590,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -626,6 +631,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -940,14 +946,17 @@ public int compareTo(DropDatabaseRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1070,6 +1079,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropDatabaseRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropDatabaseRequestStandardScheme getScheme() {
       return new DropDatabaseRequestStandardScheme();
     }
@@ -1077,113 +1087,120 @@ public DropDatabaseRequestStandardScheme getScheme() {
 
   private static class DropDatabaseRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropDatabaseRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropDatabaseRequest 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // IGNORE_UNKNOWN_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ignoreUnknownDb = iprot.readBool();
-              struct.setIgnoreUnknownDbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DELETE_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.deleteData = iprot.readBool();
-              struct.setDeleteDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // CASCADE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.cascade = iprot.readBool();
-              struct.setCascadeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // SOFT_DELETE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.softDelete = iprot.readBool();
-              struct.setSoftDeleteIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // DELETE_MANAGED_DIR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.deleteManagedDir = iprot.readBool();
-              struct.setDeleteManagedDirIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // ASYNC_DROP
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.asyncDrop = iprot.readBool();
-              struct.setAsyncDropIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 11: // CANCEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.cancel = iprot.readBool();
-              struct.setCancelIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // IGNORE_UNKNOWN_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ignoreUnknownDb = iprot.readBool();
+                struct.setIgnoreUnknownDbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DELETE_DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.deleteData = iprot.readBool();
+                struct.setDeleteDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // CASCADE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.cascade = iprot.readBool();
+                struct.setCascadeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // SOFT_DELETE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.softDelete = iprot.readBool();
+                struct.setSoftDeleteIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // DELETE_MANAGED_DIR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.deleteManagedDir = iprot.readBool();
+                struct.setDeleteManagedDirIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.id = iprot.readString();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // ASYNC_DROP
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.asyncDrop = iprot.readBool();
+                struct.setAsyncDropIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // CANCEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.cancel = iprot.readBool();
+                struct.setCancelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropDatabaseRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1248,6 +1265,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropDatabaseReques
   }
 
   private static class DropDatabaseRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropDatabaseRequestTupleScheme getScheme() {
       return new DropDatabaseRequestTupleScheme();
     }
@@ -1310,43 +1328,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropDatabaseRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropDatabaseRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.name = iprot.readString();
-      struct.setNameIsSet(true);
-      struct.ignoreUnknownDb = iprot.readBool();
-      struct.setIgnoreUnknownDbIsSet(true);
-      struct.deleteData = iprot.readBool();
-      struct.setDeleteDataIsSet(true);
-      struct.cascade = iprot.readBool();
-      struct.setCascadeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.softDelete = iprot.readBool();
-        struct.setSoftDeleteIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.txnId = iprot.readI64();
-        struct.setTxnIdIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.deleteManagedDir = iprot.readBool();
-        struct.setDeleteManagedDirIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.id = iprot.readString();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.asyncDrop = iprot.readBool();
-        struct.setAsyncDropIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.cancel = iprot.readBool();
-        struct.setCancelIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.name = iprot.readString();
+        struct.setNameIsSet(true);
+        struct.ignoreUnknownDb = iprot.readBool();
+        struct.setIgnoreUnknownDbIsSet(true);
+        struct.deleteData = iprot.readBool();
+        struct.setDeleteDataIsSet(true);
+        struct.cascade = iprot.readBool();
+        struct.setCascadeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.softDelete = iprot.readBool();
+          struct.setSoftDeleteIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.txnId = iprot.readI64();
+          struct.setTxnIdIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.deleteManagedDir = iprot.readBool();
+          struct.setDeleteManagedDirIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.id = iprot.readString();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.asyncDrop = iprot.readBool();
+          struct.setAsyncDropIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.cancel = iprot.readBool();
+          struct.setCancelIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPackageRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPackageRequest.java
index a8b0dcaebac9..4ae2236f738d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPackageRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPackageRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropPackageRequest implements org.apache.thrift.TBase<DropPackageRequest, DropPackageRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropPackageRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropPackageRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public DropPackageRequest(DropPackageRequest other) {
     }
   }
 
+  @Override
   public DropPackageRequest deepCopy() {
     return new DropPackageRequest(this);
   }
@@ -214,6 +217,7 @@ public void setPackageNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(DropPackageRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropPackageRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPackageRequestStandardScheme getScheme() {
       return new DropPackageRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public DropPackageRequestStandardScheme getScheme() {
 
   private static class DropPackageRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropPackageRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropPackageRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PACKAGE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.packageName = iprot.readString();
-              struct.setPackageNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // PACKAGE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.packageName = iprot.readString();
+                struct.setPackageNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropPackageRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropPackageRequest
   }
 
   private static class DropPackageRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPackageRequestTupleScheme getScheme() {
       return new DropPackageRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropPackageRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropPackageRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.packageName = iprot.readString();
-      struct.setPackageNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.packageName = iprot.readString();
+        struct.setPackageNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionRequest.java
index 71dc2f59bccc..2d5f0eaf97cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropPartitionRequest implements org.apache.thrift.TBase<DropPartitionRequest, DropPartitionRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropPartitionRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropPartitionRequest");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -111,7 +113,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __DELETEDATA_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.PART_NAME,_Fields.PART_VALS,_Fields.DELETE_DATA,_Fields.ENVIRONMENT_CONTEXT};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.PART_NAME,_Fields.PART_VALS,_Fields.DELETE_DATA,_Fields.ENVIRONMENT_CONTEXT};
   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);
@@ -173,6 +175,7 @@ public DropPartitionRequest(DropPartitionRequest other) {
     }
   }
 
+  @Override
   public DropPartitionRequest deepCopy() {
     return new DropPartitionRequest(this);
   }
@@ -371,6 +374,7 @@ public void setEnvironmentContextIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -433,6 +437,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -461,6 +466,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -681,14 +687,17 @@ public int compareTo(DropPartitionRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -798,6 +807,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropPartitionRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionRequestStandardScheme getScheme() {
       return new DropPartitionRequestStandardScheme();
     }
@@ -805,92 +815,99 @@ public DropPartitionRequestStandardScheme getScheme() {
 
   private static class DropPartitionRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropPartitionRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropPartitionRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PART_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partName = iprot.readString();
-              struct.setPartNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PART_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list708 = iprot.readListBegin();
-                struct.partVals = new java.util.ArrayList<java.lang.String>(_list708.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem709;
-                for (int _i710 = 0; _i710 < _list708.size; ++_i710)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partName = iprot.readString();
+                struct.setPartNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PART_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem709 = iprot.readString();
-                  struct.partVals.add(_elem709);
+                  org.apache.thrift.protocol.TList _list708 = iprot.readListBegin();
+                  struct.partVals = new java.util.ArrayList<java.lang.String>(_list708.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem709;
+                  for (int _i710 = 0; _i710 < _list708.size; ++_i710)
+                  {
+                    _elem709 = iprot.readString();
+                    struct.partVals.add(_elem709);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DELETE_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.deleteData = iprot.readBool();
-              struct.setDeleteDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
+              break;
+            case 6: // DELETE_DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.deleteData = iprot.readBool();
+                struct.setDeleteDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -952,6 +969,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionReque
   }
 
   private static class DropPartitionRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionRequestTupleScheme getScheme() {
       return new DropPartitionRequestTupleScheme();
     }
@@ -1006,41 +1024,46 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropPartitionReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropPartitionRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.partName = iprot.readString();
-        struct.setPartNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list713 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partVals = new java.util.ArrayList<java.lang.String>(_list713.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem714;
-          for (int _i715 = 0; _i715 < _list713.size; ++_i715)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.partName = iprot.readString();
+          struct.setPartNameIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem714 = iprot.readString();
-            struct.partVals.add(_elem714);
+            org.apache.thrift.protocol.TList _list713 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partVals = new java.util.ArrayList<java.lang.String>(_list713.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem714;
+            for (int _i715 = 0; _i715 < _list713.size; ++_i715)
+            {
+              _elem714 = iprot.readString();
+              struct.partVals.add(_elem714);
+            }
           }
+          struct.setPartValsIsSet(true);
         }
-        struct.setPartValsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.deleteData = iprot.readBool();
-        struct.setDeleteDataIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
+        if (incoming.get(3)) {
+          struct.deleteData = iprot.readBool();
+          struct.setDeleteDataIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java
index 765420cfd181..0766d52e4db9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropPartitionsExpr implements org.apache.thrift.TBase<DropPartitionsExpr, DropPartitionsExpr._Fields>, java.io.Serializable, Cloneable, Comparable<DropPartitionsExpr> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropPartitionsExpr");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __PARTARCHIVELEVEL_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PART_ARCHIVE_LEVEL};
+  private static final _Fields[] optionals = {_Fields.PART_ARCHIVE_LEVEL};
   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);
@@ -119,6 +121,7 @@ public DropPartitionsExpr(DropPartitionsExpr other) {
     this.partArchiveLevel = other.partArchiveLevel;
   }
 
+  @Override
   public DropPartitionsExpr deepCopy() {
     return new DropPartitionsExpr(this);
   }
@@ -184,6 +187,7 @@ public void setPartArchiveLevelIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PARTARCHIVELEVEL_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EXPR:
@@ -210,6 +214,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EXPR:
@@ -223,6 +228,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -318,14 +324,17 @@ public int compareTo(DropPartitionsExpr other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -380,6 +389,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropPartitionsExprStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionsExprStandardScheme getScheme() {
       return new DropPartitionsExprStandardScheme();
     }
@@ -387,41 +397,48 @@ public DropPartitionsExprStandardScheme getScheme() {
 
   private static class DropPartitionsExprStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropPartitionsExpr> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropPartitionsExpr 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 1: // EXPR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expr = iprot.readBinary();
-              struct.setExprIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // PART_ARCHIVE_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.partArchiveLevel = iprot.readI32();
-              struct.setPartArchiveLevelIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // EXPR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expr = iprot.readBinary();
+                struct.setExprIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PART_ARCHIVE_LEVEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.partArchiveLevel = iprot.readI32();
+                struct.setPartArchiveLevelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionsExpr struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -443,6 +460,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionsExpr
   }
 
   private static class DropPartitionsExprTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionsExprTupleScheme getScheme() {
       return new DropPartitionsExprTupleScheme();
     }
@@ -466,13 +484,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropPartitionsExpr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropPartitionsExpr struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.expr = iprot.readBinary();
-      struct.setExprIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.partArchiveLevel = iprot.readI32();
-        struct.setPartArchiveLevelIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.expr = iprot.readBinary();
+        struct.setExprIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.partArchiveLevel = iprot.readI32();
+          struct.setPartArchiveLevelIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
index 14a352eb325a..038f399761b7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropPartitionsRequest implements org.apache.thrift.TBase<DropPartitionsRequest, DropPartitionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropPartitionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropPartitionsRequest");
 
@@ -114,10 +114,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -130,7 +132,7 @@ public java.lang.String getFieldName() {
   private static final int __NEEDRESULT_ISSET_ID = 3;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 4;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DELETE_DATA,_Fields.IF_EXISTS,_Fields.IGNORE_PROTECTION,_Fields.ENVIRONMENT_CONTEXT,_Fields.NEED_RESULT,_Fields.CAT_NAME,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION};
+  private static final _Fields[] optionals = {_Fields.DELETE_DATA,_Fields.IF_EXISTS,_Fields.IGNORE_PROTECTION,_Fields.ENVIRONMENT_CONTEXT,_Fields.NEED_RESULT,_Fields.CAT_NAME,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION};
   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);
@@ -203,6 +205,7 @@ public DropPartitionsRequest(DropPartitionsRequest other) {
     this.skipColumnSchemaForPartition = other.skipColumnSchemaForPartition;
   }
 
+  @Override
   public DropPartitionsRequest deepCopy() {
     return new DropPartitionsRequest(this);
   }
@@ -456,6 +459,7 @@ public void setSkipColumnSchemaForPartitionIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -542,6 +546,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -579,6 +584,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -874,14 +880,17 @@ public int compareTo(DropPartitionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1007,6 +1016,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropPartitionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionsRequestStandardScheme getScheme() {
       return new DropPartitionsRequestStandardScheme();
     }
@@ -1014,107 +1024,114 @@ public DropPartitionsRequestStandardScheme getScheme() {
 
   private static class DropPartitionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropPartitionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropPartitionsRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.parts = new RequestPartsSpec();
-              struct.parts.read(iprot);
-              struct.setPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DELETE_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.deleteData = iprot.readBool();
-              struct.setDeleteDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // IF_EXISTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ifExists = iprot.readBool();
-              struct.setIfExistsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // IGNORE_PROTECTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ignoreProtection = iprot.readBool();
-              struct.setIgnoreProtectionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 7: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.parts = new RequestPartsSpec();
+                struct.parts.read(iprot);
+                struct.setPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DELETE_DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.deleteData = iprot.readBool();
+                struct.setDeleteDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // IF_EXISTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ifExists = iprot.readBool();
+                struct.setIfExistsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // IGNORE_PROTECTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ignoreProtection = iprot.readBool();
+                struct.setIgnoreProtectionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // NEED_RESULT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.needResult = iprot.readBool();
+                struct.setNeedResultIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // NEED_RESULT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.needResult = iprot.readBool();
-              struct.setNeedResultIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1180,6 +1197,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionsRequ
   }
 
   private static class DropPartitionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionsRequestTupleScheme getScheme() {
       return new DropPartitionsRequestTupleScheme();
     }
@@ -1241,43 +1259,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropPartitionsReque
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropPartitionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      struct.parts = new RequestPartsSpec();
-      struct.parts.read(iprot);
-      struct.setPartsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.deleteData = iprot.readBool();
-        struct.setDeleteDataIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ifExists = iprot.readBool();
-        struct.setIfExistsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ignoreProtection = iprot.readBool();
-        struct.setIgnoreProtectionIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.needResult = iprot.readBool();
-        struct.setNeedResultIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        struct.parts = new RequestPartsSpec();
+        struct.parts.read(iprot);
+        struct.setPartsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.deleteData = iprot.readBool();
+          struct.setDeleteDataIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ifExists = iprot.readBool();
+          struct.setIfExistsIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.ignoreProtection = iprot.readBool();
+          struct.setIgnoreProtectionIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.needResult = iprot.readBool();
+          struct.setNeedResultIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
index 4ed3cd860c65..76b04c1dea2d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropPartitionsResult implements org.apache.thrift.TBase<DropPartitionsResult, DropPartitionsResult._Fields>, java.io.Serializable, Cloneable, Comparable<DropPartitionsResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropPartitionsResult");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.PARTITIONS};
+  private static final _Fields[] optionals = {_Fields.PARTITIONS};
   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);
@@ -106,6 +108,7 @@ public DropPartitionsResult(DropPartitionsResult other) {
     }
   }
 
+  @Override
   public DropPartitionsResult deepCopy() {
     return new DropPartitionsResult(this);
   }
@@ -155,6 +158,7 @@ public void setPartitionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -169,6 +173,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -179,6 +184,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -249,14 +255,17 @@ public int compareTo(DropPartitionsResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -301,6 +310,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropPartitionsResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionsResultStandardScheme getScheme() {
       return new DropPartitionsResultStandardScheme();
     }
@@ -308,44 +318,51 @@ public DropPartitionsResultStandardScheme getScheme() {
 
   private static class DropPartitionsResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropPartitionsResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropPartitionsResult 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list684 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list684.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem685;
-                for (int _i686 = 0; _i686 < _list684.size; ++_i686)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem685 = new Partition();
-                  _elem685.read(iprot);
-                  struct.partitions.add(_elem685);
+                  org.apache.thrift.protocol.TList _list684 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list684.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem685;
+                  for (int _i686 = 0; _i686 < _list684.size; ++_i686)
+                  {
+                    _elem685 = new Partition();
+                    _elem685.read(iprot);
+                    struct.partitions.add(_elem685);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionsResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -371,6 +388,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropPartitionsResu
   }
 
   private static class DropPartitionsResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropPartitionsResultTupleScheme getScheme() {
       return new DropPartitionsResultTupleScheme();
     }
@@ -399,21 +417,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropPartitionsResul
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropPartitionsResult 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 _list689 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitions = new java.util.ArrayList<Partition>(_list689.size);
-          @org.apache.thrift.annotation.Nullable Partition _elem690;
-          for (int _i691 = 0; _i691 < _list689.size; ++_i691)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem690 = new Partition();
-            _elem690.read(iprot);
-            struct.partitions.add(_elem690);
+            org.apache.thrift.protocol.TList _list689 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitions = new java.util.ArrayList<Partition>(_list689.size);
+            @org.apache.thrift.annotation.Nullable Partition _elem690;
+            for (int _i691 = 0; _i691 < _list689.size; ++_i691)
+            {
+              _elem690 = new Partition();
+              _elem690.read(iprot);
+              struct.partitions.add(_elem690);
+            }
           }
+          struct.setPartitionsIsSet(true);
         }
-        struct.setPartitionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropTableRequest.java
index 1da2aa6c3b9f..bc2752515785 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropTableRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class DropTableRequest implements org.apache.thrift.TBase<DropTableRequest, DropTableRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DropTableRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DropTableRequest");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,7 +126,7 @@ public java.lang.String getFieldName() {
   private static final int __ASYNCDROP_ISSET_ID = 2;
   private static final int __CANCEL_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.DELETE_DATA,_Fields.ENV_CONTEXT,_Fields.DROP_PARTITIONS,_Fields.ID,_Fields.ASYNC_DROP,_Fields.CANCEL};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.DELETE_DATA,_Fields.ENV_CONTEXT,_Fields.DROP_PARTITIONS,_Fields.ID,_Fields.ASYNC_DROP,_Fields.CANCEL};
   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);
@@ -188,6 +190,7 @@ public DropTableRequest(DropTableRequest other) {
     this.cancel = other.cancel;
   }
 
+  @Override
   public DropTableRequest deepCopy() {
     return new DropTableRequest(this);
   }
@@ -417,6 +420,7 @@ public void setCancelIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CANCEL_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG_NAME:
@@ -495,6 +499,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG_NAME:
@@ -529,6 +534,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -799,14 +805,17 @@ public int compareTo(DropTableRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -924,6 +933,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DropTableRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropTableRequestStandardScheme getScheme() {
       return new DropTableRequestStandardScheme();
     }
@@ -931,98 +941,105 @@ public DropTableRequestStandardScheme getScheme() {
 
   private static class DropTableRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DropTableRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, DropTableRequest 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 1: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DELETE_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.deleteData = iprot.readBool();
-              struct.setDeleteDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ENV_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.envContext = new EnvironmentContext();
-              struct.envContext.read(iprot);
-              struct.setEnvContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DROP_PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.dropPartitions = iprot.readBool();
-              struct.setDropPartitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // ASYNC_DROP
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.asyncDrop = iprot.readBool();
-              struct.setAsyncDropIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DELETE_DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.deleteData = iprot.readBool();
+                struct.setDeleteDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ENV_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.envContext = new EnvironmentContext();
+                struct.envContext.read(iprot);
+                struct.setEnvContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // DROP_PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.dropPartitions = iprot.readBool();
+                struct.setDropPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.id = iprot.readString();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // ASYNC_DROP
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.asyncDrop = iprot.readBool();
+                struct.setAsyncDropIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CANCEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.cancel = iprot.readBool();
+                struct.setCancelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CANCEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.cancel = iprot.readBool();
-              struct.setCancelIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, DropTableRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1085,6 +1102,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DropTableRequest s
   }
 
   private static class DropTableRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DropTableRequestTupleScheme getScheme() {
       return new DropTableRequestTupleScheme();
     }
@@ -1145,40 +1163,45 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DropTableRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DropTableRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.deleteData = iprot.readBool();
-        struct.setDeleteDataIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.envContext = new EnvironmentContext();
-        struct.envContext.read(iprot);
-        struct.setEnvContextIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.dropPartitions = iprot.readBool();
-        struct.setDropPartitionsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.id = iprot.readString();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.asyncDrop = iprot.readBool();
-        struct.setAsyncDropIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.cancel = iprot.readBool();
-        struct.setCancelIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.deleteData = iprot.readBool();
+          struct.setDeleteDataIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.envContext = new EnvironmentContext();
+          struct.envContext.read(iprot);
+          struct.setEnvContextIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.dropPartitions = iprot.readBool();
+          struct.setDropPartitionsIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.id = iprot.readString();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.asyncDrop = iprot.readBool();
+          struct.setAsyncDropIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.cancel = iprot.readBool();
+          struct.setCancelIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
index 98394e72baf4..e67dd3210c8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class EnvironmentContext implements org.apache.thrift.TBase<EnvironmentContext, EnvironmentContext._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentContext> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentContext");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -110,6 +112,7 @@ public EnvironmentContext(EnvironmentContext other) {
     }
   }
 
+  @Override
   public EnvironmentContext deepCopy() {
     return new EnvironmentContext(this);
   }
@@ -154,6 +157,7 @@ public void setPropertiesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PROPERTIES:
@@ -168,6 +172,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PROPERTIES:
@@ -178,6 +183,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -248,14 +254,17 @@ public int compareTo(EnvironmentContext other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -298,6 +307,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class EnvironmentContextStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public EnvironmentContextStandardScheme getScheme() {
       return new EnvironmentContextStandardScheme();
     }
@@ -305,45 +315,52 @@ public EnvironmentContextStandardScheme getScheme() {
 
   private static class EnvironmentContextStandardScheme extends org.apache.thrift.scheme.StandardScheme<EnvironmentContext> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, EnvironmentContext 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 1: // PROPERTIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
-                struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map0.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val2;
-                for (int _i3 = 0; _i3 < _map0.size; ++_i3)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1 = iprot.readString();
-                  _val2 = iprot.readString();
-                  struct.properties.put(_key1, _val2);
+                  org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
+                  struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map0.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val2;
+                  for (int _i3 = 0; _i3 < _map0.size; ++_i3)
+                  {
+                    _key1 = iprot.readString();
+                    _val2 = iprot.readString();
+                    struct.properties.put(_key1, _val2);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setPropertiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPropertiesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, EnvironmentContext struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -368,6 +385,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, EnvironmentContext
   }
 
   private static class EnvironmentContextTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public EnvironmentContextTupleScheme getScheme() {
       return new EnvironmentContextTupleScheme();
     }
@@ -397,22 +415,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, EnvironmentContext
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, EnvironmentContext 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.TMap _map6 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map6.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key7;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val8;
-          for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _key7 = iprot.readString();
-            _val8 = iprot.readString();
-            struct.properties.put(_key7, _val8);
+            org.apache.thrift.protocol.TMap _map6 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map6.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key7;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val8;
+            for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+            {
+              _key7 = iprot.readString();
+              _val8 = iprot.readString();
+              struct.properties.put(_key7, _val8);
+            }
           }
+          struct.setPropertiesIsSet(true);
         }
-        struct.setPropertiesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
index a76c24b12bea..575dbc4dc58f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum EventRequestType implements org.apache.thrift.TEnum {
   INSERT(1),
   UPDATE(2),
@@ -22,6 +22,7 @@ private EventRequestType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java
index d6d789ff538f..717187d5ef41 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ExtendedTableInfo implements org.apache.thrift.TBase<ExtendedTableInfo, ExtendedTableInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExtendedTableInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExtendedTableInfo");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ACCESSTYPE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ACCESS_TYPE,_Fields.REQUIRED_READ_CAPABILITIES,_Fields.REQUIRED_WRITE_CAPABILITIES};
+  private static final _Fields[] optionals = {_Fields.ACCESS_TYPE,_Fields.REQUIRED_READ_CAPABILITIES,_Fields.REQUIRED_WRITE_CAPABILITIES};
   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);
@@ -143,6 +145,7 @@ public ExtendedTableInfo(ExtendedTableInfo other) {
     }
   }
 
+  @Override
   public ExtendedTableInfo deepCopy() {
     return new ExtendedTableInfo(this);
   }
@@ -282,6 +285,7 @@ public void setRequiredWriteCapabilitiesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TBL_NAME:
@@ -320,6 +324,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TBL_NAME:
@@ -339,6 +344,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -484,14 +490,17 @@ public int compareTo(ExtendedTableInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -566,6 +575,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ExtendedTableInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ExtendedTableInfoStandardScheme getScheme() {
       return new ExtendedTableInfoStandardScheme();
     }
@@ -573,77 +583,84 @@ public ExtendedTableInfoStandardScheme getScheme() {
 
   private static class ExtendedTableInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExtendedTableInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ExtendedTableInfo 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 1: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ACCESS_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.accessType = iprot.readI32();
-              struct.setAccessTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // REQUIRED_READ_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1256 = iprot.readListBegin();
-                struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1256.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1257;
-                for (int _i1258 = 0; _i1258 < _list1256.size; ++_i1258)
+          }
+          switch (schemeField.id) {
+            case 1: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ACCESS_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.accessType = iprot.readI32();
+                struct.setAccessTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // REQUIRED_READ_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1257 = iprot.readString();
-                  struct.requiredReadCapabilities.add(_elem1257);
+                  org.apache.thrift.protocol.TList _list1256 = iprot.readListBegin();
+                  struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1256.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1257;
+                  for (int _i1258 = 0; _i1258 < _list1256.size; ++_i1258)
+                  {
+                    _elem1257 = iprot.readString();
+                    struct.requiredReadCapabilities.add(_elem1257);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRequiredReadCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRequiredReadCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // REQUIRED_WRITE_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1259 = iprot.readListBegin();
-                struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1259.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1260;
-                for (int _i1261 = 0; _i1261 < _list1259.size; ++_i1261)
+              break;
+            case 4: // REQUIRED_WRITE_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1260 = iprot.readString();
-                  struct.requiredWriteCapabilities.add(_elem1260);
+                  org.apache.thrift.protocol.TList _list1259 = iprot.readListBegin();
+                  struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1259.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1260;
+                  for (int _i1261 = 0; _i1261 < _list1259.size; ++_i1261)
+                  {
+                    _elem1260 = iprot.readString();
+                    struct.requiredWriteCapabilities.add(_elem1260);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRequiredWriteCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRequiredWriteCapabilitiesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ExtendedTableInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -693,6 +710,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExtendedTableInfo
   }
 
   private static class ExtendedTableInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ExtendedTableInfoTupleScheme getScheme() {
       return new ExtendedTableInfoTupleScheme();
     }
@@ -740,39 +758,44 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ExtendedTableInfo s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ExtendedTableInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.accessType = iprot.readI32();
-        struct.setAccessTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1266 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1266.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1267;
-          for (int _i1268 = 0; _i1268 < _list1266.size; ++_i1268)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.accessType = iprot.readI32();
+          struct.setAccessTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1267 = iprot.readString();
-            struct.requiredReadCapabilities.add(_elem1267);
+            org.apache.thrift.protocol.TList _list1266 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1266.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1267;
+            for (int _i1268 = 0; _i1268 < _list1266.size; ++_i1268)
+            {
+              _elem1267 = iprot.readString();
+              struct.requiredReadCapabilities.add(_elem1267);
+            }
           }
+          struct.setRequiredReadCapabilitiesIsSet(true);
         }
-        struct.setRequiredReadCapabilitiesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1269 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1269.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1270;
-          for (int _i1271 = 0; _i1271 < _list1269.size; ++_i1271)
+        if (incoming.get(2)) {
           {
-            _elem1270 = iprot.readString();
-            struct.requiredWriteCapabilities.add(_elem1270);
+            org.apache.thrift.protocol.TList _list1269 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1269.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1270;
+            for (int _i1271 = 0; _i1271 < _list1269.size; ++_i1271)
+            {
+              _elem1270 = iprot.readString();
+              struct.requiredWriteCapabilities.add(_elem1270);
+            }
           }
+          struct.setRequiredWriteCapabilitiesIsSet(true);
         }
-        struct.setRequiredWriteCapabilitiesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
index bc2cfd970ecb..6d4dc2a6f11f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSchema._Fields>, java.io.Serializable, Cloneable, Comparable<FieldSchema> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FieldSchema");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public FieldSchema(FieldSchema other) {
     }
   }
 
+  @Override
   public FieldSchema deepCopy() {
     return new FieldSchema(this);
   }
@@ -214,6 +217,7 @@ public void setCommentIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(FieldSchema other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -446,6 +455,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FieldSchemaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FieldSchemaStandardScheme getScheme() {
       return new FieldSchemaStandardScheme();
     }
@@ -453,49 +463,56 @@ public FieldSchemaStandardScheme getScheme() {
 
   private static class FieldSchemaStandardScheme extends org.apache.thrift.scheme.StandardScheme<FieldSchema> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FieldSchema 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.type = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // COMMENT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.comment = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setCommentIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.type = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // COMMENT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.comment = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setCommentIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FieldSchema struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -522,6 +539,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FieldSchema struct
   }
 
   private static class FieldSchemaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FieldSchemaTupleScheme getScheme() {
       return new FieldSchemaTupleScheme();
     }
@@ -556,19 +574,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FieldSchema struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FieldSchema 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.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.type = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.comment = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setCommentIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.type = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.comment = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setCommentIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadata.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadata.java
index 0f9bddb71f7b..04daa6cd67e3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadata.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadata.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FileMetadata implements org.apache.thrift.TBase<FileMetadata, FileMetadata._Fields>, java.io.Serializable, Cloneable, Comparable<FileMetadata> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FileMetadata");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -139,6 +141,7 @@ public FileMetadata(FileMetadata other) {
     }
   }
 
+  @Override
   public FileMetadata deepCopy() {
     return new FileMetadata(this);
   }
@@ -236,6 +239,7 @@ public void setDataIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -266,6 +270,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -282,6 +287,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -398,14 +404,17 @@ public int compareTo(FileMetadata other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FileMetadataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FileMetadataStandardScheme getScheme() {
       return new FileMetadataStandardScheme();
     }
@@ -465,59 +475,66 @@ public FileMetadataStandardScheme getScheme() {
 
   private static class FileMetadataStandardScheme extends org.apache.thrift.scheme.StandardScheme<FileMetadata> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FileMetadata 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 1: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
-              struct.type = iprot.readByte();
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
-              struct.version = iprot.readByte();
-              struct.setVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list344 = iprot.readListBegin();
-                struct.data = new java.util.ArrayList<java.nio.ByteBuffer>(_list344.size);
-                @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem345;
-                for (int _i346 = 0; _i346 < _list344.size; ++_i346)
+          }
+          switch (schemeField.id) {
+            case 1: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
+                struct.type = iprot.readByte();
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
+                struct.version = iprot.readByte();
+                struct.setVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem345 = iprot.readBinary();
-                  struct.data.add(_elem345);
+                  org.apache.thrift.protocol.TList _list344 = iprot.readListBegin();
+                  struct.data = new java.util.ArrayList<java.nio.ByteBuffer>(_list344.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem345;
+                  for (int _i346 = 0; _i346 < _list344.size; ++_i346)
+                  {
+                    _elem345 = iprot.readBinary();
+                    struct.data.add(_elem345);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDataIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FileMetadata struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -547,6 +564,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FileMetadata struc
   }
 
   private static class FileMetadataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FileMetadataTupleScheme getScheme() {
       return new FileMetadataTupleScheme();
     }
@@ -587,28 +605,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FileMetadata struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FileMetadata 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.type = iprot.readByte();
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.version = iprot.readByte();
-        struct.setVersionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list349 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.data = new java.util.ArrayList<java.nio.ByteBuffer>(_list349.size);
-          @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem350;
-          for (int _i351 = 0; _i351 < _list349.size; ++_i351)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.type = iprot.readByte();
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.version = iprot.readByte();
+          struct.setVersionIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem350 = iprot.readBinary();
-            struct.data.add(_elem350);
+            org.apache.thrift.protocol.TList _list349 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.data = new java.util.ArrayList<java.nio.ByteBuffer>(_list349.size);
+            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem350;
+            for (int _i351 = 0; _i351 < _list349.size; ++_i351)
+            {
+              _elem350 = iprot.readBinary();
+              struct.data.add(_elem350);
+            }
           }
+          struct.setDataIsSet(true);
         }
-        struct.setDataIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java
index 915e4eaf17a3..500f653e2e81 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum FileMetadataExprType implements org.apache.thrift.TEnum {
   ORC_SARG(1);
 
@@ -20,6 +20,7 @@ private FileMetadataExprType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindNextCompactRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindNextCompactRequest.java
index e6fdb2ac4b9f..9486b1107084 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindNextCompactRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindNextCompactRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FindNextCompactRequest implements org.apache.thrift.TBase<FindNextCompactRequest, FindNextCompactRequest._Fields>, java.io.Serializable, Cloneable, Comparable<FindNextCompactRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FindNextCompactRequest");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.WORKER_ID,_Fields.WORKER_VERSION,_Fields.POOL_NAME};
+  private static final _Fields[] optionals = {_Fields.WORKER_ID,_Fields.WORKER_VERSION,_Fields.POOL_NAME};
   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);
@@ -121,6 +123,7 @@ public FindNextCompactRequest(FindNextCompactRequest other) {
     }
   }
 
+  @Override
   public FindNextCompactRequest deepCopy() {
     return new FindNextCompactRequest(this);
   }
@@ -204,6 +207,7 @@ public void setPoolNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case WORKER_ID:
@@ -234,6 +238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case WORKER_ID:
@@ -250,6 +255,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -370,14 +376,17 @@ public int compareTo(FindNextCompactRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -442,6 +451,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FindNextCompactRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FindNextCompactRequestStandardScheme getScheme() {
       return new FindNextCompactRequestStandardScheme();
     }
@@ -449,49 +459,56 @@ public FindNextCompactRequestStandardScheme getScheme() {
 
   private static class FindNextCompactRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<FindNextCompactRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FindNextCompactRequest 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 1: // WORKER_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.workerId = iprot.readString();
-              struct.setWorkerIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WORKER_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.workerVersion = iprot.readString();
-              struct.setWorkerVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // POOL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolName = iprot.readString();
-              struct.setPoolNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // WORKER_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.workerId = iprot.readString();
+                struct.setWorkerIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // WORKER_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.workerVersion = iprot.readString();
+                struct.setWorkerVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // POOL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolName = iprot.readString();
+                struct.setPoolNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FindNextCompactRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -524,6 +541,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FindNextCompactReq
   }
 
   private static class FindNextCompactRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FindNextCompactRequestTupleScheme getScheme() {
       return new FindNextCompactRequestTupleScheme();
     }
@@ -558,19 +576,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FindNextCompactRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FindNextCompactRequest 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.workerId = iprot.readString();
-        struct.setWorkerIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.workerVersion = iprot.readString();
-        struct.setWorkerVersionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.poolName = iprot.readString();
-        struct.setPoolNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.workerId = iprot.readString();
+          struct.setWorkerIdIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.workerVersion = iprot.readString();
+          struct.setWorkerVersionIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.poolName = iprot.readString();
+          struct.setPoolNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
index 8af51b35adbe..1ed8f542e7a6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FindSchemasByColsResp implements org.apache.thrift.TBase<FindSchemasByColsResp, FindSchemasByColsResp._Fields>, java.io.Serializable, Cloneable, Comparable<FindSchemasByColsResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FindSchemasByColsResp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public FindSchemasByColsResp(FindSchemasByColsResp other) {
     }
   }
 
+  @Override
   public FindSchemasByColsResp deepCopy() {
     return new FindSchemasByColsResp(this);
   }
@@ -161,6 +164,7 @@ public void setSchemaVersionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEMA_VERSIONS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEMA_VERSIONS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(FindSchemasByColsResp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -305,6 +314,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FindSchemasByColsRespStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FindSchemasByColsRespStandardScheme getScheme() {
       return new FindSchemasByColsRespStandardScheme();
     }
@@ -312,44 +322,51 @@ public FindSchemasByColsRespStandardScheme getScheme() {
 
   private static class FindSchemasByColsRespStandardScheme extends org.apache.thrift.scheme.StandardScheme<FindSchemasByColsResp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FindSchemasByColsResp 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 1: // SCHEMA_VERSIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1368 = iprot.readListBegin();
-                struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1368.size);
-                @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1369;
-                for (int _i1370 = 0; _i1370 < _list1368.size; ++_i1370)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // SCHEMA_VERSIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1369 = new SchemaVersionDescriptor();
-                  _elem1369.read(iprot);
-                  struct.schemaVersions.add(_elem1369);
+                  org.apache.thrift.protocol.TList _list1368 = iprot.readListBegin();
+                  struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1368.size);
+                  @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1369;
+                  for (int _i1370 = 0; _i1370 < _list1368.size; ++_i1370)
+                  {
+                    _elem1369 = new SchemaVersionDescriptor();
+                    _elem1369.read(iprot);
+                    struct.schemaVersions.add(_elem1369);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSchemaVersionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSchemaVersionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FindSchemasByColsResp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FindSchemasByColsR
   }
 
   private static class FindSchemasByColsRespTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FindSchemasByColsRespTupleScheme getScheme() {
       return new FindSchemasByColsRespTupleScheme();
     }
@@ -401,21 +419,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FindSchemasByColsRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FindSchemasByColsResp 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 _list1373 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1373.size);
-          @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1374;
-          for (int _i1375 = 0; _i1375 < _list1373.size; ++_i1375)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1374 = new SchemaVersionDescriptor();
-            _elem1374.read(iprot);
-            struct.schemaVersions.add(_elem1374);
+            org.apache.thrift.protocol.TList _list1373 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1373.size);
+            @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1374;
+            for (int _i1375 = 0; _i1375 < _list1373.size; ++_i1375)
+            {
+              _elem1374 = new SchemaVersionDescriptor();
+              _elem1374.read(iprot);
+              struct.schemaVersions.add(_elem1374);
+            }
           }
+          struct.setSchemaVersionsIsSet(true);
         }
-        struct.setSchemaVersionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java
index 4f69ef364b09..c2cd2be1a619 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FindSchemasByColsRqst implements org.apache.thrift.TBase<FindSchemasByColsRqst, FindSchemasByColsRqst._Fields>, java.io.Serializable, Cloneable, Comparable<FindSchemasByColsRqst> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FindSchemasByColsRqst");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.COL_NAME,_Fields.COL_NAMESPACE,_Fields.TYPE};
+  private static final _Fields[] optionals = {_Fields.COL_NAME,_Fields.COL_NAMESPACE,_Fields.TYPE};
   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);
@@ -121,6 +123,7 @@ public FindSchemasByColsRqst(FindSchemasByColsRqst other) {
     }
   }
 
+  @Override
   public FindSchemasByColsRqst deepCopy() {
     return new FindSchemasByColsRqst(this);
   }
@@ -204,6 +207,7 @@ public void setTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COL_NAME:
@@ -234,6 +238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_NAME:
@@ -250,6 +255,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -370,14 +376,17 @@ public int compareTo(FindSchemasByColsRqst other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -442,6 +451,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FindSchemasByColsRqstStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FindSchemasByColsRqstStandardScheme getScheme() {
       return new FindSchemasByColsRqstStandardScheme();
     }
@@ -449,49 +459,56 @@ public FindSchemasByColsRqstStandardScheme getScheme() {
 
   private static class FindSchemasByColsRqstStandardScheme extends org.apache.thrift.scheme.StandardScheme<FindSchemasByColsRqst> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FindSchemasByColsRqst 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 1: // COL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.colName = iprot.readString();
-              struct.setColNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COL_NAMESPACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.colNamespace = iprot.readString();
-              struct.setColNamespaceIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.type = iprot.readString();
-              struct.setTypeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // COL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.colName = iprot.readString();
+                struct.setColNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // COL_NAMESPACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.colNamespace = iprot.readString();
+                struct.setColNamespaceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.type = iprot.readString();
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FindSchemasByColsRqst struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -524,6 +541,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FindSchemasByColsR
   }
 
   private static class FindSchemasByColsRqstTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FindSchemasByColsRqstTupleScheme getScheme() {
       return new FindSchemasByColsRqstTupleScheme();
     }
@@ -558,19 +576,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FindSchemasByColsRq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FindSchemasByColsRqst 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.colName = iprot.readString();
-        struct.setColNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.colNamespace = iprot.readString();
-        struct.setColNamespaceIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.type = iprot.readString();
-        struct.setTypeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.colName = iprot.readString();
+          struct.setColNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.colNamespace = iprot.readString();
+          struct.setColNamespaceIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.type = iprot.readString();
+          struct.setTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
index 416dacbfbae2..3ac86dd1dbee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FireEventRequest implements org.apache.thrift.TBase<FireEventRequest, FireEventRequest._Fields>, java.io.Serializable, Cloneable, Comparable<FireEventRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventRequest");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -116,7 +118,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __SUCCESSFUL_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS,_Fields.CAT_NAME,_Fields.TBL_PARAMS,_Fields.BATCH_PARTITION_VALS_FOR_REFRESH};
+  private static final _Fields[] optionals = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS,_Fields.CAT_NAME,_Fields.TBL_PARAMS,_Fields.BATCH_PARTITION_VALS_FOR_REFRESH};
   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);
@@ -194,6 +196,7 @@ public FireEventRequest(FireEventRequest other) {
     }
   }
 
+  @Override
   public FireEventRequest deepCopy() {
     return new FireEventRequest(this);
   }
@@ -444,6 +447,7 @@ public void setBatchPartitionValsForRefreshIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SUCCESSFUL:
@@ -514,6 +518,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SUCCESSFUL:
@@ -545,6 +550,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -788,14 +794,17 @@ public int compareTo(FireEventRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -912,6 +921,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FireEventRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FireEventRequestStandardScheme getScheme() {
       return new FireEventRequestStandardScheme();
     }
@@ -919,132 +929,139 @@ public FireEventRequestStandardScheme getScheme() {
 
   private static class FireEventRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<FireEventRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FireEventRequest 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 1: // SUCCESSFUL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.successful = iprot.readBool();
-              struct.setSuccessfulIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.data = new FireEventRequestData();
-              struct.data.read(iprot);
-              struct.setDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // DB_NAME
-            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 4: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PARTITION_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1074 = iprot.readListBegin();
-                struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1074.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1075;
-                for (int _i1076 = 0; _i1076 < _list1074.size; ++_i1076)
+          }
+          switch (schemeField.id) {
+            case 1: // SUCCESSFUL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.successful = iprot.readBool();
+                struct.setSuccessfulIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.data = new FireEventRequestData();
+                struct.data.read(iprot);
+                struct.setDataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DB_NAME
+              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 4: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARTITION_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1075 = iprot.readString();
-                  struct.partitionVals.add(_elem1075);
+                  org.apache.thrift.protocol.TList _list1074 = iprot.readListBegin();
+                  struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1074.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1075;
+                  for (int _i1076 = 0; _i1076 < _list1074.size; ++_i1076)
+                  {
+                    _elem1075 = iprot.readString();
+                    struct.partitionVals.add(_elem1075);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionValsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TBL_PARAMS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map1077 = iprot.readMapBegin();
-                struct.tblParams = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1077.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1078;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val1079;
-                for (int _i1080 = 0; _i1080 < _map1077.size; ++_i1080)
+              break;
+            case 6: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // TBL_PARAMS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1078 = iprot.readString();
-                  _val1079 = iprot.readString();
-                  struct.tblParams.put(_key1078, _val1079);
+                  org.apache.thrift.protocol.TMap _map1077 = iprot.readMapBegin();
+                  struct.tblParams = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1077.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1078;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val1079;
+                  for (int _i1080 = 0; _i1080 < _map1077.size; ++_i1080)
+                  {
+                    _key1078 = iprot.readString();
+                    _val1079 = iprot.readString();
+                    struct.tblParams.put(_key1078, _val1079);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setTblParamsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTblParamsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // BATCH_PARTITION_VALS_FOR_REFRESH
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1081 = iprot.readListBegin();
-                struct.batchPartitionValsForRefresh = new java.util.ArrayList<java.util.List<java.lang.String>>(_list1081.size);
-                @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem1082;
-                for (int _i1083 = 0; _i1083 < _list1081.size; ++_i1083)
+              break;
+            case 8: // BATCH_PARTITION_VALS_FOR_REFRESH
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
+                  org.apache.thrift.protocol.TList _list1081 = iprot.readListBegin();
+                  struct.batchPartitionValsForRefresh = new java.util.ArrayList<java.util.List<java.lang.String>>(_list1081.size);
+                  @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem1082;
+                  for (int _i1083 = 0; _i1083 < _list1081.size; ++_i1083)
                   {
-                    org.apache.thrift.protocol.TList _list1084 = iprot.readListBegin();
-                    _elem1082 = new java.util.ArrayList<java.lang.String>(_list1084.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1085;
-                    for (int _i1086 = 0; _i1086 < _list1084.size; ++_i1086)
                     {
-                      _elem1085 = iprot.readString();
-                      _elem1082.add(_elem1085);
+                      org.apache.thrift.protocol.TList _list1084 = iprot.readListBegin();
+                      _elem1082 = new java.util.ArrayList<java.lang.String>(_list1084.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _elem1085;
+                      for (int _i1086 = 0; _i1086 < _list1084.size; ++_i1086)
+                      {
+                        _elem1085 = iprot.readString();
+                        _elem1082.add(_elem1085);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.batchPartitionValsForRefresh.add(_elem1082);
                   }
-                  struct.batchPartitionValsForRefresh.add(_elem1082);
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setBatchPartitionValsForRefreshIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setBatchPartitionValsForRefreshIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FireEventRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1135,6 +1152,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FireEventRequest s
   }
 
   private static class FireEventRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FireEventRequestTupleScheme getScheme() {
       return new FireEventRequestTupleScheme();
     }
@@ -1214,74 +1232,79 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FireEventRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FireEventRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.successful = iprot.readBool();
-      struct.setSuccessfulIsSet(true);
-      struct.data = new FireEventRequestData();
-      struct.data.read(iprot);
-      struct.setDataIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1095 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1095.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1096;
-          for (int _i1097 = 0; _i1097 < _list1095.size; ++_i1097)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.successful = iprot.readBool();
+        struct.setSuccessfulIsSet(true);
+        struct.data = new FireEventRequestData();
+        struct.data.read(iprot);
+        struct.setDataIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem1096 = iprot.readString();
-            struct.partitionVals.add(_elem1096);
+            org.apache.thrift.protocol.TList _list1095 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1095.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1096;
+            for (int _i1097 = 0; _i1097 < _list1095.size; ++_i1097)
+            {
+              _elem1096 = iprot.readString();
+              struct.partitionVals.add(_elem1096);
+            }
           }
+          struct.setPartitionValsIsSet(true);
         }
-        struct.setPartitionValsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TMap _map1098 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.tblParams = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1098.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key1099;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val1100;
-          for (int _i1101 = 0; _i1101 < _map1098.size; ++_i1101)
+        if (incoming.get(3)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _key1099 = iprot.readString();
-            _val1100 = iprot.readString();
-            struct.tblParams.put(_key1099, _val1100);
+            org.apache.thrift.protocol.TMap _map1098 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.tblParams = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1098.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key1099;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val1100;
+            for (int _i1101 = 0; _i1101 < _map1098.size; ++_i1101)
+            {
+              _key1099 = iprot.readString();
+              _val1100 = iprot.readString();
+              struct.tblParams.put(_key1099, _val1100);
+            }
           }
+          struct.setTblParamsIsSet(true);
         }
-        struct.setTblParamsIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list1102 = iprot.readListBegin(org.apache.thrift.protocol.TType.LIST);
-          struct.batchPartitionValsForRefresh = new java.util.ArrayList<java.util.List<java.lang.String>>(_list1102.size);
-          @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem1103;
-          for (int _i1104 = 0; _i1104 < _list1102.size; ++_i1104)
+        if (incoming.get(5)) {
           {
+            org.apache.thrift.protocol.TList _list1102 = iprot.readListBegin(org.apache.thrift.protocol.TType.LIST);
+            struct.batchPartitionValsForRefresh = new java.util.ArrayList<java.util.List<java.lang.String>>(_list1102.size);
+            @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem1103;
+            for (int _i1104 = 0; _i1104 < _list1102.size; ++_i1104)
             {
-              org.apache.thrift.protocol.TList _list1105 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-              _elem1103 = new java.util.ArrayList<java.lang.String>(_list1105.size);
-              @org.apache.thrift.annotation.Nullable java.lang.String _elem1106;
-              for (int _i1107 = 0; _i1107 < _list1105.size; ++_i1107)
               {
-                _elem1106 = iprot.readString();
-                _elem1103.add(_elem1106);
+                org.apache.thrift.protocol.TList _list1105 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+                _elem1103 = new java.util.ArrayList<java.lang.String>(_list1105.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1106;
+                for (int _i1107 = 0; _i1107 < _list1105.size; ++_i1107)
+                {
+                  _elem1106 = iprot.readString();
+                  _elem1103.add(_elem1106);
+                }
               }
+              struct.batchPartitionValsForRefresh.add(_elem1103);
             }
-            struct.batchPartitionValsForRefresh.add(_elem1103);
           }
+          struct.setBatchPartitionValsForRefreshIsSet(true);
         }
-        struct.setBatchPartitionValsForRefreshIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
index 6d194e8857c3..9c31a58a6f2b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FireEventRequestData extends org.apache.thrift.TUnion<FireEventRequestData, FireEventRequestData._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventRequestData");
   private static final org.apache.thrift.protocol.TField INSERT_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("insertData", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -71,10 +71,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -105,6 +107,7 @@ public FireEventRequestData(_Fields setField, java.lang.Object value) {
   public FireEventRequestData(FireEventRequestData other) {
     super(other);
   }
+  @Override
   public FireEventRequestData deepCopy() {
     return new FireEventRequestData(this);
   }
@@ -320,6 +323,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
index 67bde00025c4..85c466744b51 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class FireEventResponse implements org.apache.thrift.TBase<FireEventResponse, FireEventResponse._Fields>, java.io.Serializable, Cloneable, Comparable<FireEventResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public FireEventResponse(FireEventResponse other) {
     }
   }
 
+  @Override
   public FireEventResponse deepCopy() {
     return new FireEventResponse(this);
   }
@@ -158,6 +161,7 @@ public void setEventIdsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EVENT_IDS:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EVENT_IDS:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(FireEventResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -302,6 +311,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FireEventResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FireEventResponseStandardScheme getScheme() {
       return new FireEventResponseStandardScheme();
     }
@@ -309,43 +319,50 @@ public FireEventResponseStandardScheme getScheme() {
 
   private static class FireEventResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<FireEventResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, FireEventResponse 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 1: // EVENT_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1108 = iprot.readListBegin();
-                struct.eventIds = new java.util.ArrayList<java.lang.Long>(_list1108.size);
-                long _elem1109;
-                for (int _i1110 = 0; _i1110 < _list1108.size; ++_i1110)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // EVENT_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1109 = iprot.readI64();
-                  struct.eventIds.add(_elem1109);
+                  org.apache.thrift.protocol.TList _list1108 = iprot.readListBegin();
+                  struct.eventIds = new java.util.ArrayList<java.lang.Long>(_list1108.size);
+                  long _elem1109;
+                  for (int _i1110 = 0; _i1110 < _list1108.size; ++_i1110)
+                  {
+                    _elem1109 = iprot.readI64();
+                    struct.eventIds.add(_elem1109);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setEventIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setEventIdsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, FireEventResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -369,6 +386,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FireEventResponse
   }
 
   private static class FireEventResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FireEventResponseTupleScheme getScheme() {
       return new FireEventResponseTupleScheme();
     }
@@ -397,20 +415,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, FireEventResponse s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, FireEventResponse 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 _list1113 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-          struct.eventIds = new java.util.ArrayList<java.lang.Long>(_list1113.size);
-          long _elem1114;
-          for (int _i1115 = 0; _i1115 < _list1113.size; ++_i1115)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1114 = iprot.readI64();
-            struct.eventIds.add(_elem1114);
+            org.apache.thrift.protocol.TList _list1113 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+            struct.eventIds = new java.util.ArrayList<java.lang.Long>(_list1113.size);
+            long _elem1114;
+            for (int _i1115 = 0; _i1115 < _list1113.size; ++_i1115)
+            {
+              _elem1114 = iprot.readI64();
+              struct.eventIds.add(_elem1114);
+            }
           }
+          struct.setEventIdsIsSet(true);
         }
-        struct.setEventIdsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
index 6d10b2a68ff6..6c10679445f5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ForeignKeysRequest implements org.apache.thrift.TBase<ForeignKeysRequest, ForeignKeysRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ForeignKeysRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ForeignKeysRequest");
 
@@ -89,17 +89,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -154,6 +156,7 @@ public ForeignKeysRequest(ForeignKeysRequest other) {
     }
   }
 
+  @Override
   public ForeignKeysRequest deepCopy() {
     return new ForeignKeysRequest(this);
   }
@@ -287,6 +290,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARENT_DB_NAME:
@@ -333,6 +337,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARENT_DB_NAME:
@@ -355,6 +360,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -525,14 +531,17 @@ public int compareTo(ForeignKeysRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -609,6 +618,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ForeignKeysRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ForeignKeysRequestStandardScheme getScheme() {
       return new ForeignKeysRequestStandardScheme();
     }
@@ -616,65 +626,72 @@ public ForeignKeysRequestStandardScheme getScheme() {
 
   private static class ForeignKeysRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ForeignKeysRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ForeignKeysRequest 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 1: // PARENT_DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.parent_db_name = iprot.readString();
-              struct.setParent_db_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PARENT_TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.parent_tbl_name = iprot.readString();
-              struct.setParent_tbl_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // FOREIGN_DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.foreign_db_name = iprot.readString();
-              struct.setForeign_db_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FOREIGN_TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.foreign_tbl_name = iprot.readString();
-              struct.setForeign_tbl_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // PARENT_DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.parent_db_name = iprot.readString();
+                struct.setParent_db_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PARENT_TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.parent_tbl_name = iprot.readString();
+                struct.setParent_tbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // FOREIGN_DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.foreign_db_name = iprot.readString();
+                struct.setForeign_db_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FOREIGN_TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.foreign_tbl_name = iprot.readString();
+                struct.setForeign_tbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ForeignKeysRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -713,6 +730,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ForeignKeysRequest
   }
 
   private static class ForeignKeysRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ForeignKeysRequestTupleScheme getScheme() {
       return new ForeignKeysRequestTupleScheme();
     }
@@ -759,27 +777,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.parent_db_name = iprot.readString();
-        struct.setParent_db_nameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.parent_tbl_name = iprot.readString();
-        struct.setParent_tbl_nameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.foreign_db_name = iprot.readString();
-        struct.setForeign_db_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.foreign_tbl_name = iprot.readString();
-        struct.setForeign_tbl_nameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.parent_db_name = iprot.readString();
+          struct.setParent_db_nameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.parent_tbl_name = iprot.readString();
+          struct.setParent_tbl_nameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.foreign_db_name = iprot.readString();
+          struct.setForeign_db_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.foreign_tbl_name = iprot.readString();
+          struct.setForeign_tbl_nameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
index cb0238f69d99..5ed7e4040b8e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ForeignKeysResponse implements org.apache.thrift.TBase<ForeignKeysResponse, ForeignKeysResponse._Fields>, java.io.Serializable, Cloneable, Comparable<ForeignKeysResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ForeignKeysResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public ForeignKeysResponse(ForeignKeysResponse other) {
     }
   }
 
+  @Override
   public ForeignKeysResponse deepCopy() {
     return new ForeignKeysResponse(this);
   }
@@ -161,6 +164,7 @@ public void setForeignKeysIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FOREIGN_KEYS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FOREIGN_KEYS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(ForeignKeysResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ForeignKeysResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ForeignKeysResponseStandardScheme getScheme() {
       return new ForeignKeysResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public ForeignKeysResponseStandardScheme getScheme() {
 
   private static class ForeignKeysResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<ForeignKeysResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ForeignKeysResponse 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 1: // FOREIGN_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list498 = iprot.readListBegin();
-                struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list498.size);
-                @org.apache.thrift.annotation.Nullable SQLForeignKey _elem499;
-                for (int _i500 = 0; _i500 < _list498.size; ++_i500)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FOREIGN_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem499 = new SQLForeignKey();
-                  _elem499.read(iprot);
-                  struct.foreignKeys.add(_elem499);
+                  org.apache.thrift.protocol.TList _list498 = iprot.readListBegin();
+                  struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list498.size);
+                  @org.apache.thrift.annotation.Nullable SQLForeignKey _elem499;
+                  for (int _i500 = 0; _i500 < _list498.size; ++_i500)
+                  {
+                    _elem499 = new SQLForeignKey();
+                    _elem499.read(iprot);
+                    struct.foreignKeys.add(_elem499);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setForeignKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setForeignKeysIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ForeignKeysResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ForeignKeysRespons
   }
 
   private static class ForeignKeysResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ForeignKeysResponseTupleScheme getScheme() {
       return new ForeignKeysResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ForeignKeysResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ForeignKeysResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list503 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list503.size);
-        @org.apache.thrift.annotation.Nullable SQLForeignKey _elem504;
-        for (int _i505 = 0; _i505 < _list503.size; ++_i505)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem504 = new SQLForeignKey();
-          _elem504.read(iprot);
-          struct.foreignKeys.add(_elem504);
+          org.apache.thrift.protocol.TList _list503 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list503.size);
+          @org.apache.thrift.annotation.Nullable SQLForeignKey _elem504;
+          for (int _i505 = 0; _i505 < _list503.size; ++_i505)
+          {
+            _elem504 = new SQLForeignKey();
+            _elem504.read(iprot);
+            struct.foreignKeys.add(_elem504);
+          }
         }
+        struct.setForeignKeysIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setForeignKeysIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
index 5423136f947d..39e05a490e57 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Function implements org.apache.thrift.TBase<Function, Function._Fields>, java.io.Serializable, Cloneable, Comparable<Function> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Function");
 
@@ -117,10 +117,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -129,7 +131,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __CREATETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -217,6 +219,7 @@ public Function(Function other) {
     }
   }
 
+  @Override
   public Function deepCopy() {
     return new Function(this);
   }
@@ -481,6 +484,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FUNCTION_NAME:
@@ -559,6 +563,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FUNCTION_NAME:
@@ -593,6 +598,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -861,14 +867,17 @@ public int compareTo(Function other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -975,6 +984,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FunctionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FunctionStandardScheme getScheme() {
       return new FunctionStandardScheme();
     }
@@ -982,108 +992,115 @@ public FunctionStandardScheme getScheme() {
 
   private static class FunctionStandardScheme extends org.apache.thrift.scheme.StandardScheme<Function> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Function 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 1: // FUNCTION_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.functionName = iprot.readString();
-              struct.setFunctionNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // CLASS_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.className = iprot.readString();
-              struct.setClassNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // OWNER_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setOwnerTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // FUNCTION_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.functionType = org.apache.hadoop.hive.metastore.api.FunctionType.findByValue(iprot.readI32());
-              struct.setFunctionTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // RESOURCE_URIS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list782 = iprot.readListBegin();
-                struct.resourceUris = new java.util.ArrayList<ResourceUri>(_list782.size);
-                @org.apache.thrift.annotation.Nullable ResourceUri _elem783;
-                for (int _i784 = 0; _i784 < _list782.size; ++_i784)
+          }
+          switch (schemeField.id) {
+            case 1: // FUNCTION_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.functionName = iprot.readString();
+                struct.setFunctionNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // CLASS_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.className = iprot.readString();
+                struct.setClassNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // OWNER_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setOwnerTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // FUNCTION_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.functionType = org.apache.hadoop.hive.metastore.api.FunctionType.findByValue(iprot.readI32());
+                struct.setFunctionTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // RESOURCE_URIS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem783 = new ResourceUri();
-                  _elem783.read(iprot);
-                  struct.resourceUris.add(_elem783);
+                  org.apache.thrift.protocol.TList _list782 = iprot.readListBegin();
+                  struct.resourceUris = new java.util.ArrayList<ResourceUri>(_list782.size);
+                  @org.apache.thrift.annotation.Nullable ResourceUri _elem783;
+                  for (int _i784 = 0; _i784 < _list782.size; ++_i784)
+                  {
+                    _elem783 = new ResourceUri();
+                    _elem783.read(iprot);
+                    struct.resourceUris.add(_elem783);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setResourceUrisIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setResourceUrisIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+              break;
+            case 9: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Function struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1147,6 +1164,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Function struct) t
   }
 
   private static class FunctionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FunctionTupleScheme getScheme() {
       return new FunctionTupleScheme();
     }
@@ -1223,53 +1241,58 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Function struct) th
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Function struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.functionName = iprot.readString();
-        struct.setFunctionNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.className = iprot.readString();
-        struct.setClassNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setOwnerTypeIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.functionType = org.apache.hadoop.hive.metastore.api.FunctionType.findByValue(iprot.readI32());
-        struct.setFunctionTypeIsSet(true);
-      }
-      if (incoming.get(7)) {
-        {
-          org.apache.thrift.protocol.TList _list787 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.resourceUris = new java.util.ArrayList<ResourceUri>(_list787.size);
-          @org.apache.thrift.annotation.Nullable ResourceUri _elem788;
-          for (int _i789 = 0; _i789 < _list787.size; ++_i789)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.functionName = iprot.readString();
+          struct.setFunctionNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.className = iprot.readString();
+          struct.setClassNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setOwnerTypeIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.functionType = org.apache.hadoop.hive.metastore.api.FunctionType.findByValue(iprot.readI32());
+          struct.setFunctionTypeIsSet(true);
+        }
+        if (incoming.get(7)) {
           {
-            _elem788 = new ResourceUri();
-            _elem788.read(iprot);
-            struct.resourceUris.add(_elem788);
+            org.apache.thrift.protocol.TList _list787 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.resourceUris = new java.util.ArrayList<ResourceUri>(_list787.size);
+            @org.apache.thrift.annotation.Nullable ResourceUri _elem788;
+            for (int _i789 = 0; _i789 < _list787.size; ++_i789)
+            {
+              _elem788 = new ResourceUri();
+              _elem788.read(iprot);
+              struct.resourceUris.add(_elem788);
+            }
           }
+          struct.setResourceUrisIsSet(true);
         }
-        struct.setResourceUrisIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+        if (incoming.get(8)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
index 4af18aa245bf..69d7add5fbd7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum FunctionType implements org.apache.thrift.TEnum {
   JAVA(1);
 
@@ -20,6 +20,7 @@ private FunctionType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
index 46b337852e4a..5f3118855b94 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetAllFunctionsResponse implements org.apache.thrift.TBase<GetAllFunctionsResponse, GetAllFunctionsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetAllFunctionsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetAllFunctionsResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.FUNCTIONS};
+  private static final _Fields[] optionals = {_Fields.FUNCTIONS};
   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);
@@ -106,6 +108,7 @@ public GetAllFunctionsResponse(GetAllFunctionsResponse other) {
     }
   }
 
+  @Override
   public GetAllFunctionsResponse deepCopy() {
     return new GetAllFunctionsResponse(this);
   }
@@ -155,6 +158,7 @@ public void setFunctionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FUNCTIONS:
@@ -169,6 +173,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FUNCTIONS:
@@ -179,6 +184,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -249,14 +255,17 @@ public int compareTo(GetAllFunctionsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -301,6 +310,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetAllFunctionsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetAllFunctionsResponseStandardScheme getScheme() {
       return new GetAllFunctionsResponseStandardScheme();
     }
@@ -308,44 +318,51 @@ public GetAllFunctionsResponseStandardScheme getScheme() {
 
   private static class GetAllFunctionsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetAllFunctionsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetAllFunctionsResponse 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 1: // FUNCTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1192 = iprot.readListBegin();
-                struct.functions = new java.util.ArrayList<Function>(_list1192.size);
-                @org.apache.thrift.annotation.Nullable Function _elem1193;
-                for (int _i1194 = 0; _i1194 < _list1192.size; ++_i1194)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FUNCTIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1193 = new Function();
-                  _elem1193.read(iprot);
-                  struct.functions.add(_elem1193);
+                  org.apache.thrift.protocol.TList _list1192 = iprot.readListBegin();
+                  struct.functions = new java.util.ArrayList<Function>(_list1192.size);
+                  @org.apache.thrift.annotation.Nullable Function _elem1193;
+                  for (int _i1194 = 0; _i1194 < _list1192.size; ++_i1194)
+                  {
+                    _elem1193 = new Function();
+                    _elem1193.read(iprot);
+                    struct.functions.add(_elem1193);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFunctionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFunctionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetAllFunctionsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -371,6 +388,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetAllFunctionsRes
   }
 
   private static class GetAllFunctionsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetAllFunctionsResponseTupleScheme getScheme() {
       return new GetAllFunctionsResponseTupleScheme();
     }
@@ -399,21 +417,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetAllFunctionsResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetAllFunctionsResponse 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 _list1197 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.functions = new java.util.ArrayList<Function>(_list1197.size);
-          @org.apache.thrift.annotation.Nullable Function _elem1198;
-          for (int _i1199 = 0; _i1199 < _list1197.size; ++_i1199)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1198 = new Function();
-            _elem1198.read(iprot);
-            struct.functions.add(_elem1198);
+            org.apache.thrift.protocol.TList _list1197 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.functions = new java.util.ArrayList<Function>(_list1197.size);
+            @org.apache.thrift.annotation.Nullable Function _elem1198;
+            for (int _i1199 = 0; _i1199 < _list1197.size; ++_i1199)
+            {
+              _elem1198 = new Function();
+              _elem1198.read(iprot);
+              struct.functions.add(_elem1198);
+            }
           }
+          struct.setFunctionsIsSet(true);
         }
-        struct.setFunctionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllWriteEventInfoRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllWriteEventInfoRequest.java
index f4c7f95d94a7..8c457f1c2caa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllWriteEventInfoRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllWriteEventInfoRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetAllWriteEventInfoRequest implements org.apache.thrift.TBase<GetAllWriteEventInfoRequest, GetAllWriteEventInfoRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetAllWriteEventInfoRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetAllWriteEventInfoRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -91,7 +93,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __TXNID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME};
+  private static final _Fields[] optionals = {_Fields.DB_NAME,_Fields.TABLE_NAME};
   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);
@@ -130,6 +132,7 @@ public GetAllWriteEventInfoRequest(GetAllWriteEventInfoRequest other) {
     }
   }
 
+  @Override
   public GetAllWriteEventInfoRequest deepCopy() {
     return new GetAllWriteEventInfoRequest(this);
   }
@@ -212,6 +215,7 @@ public void setTableNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_ID:
@@ -242,6 +246,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_ID:
@@ -258,6 +263,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -376,14 +382,17 @@ public int compareTo(GetAllWriteEventInfoRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -448,6 +457,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetAllWriteEventInfoRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetAllWriteEventInfoRequestStandardScheme getScheme() {
       return new GetAllWriteEventInfoRequestStandardScheme();
     }
@@ -455,49 +465,56 @@ public GetAllWriteEventInfoRequestStandardScheme getScheme() {
 
   private static class GetAllWriteEventInfoRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetAllWriteEventInfoRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetAllWriteEventInfoRequest 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 1: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetAllWriteEventInfoRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -526,6 +543,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetAllWriteEventIn
   }
 
   private static class GetAllWriteEventInfoRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetAllWriteEventInfoRequestTupleScheme getScheme() {
       return new GetAllWriteEventInfoRequestTupleScheme();
     }
@@ -555,17 +573,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetAllWriteEventInf
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetAllWriteEventInfoRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txnId = iprot.readI64();
-      struct.setTxnIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txnId = iprot.readI64();
+        struct.setTxnIdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java
index b5d901a9f4cf..dd258431e786 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetCatalogRequest implements org.apache.thrift.TBase<GetCatalogRequest, GetCatalogRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetCatalogRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCatalogRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public GetCatalogRequest(GetCatalogRequest other) {
     }
   }
 
+  @Override
   public GetCatalogRequest deepCopy() {
     return new GetCatalogRequest(this);
   }
@@ -140,6 +143,7 @@ public void setNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(GetCatalogRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetCatalogRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetCatalogRequestStandardScheme getScheme() {
       return new GetCatalogRequestStandardScheme();
     }
@@ -291,33 +301,40 @@ public GetCatalogRequestStandardScheme getScheme() {
 
   private static class GetCatalogRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCatalogRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogRequest 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogRequest
   }
 
   private static class GetCatalogRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetCatalogRequestTupleScheme getScheme() {
       return new GetCatalogRequestTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCatalogRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetCatalogRequest 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.name = iprot.readString();
-        struct.setNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java
index d7e3e73315ce..5d614899aba4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetCatalogResponse implements org.apache.thrift.TBase<GetCatalogResponse, GetCatalogResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetCatalogResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCatalogResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public GetCatalogResponse(GetCatalogResponse other) {
     }
   }
 
+  @Override
   public GetCatalogResponse deepCopy() {
     return new GetCatalogResponse(this);
   }
@@ -140,6 +143,7 @@ public void setCatalogIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(GetCatalogResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -287,6 +296,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetCatalogResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetCatalogResponseStandardScheme getScheme() {
       return new GetCatalogResponseStandardScheme();
     }
@@ -294,34 +304,41 @@ public GetCatalogResponseStandardScheme getScheme() {
 
   private static class GetCatalogResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCatalogResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogResponse 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 1: // CATALOG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.catalog = new Catalog();
-              struct.catalog.read(iprot);
-              struct.setCatalogIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.catalog = new Catalog();
+                struct.catalog.read(iprot);
+                struct.setCatalogIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogResponse
   }
 
   private static class GetCatalogResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetCatalogResponseTupleScheme getScheme() {
       return new GetCatalogResponseTupleScheme();
     }
@@ -360,12 +378,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCatalogResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetCatalogResponse 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.catalog = new Catalog();
-        struct.catalog.read(iprot);
-        struct.setCatalogIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.catalog = new Catalog();
+          struct.catalog.read(iprot);
+          struct.setCatalogIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java
index ba753fee8ecd..41370f8c4a06 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetCatalogsResponse implements org.apache.thrift.TBase<GetCatalogsResponse, GetCatalogsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetCatalogsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCatalogsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public GetCatalogsResponse(GetCatalogsResponse other) {
     }
   }
 
+  @Override
   public GetCatalogsResponse deepCopy() {
     return new GetCatalogsResponse(this);
   }
@@ -158,6 +161,7 @@ public void setNamesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAMES:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAMES:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(GetCatalogsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -302,6 +311,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetCatalogsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetCatalogsResponseStandardScheme getScheme() {
       return new GetCatalogsResponseStandardScheme();
     }
@@ -309,43 +319,50 @@ public GetCatalogsResponseStandardScheme getScheme() {
 
   private static class GetCatalogsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetCatalogsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogsResponse 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 1: // NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list208 = iprot.readListBegin();
-                struct.names = new java.util.ArrayList<java.lang.String>(_list208.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem209;
-                for (int _i210 = 0; _i210 < _list208.size; ++_i210)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem209 = iprot.readString();
-                  struct.names.add(_elem209);
+                  org.apache.thrift.protocol.TList _list208 = iprot.readListBegin();
+                  struct.names = new java.util.ArrayList<java.lang.String>(_list208.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem209;
+                  for (int _i210 = 0; _i210 < _list208.size; ++_i210)
+                  {
+                    _elem209 = iprot.readString();
+                    struct.names.add(_elem209);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNamesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -369,6 +386,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogsRespons
   }
 
   private static class GetCatalogsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetCatalogsResponseTupleScheme getScheme() {
       return new GetCatalogsResponseTupleScheme();
     }
@@ -397,20 +415,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetCatalogsResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetCatalogsResponse 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 _list213 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.names = new java.util.ArrayList<java.lang.String>(_list213.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem214;
-          for (int _i215 = 0; _i215 < _list213.size; ++_i215)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem214 = iprot.readString();
-            struct.names.add(_elem214);
+            org.apache.thrift.protocol.TList _list213 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.names = new java.util.ArrayList<java.lang.String>(_list213.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem214;
+            for (int _i215 = 0; _i215 < _list213.size; ++_i215)
+            {
+              _elem214 = iprot.readString();
+              struct.names.add(_elem214);
+            }
           }
+          struct.setNamesIsSet(true);
         }
-        struct.setNamesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDataConnectorRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDataConnectorRequest.java
index 4e67504431da..43f9c620aba1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDataConnectorRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDataConnectorRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetDataConnectorRequest implements org.apache.thrift.TBase<GetDataConnectorRequest, GetDataConnectorRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetDataConnectorRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDataConnectorRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public GetDataConnectorRequest(GetDataConnectorRequest other) {
     }
   }
 
+  @Override
   public GetDataConnectorRequest deepCopy() {
     return new GetDataConnectorRequest(this);
   }
@@ -140,6 +143,7 @@ public void setConnectorNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CONNECTOR_NAME:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CONNECTOR_NAME:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(GetDataConnectorRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -288,6 +297,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetDataConnectorRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDataConnectorRequestStandardScheme getScheme() {
       return new GetDataConnectorRequestStandardScheme();
     }
@@ -295,33 +305,40 @@ public GetDataConnectorRequestStandardScheme getScheme() {
 
   private static class GetDataConnectorRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetDataConnectorRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetDataConnectorRequest 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 1: // CONNECTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.connectorName = iprot.readString();
-              struct.setConnectorNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // CONNECTOR_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.connectorName = iprot.readString();
+                struct.setConnectorNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetDataConnectorRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetDataConnectorRe
   }
 
   private static class GetDataConnectorRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDataConnectorRequestTupleScheme getScheme() {
       return new GetDataConnectorRequestTupleScheme();
     }
@@ -353,9 +371,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetDataConnectorReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetDataConnectorRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.connectorName = iprot.readString();
-      struct.setConnectorNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.connectorName = iprot.readString();
+        struct.setConnectorNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsRequest.java
index aee977e3d99f..79fc5fe94a43 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetDatabaseObjectsRequest implements org.apache.thrift.TBase<GetDatabaseObjectsRequest, GetDatabaseObjectsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetDatabaseObjectsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDatabaseObjectsRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.PATTERN};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.PATTERN};
   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);
@@ -111,6 +113,7 @@ public GetDatabaseObjectsRequest(GetDatabaseObjectsRequest other) {
     }
   }
 
+  @Override
   public GetDatabaseObjectsRequest deepCopy() {
     return new GetDatabaseObjectsRequest(this);
   }
@@ -169,6 +172,7 @@ public void setPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG_NAME:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG_NAME:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(GetDatabaseObjectsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -361,6 +370,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetDatabaseObjectsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDatabaseObjectsRequestStandardScheme getScheme() {
       return new GetDatabaseObjectsRequestStandardScheme();
     }
@@ -368,41 +378,48 @@ public GetDatabaseObjectsRequestStandardScheme getScheme() {
 
   private static class GetDatabaseObjectsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetDatabaseObjectsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetDatabaseObjectsRequest 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 1: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pattern = iprot.readString();
-              struct.setPatternIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pattern = iprot.readString();
+                struct.setPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetDatabaseObjectsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetDatabaseObjects
   }
 
   private static class GetDatabaseObjectsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDatabaseObjectsRequestTupleScheme getScheme() {
       return new GetDatabaseObjectsRequestTupleScheme();
     }
@@ -456,15 +474,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetDatabaseObjectsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetDatabaseObjectsRequest 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.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.pattern = iprot.readString();
-        struct.setPatternIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.pattern = iprot.readString();
+          struct.setPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsResponse.java
index 944120be8538..eae4bc843b7b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseObjectsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetDatabaseObjectsResponse implements org.apache.thrift.TBase<GetDatabaseObjectsResponse, GetDatabaseObjectsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetDatabaseObjectsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDatabaseObjectsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetDatabaseObjectsResponse(GetDatabaseObjectsResponse other) {
     }
   }
 
+  @Override
   public GetDatabaseObjectsResponse deepCopy() {
     return new GetDatabaseObjectsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setDatabasesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DATABASES:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATABASES:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetDatabaseObjectsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetDatabaseObjectsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDatabaseObjectsResponseStandardScheme getScheme() {
       return new GetDatabaseObjectsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetDatabaseObjectsResponseStandardScheme getScheme() {
 
   private static class GetDatabaseObjectsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetDatabaseObjectsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetDatabaseObjectsResponse 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 1: // DATABASES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list226 = iprot.readListBegin();
-                struct.databases = new java.util.ArrayList<Database>(_list226.size);
-                @org.apache.thrift.annotation.Nullable Database _elem227;
-                for (int _i228 = 0; _i228 < _list226.size; ++_i228)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // DATABASES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem227 = new Database();
-                  _elem227.read(iprot);
-                  struct.databases.add(_elem227);
+                  org.apache.thrift.protocol.TList _list226 = iprot.readListBegin();
+                  struct.databases = new java.util.ArrayList<Database>(_list226.size);
+                  @org.apache.thrift.annotation.Nullable Database _elem227;
+                  for (int _i228 = 0; _i228 < _list226.size; ++_i228)
+                  {
+                    _elem227 = new Database();
+                    _elem227.read(iprot);
+                    struct.databases.add(_elem227);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setDatabasesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDatabasesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetDatabaseObjectsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetDatabaseObjects
   }
 
   private static class GetDatabaseObjectsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDatabaseObjectsResponseTupleScheme getScheme() {
       return new GetDatabaseObjectsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetDatabaseObjectsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetDatabaseObjectsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list231 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.databases = new java.util.ArrayList<Database>(_list231.size);
-        @org.apache.thrift.annotation.Nullable Database _elem232;
-        for (int _i233 = 0; _i233 < _list231.size; ++_i233)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem232 = new Database();
-          _elem232.read(iprot);
-          struct.databases.add(_elem232);
+          org.apache.thrift.protocol.TList _list231 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.databases = new java.util.ArrayList<Database>(_list231.size);
+          @org.apache.thrift.annotation.Nullable Database _elem232;
+          for (int _i233 = 0; _i233 < _list231.size; ++_i233)
+          {
+            _elem232 = new Database();
+            _elem232.read(iprot);
+            struct.databases.add(_elem232);
+          }
         }
+        struct.setDatabasesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setDatabasesIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java
index f016030b1b4c..42c11c9c2887 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetDatabaseRequest implements org.apache.thrift.TBase<GetDatabaseRequest, GetDatabaseRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetDatabaseRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDatabaseRequest");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.NAME,_Fields.CATALOG_NAME,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER};
+  private static final _Fields[] optionals = {_Fields.NAME,_Fields.CATALOG_NAME,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER};
   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);
@@ -133,6 +135,7 @@ public GetDatabaseRequest(GetDatabaseRequest other) {
     }
   }
 
+  @Override
   public GetDatabaseRequest deepCopy() {
     return new GetDatabaseRequest(this);
   }
@@ -257,6 +260,7 @@ public void setProcessorIdentifierIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -295,6 +299,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -314,6 +319,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -459,14 +465,17 @@ public int compareTo(GetDatabaseRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -541,6 +550,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetDatabaseRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDatabaseRequestStandardScheme getScheme() {
       return new GetDatabaseRequestStandardScheme();
     }
@@ -548,67 +558,74 @@ public GetDatabaseRequestStandardScheme getScheme() {
 
   private static class GetDatabaseRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetDatabaseRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetDatabaseRequest 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1272 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1272.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1273;
-                for (int _i1274 = 0; _i1274 < _list1272.size; ++_i1274)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1273 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1273);
+                  org.apache.thrift.protocol.TList _list1272 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1272.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1273;
+                  for (int _i1274 = 0; _i1274 < _list1272.size; ++_i1274)
+                  {
+                    _elem1273 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1273);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
+              break;
+            case 4: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetDatabaseRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -655,6 +672,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetDatabaseRequest
   }
 
   private static class GetDatabaseRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetDatabaseRequestTupleScheme getScheme() {
       return new GetDatabaseRequestTupleScheme();
     }
@@ -701,32 +719,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetDatabaseRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetDatabaseRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1277 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1277.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1278;
-          for (int _i1279 = 0; _i1279 < _list1277.size; ++_i1279)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem1278 = iprot.readString();
-            struct.processorCapabilities.add(_elem1278);
+            org.apache.thrift.protocol.TList _list1277 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1277.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1278;
+            for (int _i1279 = 0; _i1279 < _list1277.size; ++_i1279)
+            {
+              _elem1278 = iprot.readString();
+              struct.processorCapabilities.add(_elem1278);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
+        if (incoming.get(3)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsRequest.java
index 51aa315ef80a..8cfc303a6143 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFieldsRequest implements org.apache.thrift.TBase<GetFieldsRequest, GetFieldsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetFieldsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFieldsRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.ENV_CONTEXT,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.ENV_CONTEXT,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
   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);
@@ -163,6 +165,7 @@ public GetFieldsRequest(GetFieldsRequest other) {
     this.id = other.id;
   }
 
+  @Override
   public GetFieldsRequest deepCopy() {
     return new GetFieldsRequest(this);
   }
@@ -320,6 +323,7 @@ public void setIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -374,6 +378,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -399,6 +404,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -594,14 +600,17 @@ public int compareTo(GetFieldsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -701,6 +710,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFieldsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFieldsRequestStandardScheme getScheme() {
       return new GetFieldsRequestStandardScheme();
     }
@@ -708,74 +718,81 @@ public GetFieldsRequestStandardScheme getScheme() {
 
   private static class GetFieldsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFieldsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFieldsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ENV_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.envContext = new EnvironmentContext();
+                struct.envContext.read(iprot);
+                struct.setEnvContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ENV_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.envContext = new EnvironmentContext();
-              struct.envContext.read(iprot);
-              struct.setEnvContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFieldsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -823,6 +840,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFieldsRequest s
   }
 
   private static class GetFieldsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFieldsRequestTupleScheme getScheme() {
       return new GetFieldsRequestTupleScheme();
     }
@@ -865,28 +883,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFieldsRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFieldsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.envContext = new EnvironmentContext();
-        struct.envContext.read(iprot);
-        struct.setEnvContextIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.envContext = new EnvironmentContext();
+          struct.envContext.read(iprot);
+          struct.setEnvContextIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsResponse.java
index fac3a01da634..105015fd2d56 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFieldsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFieldsResponse implements org.apache.thrift.TBase<GetFieldsResponse, GetFieldsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetFieldsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFieldsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetFieldsResponse(GetFieldsResponse other) {
     }
   }
 
+  @Override
   public GetFieldsResponse deepCopy() {
     return new GetFieldsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setFieldsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FIELDS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELDS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetFieldsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFieldsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFieldsResponseStandardScheme getScheme() {
       return new GetFieldsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetFieldsResponseStandardScheme getScheme() {
 
   private static class GetFieldsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFieldsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFieldsResponse 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 1: // FIELDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1524 = iprot.readListBegin();
-                struct.fields = new java.util.ArrayList<FieldSchema>(_list1524.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem1525;
-                for (int _i1526 = 0; _i1526 < _list1524.size; ++_i1526)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FIELDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1525 = new FieldSchema();
-                  _elem1525.read(iprot);
-                  struct.fields.add(_elem1525);
+                  org.apache.thrift.protocol.TList _list1524 = iprot.readListBegin();
+                  struct.fields = new java.util.ArrayList<FieldSchema>(_list1524.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1525;
+                  for (int _i1526 = 0; _i1526 < _list1524.size; ++_i1526)
+                  {
+                    _elem1525 = new FieldSchema();
+                    _elem1525.read(iprot);
+                    struct.fields.add(_elem1525);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFieldsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFieldsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFieldsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFieldsResponse
   }
 
   private static class GetFieldsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFieldsResponseTupleScheme getScheme() {
       return new GetFieldsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFieldsResponse s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFieldsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1529 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.fields = new java.util.ArrayList<FieldSchema>(_list1529.size);
-        @org.apache.thrift.annotation.Nullable FieldSchema _elem1530;
-        for (int _i1531 = 0; _i1531 < _list1529.size; ++_i1531)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1530 = new FieldSchema();
-          _elem1530.read(iprot);
-          struct.fields.add(_elem1530);
+          org.apache.thrift.protocol.TList _list1529 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.fields = new java.util.ArrayList<FieldSchema>(_list1529.size);
+          @org.apache.thrift.annotation.Nullable FieldSchema _elem1530;
+          for (int _i1531 = 0; _i1531 < _list1529.size; ++_i1531)
+          {
+            _elem1530 = new FieldSchema();
+            _elem1530.read(iprot);
+            struct.fields.add(_elem1530);
+          }
         }
+        struct.setFieldsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setFieldsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
index 9e881febc5a0..856aa300fbd8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<GetFileMetadataByExprRequest, GetFileMetadataByExprRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetFileMetadataByExprRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFileMetadataByExprRequest");
 
@@ -88,10 +88,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -100,7 +102,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __DOGETFOOTERS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DO_GET_FOOTERS,_Fields.TYPE};
+  private static final _Fields[] optionals = {_Fields.DO_GET_FOOTERS,_Fields.TYPE};
   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);
@@ -147,6 +149,7 @@ public GetFileMetadataByExprRequest(GetFileMetadataByExprRequest other) {
     }
   }
 
+  @Override
   public GetFileMetadataByExprRequest deepCopy() {
     return new GetFileMetadataByExprRequest(this);
   }
@@ -286,6 +289,7 @@ public void setTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FILE_IDS:
@@ -328,6 +332,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FILE_IDS:
@@ -347,6 +352,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -492,14 +498,17 @@ public int compareTo(GetFileMetadataByExprRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -576,6 +585,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFileMetadataByExprRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataByExprRequestStandardScheme getScheme() {
       return new GetFileMetadataByExprRequestStandardScheme();
     }
@@ -583,67 +593,74 @@ public GetFileMetadataByExprRequestStandardScheme getScheme() {
 
   private static class GetFileMetadataByExprRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFileMetadataByExprRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFileMetadataByExprRequest 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 1: // FILE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1142 = iprot.readListBegin();
-                struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1142.size);
-                long _elem1143;
-                for (int _i1144 = 0; _i1144 < _list1142.size; ++_i1144)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FILE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1143 = iprot.readI64();
-                  struct.fileIds.add(_elem1143);
+                  org.apache.thrift.protocol.TList _list1142 = iprot.readListBegin();
+                  struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1142.size);
+                  long _elem1143;
+                  for (int _i1144 = 0; _i1144 < _list1142.size; ++_i1144)
+                  {
+                    _elem1143 = iprot.readI64();
+                    struct.fileIds.add(_elem1143);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFileIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFileIdsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // EXPR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expr = iprot.readBinary();
-              struct.setExprIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // DO_GET_FOOTERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.doGetFooters = iprot.readBool();
-              struct.setDoGetFootersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
+              break;
+            case 2: // EXPR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expr = iprot.readBinary();
+                struct.setExprIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DO_GET_FOOTERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.doGetFooters = iprot.readBool();
+                struct.setDoGetFootersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataByExprRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -684,6 +701,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataByE
   }
 
   private static class GetFileMetadataByExprRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataByExprRequestTupleScheme getScheme() {
       return new GetFileMetadataByExprRequestTupleScheme();
     }
@@ -720,28 +738,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataByEx
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataByExprRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1147 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1147.size);
-        long _elem1148;
-        for (int _i1149 = 0; _i1149 < _list1147.size; ++_i1149)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1148 = iprot.readI64();
-          struct.fileIds.add(_elem1148);
+          org.apache.thrift.protocol.TList _list1147 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1147.size);
+          long _elem1148;
+          for (int _i1149 = 0; _i1149 < _list1147.size; ++_i1149)
+          {
+            _elem1148 = iprot.readI64();
+            struct.fileIds.add(_elem1148);
+          }
         }
-      }
-      struct.setFileIdsIsSet(true);
-      struct.expr = iprot.readBinary();
-      struct.setExprIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.doGetFooters = iprot.readBool();
-        struct.setDoGetFootersIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
+        struct.setFileIdsIsSet(true);
+        struct.expr = iprot.readBinary();
+        struct.setExprIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.doGetFooters = iprot.readBool();
+          struct.setDoGetFootersIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
+          struct.setTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java
index 065ee6533e63..139f94b0be73 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFileMetadataByExprResult implements org.apache.thrift.TBase<GetFileMetadataByExprResult, GetFileMetadataByExprResult._Fields>, java.io.Serializable, Cloneable, Comparable<GetFileMetadataByExprResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFileMetadataByExprResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -135,6 +137,7 @@ public GetFileMetadataByExprResult(GetFileMetadataByExprResult other) {
     this.isSupported = other.isSupported;
   }
 
+  @Override
   public GetFileMetadataByExprResult deepCopy() {
     return new GetFileMetadataByExprResult(this);
   }
@@ -203,6 +206,7 @@ public void setIsSupportedIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSUPPORTED_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case METADATA:
@@ -225,6 +229,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case METADATA:
@@ -238,6 +243,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -331,14 +337,17 @@ public int compareTo(GetFileMetadataByExprResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -395,6 +404,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFileMetadataByExprResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataByExprResultStandardScheme getScheme() {
       return new GetFileMetadataByExprResultStandardScheme();
     }
@@ -402,54 +412,61 @@ public GetFileMetadataByExprResultStandardScheme getScheme() {
 
   private static class GetFileMetadataByExprResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFileMetadataByExprResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFileMetadataByExprResult 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 1: // METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map1132 = iprot.readMapBegin();
-                struct.metadata = new java.util.HashMap<java.lang.Long,MetadataPpdResult>(2*_map1132.size);
-                long _key1133;
-                @org.apache.thrift.annotation.Nullable MetadataPpdResult _val1134;
-                for (int _i1135 = 0; _i1135 < _map1132.size; ++_i1135)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1133 = iprot.readI64();
-                  _val1134 = new MetadataPpdResult();
-                  _val1134.read(iprot);
-                  struct.metadata.put(_key1133, _val1134);
+                  org.apache.thrift.protocol.TMap _map1132 = iprot.readMapBegin();
+                  struct.metadata = new java.util.HashMap<java.lang.Long,MetadataPpdResult>(2*_map1132.size);
+                  long _key1133;
+                  @org.apache.thrift.annotation.Nullable MetadataPpdResult _val1134;
+                  for (int _i1135 = 0; _i1135 < _map1132.size; ++_i1135)
+                  {
+                    _key1133 = iprot.readI64();
+                    _val1134 = new MetadataPpdResult();
+                    _val1134.read(iprot);
+                    struct.metadata.put(_key1133, _val1134);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IS_SUPPORTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isSupported = iprot.readBool();
-              struct.setIsSupportedIsSet(true);
-            } else { 
+              break;
+            case 2: // IS_SUPPORTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isSupported = iprot.readBool();
+                struct.setIsSupportedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataByExprResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -477,6 +494,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataByE
   }
 
   private static class GetFileMetadataByExprResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataByExprResultTupleScheme getScheme() {
       return new GetFileMetadataByExprResultTupleScheme();
     }
@@ -500,23 +518,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataByEx
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataByExprResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map1138 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRUCT); 
-        struct.metadata = new java.util.HashMap<java.lang.Long,MetadataPpdResult>(2*_map1138.size);
-        long _key1139;
-        @org.apache.thrift.annotation.Nullable MetadataPpdResult _val1140;
-        for (int _i1141 = 0; _i1141 < _map1138.size; ++_i1141)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key1139 = iprot.readI64();
-          _val1140 = new MetadataPpdResult();
-          _val1140.read(iprot);
-          struct.metadata.put(_key1139, _val1140);
+          org.apache.thrift.protocol.TMap _map1138 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRUCT); 
+          struct.metadata = new java.util.HashMap<java.lang.Long,MetadataPpdResult>(2*_map1138.size);
+          long _key1139;
+          @org.apache.thrift.annotation.Nullable MetadataPpdResult _val1140;
+          for (int _i1141 = 0; _i1141 < _map1138.size; ++_i1141)
+          {
+            _key1139 = iprot.readI64();
+            _val1140 = new MetadataPpdResult();
+            _val1140.read(iprot);
+            struct.metadata.put(_key1139, _val1140);
+          }
         }
+        struct.setMetadataIsSet(true);
+        struct.isSupported = iprot.readBool();
+        struct.setIsSupportedIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setMetadataIsSet(true);
-      struct.isSupported = iprot.readBool();
-      struct.setIsSupportedIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java
index a75f0bba6439..e040d6a80045 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFileMetadataRequest implements org.apache.thrift.TBase<GetFileMetadataRequest, GetFileMetadataRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetFileMetadataRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFileMetadataRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public GetFileMetadataRequest(GetFileMetadataRequest other) {
     }
   }
 
+  @Override
   public GetFileMetadataRequest deepCopy() {
     return new GetFileMetadataRequest(this);
   }
@@ -158,6 +161,7 @@ public void setFileIdsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FILE_IDS:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FILE_IDS:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(GetFileMetadataRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -306,6 +315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFileMetadataRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataRequestStandardScheme getScheme() {
       return new GetFileMetadataRequestStandardScheme();
     }
@@ -313,43 +323,50 @@ public GetFileMetadataRequestStandardScheme getScheme() {
 
   private static class GetFileMetadataRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFileMetadataRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFileMetadataRequest 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 1: // FILE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1160 = iprot.readListBegin();
-                struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1160.size);
-                long _elem1161;
-                for (int _i1162 = 0; _i1162 < _list1160.size; ++_i1162)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FILE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1161 = iprot.readI64();
-                  struct.fileIds.add(_elem1161);
+                  org.apache.thrift.protocol.TList _list1160 = iprot.readListBegin();
+                  struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1160.size);
+                  long _elem1161;
+                  for (int _i1162 = 0; _i1162 < _list1160.size; ++_i1162)
+                  {
+                    _elem1161 = iprot.readI64();
+                    struct.fileIds.add(_elem1161);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFileIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFileIdsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataReq
   }
 
   private static class GetFileMetadataRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataRequestTupleScheme getScheme() {
       return new GetFileMetadataRequestTupleScheme();
     }
@@ -394,18 +412,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1165 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1165.size);
-        long _elem1166;
-        for (int _i1167 = 0; _i1167 < _list1165.size; ++_i1167)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1166 = iprot.readI64();
-          struct.fileIds.add(_elem1166);
+          org.apache.thrift.protocol.TList _list1165 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1165.size);
+          long _elem1166;
+          for (int _i1167 = 0; _i1167 < _list1165.size; ++_i1167)
+          {
+            _elem1166 = iprot.readI64();
+            struct.fileIds.add(_elem1166);
+          }
         }
+        struct.setFileIdsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setFileIdsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java
index 92106db4d489..ab02c4e8bdc2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFileMetadataResult implements org.apache.thrift.TBase<GetFileMetadataResult, GetFileMetadataResult._Fields>, java.io.Serializable, Cloneable, Comparable<GetFileMetadataResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFileMetadataResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public GetFileMetadataResult(GetFileMetadataResult other) {
     this.isSupported = other.isSupported;
   }
 
+  @Override
   public GetFileMetadataResult deepCopy() {
     return new GetFileMetadataResult(this);
   }
@@ -192,6 +195,7 @@ public void setIsSupportedIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSUPPORTED_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case METADATA:
@@ -214,6 +218,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case METADATA:
@@ -227,6 +232,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -320,14 +326,17 @@ public int compareTo(GetFileMetadataResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -384,6 +393,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFileMetadataResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataResultStandardScheme getScheme() {
       return new GetFileMetadataResultStandardScheme();
     }
@@ -391,53 +401,60 @@ public GetFileMetadataResultStandardScheme getScheme() {
 
   private static class GetFileMetadataResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFileMetadataResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFileMetadataResult 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 1: // METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map1150 = iprot.readMapBegin();
-                struct.metadata = new java.util.HashMap<java.lang.Long,java.nio.ByteBuffer>(2*_map1150.size);
-                long _key1151;
-                @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _val1152;
-                for (int _i1153 = 0; _i1153 < _map1150.size; ++_i1153)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1151 = iprot.readI64();
-                  _val1152 = iprot.readBinary();
-                  struct.metadata.put(_key1151, _val1152);
+                  org.apache.thrift.protocol.TMap _map1150 = iprot.readMapBegin();
+                  struct.metadata = new java.util.HashMap<java.lang.Long,java.nio.ByteBuffer>(2*_map1150.size);
+                  long _key1151;
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _val1152;
+                  for (int _i1153 = 0; _i1153 < _map1150.size; ++_i1153)
+                  {
+                    _key1151 = iprot.readI64();
+                    _val1152 = iprot.readBinary();
+                    struct.metadata.put(_key1151, _val1152);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IS_SUPPORTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isSupported = iprot.readBool();
-              struct.setIsSupportedIsSet(true);
-            } else { 
+              break;
+            case 2: // IS_SUPPORTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isSupported = iprot.readBool();
+                struct.setIsSupportedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -465,6 +482,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFileMetadataRes
   }
 
   private static class GetFileMetadataResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFileMetadataResultTupleScheme getScheme() {
       return new GetFileMetadataResultTupleScheme();
     }
@@ -488,22 +506,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataResu
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFileMetadataResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map1156 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRING); 
-        struct.metadata = new java.util.HashMap<java.lang.Long,java.nio.ByteBuffer>(2*_map1156.size);
-        long _key1157;
-        @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _val1158;
-        for (int _i1159 = 0; _i1159 < _map1156.size; ++_i1159)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key1157 = iprot.readI64();
-          _val1158 = iprot.readBinary();
-          struct.metadata.put(_key1157, _val1158);
+          org.apache.thrift.protocol.TMap _map1156 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRING); 
+          struct.metadata = new java.util.HashMap<java.lang.Long,java.nio.ByteBuffer>(2*_map1156.size);
+          long _key1157;
+          @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _val1158;
+          for (int _i1159 = 0; _i1159 < _map1156.size; ++_i1159)
+          {
+            _key1157 = iprot.readI64();
+            _val1158 = iprot.readBinary();
+            struct.metadata.put(_key1157, _val1158);
+          }
         }
+        struct.setMetadataIsSet(true);
+        struct.isSupported = iprot.readBool();
+        struct.setIsSupportedIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setMetadataIsSet(true);
-      struct.isSupported = iprot.readBool();
-      struct.setIsSupportedIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsRequest.java
index 5db551208d49..2d08a74f64c7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFunctionsRequest implements org.apache.thrift.TBase<GetFunctionsRequest, GetFunctionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetFunctionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFunctionsRequest");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __RETURNNAMES_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CATALOG_NAME,_Fields.PATTERN,_Fields.RETURN_NAMES};
+  private static final _Fields[] optionals = {_Fields.CATALOG_NAME,_Fields.PATTERN,_Fields.RETURN_NAMES};
   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);
@@ -141,6 +143,7 @@ public GetFunctionsRequest(GetFunctionsRequest other) {
     this.returnNames = other.returnNames;
   }
 
+  @Override
   public GetFunctionsRequest deepCopy() {
     return new GetFunctionsRequest(this);
   }
@@ -248,6 +251,7 @@ public void setReturnNamesIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RETURNNAMES_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -286,6 +290,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -305,6 +310,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -450,14 +456,17 @@ public int compareTo(GetFunctionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -532,6 +541,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFunctionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFunctionsRequestStandardScheme getScheme() {
       return new GetFunctionsRequestStandardScheme();
     }
@@ -539,57 +549,64 @@ public GetFunctionsRequestStandardScheme getScheme() {
 
   private static class GetFunctionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFunctionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFunctionsRequest 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 1: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // CATALOG_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalogName = iprot.readString();
-              struct.setCatalogNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // CATALOG_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalogName = iprot.readString();
+                struct.setCatalogNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pattern = iprot.readString();
+                struct.setPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // RETURN_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.returnNames = iprot.readBool();
+                struct.setReturnNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pattern = iprot.readString();
-              struct.setPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // RETURN_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.returnNames = iprot.readBool();
-              struct.setReturnNamesIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -625,6 +642,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctionsReques
   }
 
   private static class GetFunctionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFunctionsRequestTupleScheme getScheme() {
       return new GetFunctionsRequestTupleScheme();
     }
@@ -660,21 +678,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFunctionsRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFunctionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.catalogName = iprot.readString();
-        struct.setCatalogNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.pattern = iprot.readString();
-        struct.setPatternIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.returnNames = iprot.readBool();
-        struct.setReturnNamesIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.catalogName = iprot.readString();
+          struct.setCatalogNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.pattern = iprot.readString();
+          struct.setPatternIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.returnNames = iprot.readBool();
+          struct.setReturnNamesIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsResponse.java
index ededce87b05c..47fe4855f848 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFunctionsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetFunctionsResponse implements org.apache.thrift.TBase<GetFunctionsResponse, GetFunctionsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetFunctionsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetFunctionsResponse");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.FUNCTION_NAMES,_Fields.FUNCTIONS};
+  private static final _Fields[] optionals = {_Fields.FUNCTION_NAMES,_Fields.FUNCTIONS};
   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);
@@ -118,6 +120,7 @@ public GetFunctionsResponse(GetFunctionsResponse other) {
     }
   }
 
+  @Override
   public GetFunctionsResponse deepCopy() {
     return new GetFunctionsResponse(this);
   }
@@ -208,6 +211,7 @@ public void setFunctionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FUNCTION_NAMES:
@@ -230,6 +234,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FUNCTION_NAMES:
@@ -243,6 +248,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -338,14 +344,17 @@ public int compareTo(GetFunctionsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -400,6 +409,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetFunctionsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFunctionsResponseStandardScheme getScheme() {
       return new GetFunctionsResponseStandardScheme();
     }
@@ -407,62 +417,69 @@ public GetFunctionsResponseStandardScheme getScheme() {
 
   private static class GetFunctionsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetFunctionsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetFunctionsResponse 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 1: // FUNCTION_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1280 = iprot.readListBegin();
-                struct.function_names = new java.util.ArrayList<java.lang.String>(_list1280.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1281;
-                for (int _i1282 = 0; _i1282 < _list1280.size; ++_i1282)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FUNCTION_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1281 = iprot.readString();
-                  struct.function_names.add(_elem1281);
+                  org.apache.thrift.protocol.TList _list1280 = iprot.readListBegin();
+                  struct.function_names = new java.util.ArrayList<java.lang.String>(_list1280.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1281;
+                  for (int _i1282 = 0; _i1282 < _list1280.size; ++_i1282)
+                  {
+                    _elem1281 = iprot.readString();
+                    struct.function_names.add(_elem1281);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFunction_namesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFunction_namesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FUNCTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1283 = iprot.readListBegin();
-                struct.functions = new java.util.ArrayList<Function>(_list1283.size);
-                @org.apache.thrift.annotation.Nullable Function _elem1284;
-                for (int _i1285 = 0; _i1285 < _list1283.size; ++_i1285)
+              break;
+            case 2: // FUNCTIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1284 = new Function();
-                  _elem1284.read(iprot);
-                  struct.functions.add(_elem1284);
+                  org.apache.thrift.protocol.TList _list1283 = iprot.readListBegin();
+                  struct.functions = new java.util.ArrayList<Function>(_list1283.size);
+                  @org.apache.thrift.annotation.Nullable Function _elem1284;
+                  for (int _i1285 = 0; _i1285 < _list1283.size; ++_i1285)
+                  {
+                    _elem1284 = new Function();
+                    _elem1284.read(iprot);
+                    struct.functions.add(_elem1284);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFunctionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFunctionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctionsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -502,6 +519,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetFunctionsRespon
   }
 
   private static class GetFunctionsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetFunctionsResponseTupleScheme getScheme() {
       return new GetFunctionsResponseTupleScheme();
     }
@@ -542,34 +560,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetFunctionsRespons
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetFunctionsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list1290 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.function_names = new java.util.ArrayList<java.lang.String>(_list1290.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1291;
-          for (int _i1292 = 0; _i1292 < _list1290.size; ++_i1292)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
           {
-            _elem1291 = iprot.readString();
-            struct.function_names.add(_elem1291);
+            org.apache.thrift.protocol.TList _list1290 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.function_names = new java.util.ArrayList<java.lang.String>(_list1290.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1291;
+            for (int _i1292 = 0; _i1292 < _list1290.size; ++_i1292)
+            {
+              _elem1291 = iprot.readString();
+              struct.function_names.add(_elem1291);
+            }
           }
+          struct.setFunction_namesIsSet(true);
         }
-        struct.setFunction_namesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1293 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.functions = new java.util.ArrayList<Function>(_list1293.size);
-          @org.apache.thrift.annotation.Nullable Function _elem1294;
-          for (int _i1295 = 0; _i1295 < _list1293.size; ++_i1295)
+        if (incoming.get(1)) {
           {
-            _elem1294 = new Function();
-            _elem1294.read(iprot);
-            struct.functions.add(_elem1294);
+            org.apache.thrift.protocol.TList _list1293 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.functions = new java.util.ArrayList<Function>(_list1293.size);
+            @org.apache.thrift.annotation.Nullable Function _elem1294;
+            for (int _i1295 = 0; _i1295 < _list1293.size; ++_i1295)
+            {
+              _elem1294 = new Function();
+              _elem1294.read(iprot);
+              struct.functions.add(_elem1294);
+            }
           }
+          struct.setFunctionsIsSet(true);
         }
-        struct.setFunctionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoRequest.java
index 9abd8f520fe8..685d8a3bf826 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetLatestCommittedCompactionInfoRequest implements org.apache.thrift.TBase<GetLatestCommittedCompactionInfoRequest, GetLatestCommittedCompactionInfoRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetLatestCommittedCompactionInfoRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetLatestCommittedCompactionInfoRequest");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __LASTCOMPACTIONID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITIONNAMES,_Fields.LAST_COMPACTION_ID};
+  private static final _Fields[] optionals = {_Fields.PARTITIONNAMES,_Fields.LAST_COMPACTION_ID};
   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);
@@ -143,6 +145,7 @@ public GetLatestCommittedCompactionInfoRequest(GetLatestCommittedCompactionInfoR
     this.lastCompactionId = other.lastCompactionId;
   }
 
+  @Override
   public GetLatestCommittedCompactionInfoRequest deepCopy() {
     return new GetLatestCommittedCompactionInfoRequest(this);
   }
@@ -266,6 +269,7 @@ public void setLastCompactionIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTCOMPACTIONID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DBNAME:
@@ -304,6 +308,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DBNAME:
@@ -323,6 +328,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -468,14 +474,17 @@ public int compareTo(GetLatestCommittedCompactionInfoRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -552,6 +561,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetLatestCommittedCompactionInfoRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetLatestCommittedCompactionInfoRequestStandardScheme getScheme() {
       return new GetLatestCommittedCompactionInfoRequestStandardScheme();
     }
@@ -559,67 +569,74 @@ public GetLatestCommittedCompactionInfoRequestStandardScheme getScheme() {
 
   private static class GetLatestCommittedCompactionInfoRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetLatestCommittedCompactionInfoRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetLatestCommittedCompactionInfoRequest 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 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: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PARTITIONNAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list970 = iprot.readListBegin();
-                struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list970.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem971;
-                for (int _i972 = 0; _i972 < _list970.size; ++_i972)
+          }
+          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: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITIONNAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem971 = iprot.readString();
-                  struct.partitionnames.add(_elem971);
+                  org.apache.thrift.protocol.TList _list970 = iprot.readListBegin();
+                  struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list970.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem971;
+                  for (int _i972 = 0; _i972 < _list970.size; ++_i972)
+                  {
+                    _elem971 = iprot.readString();
+                    struct.partitionnames.add(_elem971);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionnamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionnamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // LAST_COMPACTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastCompactionId = iprot.readI64();
-              struct.setLastCompactionIdIsSet(true);
-            } else { 
+              break;
+            case 4: // LAST_COMPACTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lastCompactionId = iprot.readI64();
+                struct.setLastCompactionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetLatestCommittedCompactionInfoRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -660,6 +677,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetLatestCommitted
   }
 
   private static class GetLatestCommittedCompactionInfoRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetLatestCommittedCompactionInfoRequestTupleScheme getScheme() {
       return new GetLatestCommittedCompactionInfoRequestTupleScheme();
     }
@@ -696,28 +714,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetLatestCommittedC
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetLatestCommittedCompactionInfoRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tablename = iprot.readString();
-      struct.setTablenameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list975 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list975.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem976;
-          for (int _i977 = 0; _i977 < _list975.size; ++_i977)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tablename = iprot.readString();
+        struct.setTablenameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
           {
-            _elem976 = iprot.readString();
-            struct.partitionnames.add(_elem976);
+            org.apache.thrift.protocol.TList _list975 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partitionnames = new java.util.ArrayList<java.lang.String>(_list975.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem976;
+            for (int _i977 = 0; _i977 < _list975.size; ++_i977)
+            {
+              _elem976 = iprot.readString();
+              struct.partitionnames.add(_elem976);
+            }
           }
+          struct.setPartitionnamesIsSet(true);
         }
-        struct.setPartitionnamesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.lastCompactionId = iprot.readI64();
-        struct.setLastCompactionIdIsSet(true);
+        if (incoming.get(1)) {
+          struct.lastCompactionId = iprot.readI64();
+          struct.setLastCompactionIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoResponse.java
index 2505497d1c9e..f535b4a5c149 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetLatestCommittedCompactionInfoResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetLatestCommittedCompactionInfoResponse implements org.apache.thrift.TBase<GetLatestCommittedCompactionInfoResponse, GetLatestCommittedCompactionInfoResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetLatestCommittedCompactionInfoResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetLatestCommittedCompactionInfoResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetLatestCommittedCompactionInfoResponse(GetLatestCommittedCompactionInfo
     }
   }
 
+  @Override
   public GetLatestCommittedCompactionInfoResponse deepCopy() {
     return new GetLatestCommittedCompactionInfoResponse(this);
   }
@@ -161,6 +164,7 @@ public void setCompactionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPACTIONS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPACTIONS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetLatestCommittedCompactionInfoResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetLatestCommittedCompactionInfoResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetLatestCommittedCompactionInfoResponseStandardScheme getScheme() {
       return new GetLatestCommittedCompactionInfoResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetLatestCommittedCompactionInfoResponseStandardScheme getScheme() {
 
   private static class GetLatestCommittedCompactionInfoResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetLatestCommittedCompactionInfoResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetLatestCommittedCompactionInfoResponse 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 1: // COMPACTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list978 = iprot.readListBegin();
-                struct.compactions = new java.util.ArrayList<CompactionInfoStruct>(_list978.size);
-                @org.apache.thrift.annotation.Nullable CompactionInfoStruct _elem979;
-                for (int _i980 = 0; _i980 < _list978.size; ++_i980)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COMPACTIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem979 = new CompactionInfoStruct();
-                  _elem979.read(iprot);
-                  struct.compactions.add(_elem979);
+                  org.apache.thrift.protocol.TList _list978 = iprot.readListBegin();
+                  struct.compactions = new java.util.ArrayList<CompactionInfoStruct>(_list978.size);
+                  @org.apache.thrift.annotation.Nullable CompactionInfoStruct _elem979;
+                  for (int _i980 = 0; _i980 < _list978.size; ++_i980)
+                  {
+                    _elem979 = new CompactionInfoStruct();
+                    _elem979.read(iprot);
+                    struct.compactions.add(_elem979);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCompactionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCompactionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetLatestCommittedCompactionInfoResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetLatestCommitted
   }
 
   private static class GetLatestCommittedCompactionInfoResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetLatestCommittedCompactionInfoResponseTupleScheme getScheme() {
       return new GetLatestCommittedCompactionInfoResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetLatestCommittedC
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetLatestCommittedCompactionInfoResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list983 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.compactions = new java.util.ArrayList<CompactionInfoStruct>(_list983.size);
-        @org.apache.thrift.annotation.Nullable CompactionInfoStruct _elem984;
-        for (int _i985 = 0; _i985 < _list983.size; ++_i985)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem984 = new CompactionInfoStruct();
-          _elem984.read(iprot);
-          struct.compactions.add(_elem984);
+          org.apache.thrift.protocol.TList _list983 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.compactions = new java.util.ArrayList<CompactionInfoStruct>(_list983.size);
+          @org.apache.thrift.annotation.Nullable CompactionInfoStruct _elem984;
+          for (int _i985 = 0; _i985 < _list983.size; ++_i985)
+          {
+            _elem984 = new CompactionInfoStruct();
+            _elem984.read(iprot);
+            struct.compactions.add(_elem984);
+          }
         }
+        struct.setCompactionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setCompactionsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
index ea4776f4a975..433db98ff390 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenTxnsInfoResponse, GetOpenTxnsInfoResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetOpenTxnsInfoResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOpenTxnsInfoResponse");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -126,6 +128,7 @@ public GetOpenTxnsInfoResponse(GetOpenTxnsInfoResponse other) {
     }
   }
 
+  @Override
   public GetOpenTxnsInfoResponse deepCopy() {
     return new GetOpenTxnsInfoResponse(this);
   }
@@ -199,6 +202,7 @@ public void setOpen_txnsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_HIGH_WATER_MARK:
@@ -221,6 +225,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_HIGH_WATER_MARK:
@@ -234,6 +239,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -327,14 +333,17 @@ public int compareTo(GetOpenTxnsInfoResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -391,6 +400,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetOpenTxnsInfoResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetOpenTxnsInfoResponseStandardScheme getScheme() {
       return new GetOpenTxnsInfoResponseStandardScheme();
     }
@@ -398,52 +408,59 @@ public GetOpenTxnsInfoResponseStandardScheme getScheme() {
 
   private static class GetOpenTxnsInfoResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetOpenTxnsInfoResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetOpenTxnsInfoResponse 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 1: // TXN_HIGH_WATER_MARK
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txn_high_water_mark = iprot.readI64();
-              struct.setTxn_high_water_markIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPEN_TXNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list790 = iprot.readListBegin();
-                struct.open_txns = new java.util.ArrayList<TxnInfo>(_list790.size);
-                @org.apache.thrift.annotation.Nullable TxnInfo _elem791;
-                for (int _i792 = 0; _i792 < _list790.size; ++_i792)
+          }
+          switch (schemeField.id) {
+            case 1: // TXN_HIGH_WATER_MARK
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txn_high_water_mark = iprot.readI64();
+                struct.setTxn_high_water_markIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPEN_TXNS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem791 = new TxnInfo();
-                  _elem791.read(iprot);
-                  struct.open_txns.add(_elem791);
+                  org.apache.thrift.protocol.TList _list790 = iprot.readListBegin();
+                  struct.open_txns = new java.util.ArrayList<TxnInfo>(_list790.size);
+                  @org.apache.thrift.annotation.Nullable TxnInfo _elem791;
+                  for (int _i792 = 0; _i792 < _list790.size; ++_i792)
+                  {
+                    _elem791 = new TxnInfo();
+                    _elem791.read(iprot);
+                    struct.open_txns.add(_elem791);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setOpen_txnsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setOpen_txnsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetOpenTxnsInfoResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -470,6 +487,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetOpenTxnsInfoRes
   }
 
   private static class GetOpenTxnsInfoResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetOpenTxnsInfoResponseTupleScheme getScheme() {
       return new GetOpenTxnsInfoResponseTupleScheme();
     }
@@ -492,21 +510,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetOpenTxnsInfoResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetOpenTxnsInfoResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txn_high_water_mark = iprot.readI64();
-      struct.setTxn_high_water_markIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list795 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.open_txns = new java.util.ArrayList<TxnInfo>(_list795.size);
-        @org.apache.thrift.annotation.Nullable TxnInfo _elem796;
-        for (int _i797 = 0; _i797 < _list795.size; ++_i797)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txn_high_water_mark = iprot.readI64();
+        struct.setTxn_high_water_markIsSet(true);
         {
-          _elem796 = new TxnInfo();
-          _elem796.read(iprot);
-          struct.open_txns.add(_elem796);
+          org.apache.thrift.protocol.TList _list795 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.open_txns = new java.util.ArrayList<TxnInfo>(_list795.size);
+          @org.apache.thrift.annotation.Nullable TxnInfo _elem796;
+          for (int _i797 = 0; _i797 < _list795.size; ++_i797)
+          {
+            _elem796 = new TxnInfo();
+            _elem796.read(iprot);
+            struct.open_txns.add(_elem796);
+          }
         }
+        struct.setOpen_txnsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setOpen_txnsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsRequest.java
index a0b39c375007..79572c8020c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetOpenTxnsRequest implements org.apache.thrift.TBase<GetOpenTxnsRequest, GetOpenTxnsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetOpenTxnsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOpenTxnsRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.EXCLUDE_TXN_TYPES};
+  private static final _Fields[] optionals = {_Fields.EXCLUDE_TXN_TYPES};
   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);
@@ -106,6 +108,7 @@ public GetOpenTxnsRequest(GetOpenTxnsRequest other) {
     }
   }
 
+  @Override
   public GetOpenTxnsRequest deepCopy() {
     return new GetOpenTxnsRequest(this);
   }
@@ -155,6 +158,7 @@ public void setExcludeTxnTypesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EXCLUDE_TXN_TYPES:
@@ -169,6 +173,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EXCLUDE_TXN_TYPES:
@@ -179,6 +184,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -249,14 +255,17 @@ public int compareTo(GetOpenTxnsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -301,6 +310,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetOpenTxnsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetOpenTxnsRequestStandardScheme getScheme() {
       return new GetOpenTxnsRequestStandardScheme();
     }
@@ -308,46 +318,53 @@ public GetOpenTxnsRequestStandardScheme getScheme() {
 
   private static class GetOpenTxnsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetOpenTxnsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetOpenTxnsRequest 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 1: // EXCLUDE_TXN_TYPES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1612 = iprot.readListBegin();
-                struct.excludeTxnTypes = new java.util.ArrayList<TxnType>(_list1612.size);
-                @org.apache.thrift.annotation.Nullable TxnType _elem1613;
-                for (int _i1614 = 0; _i1614 < _list1612.size; ++_i1614)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // EXCLUDE_TXN_TYPES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1613 = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-                  if (_elem1613 != null)
+                  org.apache.thrift.protocol.TList _list1612 = iprot.readListBegin();
+                  struct.excludeTxnTypes = new java.util.ArrayList<TxnType>(_list1612.size);
+                  @org.apache.thrift.annotation.Nullable TxnType _elem1613;
+                  for (int _i1614 = 0; _i1614 < _list1612.size; ++_i1614)
                   {
-                    struct.excludeTxnTypes.add(_elem1613);
+                    _elem1613 = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+                    if (_elem1613 != null)
+                    {
+                      struct.excludeTxnTypes.add(_elem1613);
+                    }
                   }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setExcludeTxnTypesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setExcludeTxnTypesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetOpenTxnsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetOpenTxnsRequest
   }
 
   private static class GetOpenTxnsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetOpenTxnsRequestTupleScheme getScheme() {
       return new GetOpenTxnsRequestTupleScheme();
     }
@@ -401,23 +419,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetOpenTxnsRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetOpenTxnsRequest 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 _list1617 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
-          struct.excludeTxnTypes = new java.util.ArrayList<TxnType>(_list1617.size);
-          @org.apache.thrift.annotation.Nullable TxnType _elem1618;
-          for (int _i1619 = 0; _i1619 < _list1617.size; ++_i1619)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1618 = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-            if (_elem1618 != null)
+            org.apache.thrift.protocol.TList _list1617 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+            struct.excludeTxnTypes = new java.util.ArrayList<TxnType>(_list1617.size);
+            @org.apache.thrift.annotation.Nullable TxnType _elem1618;
+            for (int _i1619 = 0; _i1619 < _list1617.size; ++_i1619)
             {
-              struct.excludeTxnTypes.add(_elem1618);
+              _elem1618 = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+              if (_elem1618 != null)
+              {
+                struct.excludeTxnTypes.add(_elem1618);
+              }
             }
           }
+          struct.setExcludeTxnTypesIsSet(true);
         }
-        struct.setExcludeTxnTypesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
index 71acdf413b3e..9b734c9a8c3f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsResponse, GetOpenTxnsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetOpenTxnsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOpenTxnsResponse");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -97,7 +99,7 @@ public java.lang.String getFieldName() {
   private static final int __TXN_HIGH_WATER_MARK_ISSET_ID = 0;
   private static final int __MIN_OPEN_TXN_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MIN_OPEN_TXN};
+  private static final _Fields[] optionals = {_Fields.MIN_OPEN_TXN};
   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);
@@ -145,6 +147,7 @@ public GetOpenTxnsResponse(GetOpenTxnsResponse other) {
     }
   }
 
+  @Override
   public GetOpenTxnsResponse deepCopy() {
     return new GetOpenTxnsResponse(this);
   }
@@ -275,6 +278,7 @@ public void setAbortedBitsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_HIGH_WATER_MARK:
@@ -317,6 +321,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_HIGH_WATER_MARK:
@@ -336,6 +341,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -479,14 +485,17 @@ public int compareTo(GetOpenTxnsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -561,6 +570,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetOpenTxnsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetOpenTxnsResponseStandardScheme getScheme() {
       return new GetOpenTxnsResponseStandardScheme();
     }
@@ -568,67 +578,74 @@ public GetOpenTxnsResponseStandardScheme getScheme() {
 
   private static class GetOpenTxnsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetOpenTxnsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetOpenTxnsResponse 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 1: // TXN_HIGH_WATER_MARK
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txn_high_water_mark = iprot.readI64();
-              struct.setTxn_high_water_markIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // OPEN_TXNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list798 = iprot.readListBegin();
-                struct.open_txns = new java.util.ArrayList<java.lang.Long>(_list798.size);
-                long _elem799;
-                for (int _i800 = 0; _i800 < _list798.size; ++_i800)
+          }
+          switch (schemeField.id) {
+            case 1: // TXN_HIGH_WATER_MARK
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txn_high_water_mark = iprot.readI64();
+                struct.setTxn_high_water_markIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // OPEN_TXNS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem799 = iprot.readI64();
-                  struct.open_txns.add(_elem799);
+                  org.apache.thrift.protocol.TList _list798 = iprot.readListBegin();
+                  struct.open_txns = new java.util.ArrayList<java.lang.Long>(_list798.size);
+                  long _elem799;
+                  for (int _i800 = 0; _i800 < _list798.size; ++_i800)
+                  {
+                    _elem799 = iprot.readI64();
+                    struct.open_txns.add(_elem799);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setOpen_txnsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setOpen_txnsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // MIN_OPEN_TXN
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.min_open_txn = iprot.readI64();
-              struct.setMin_open_txnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ABORTED_BITS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.abortedBits = iprot.readBinary();
-              struct.setAbortedBitsIsSet(true);
-            } else { 
+              break;
+            case 3: // MIN_OPEN_TXN
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.min_open_txn = iprot.readI64();
+                struct.setMin_open_txnIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ABORTED_BITS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.abortedBits = iprot.readBinary();
+                struct.setAbortedBitsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetOpenTxnsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -665,6 +682,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetOpenTxnsRespons
   }
 
   private static class GetOpenTxnsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetOpenTxnsResponseTupleScheme getScheme() {
       return new GetOpenTxnsResponseTupleScheme();
     }
@@ -696,26 +714,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetOpenTxnsResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetOpenTxnsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txn_high_water_mark = iprot.readI64();
-      struct.setTxn_high_water_markIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list803 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.open_txns = new java.util.ArrayList<java.lang.Long>(_list803.size);
-        long _elem804;
-        for (int _i805 = 0; _i805 < _list803.size; ++_i805)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txn_high_water_mark = iprot.readI64();
+        struct.setTxn_high_water_markIsSet(true);
         {
-          _elem804 = iprot.readI64();
-          struct.open_txns.add(_elem804);
+          org.apache.thrift.protocol.TList _list803 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.open_txns = new java.util.ArrayList<java.lang.Long>(_list803.size);
+          long _elem804;
+          for (int _i805 = 0; _i805 < _list803.size; ++_i805)
+          {
+            _elem804 = iprot.readI64();
+            struct.open_txns.add(_elem804);
+          }
         }
-      }
-      struct.setOpen_txnsIsSet(true);
-      struct.abortedBits = iprot.readBinary();
-      struct.setAbortedBitsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.min_open_txn = iprot.readI64();
-        struct.setMin_open_txnIsSet(true);
+        struct.setOpen_txnsIsSet(true);
+        struct.abortedBits = iprot.readBinary();
+        struct.setAbortedBitsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.min_open_txn = iprot.readI64();
+          struct.setMin_open_txnIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPackageRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPackageRequest.java
index 603795802e5b..443f8fbdaf7c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPackageRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPackageRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPackageRequest implements org.apache.thrift.TBase<GetPackageRequest, GetPackageRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPackageRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPackageRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public GetPackageRequest(GetPackageRequest other) {
     }
   }
 
+  @Override
   public GetPackageRequest deepCopy() {
     return new GetPackageRequest(this);
   }
@@ -214,6 +217,7 @@ public void setPackageNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(GetPackageRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPackageRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPackageRequestStandardScheme getScheme() {
       return new GetPackageRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public GetPackageRequestStandardScheme getScheme() {
 
   private static class GetPackageRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPackageRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPackageRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PACKAGE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.packageName = iprot.readString();
-              struct.setPackageNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // PACKAGE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.packageName = iprot.readString();
+                struct.setPackageNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPackageRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPackageRequest
   }
 
   private static class GetPackageRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPackageRequestTupleScheme getScheme() {
       return new GetPackageRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPackageRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPackageRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.packageName = iprot.readString();
-      struct.setPackageNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.packageName = iprot.readString();
+        struct.setPackageNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsRequest.java
index 6b2c7728f214..265d6e4d17a1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionNamesPsRequest implements org.apache.thrift.TBase<GetPartitionNamesPsRequest, GetPartitionNamesPsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionNamesPsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionNamesPsRequest");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,7 +114,7 @@ public java.lang.String getFieldName() {
   private static final int __MAXPARTS_ISSET_ID = 0;
   private static final int __ID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.PART_VALUES,_Fields.MAX_PARTS,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.PART_VALUES,_Fields.MAX_PARTS,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
   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);
@@ -176,6 +178,7 @@ public GetPartitionNamesPsRequest(GetPartitionNamesPsRequest other) {
     this.id = other.id;
   }
 
+  @Override
   public GetPartitionNamesPsRequest deepCopy() {
     return new GetPartitionNamesPsRequest(this);
   }
@@ -373,6 +376,7 @@ public void setIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -435,6 +439,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -463,6 +468,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -683,14 +689,17 @@ public int compareTo(GetPartitionNamesPsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -793,6 +802,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionNamesPsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionNamesPsRequestStandardScheme getScheme() {
       return new GetPartitionNamesPsRequestStandardScheme();
     }
@@ -800,91 +810,98 @@ public GetPartitionNamesPsRequestStandardScheme getScheme() {
 
   private static class GetPartitionNamesPsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionNamesPsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionNamesPsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PART_VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1556 = iprot.readListBegin();
-                struct.partValues = new java.util.ArrayList<java.lang.String>(_list1556.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1557;
-                for (int _i1558 = 0; _i1558 < _list1556.size; ++_i1558)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1557 = iprot.readString();
-                  struct.partValues.add(_elem1557);
+                  org.apache.thrift.protocol.TList _list1556 = iprot.readListBegin();
+                  struct.partValues = new java.util.ArrayList<java.lang.String>(_list1556.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1557;
+                  for (int _i1558 = 0; _i1558 < _list1556.size; ++_i1558)
+                  {
+                    _elem1557 = iprot.readString();
+                    struct.partValues.add(_elem1557);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // MAX_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.maxParts = iprot.readI16();
-              struct.setMaxPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
+              break;
+            case 5: // MAX_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.maxParts = iprot.readI16();
+                struct.setMaxPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionNamesPsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -944,6 +961,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionNamesP
   }
 
   private static class GetPartitionNamesPsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionNamesPsRequestTupleScheme getScheme() {
       return new GetPartitionNamesPsRequestTupleScheme();
     }
@@ -998,40 +1016,45 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionNamesPs
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionNamesPsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1561 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partValues = new java.util.ArrayList<java.lang.String>(_list1561.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1562;
-          for (int _i1563 = 0; _i1563 < _list1561.size; ++_i1563)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1562 = iprot.readString();
-            struct.partValues.add(_elem1562);
+            org.apache.thrift.protocol.TList _list1561 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partValues = new java.util.ArrayList<java.lang.String>(_list1561.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1562;
+            for (int _i1563 = 0; _i1563 < _list1561.size; ++_i1563)
+            {
+              _elem1562 = iprot.readString();
+              struct.partValues.add(_elem1562);
+            }
           }
+          struct.setPartValuesIsSet(true);
         }
-        struct.setPartValuesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.maxParts = iprot.readI16();
-        struct.setMaxPartsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
+        if (incoming.get(2)) {
+          struct.maxParts = iprot.readI16();
+          struct.setMaxPartsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsResponse.java
index daf65d2c12ef..bf76191d5b6a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionNamesPsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionNamesPsResponse implements org.apache.thrift.TBase<GetPartitionNamesPsResponse, GetPartitionNamesPsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionNamesPsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionNamesPsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public GetPartitionNamesPsResponse(GetPartitionNamesPsResponse other) {
     }
   }
 
+  @Override
   public GetPartitionNamesPsResponse deepCopy() {
     return new GetPartitionNamesPsResponse(this);
   }
@@ -158,6 +161,7 @@ public void setNamesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAMES:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAMES:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(GetPartitionNamesPsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -306,6 +315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionNamesPsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionNamesPsResponseStandardScheme getScheme() {
       return new GetPartitionNamesPsResponseStandardScheme();
     }
@@ -313,43 +323,50 @@ public GetPartitionNamesPsResponseStandardScheme getScheme() {
 
   private static class GetPartitionNamesPsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionNamesPsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionNamesPsResponse 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 1: // NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1564 = iprot.readListBegin();
-                struct.names = new java.util.ArrayList<java.lang.String>(_list1564.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1565;
-                for (int _i1566 = 0; _i1566 < _list1564.size; ++_i1566)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1565 = iprot.readString();
-                  struct.names.add(_elem1565);
+                  org.apache.thrift.protocol.TList _list1564 = iprot.readListBegin();
+                  struct.names = new java.util.ArrayList<java.lang.String>(_list1564.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1565;
+                  for (int _i1566 = 0; _i1566 < _list1564.size; ++_i1566)
+                  {
+                    _elem1565 = iprot.readString();
+                    struct.names.add(_elem1565);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNamesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionNamesPsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionNamesP
   }
 
   private static class GetPartitionNamesPsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionNamesPsResponseTupleScheme getScheme() {
       return new GetPartitionNamesPsResponseTupleScheme();
     }
@@ -394,18 +412,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionNamesPs
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionNamesPsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1569 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.names = new java.util.ArrayList<java.lang.String>(_list1569.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem1570;
-        for (int _i1571 = 0; _i1571 < _list1569.size; ++_i1571)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1570 = iprot.readString();
-          struct.names.add(_elem1570);
+          org.apache.thrift.protocol.TList _list1569 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.names = new java.util.ArrayList<java.lang.String>(_list1569.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1570;
+          for (int _i1571 = 0; _i1571 < _list1569.size; ++_i1571)
+          {
+            _elem1570 = iprot.readString();
+            struct.names.add(_elem1570);
+          }
         }
+        struct.setNamesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setNamesIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionRequest.java
index 0b3047f0cfc5..8787e6277260 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionRequest implements org.apache.thrift.TBase<GetPartitionRequest, GetPartitionRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
   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);
@@ -167,6 +169,7 @@ public GetPartitionRequest(GetPartitionRequest other) {
     this.id = other.id;
   }
 
+  @Override
   public GetPartitionRequest deepCopy() {
     return new GetPartitionRequest(this);
   }
@@ -340,6 +343,7 @@ public void setIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -394,6 +398,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -419,6 +424,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -614,14 +620,17 @@ public int compareTo(GetPartitionRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -720,6 +729,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionRequestStandardScheme getScheme() {
       return new GetPartitionRequestStandardScheme();
     }
@@ -727,83 +737,90 @@ public GetPartitionRequestStandardScheme getScheme() {
 
   private static class GetPartitionRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PART_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1540 = iprot.readListBegin();
-                struct.partVals = new java.util.ArrayList<java.lang.String>(_list1540.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1541;
-                for (int _i1542 = 0; _i1542 < _list1540.size; ++_i1542)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1541 = iprot.readString();
-                  struct.partVals.add(_elem1541);
+                  org.apache.thrift.protocol.TList _list1540 = iprot.readListBegin();
+                  struct.partVals = new java.util.ArrayList<java.lang.String>(_list1540.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1541;
+                  for (int _i1542 = 0; _i1542 < _list1540.size; ++_i1542)
+                  {
+                    _elem1541 = iprot.readString();
+                    struct.partVals.add(_elem1541);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
+              break;
+            case 5: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -856,6 +873,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionReques
   }
 
   private static class GetPartitionRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionRequestTupleScheme getScheme() {
       return new GetPartitionRequestTupleScheme();
     }
@@ -899,34 +917,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list1545 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.partVals = new java.util.ArrayList<java.lang.String>(_list1545.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem1546;
-        for (int _i1547 = 0; _i1547 < _list1545.size; ++_i1547)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
         {
-          _elem1546 = iprot.readString();
-          struct.partVals.add(_elem1546);
+          org.apache.thrift.protocol.TList _list1545 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.partVals = new java.util.ArrayList<java.lang.String>(_list1545.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1546;
+          for (int _i1547 = 0; _i1547 < _list1545.size; ++_i1547)
+          {
+            _elem1546 = iprot.readString();
+            struct.partVals.add(_elem1546);
+          }
         }
-      }
-      struct.setPartValsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
+        struct.setPartValsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionResponse.java
index 11ee0c794fd6..98b8a4197ecb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionResponse implements org.apache.thrift.TBase<GetPartitionResponse, GetPartitionResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public GetPartitionResponse(GetPartitionResponse other) {
     }
   }
 
+  @Override
   public GetPartitionResponse deepCopy() {
     return new GetPartitionResponse(this);
   }
@@ -140,6 +143,7 @@ public void setPartitionIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITION:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITION:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(GetPartitionResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -291,6 +300,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionResponseStandardScheme getScheme() {
       return new GetPartitionResponseStandardScheme();
     }
@@ -298,34 +308,41 @@ public GetPartitionResponseStandardScheme getScheme() {
 
   private static class GetPartitionResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionResponse 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 1: // PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.partition = new Partition();
-              struct.partition.read(iprot);
-              struct.setPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.partition = new Partition();
+                struct.partition.read(iprot);
+                struct.setPartitionIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -342,6 +359,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionRespon
   }
 
   private static class GetPartitionResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionResponseTupleScheme getScheme() {
       return new GetPartitionResponseTupleScheme();
     }
@@ -357,10 +375,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionRespons
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.partition = new Partition();
-      struct.partition.read(iprot);
-      struct.setPartitionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.partition = new Partition();
+        struct.partition.read(iprot);
+        struct.setPartitionIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByFilterRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByFilterRequest.java
index 2042e78886c4..c996b72b6366 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByFilterRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByFilterRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsByFilterRequest implements org.apache.thrift.TBase<GetPartitionsByFilterRequest, GetPartitionsByFilterRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsByFilterRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsByFilterRequest");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -117,7 +119,7 @@ public java.lang.String getFieldName() {
   private static final int __MAXPARTS_ISSET_ID = 0;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.MAX_PARTS,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.MAX_PARTS,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
   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);
@@ -184,6 +186,7 @@ public GetPartitionsByFilterRequest(GetPartitionsByFilterRequest other) {
     }
   }
 
+  @Override
   public GetPartitionsByFilterRequest deepCopy() {
     return new GetPartitionsByFilterRequest(this);
   }
@@ -390,6 +393,7 @@ public void setExcludeParamKeyPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -460,6 +464,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -491,6 +496,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -736,14 +742,17 @@ public int compareTo(GetPartitionsByFilterRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -846,6 +855,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsByFilterRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsByFilterRequestStandardScheme getScheme() {
       return new GetPartitionsByFilterRequestStandardScheme();
     }
@@ -853,89 +863,96 @@ public GetPartitionsByFilterRequestStandardScheme getScheme() {
 
   private static class GetPartitionsByFilterRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsByFilterRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsByFilterRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.filter = iprot.readString();
-              struct.setFilterIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // MAX_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.maxParts = iprot.readI16();
-              struct.setMaxPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // INCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeParamKeyPattern = iprot.readString();
-              struct.setIncludeParamKeyPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // EXCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.excludeParamKeyPattern = iprot.readString();
-              struct.setExcludeParamKeyPatternIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FILTER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.filter = iprot.readString();
+                struct.setFilterIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // MAX_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.maxParts = iprot.readI16();
+                struct.setMaxPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // INCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeParamKeyPattern = iprot.readString();
+                struct.setIncludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // EXCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.excludeParamKeyPattern = iprot.readString();
+                struct.setExcludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsByFilterRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -993,6 +1010,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsByFil
   }
 
   private static class GetPartitionsByFilterRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsByFilterRequestTupleScheme getScheme() {
       return new GetPartitionsByFilterRequestTupleScheme();
     }
@@ -1057,39 +1075,44 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsByFilt
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsByFilterRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.tblName = iprot.readString();
-        struct.setTblNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.filter = iprot.readString();
-        struct.setFilterIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.maxParts = iprot.readI16();
-        struct.setMaxPartsIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.includeParamKeyPattern = iprot.readString();
-        struct.setIncludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.excludeParamKeyPattern = iprot.readString();
-        struct.setExcludeParamKeyPatternIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.tblName = iprot.readString();
+          struct.setTblNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.filter = iprot.readString();
+          struct.setFilterIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.maxParts = iprot.readI16();
+          struct.setMaxPartsIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.includeParamKeyPattern = iprot.readString();
+          struct.setIncludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.excludeParamKeyPattern = iprot.readString();
+          struct.setExcludeParamKeyPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesRequest.java
index e6a113545b87..7da1dcaa8da5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsByNamesRequest implements org.apache.thrift.TBase<GetPartitionsByNamesRequest, GetPartitionsByNamesRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsByNamesRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsByNamesRequest");
 
@@ -129,10 +129,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -144,7 +146,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 2;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.NAMES,_Fields.GET_COL_STATS,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.ENGINE,_Fields.VALID_WRITE_ID_LIST,_Fields.GET_FILE_METADATA,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
+  private static final _Fields[] optionals = {_Fields.NAMES,_Fields.GET_COL_STATS,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.ENGINE,_Fields.VALID_WRITE_ID_LIST,_Fields.GET_FILE_METADATA,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
   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);
@@ -236,6 +238,7 @@ public GetPartitionsByNamesRequest(GetPartitionsByNamesRequest other) {
     }
   }
 
+  @Override
   public GetPartitionsByNamesRequest deepCopy() {
     return new GetPartitionsByNamesRequest(this);
   }
@@ -598,6 +601,7 @@ public void setExcludeParamKeyPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -708,6 +712,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -754,6 +759,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1124,14 +1130,17 @@ public int compareTo(GetPartitionsByNamesRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1286,6 +1295,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsByNamesRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsByNamesRequestStandardScheme getScheme() {
       return new GetPartitionsByNamesRequestStandardScheme();
     }
@@ -1293,149 +1303,156 @@ public GetPartitionsByNamesRequestStandardScheme getScheme() {
 
   private static class GetPartitionsByNamesRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsByNamesRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsByNamesRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list748 = iprot.readListBegin();
-                struct.names = new java.util.ArrayList<java.lang.String>(_list748.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem749;
-                for (int _i750 = 0; _i750 < _list748.size; ++_i750)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem749 = iprot.readString();
-                  struct.names.add(_elem749);
+                  org.apache.thrift.protocol.TList _list748 = iprot.readListBegin();
+                  struct.names = new java.util.ArrayList<java.lang.String>(_list748.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem749;
+                  for (int _i750 = 0; _i750 < _list748.size; ++_i750)
+                  {
+                    _elem749 = iprot.readString();
+                    struct.names.add(_elem749);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // GET_COL_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.get_col_stats = iprot.readBool();
-              struct.setGet_col_statsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list751 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list751.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem752;
-                for (int _i753 = 0; _i753 < _list751.size; ++_i753)
+              break;
+            case 4: // GET_COL_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.get_col_stats = iprot.readBool();
+                struct.setGet_col_statsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem752 = iprot.readString();
-                  struct.processorCapabilities.add(_elem752);
+                  org.apache.thrift.protocol.TList _list751 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list751.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem752;
+                  for (int _i753 = 0; _i753 < _list751.size; ++_i753)
+                  {
+                    _elem752 = iprot.readString();
+                    struct.processorCapabilities.add(_elem752);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // GET_FILE_METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.getFileMetadata = iprot.readBool();
-              struct.setGetFileMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // INCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeParamKeyPattern = iprot.readString();
-              struct.setIncludeParamKeyPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // EXCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.excludeParamKeyPattern = iprot.readString();
-              struct.setExcludeParamKeyPatternIsSet(true);
-            } else { 
+              break;
+            case 6: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // GET_FILE_METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.getFileMetadata = iprot.readBool();
+                struct.setGetFileMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // INCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeParamKeyPattern = iprot.readString();
+                struct.setIncludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // EXCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.excludeParamKeyPattern = iprot.readString();
+                struct.setExcludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsByNamesRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1540,6 +1557,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsByNam
   }
 
   private static class GetPartitionsByNamesRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsByNamesRequestTupleScheme getScheme() {
       return new GetPartitionsByNamesRequestTupleScheme();
     }
@@ -1636,73 +1654,78 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsByName
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsByNamesRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(11);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list758 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.names = new java.util.ArrayList<java.lang.String>(_list758.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem759;
-          for (int _i760 = 0; _i760 < _list758.size; ++_i760)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(11);
+        if (incoming.get(0)) {
           {
-            _elem759 = iprot.readString();
-            struct.names.add(_elem759);
+            org.apache.thrift.protocol.TList _list758 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.names = new java.util.ArrayList<java.lang.String>(_list758.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem759;
+            for (int _i760 = 0; _i760 < _list758.size; ++_i760)
+            {
+              _elem759 = iprot.readString();
+              struct.names.add(_elem759);
+            }
           }
+          struct.setNamesIsSet(true);
         }
-        struct.setNamesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.get_col_stats = iprot.readBool();
-        struct.setGet_col_statsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list761 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list761.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem762;
-          for (int _i763 = 0; _i763 < _list761.size; ++_i763)
+        if (incoming.get(1)) {
+          struct.get_col_stats = iprot.readBool();
+          struct.setGet_col_statsIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem762 = iprot.readString();
-            struct.processorCapabilities.add(_elem762);
+            org.apache.thrift.protocol.TList _list761 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list761.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem762;
+            for (int _i763 = 0; _i763 < _list761.size; ++_i763)
+            {
+              _elem762 = iprot.readString();
+              struct.processorCapabilities.add(_elem762);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.getFileMetadata = iprot.readBool();
-        struct.setGetFileMetadataIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.includeParamKeyPattern = iprot.readString();
-        struct.setIncludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.excludeParamKeyPattern = iprot.readString();
-        struct.setExcludeParamKeyPatternIsSet(true);
+        if (incoming.get(3)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.getFileMetadata = iprot.readBool();
+          struct.setGetFileMetadataIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.includeParamKeyPattern = iprot.readString();
+          struct.setIncludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.excludeParamKeyPattern = iprot.readString();
+          struct.setExcludeParamKeyPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesResult.java
index eb30c72f8bff..fc933ae6797b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsByNamesResult implements org.apache.thrift.TBase<GetPartitionsByNamesResult, GetPartitionsByNamesResult._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsByNamesResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsByNamesResult");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.DICTIONARY};
+  private static final _Fields[] optionals = {_Fields.DICTIONARY};
   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);
@@ -123,6 +125,7 @@ public GetPartitionsByNamesResult(GetPartitionsByNamesResult other) {
     }
   }
 
+  @Override
   public GetPartitionsByNamesResult deepCopy() {
     return new GetPartitionsByNamesResult(this);
   }
@@ -197,6 +200,7 @@ public void setDictionaryIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -219,6 +223,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -232,6 +237,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -327,14 +333,17 @@ public int compareTo(GetPartitionsByNamesResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -394,6 +403,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsByNamesResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsByNamesResultStandardScheme getScheme() {
       return new GetPartitionsByNamesResultStandardScheme();
     }
@@ -401,53 +411,60 @@ public GetPartitionsByNamesResultStandardScheme getScheme() {
 
   private static class GetPartitionsByNamesResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsByNamesResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsByNamesResult 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list764 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list764.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem765;
-                for (int _i766 = 0; _i766 < _list764.size; ++_i766)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem765 = new Partition();
-                  _elem765.read(iprot);
-                  struct.partitions.add(_elem765);
+                  org.apache.thrift.protocol.TList _list764 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list764.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem765;
+                  for (int _i766 = 0; _i766 < _list764.size; ++_i766)
+                  {
+                    _elem765 = new Partition();
+                    _elem765.read(iprot);
+                    struct.partitions.add(_elem765);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DICTIONARY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.dictionary = new ObjectDictionary();
-              struct.dictionary.read(iprot);
-              struct.setDictionaryIsSet(true);
-            } else { 
+              break;
+            case 2: // DICTIONARY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.dictionary = new ObjectDictionary();
+                struct.dictionary.read(iprot);
+                struct.setDictionaryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsByNamesResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -478,6 +495,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsByNam
   }
 
   private static class GetPartitionsByNamesResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsByNamesResultTupleScheme getScheme() {
       return new GetPartitionsByNamesResultTupleScheme();
     }
@@ -507,24 +525,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsByName
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsByNamesResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list769 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitions = new java.util.ArrayList<Partition>(_list769.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem770;
-        for (int _i771 = 0; _i771 < _list769.size; ++_i771)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem770 = new Partition();
-          _elem770.read(iprot);
-          struct.partitions.add(_elem770);
+          org.apache.thrift.protocol.TList _list769 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitions = new java.util.ArrayList<Partition>(_list769.size);
+          @org.apache.thrift.annotation.Nullable Partition _elem770;
+          for (int _i771 = 0; _i771 < _list769.size; ++_i771)
+          {
+            _elem770 = new Partition();
+            _elem770.read(iprot);
+            struct.partitions.add(_elem770);
+          }
         }
-      }
-      struct.setPartitionsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.dictionary = new ObjectDictionary();
-        struct.dictionary.read(iprot);
-        struct.setDictionaryIsSet(true);
+        struct.setPartitionsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.dictionary = new ObjectDictionary();
+          struct.dictionary.read(iprot);
+          struct.setDictionaryIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsFilterSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsFilterSpec.java
index 7d4b749a566e..c840be267aac 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsFilterSpec.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsFilterSpec.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsFilterSpec implements org.apache.thrift.TBase<GetPartitionsFilterSpec, GetPartitionsFilterSpec._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsFilterSpec> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsFilterSpec");
 
@@ -78,17 +78,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.FILTER_MODE,_Fields.FILTERS};
+  private static final _Fields[] optionals = {_Fields.FILTER_MODE,_Fields.FILTERS};
   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);
@@ -117,6 +119,7 @@ public GetPartitionsFilterSpec(GetPartitionsFilterSpec other) {
     }
   }
 
+  @Override
   public GetPartitionsFilterSpec deepCopy() {
     return new GetPartitionsFilterSpec(this);
   }
@@ -199,6 +202,7 @@ public void setFiltersIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FILTER_MODE:
@@ -221,6 +225,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FILTER_MODE:
@@ -234,6 +239,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -329,14 +335,17 @@ public int compareTo(GetPartitionsFilterSpec other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -391,6 +400,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsFilterSpecStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsFilterSpecStandardScheme getScheme() {
       return new GetPartitionsFilterSpecStandardScheme();
     }
@@ -398,51 +408,58 @@ public GetPartitionsFilterSpecStandardScheme getScheme() {
 
   private static class GetPartitionsFilterSpecStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsFilterSpec> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsFilterSpec 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 7: // FILTER_MODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.filterMode = org.apache.hadoop.hive.metastore.api.PartitionFilterMode.findByValue(iprot.readI32());
-              struct.setFilterModeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // FILTERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1492 = iprot.readListBegin();
-                struct.filters = new java.util.ArrayList<java.lang.String>(_list1492.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1493;
-                for (int _i1494 = 0; _i1494 < _list1492.size; ++_i1494)
+          }
+          switch (schemeField.id) {
+            case 7: // FILTER_MODE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.filterMode = org.apache.hadoop.hive.metastore.api.PartitionFilterMode.findByValue(iprot.readI32());
+                struct.setFilterModeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // FILTERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1493 = iprot.readString();
-                  struct.filters.add(_elem1493);
+                  org.apache.thrift.protocol.TList _list1492 = iprot.readListBegin();
+                  struct.filters = new java.util.ArrayList<java.lang.String>(_list1492.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1493;
+                  for (int _i1494 = 0; _i1494 < _list1492.size; ++_i1494)
+                  {
+                    _elem1493 = iprot.readString();
+                    struct.filters.add(_elem1493);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFiltersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFiltersIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsFilterSpec struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -475,6 +492,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsFilte
   }
 
   private static class GetPartitionsFilterSpecTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsFilterSpecTupleScheme getScheme() {
       return new GetPartitionsFilterSpecTupleScheme();
     }
@@ -509,24 +527,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsFilter
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsFilterSpec 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.filterMode = org.apache.hadoop.hive.metastore.api.PartitionFilterMode.findByValue(iprot.readI32());
-        struct.setFilterModeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1497 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.filters = new java.util.ArrayList<java.lang.String>(_list1497.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1498;
-          for (int _i1499 = 0; _i1499 < _list1497.size; ++_i1499)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.filterMode = org.apache.hadoop.hive.metastore.api.PartitionFilterMode.findByValue(iprot.readI32());
+          struct.setFilterModeIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1498 = iprot.readString();
-            struct.filters.add(_elem1498);
+            org.apache.thrift.protocol.TList _list1497 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.filters = new java.util.ArrayList<java.lang.String>(_list1497.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1498;
+            for (int _i1499 = 0; _i1499 < _list1497.size; ++_i1499)
+            {
+              _elem1498 = iprot.readString();
+              struct.filters.add(_elem1498);
+            }
           }
+          struct.setFiltersIsSet(true);
         }
-        struct.setFiltersIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthRequest.java
index 97dadd66aed8..56c8f2791fb2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsPsWithAuthRequest implements org.apache.thrift.TBase<GetPartitionsPsWithAuthRequest, GetPartitionsPsWithAuthRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsPsWithAuthRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsPsWithAuthRequest");
 
@@ -129,10 +129,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -143,7 +145,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 1;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.PART_VALS,_Fields.MAX_PARTS,_Fields.USER_NAME,_Fields.GROUP_NAMES,_Fields.VALID_WRITE_ID_LIST,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN,_Fields.PART_NAMES};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.PART_VALS,_Fields.MAX_PARTS,_Fields.USER_NAME,_Fields.GROUP_NAMES,_Fields.VALID_WRITE_ID_LIST,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN,_Fields.PART_NAMES};
   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);
@@ -239,6 +241,7 @@ public GetPartitionsPsWithAuthRequest(GetPartitionsPsWithAuthRequest other) {
     }
   }
 
+  @Override
   public GetPartitionsPsWithAuthRequest deepCopy() {
     return new GetPartitionsPsWithAuthRequest(this);
   }
@@ -617,6 +620,7 @@ public void setPartNamesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -727,6 +731,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -773,6 +778,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1143,14 +1149,17 @@ public int compareTo(GetPartitionsPsWithAuthRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1309,6 +1318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsPsWithAuthRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsPsWithAuthRequestStandardScheme getScheme() {
       return new GetPartitionsPsWithAuthRequestStandardScheme();
     }
@@ -1316,159 +1326,166 @@ public GetPartitionsPsWithAuthRequestStandardScheme getScheme() {
 
   private static class GetPartitionsPsWithAuthRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsPsWithAuthRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsPsWithAuthRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PART_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1572 = iprot.readListBegin();
-                struct.partVals = new java.util.ArrayList<java.lang.String>(_list1572.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1573;
-                for (int _i1574 = 0; _i1574 < _list1572.size; ++_i1574)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1573 = iprot.readString();
-                  struct.partVals.add(_elem1573);
+                  org.apache.thrift.protocol.TList _list1572 = iprot.readListBegin();
+                  struct.partVals = new java.util.ArrayList<java.lang.String>(_list1572.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1573;
+                  for (int _i1574 = 0; _i1574 < _list1572.size; ++_i1574)
+                  {
+                    _elem1573 = iprot.readString();
+                    struct.partVals.add(_elem1573);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // MAX_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.maxParts = iprot.readI16();
-              struct.setMaxPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // USER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.userName = iprot.readString();
-              struct.setUserNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // GROUP_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1575 = iprot.readListBegin();
-                struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1575.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1576;
-                for (int _i1577 = 0; _i1577 < _list1575.size; ++_i1577)
+              break;
+            case 5: // MAX_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.maxParts = iprot.readI16();
+                struct.setMaxPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // USER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.userName = iprot.readString();
+                struct.setUserNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // GROUP_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1576 = iprot.readString();
-                  struct.groupNames.add(_elem1576);
+                  org.apache.thrift.protocol.TList _list1575 = iprot.readListBegin();
+                  struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1575.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1576;
+                  for (int _i1577 = 0; _i1577 < _list1575.size; ++_i1577)
+                  {
+                    _elem1576 = iprot.readString();
+                    struct.groupNames.add(_elem1576);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setGroupNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setGroupNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // INCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeParamKeyPattern = iprot.readString();
-              struct.setIncludeParamKeyPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // EXCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.excludeParamKeyPattern = iprot.readString();
-              struct.setExcludeParamKeyPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // PART_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1578 = iprot.readListBegin();
-                struct.partNames = new java.util.ArrayList<java.lang.String>(_list1578.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1579;
-                for (int _i1580 = 0; _i1580 < _list1578.size; ++_i1580)
+              break;
+            case 8: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // INCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeParamKeyPattern = iprot.readString();
+                struct.setIncludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // EXCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.excludeParamKeyPattern = iprot.readString();
+                struct.setExcludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // PART_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1579 = iprot.readString();
-                  struct.partNames.add(_elem1579);
+                  org.apache.thrift.protocol.TList _list1578 = iprot.readListBegin();
+                  struct.partNames = new java.util.ArrayList<java.lang.String>(_list1578.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1579;
+                  for (int _i1580 = 0; _i1580 < _list1578.size; ++_i1580)
+                  {
+                    _elem1579 = iprot.readString();
+                    struct.partNames.add(_elem1579);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartNamesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsPsWithAuthRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1582,6 +1599,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsPsWit
   }
 
   private static class GetPartitionsPsWithAuthRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsPsWithAuthRequestTupleScheme getScheme() {
       return new GetPartitionsPsWithAuthRequestTupleScheme();
     }
@@ -1684,82 +1702,87 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsPsWith
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsPsWithAuthRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(11);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1587 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partVals = new java.util.ArrayList<java.lang.String>(_list1587.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1588;
-          for (int _i1589 = 0; _i1589 < _list1587.size; ++_i1589)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(11);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1588 = iprot.readString();
-            struct.partVals.add(_elem1588);
+            org.apache.thrift.protocol.TList _list1587 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partVals = new java.util.ArrayList<java.lang.String>(_list1587.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1588;
+            for (int _i1589 = 0; _i1589 < _list1587.size; ++_i1589)
+            {
+              _elem1588 = iprot.readString();
+              struct.partVals.add(_elem1588);
+            }
           }
+          struct.setPartValsIsSet(true);
         }
-        struct.setPartValsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.maxParts = iprot.readI16();
-        struct.setMaxPartsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.userName = iprot.readString();
-        struct.setUserNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list1590 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1590.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1591;
-          for (int _i1592 = 0; _i1592 < _list1590.size; ++_i1592)
+        if (incoming.get(2)) {
+          struct.maxParts = iprot.readI16();
+          struct.setMaxPartsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.userName = iprot.readString();
+          struct.setUserNameIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _elem1591 = iprot.readString();
-            struct.groupNames.add(_elem1591);
+            org.apache.thrift.protocol.TList _list1590 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1590.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1591;
+            for (int _i1592 = 0; _i1592 < _list1590.size; ++_i1592)
+            {
+              _elem1591 = iprot.readString();
+              struct.groupNames.add(_elem1591);
+            }
           }
+          struct.setGroupNamesIsSet(true);
         }
-        struct.setGroupNamesIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.includeParamKeyPattern = iprot.readString();
-        struct.setIncludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.excludeParamKeyPattern = iprot.readString();
-        struct.setExcludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(10)) {
-        {
-          org.apache.thrift.protocol.TList _list1593 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partNames = new java.util.ArrayList<java.lang.String>(_list1593.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1594;
-          for (int _i1595 = 0; _i1595 < _list1593.size; ++_i1595)
+        if (incoming.get(5)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.includeParamKeyPattern = iprot.readString();
+          struct.setIncludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.excludeParamKeyPattern = iprot.readString();
+          struct.setExcludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(10)) {
           {
-            _elem1594 = iprot.readString();
-            struct.partNames.add(_elem1594);
+            org.apache.thrift.protocol.TList _list1593 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partNames = new java.util.ArrayList<java.lang.String>(_list1593.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1594;
+            for (int _i1595 = 0; _i1595 < _list1593.size; ++_i1595)
+            {
+              _elem1594 = iprot.readString();
+              struct.partNames.add(_elem1594);
+            }
           }
+          struct.setPartNamesIsSet(true);
         }
-        struct.setPartNamesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthResponse.java
index 0901ec7cc17d..d1b040377766 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsPsWithAuthResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsPsWithAuthResponse implements org.apache.thrift.TBase<GetPartitionsPsWithAuthResponse, GetPartitionsPsWithAuthResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsPsWithAuthResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsPsWithAuthResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetPartitionsPsWithAuthResponse(GetPartitionsPsWithAuthResponse other) {
     }
   }
 
+  @Override
   public GetPartitionsPsWithAuthResponse deepCopy() {
     return new GetPartitionsPsWithAuthResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPartitionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetPartitionsPsWithAuthResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsPsWithAuthResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsPsWithAuthResponseStandardScheme getScheme() {
       return new GetPartitionsPsWithAuthResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetPartitionsPsWithAuthResponseStandardScheme getScheme() {
 
   private static class GetPartitionsPsWithAuthResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsPsWithAuthResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsPsWithAuthResponse 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1596 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list1596.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem1597;
-                for (int _i1598 = 0; _i1598 < _list1596.size; ++_i1598)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1597 = new Partition();
-                  _elem1597.read(iprot);
-                  struct.partitions.add(_elem1597);
+                  org.apache.thrift.protocol.TList _list1596 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list1596.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem1597;
+                  for (int _i1598 = 0; _i1598 < _list1596.size; ++_i1598)
+                  {
+                    _elem1597 = new Partition();
+                    _elem1597.read(iprot);
+                    struct.partitions.add(_elem1597);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsPsWithAuthResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsPsWit
   }
 
   private static class GetPartitionsPsWithAuthResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsPsWithAuthResponseTupleScheme getScheme() {
       return new GetPartitionsPsWithAuthResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsPsWith
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsPsWithAuthResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1601 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitions = new java.util.ArrayList<Partition>(_list1601.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem1602;
-        for (int _i1603 = 0; _i1603 < _list1601.size; ++_i1603)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1602 = new Partition();
-          _elem1602.read(iprot);
-          struct.partitions.add(_elem1602);
+          org.apache.thrift.protocol.TList _list1601 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitions = new java.util.ArrayList<Partition>(_list1601.size);
+          @org.apache.thrift.annotation.Nullable Partition _elem1602;
+          for (int _i1603 = 0; _i1603 < _list1601.size; ++_i1603)
+          {
+            _elem1602 = new Partition();
+            _elem1602.read(iprot);
+            struct.partitions.add(_elem1602);
+          }
         }
+        struct.setPartitionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPartitionsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsRequest.java
index 115123896931..2e47741386e5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsRequest implements org.apache.thrift.TBase<GetPartitionsRequest, GetPartitionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsRequest");
 
@@ -119,10 +119,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,7 +133,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __WITHAUTH_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.WITH_AUTH,_Fields.USER,_Fields.GROUP_NAMES,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.VALID_WRITE_ID_LIST};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.WITH_AUTH,_Fields.USER,_Fields.GROUP_NAMES,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.VALID_WRITE_ID_LIST};
   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);
@@ -219,6 +221,7 @@ public GetPartitionsRequest(GetPartitionsRequest other) {
     }
   }
 
+  @Override
   public GetPartitionsRequest deepCopy() {
     return new GetPartitionsRequest(this);
   }
@@ -533,6 +536,7 @@ public void setValidWriteIdListIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -627,6 +631,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -667,6 +672,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -987,14 +993,17 @@ public int compareTo(GetPartitionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1135,6 +1144,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsRequestStandardScheme getScheme() {
       return new GetPartitionsRequestStandardScheme();
     }
@@ -1142,135 +1152,142 @@ public GetPartitionsRequestStandardScheme getScheme() {
 
   private static class GetPartitionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // WITH_AUTH
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.withAuth = iprot.readBool();
-              struct.setWithAuthIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // GROUP_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1508 = iprot.readListBegin();
-                struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1508.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1509;
-                for (int _i1510 = 0; _i1510 < _list1508.size; ++_i1510)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // WITH_AUTH
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.withAuth = iprot.readBool();
+                struct.setWithAuthIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // GROUP_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1509 = iprot.readString();
-                  struct.groupNames.add(_elem1509);
+                  org.apache.thrift.protocol.TList _list1508 = iprot.readListBegin();
+                  struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1508.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1509;
+                  for (int _i1510 = 0; _i1510 < _list1508.size; ++_i1510)
+                  {
+                    _elem1509 = iprot.readString();
+                    struct.groupNames.add(_elem1509);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setGroupNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setGroupNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // PROJECTION_SPEC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.projectionSpec = new GetProjectionsSpec();
-              struct.projectionSpec.read(iprot);
-              struct.setProjectionSpecIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // FILTER_SPEC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.filterSpec = new GetPartitionsFilterSpec();
-              struct.filterSpec.read(iprot);
-              struct.setFilterSpecIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1511 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1511.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1512;
-                for (int _i1513 = 0; _i1513 < _list1511.size; ++_i1513)
+              break;
+            case 7: // PROJECTION_SPEC
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.projectionSpec = new GetProjectionsSpec();
+                struct.projectionSpec.read(iprot);
+                struct.setProjectionSpecIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // FILTER_SPEC
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.filterSpec = new GetPartitionsFilterSpec();
+                struct.filterSpec.read(iprot);
+                struct.setFilterSpecIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1512 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1512);
+                  org.apache.thrift.protocol.TList _list1511 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1511.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1512;
+                  for (int _i1513 = 0; _i1513 < _list1511.size; ++_i1513)
+                  {
+                    _elem1512 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1512);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
+              break;
+            case 10: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1363,6 +1380,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsReque
   }
 
   private static class GetPartitionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsRequestTupleScheme getScheme() {
       return new GetPartitionsRequestTupleScheme();
     }
@@ -1457,71 +1475,76 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(11);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.tblName = iprot.readString();
-        struct.setTblNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.withAuth = iprot.readBool();
-        struct.setWithAuthIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.user = iprot.readString();
-        struct.setUserIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list1518 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1518.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1519;
-          for (int _i1520 = 0; _i1520 < _list1518.size; ++_i1520)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(11);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.tblName = iprot.readString();
+          struct.setTblNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.withAuth = iprot.readBool();
+          struct.setWithAuthIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.user = iprot.readString();
+          struct.setUserIsSet(true);
+        }
+        if (incoming.get(5)) {
           {
-            _elem1519 = iprot.readString();
-            struct.groupNames.add(_elem1519);
+            org.apache.thrift.protocol.TList _list1518 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.groupNames = new java.util.ArrayList<java.lang.String>(_list1518.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1519;
+            for (int _i1520 = 0; _i1520 < _list1518.size; ++_i1520)
+            {
+              _elem1519 = iprot.readString();
+              struct.groupNames.add(_elem1519);
+            }
           }
+          struct.setGroupNamesIsSet(true);
         }
-        struct.setGroupNamesIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.projectionSpec = new GetProjectionsSpec();
-        struct.projectionSpec.read(iprot);
-        struct.setProjectionSpecIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.filterSpec = new GetPartitionsFilterSpec();
-        struct.filterSpec.read(iprot);
-        struct.setFilterSpecIsSet(true);
-      }
-      if (incoming.get(8)) {
-        {
-          org.apache.thrift.protocol.TList _list1521 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1521.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1522;
-          for (int _i1523 = 0; _i1523 < _list1521.size; ++_i1523)
+        if (incoming.get(6)) {
+          struct.projectionSpec = new GetProjectionsSpec();
+          struct.projectionSpec.read(iprot);
+          struct.setProjectionSpecIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.filterSpec = new GetPartitionsFilterSpec();
+          struct.filterSpec.read(iprot);
+          struct.setFilterSpecIsSet(true);
+        }
+        if (incoming.get(8)) {
           {
-            _elem1522 = iprot.readString();
-            struct.processorCapabilities.add(_elem1522);
+            org.apache.thrift.protocol.TList _list1521 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1521.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1522;
+            for (int _i1523 = 0; _i1523 < _list1521.size; ++_i1523)
+            {
+              _elem1522 = iprot.readString();
+              struct.processorCapabilities.add(_elem1522);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
+        if (incoming.get(9)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsResponse.java
index c9dbf3b33b3c..2c4102e47077 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPartitionsResponse implements org.apache.thrift.TBase<GetPartitionsResponse, GetPartitionsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetPartitionsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPartitionsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetPartitionsResponse(GetPartitionsResponse other) {
     }
   }
 
+  @Override
   public GetPartitionsResponse deepCopy() {
     return new GetPartitionsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPartitionSpecIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITION_SPEC:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITION_SPEC:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetPartitionsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -305,6 +314,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPartitionsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsResponseStandardScheme getScheme() {
       return new GetPartitionsResponseStandardScheme();
     }
@@ -312,44 +322,51 @@ public GetPartitionsResponseStandardScheme getScheme() {
 
   private static class GetPartitionsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPartitionsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPartitionsResponse 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 1: // PARTITION_SPEC
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1500 = iprot.readListBegin();
-                struct.partitionSpec = new java.util.ArrayList<PartitionSpec>(_list1500.size);
-                @org.apache.thrift.annotation.Nullable PartitionSpec _elem1501;
-                for (int _i1502 = 0; _i1502 < _list1500.size; ++_i1502)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITION_SPEC
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1501 = new PartitionSpec();
-                  _elem1501.read(iprot);
-                  struct.partitionSpec.add(_elem1501);
+                  org.apache.thrift.protocol.TList _list1500 = iprot.readListBegin();
+                  struct.partitionSpec = new java.util.ArrayList<PartitionSpec>(_list1500.size);
+                  @org.apache.thrift.annotation.Nullable PartitionSpec _elem1501;
+                  for (int _i1502 = 0; _i1502 < _list1500.size; ++_i1502)
+                  {
+                    _elem1501 = new PartitionSpec();
+                    _elem1501.read(iprot);
+                    struct.partitionSpec.add(_elem1501);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionSpecIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionSpecIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPartitionsRespo
   }
 
   private static class GetPartitionsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPartitionsResponseTupleScheme getScheme() {
       return new GetPartitionsResponseTupleScheme();
     }
@@ -401,21 +419,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPartitionsRespon
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPartitionsResponse 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 _list1505 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitionSpec = new java.util.ArrayList<PartitionSpec>(_list1505.size);
-          @org.apache.thrift.annotation.Nullable PartitionSpec _elem1506;
-          for (int _i1507 = 0; _i1507 < _list1505.size; ++_i1507)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1506 = new PartitionSpec();
-            _elem1506.read(iprot);
-            struct.partitionSpec.add(_elem1506);
+            org.apache.thrift.protocol.TList _list1505 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitionSpec = new java.util.ArrayList<PartitionSpec>(_list1505.size);
+            @org.apache.thrift.annotation.Nullable PartitionSpec _elem1506;
+            for (int _i1507 = 0; _i1507 < _list1505.size; ++_i1507)
+            {
+              _elem1506 = new PartitionSpec();
+              _elem1506.read(iprot);
+              struct.partitionSpec.add(_elem1506);
+            }
           }
+          struct.setPartitionSpecIsSet(true);
         }
-        struct.setPartitionSpecIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java
index 526713d93809..7288deae66f1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPrincipalsInRoleRequest implements org.apache.thrift.TBase<GetPrincipalsInRoleRequest, GetPrincipalsInRoleRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPrincipalsInRoleRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPrincipalsInRoleRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public GetPrincipalsInRoleRequest(GetPrincipalsInRoleRequest other) {
     }
   }
 
+  @Override
   public GetPrincipalsInRoleRequest deepCopy() {
     return new GetPrincipalsInRoleRequest(this);
   }
@@ -140,6 +143,7 @@ public void setRoleNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ROLE_NAME:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ROLE_NAME:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(GetPrincipalsInRoleRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -288,6 +297,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPrincipalsInRoleRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPrincipalsInRoleRequestStandardScheme getScheme() {
       return new GetPrincipalsInRoleRequestStandardScheme();
     }
@@ -295,33 +305,40 @@ public GetPrincipalsInRoleRequestStandardScheme getScheme() {
 
   private static class GetPrincipalsInRoleRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPrincipalsInRoleRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPrincipalsInRoleRequest 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 1: // ROLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.roleName = iprot.readString();
-              struct.setRoleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // ROLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.roleName = iprot.readString();
+                struct.setRoleNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrincipalsInRoleRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrincipalsInRol
   }
 
   private static class GetPrincipalsInRoleRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPrincipalsInRoleRequestTupleScheme getScheme() {
       return new GetPrincipalsInRoleRequestTupleScheme();
     }
@@ -353,9 +371,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPrincipalsInRole
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPrincipalsInRoleRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.roleName = iprot.readString();
-      struct.setRoleNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.roleName = iprot.readString();
+        struct.setRoleNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
index d5ea86e1f80f..0d3271487db2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetPrincipalsInRoleResponse, GetPrincipalsInRoleResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetPrincipalsInRoleResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPrincipalsInRoleResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetPrincipalsInRoleResponse(GetPrincipalsInRoleResponse other) {
     }
   }
 
+  @Override
   public GetPrincipalsInRoleResponse deepCopy() {
     return new GetPrincipalsInRoleResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPrincipalGrantsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRINCIPAL_GRANTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRINCIPAL_GRANTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetPrincipalsInRoleResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetPrincipalsInRoleResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPrincipalsInRoleResponseStandardScheme getScheme() {
       return new GetPrincipalsInRoleResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetPrincipalsInRoleResponseStandardScheme getScheme() {
 
   private static class GetPrincipalsInRoleResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetPrincipalsInRoleResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetPrincipalsInRoleResponse 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 1: // PRINCIPAL_GRANTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list190 = iprot.readListBegin();
-                struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list190.size);
-                @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem191;
-                for (int _i192 = 0; _i192 < _list190.size; ++_i192)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PRINCIPAL_GRANTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem191 = new RolePrincipalGrant();
-                  _elem191.read(iprot);
-                  struct.principalGrants.add(_elem191);
+                  org.apache.thrift.protocol.TList _list190 = iprot.readListBegin();
+                  struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list190.size);
+                  @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem191;
+                  for (int _i192 = 0; _i192 < _list190.size; ++_i192)
+                  {
+                    _elem191 = new RolePrincipalGrant();
+                    _elem191.read(iprot);
+                    struct.principalGrants.add(_elem191);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrincipalGrantsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrincipalGrantsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrincipalsInRoleResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetPrincipalsInRol
   }
 
   private static class GetPrincipalsInRoleResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetPrincipalsInRoleResponseTupleScheme getScheme() {
       return new GetPrincipalsInRoleResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetPrincipalsInRole
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetPrincipalsInRoleResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list195 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list195.size);
-        @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem196;
-        for (int _i197 = 0; _i197 < _list195.size; ++_i197)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem196 = new RolePrincipalGrant();
-          _elem196.read(iprot);
-          struct.principalGrants.add(_elem196);
+          org.apache.thrift.protocol.TList _list195 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list195.size);
+          @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem196;
+          for (int _i197 = 0; _i197 < _list195.size; ++_i197)
+          {
+            _elem196 = new RolePrincipalGrant();
+            _elem196.read(iprot);
+            struct.principalGrants.add(_elem196);
+          }
         }
+        struct.setPrincipalGrantsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPrincipalGrantsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java
index 26cf2ab272d6..f29feeb5d01f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetProjectionsSpec implements org.apache.thrift.TBase<GetProjectionsSpec, GetProjectionsSpec._Fields>, java.io.Serializable, Cloneable, Comparable<GetProjectionsSpec> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetProjectionsSpec");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -133,6 +135,7 @@ public GetProjectionsSpec(GetProjectionsSpec other) {
     }
   }
 
+  @Override
   public GetProjectionsSpec deepCopy() {
     return new GetProjectionsSpec(this);
   }
@@ -232,6 +235,7 @@ public void setExcludeParamKeyPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FIELD_LIST:
@@ -262,6 +266,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELD_LIST:
@@ -278,6 +283,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -398,14 +404,17 @@ public int compareTo(GetProjectionsSpec other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -464,6 +473,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetProjectionsSpecStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetProjectionsSpecStandardScheme getScheme() {
       return new GetProjectionsSpecStandardScheme();
     }
@@ -471,59 +481,66 @@ public GetProjectionsSpecStandardScheme getScheme() {
 
   private static class GetProjectionsSpecStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetProjectionsSpec> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetProjectionsSpec 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 1: // FIELD_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1208 = iprot.readListBegin();
-                struct.fieldList = new java.util.ArrayList<java.lang.String>(_list1208.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1209;
-                for (int _i1210 = 0; _i1210 < _list1208.size; ++_i1210)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FIELD_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1209 = iprot.readString();
-                  struct.fieldList.add(_elem1209);
+                  org.apache.thrift.protocol.TList _list1208 = iprot.readListBegin();
+                  struct.fieldList = new java.util.ArrayList<java.lang.String>(_list1208.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1209;
+                  for (int _i1210 = 0; _i1210 < _list1208.size; ++_i1210)
+                  {
+                    _elem1209 = iprot.readString();
+                    struct.fieldList.add(_elem1209);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFieldListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFieldListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // INCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeParamKeyPattern = iprot.readString();
-              struct.setIncludeParamKeyPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // EXCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.excludeParamKeyPattern = iprot.readString();
-              struct.setExcludeParamKeyPatternIsSet(true);
-            } else { 
+              break;
+            case 2: // INCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeParamKeyPattern = iprot.readString();
+                struct.setIncludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // EXCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.excludeParamKeyPattern = iprot.readString();
+                struct.setExcludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetProjectionsSpec struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -557,6 +574,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetProjectionsSpec
   }
 
   private static class GetProjectionsSpecTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetProjectionsSpecTupleScheme getScheme() {
       return new GetProjectionsSpecTupleScheme();
     }
@@ -597,28 +615,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetProjectionsSpec
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetProjectionsSpec 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)) {
-        {
-          org.apache.thrift.protocol.TList _list1213 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.fieldList = new java.util.ArrayList<java.lang.String>(_list1213.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1214;
-          for (int _i1215 = 0; _i1215 < _list1213.size; ++_i1215)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _elem1214 = iprot.readString();
-            struct.fieldList.add(_elem1214);
+            org.apache.thrift.protocol.TList _list1213 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.fieldList = new java.util.ArrayList<java.lang.String>(_list1213.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1214;
+            for (int _i1215 = 0; _i1215 < _list1213.size; ++_i1215)
+            {
+              _elem1214 = iprot.readString();
+              struct.fieldList.add(_elem1214);
+            }
           }
+          struct.setFieldListIsSet(true);
         }
-        struct.setFieldListIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.includeParamKeyPattern = iprot.readString();
-        struct.setIncludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.excludeParamKeyPattern = iprot.readString();
-        struct.setExcludeParamKeyPatternIsSet(true);
+        if (incoming.get(1)) {
+          struct.includeParamKeyPattern = iprot.readString();
+          struct.setIncludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.excludeParamKeyPattern = iprot.readString();
+          struct.setExcludeParamKeyPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetReplicationMetricsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetReplicationMetricsRequest.java
index f036a8e8cdd7..d11d6c4153f8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetReplicationMetricsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetReplicationMetricsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetReplicationMetricsRequest implements org.apache.thrift.TBase<GetReplicationMetricsRequest, GetReplicationMetricsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetReplicationMetricsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetReplicationMetricsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -92,7 +94,7 @@ public java.lang.String getFieldName() {
   private static final int __SCHEDULEDEXECUTIONID_ISSET_ID = 0;
   private static final int __DUMPEXECUTIONID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SCHEDULED_EXECUTION_ID,_Fields.POLICY,_Fields.DUMP_EXECUTION_ID};
+  private static final _Fields[] optionals = {_Fields.SCHEDULED_EXECUTION_ID,_Fields.POLICY,_Fields.DUMP_EXECUTION_ID};
   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);
@@ -121,6 +123,7 @@ public GetReplicationMetricsRequest(GetReplicationMetricsRequest other) {
     this.dumpExecutionId = other.dumpExecutionId;
   }
 
+  @Override
   public GetReplicationMetricsRequest deepCopy() {
     return new GetReplicationMetricsRequest(this);
   }
@@ -202,6 +205,7 @@ public void setDumpExecutionIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DUMPEXECUTIONID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEDULED_EXECUTION_ID:
@@ -232,6 +236,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEDULED_EXECUTION_ID:
@@ -248,6 +253,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -368,14 +374,17 @@ public int compareTo(GetReplicationMetricsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -434,6 +443,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetReplicationMetricsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetReplicationMetricsRequestStandardScheme getScheme() {
       return new GetReplicationMetricsRequestStandardScheme();
     }
@@ -441,49 +451,56 @@ public GetReplicationMetricsRequestStandardScheme getScheme() {
 
   private static class GetReplicationMetricsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetReplicationMetricsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetReplicationMetricsRequest 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 1: // SCHEDULED_EXECUTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.scheduledExecutionId = iprot.readI64();
-              struct.setScheduledExecutionIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.policy = iprot.readString();
-              struct.setPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // DUMP_EXECUTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.dumpExecutionId = iprot.readI64();
-              struct.setDumpExecutionIdIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEDULED_EXECUTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.scheduledExecutionId = iprot.readI64();
+                struct.setScheduledExecutionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.policy = iprot.readString();
+                struct.setPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DUMP_EXECUTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.dumpExecutionId = iprot.readI64();
+                struct.setDumpExecutionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetReplicationMetricsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -512,6 +529,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetReplicationMetr
   }
 
   private static class GetReplicationMetricsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetReplicationMetricsRequestTupleScheme getScheme() {
       return new GetReplicationMetricsRequestTupleScheme();
     }
@@ -546,19 +564,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetReplicationMetri
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetReplicationMetricsRequest 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.scheduledExecutionId = iprot.readI64();
-        struct.setScheduledExecutionIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.policy = iprot.readString();
-        struct.setPolicyIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.dumpExecutionId = iprot.readI64();
-        struct.setDumpExecutionIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.scheduledExecutionId = iprot.readI64();
+          struct.setScheduledExecutionIdIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.policy = iprot.readString();
+          struct.setPolicyIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.dumpExecutionId = iprot.readI64();
+          struct.setDumpExecutionIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java
index 4ae933f69309..93433283c3ce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetRoleGrantsForPrincipalRequest implements org.apache.thrift.TBase<GetRoleGrantsForPrincipalRequest, GetRoleGrantsForPrincipalRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetRoleGrantsForPrincipalRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetRoleGrantsForPrincipalRequest");
 
@@ -78,10 +78,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public GetRoleGrantsForPrincipalRequest(GetRoleGrantsForPrincipalRequest other)
     }
   }
 
+  @Override
   public GetRoleGrantsForPrincipalRequest deepCopy() {
     return new GetRoleGrantsForPrincipalRequest(this);
   }
@@ -189,6 +192,7 @@ public void setPrincipal_typeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRINCIPAL_NAME:
@@ -211,6 +215,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRINCIPAL_NAME:
@@ -224,6 +229,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -319,14 +325,17 @@ public int compareTo(GetRoleGrantsForPrincipalRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -385,6 +394,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetRoleGrantsForPrincipalRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetRoleGrantsForPrincipalRequestStandardScheme getScheme() {
       return new GetRoleGrantsForPrincipalRequestStandardScheme();
     }
@@ -392,41 +402,48 @@ public GetRoleGrantsForPrincipalRequestStandardScheme getScheme() {
 
   private static class GetRoleGrantsForPrincipalRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetRoleGrantsForPrincipalRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetRoleGrantsForPrincipalRequest 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 1: // PRINCIPAL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.principal_name = iprot.readString();
-              struct.setPrincipal_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setPrincipal_typeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // PRINCIPAL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.principal_name = iprot.readString();
+                struct.setPrincipal_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PRINCIPAL_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setPrincipal_typeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetRoleGrantsForPrincipalRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -448,6 +465,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetRoleGrantsForPr
   }
 
   private static class GetRoleGrantsForPrincipalRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetRoleGrantsForPrincipalRequestTupleScheme getScheme() {
       return new GetRoleGrantsForPrincipalRequestTupleScheme();
     }
@@ -464,11 +482,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetRoleGrantsForPri
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetRoleGrantsForPrincipalRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.principal_name = iprot.readString();
-      struct.setPrincipal_nameIsSet(true);
-      struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-      struct.setPrincipal_typeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.principal_name = iprot.readString();
+        struct.setPrincipal_nameIsSet(true);
+        struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+        struct.setPrincipal_typeIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
index 006ec3585184..1261b39d1d96 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBase<GetRoleGrantsForPrincipalResponse, GetRoleGrantsForPrincipalResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetRoleGrantsForPrincipalResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetRoleGrantsForPrincipalResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetRoleGrantsForPrincipalResponse(GetRoleGrantsForPrincipalResponse other
     }
   }
 
+  @Override
   public GetRoleGrantsForPrincipalResponse deepCopy() {
     return new GetRoleGrantsForPrincipalResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPrincipalGrantsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRINCIPAL_GRANTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRINCIPAL_GRANTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetRoleGrantsForPrincipalResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetRoleGrantsForPrincipalResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetRoleGrantsForPrincipalResponseStandardScheme getScheme() {
       return new GetRoleGrantsForPrincipalResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetRoleGrantsForPrincipalResponseStandardScheme getScheme() {
 
   private static class GetRoleGrantsForPrincipalResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetRoleGrantsForPrincipalResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetRoleGrantsForPrincipalResponse 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 1: // PRINCIPAL_GRANTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list182 = iprot.readListBegin();
-                struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list182.size);
-                @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem183;
-                for (int _i184 = 0; _i184 < _list182.size; ++_i184)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PRINCIPAL_GRANTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem183 = new RolePrincipalGrant();
-                  _elem183.read(iprot);
-                  struct.principalGrants.add(_elem183);
+                  org.apache.thrift.protocol.TList _list182 = iprot.readListBegin();
+                  struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list182.size);
+                  @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem183;
+                  for (int _i184 = 0; _i184 < _list182.size; ++_i184)
+                  {
+                    _elem183 = new RolePrincipalGrant();
+                    _elem183.read(iprot);
+                    struct.principalGrants.add(_elem183);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrincipalGrantsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrincipalGrantsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetRoleGrantsForPrincipalResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetRoleGrantsForPr
   }
 
   private static class GetRoleGrantsForPrincipalResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetRoleGrantsForPrincipalResponseTupleScheme getScheme() {
       return new GetRoleGrantsForPrincipalResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetRoleGrantsForPri
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetRoleGrantsForPrincipalResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list187 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list187.size);
-        @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem188;
-        for (int _i189 = 0; _i189 < _list187.size; ++_i189)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem188 = new RolePrincipalGrant();
-          _elem188.read(iprot);
-          struct.principalGrants.add(_elem188);
+          org.apache.thrift.protocol.TList _list187 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.principalGrants = new java.util.ArrayList<RolePrincipalGrant>(_list187.size);
+          @org.apache.thrift.annotation.Nullable RolePrincipalGrant _elem188;
+          for (int _i189 = 0; _i189 < _list187.size; ++_i189)
+          {
+            _elem188 = new RolePrincipalGrant();
+            _elem188.read(iprot);
+            struct.principalGrants.add(_elem188);
+          }
         }
+        struct.setPrincipalGrantsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPrincipalGrantsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java
index c8c85a588687..c8c3993b65f2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetRuntimeStatsRequest implements org.apache.thrift.TBase<GetRuntimeStatsRequest, GetRuntimeStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetRuntimeStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetRuntimeStatsRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public GetRuntimeStatsRequest(GetRuntimeStatsRequest other) {
     this.maxCreateTime = other.maxCreateTime;
   }
 
+  @Override
   public GetRuntimeStatsRequest deepCopy() {
     return new GetRuntimeStatsRequest(this);
   }
@@ -177,6 +180,7 @@ public void setMaxCreateTimeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXCREATETIME_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MAX_WEIGHT:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MAX_WEIGHT:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -303,14 +309,17 @@ public int compareTo(GetRuntimeStatsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -363,6 +372,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetRuntimeStatsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetRuntimeStatsRequestStandardScheme getScheme() {
       return new GetRuntimeStatsRequestStandardScheme();
     }
@@ -370,41 +380,48 @@ public GetRuntimeStatsRequestStandardScheme getScheme() {
 
   private static class GetRuntimeStatsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetRuntimeStatsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetRuntimeStatsRequest 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 1: // MAX_WEIGHT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.maxWeight = iprot.readI32();
-              struct.setMaxWeightIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // MAX_CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.maxCreateTime = iprot.readI32();
-              struct.setMaxCreateTimeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MAX_WEIGHT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.maxWeight = iprot.readI32();
+                struct.setMaxWeightIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MAX_CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.maxCreateTime = iprot.readI32();
+                struct.setMaxCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetRuntimeStatsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -422,6 +439,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetRuntimeStatsReq
   }
 
   private static class GetRuntimeStatsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetRuntimeStatsRequestTupleScheme getScheme() {
       return new GetRuntimeStatsRequestTupleScheme();
     }
@@ -438,11 +456,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetRuntimeStatsRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetRuntimeStatsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.maxWeight = iprot.readI32();
-      struct.setMaxWeightIsSet(true);
-      struct.maxCreateTime = iprot.readI32();
-      struct.setMaxCreateTimeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.maxWeight = iprot.readI32();
+        struct.setMaxWeightIsSet(true);
+        struct.maxCreateTime = iprot.readI32();
+        struct.setMaxCreateTimeIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaRequest.java
index b45bf424cda0..9ea44eb6c2b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetSchemaRequest implements org.apache.thrift.TBase<GetSchemaRequest, GetSchemaRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetSchemaRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetSchemaRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.ENV_CONTEXT,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.ENV_CONTEXT,_Fields.VALID_WRITE_ID_LIST,_Fields.ID};
   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);
@@ -163,6 +165,7 @@ public GetSchemaRequest(GetSchemaRequest other) {
     this.id = other.id;
   }
 
+  @Override
   public GetSchemaRequest deepCopy() {
     return new GetSchemaRequest(this);
   }
@@ -320,6 +323,7 @@ public void setIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -374,6 +378,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -399,6 +404,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -594,14 +600,17 @@ public int compareTo(GetSchemaRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -701,6 +710,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetSchemaRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetSchemaRequestStandardScheme getScheme() {
       return new GetSchemaRequestStandardScheme();
     }
@@ -708,74 +718,81 @@ public GetSchemaRequestStandardScheme getScheme() {
 
   private static class GetSchemaRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetSchemaRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetSchemaRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ENV_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.envContext = new EnvironmentContext();
+                struct.envContext.read(iprot);
+                struct.setEnvContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ENV_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.envContext = new EnvironmentContext();
-              struct.envContext.read(iprot);
-              struct.setEnvContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemaRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -823,6 +840,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemaRequest s
   }
 
   private static class GetSchemaRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetSchemaRequestTupleScheme getScheme() {
       return new GetSchemaRequestTupleScheme();
     }
@@ -865,28 +883,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetSchemaRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetSchemaRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.envContext = new EnvironmentContext();
-        struct.envContext.read(iprot);
-        struct.setEnvContextIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.envContext = new EnvironmentContext();
+          struct.envContext.read(iprot);
+          struct.setEnvContextIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaResponse.java
index 1725bc4f88fe..559dbd4e5374 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSchemaResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetSchemaResponse implements org.apache.thrift.TBase<GetSchemaResponse, GetSchemaResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetSchemaResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetSchemaResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetSchemaResponse(GetSchemaResponse other) {
     }
   }
 
+  @Override
   public GetSchemaResponse deepCopy() {
     return new GetSchemaResponse(this);
   }
@@ -161,6 +164,7 @@ public void setFieldsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FIELDS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELDS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetSchemaResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetSchemaResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetSchemaResponseStandardScheme getScheme() {
       return new GetSchemaResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetSchemaResponseStandardScheme getScheme() {
 
   private static class GetSchemaResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetSchemaResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetSchemaResponse 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 1: // FIELDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1532 = iprot.readListBegin();
-                struct.fields = new java.util.ArrayList<FieldSchema>(_list1532.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem1533;
-                for (int _i1534 = 0; _i1534 < _list1532.size; ++_i1534)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FIELDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1533 = new FieldSchema();
-                  _elem1533.read(iprot);
-                  struct.fields.add(_elem1533);
+                  org.apache.thrift.protocol.TList _list1532 = iprot.readListBegin();
+                  struct.fields = new java.util.ArrayList<FieldSchema>(_list1532.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1533;
+                  for (int _i1534 = 0; _i1534 < _list1532.size; ++_i1534)
+                  {
+                    _elem1533 = new FieldSchema();
+                    _elem1533.read(iprot);
+                    struct.fields.add(_elem1533);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFieldsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFieldsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemaResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetSchemaResponse
   }
 
   private static class GetSchemaResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetSchemaResponseTupleScheme getScheme() {
       return new GetSchemaResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetSchemaResponse s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetSchemaResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1537 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.fields = new java.util.ArrayList<FieldSchema>(_list1537.size);
-        @org.apache.thrift.annotation.Nullable FieldSchema _elem1538;
-        for (int _i1539 = 0; _i1539 < _list1537.size; ++_i1539)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1538 = new FieldSchema();
-          _elem1538.read(iprot);
-          struct.fields.add(_elem1538);
+          org.apache.thrift.protocol.TList _list1537 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.fields = new java.util.ArrayList<FieldSchema>(_list1537.size);
+          @org.apache.thrift.annotation.Nullable FieldSchema _elem1538;
+          for (int _i1539 = 0; _i1539 < _list1537.size; ++_i1539)
+          {
+            _elem1538 = new FieldSchema();
+            _elem1538.read(iprot);
+            struct.fields.add(_elem1538);
+          }
         }
+        struct.setFieldsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setFieldsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java
index f17f697463b8..70d71f6f0594 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetSerdeRequest implements org.apache.thrift.TBase<GetSerdeRequest, GetSerdeRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetSerdeRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetSerdeRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public GetSerdeRequest(GetSerdeRequest other) {
     }
   }
 
+  @Override
   public GetSerdeRequest deepCopy() {
     return new GetSerdeRequest(this);
   }
@@ -140,6 +143,7 @@ public void setSerdeNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SERDE_NAME:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SERDE_NAME:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(GetSerdeRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetSerdeRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetSerdeRequestStandardScheme getScheme() {
       return new GetSerdeRequestStandardScheme();
     }
@@ -291,33 +301,40 @@ public GetSerdeRequestStandardScheme getScheme() {
 
   private static class GetSerdeRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetSerdeRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetSerdeRequest 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 1: // SERDE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.serdeName = iprot.readString();
-              struct.setSerdeNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SERDE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.serdeName = iprot.readString();
+                struct.setSerdeNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetSerdeRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetSerdeRequest st
   }
 
   private static class GetSerdeRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetSerdeRequestTupleScheme getScheme() {
       return new GetSerdeRequestTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetSerdeRequest str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetSerdeRequest 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.serdeName = iprot.readString();
-        struct.setSerdeNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.serdeName = iprot.readString();
+          struct.setSerdeNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
index e165bc30b244..3e3718b62833 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetTableRequest implements org.apache.thrift.TBase<GetTableRequest, GetTableRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetTableRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTableRequest");
 
@@ -114,10 +114,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -127,7 +129,7 @@ public java.lang.String getFieldName() {
   private static final int __GETCOLUMNSTATS_ISSET_ID = 0;
   private static final int __ID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAPABILITIES,_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.GET_COLUMN_STATS,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.ENGINE,_Fields.ID};
+  private static final _Fields[] optionals = {_Fields.CAPABILITIES,_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.GET_COLUMN_STATS,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.ENGINE,_Fields.ID};
   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);
@@ -206,6 +208,7 @@ public GetTableRequest(GetTableRequest other) {
     this.id = other.id;
   }
 
+  @Override
   public GetTableRequest deepCopy() {
     return new GetTableRequest(this);
   }
@@ -479,6 +482,7 @@ public void setIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -565,6 +569,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -602,6 +607,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -897,14 +903,17 @@ public int compareTo(GetTableRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1040,6 +1049,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetTableRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTableRequestStandardScheme getScheme() {
       return new GetTableRequestStandardScheme();
     }
@@ -1047,116 +1057,123 @@ public GetTableRequestStandardScheme getScheme() {
 
   private static class GetTableRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTableRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetTableRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.capabilities = new ClientCapabilities();
-              struct.capabilities.read(iprot);
-              struct.setCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // GET_COLUMN_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.getColumnStats = iprot.readBool();
-              struct.setGetColumnStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1216 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1216.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1217;
-                for (int _i1218 = 0; _i1218 < _list1216.size; ++_i1218)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.capabilities = new ClientCapabilities();
+                struct.capabilities.read(iprot);
+                struct.setCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // GET_COLUMN_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.getColumnStats = iprot.readBool();
+                struct.setGetColumnStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1217 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1217);
+                  org.apache.thrift.protocol.TList _list1216 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1216.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1217;
+                  for (int _i1218 = 0; _i1218 < _list1216.size; ++_i1218)
+                  {
+                    _elem1217 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1217);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
+              break;
+            case 9: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1237,6 +1254,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableRequest st
   }
 
   private static class GetTableRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTableRequestTupleScheme getScheme() {
       return new GetTableRequestTupleScheme();
     }
@@ -1309,53 +1327,58 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTableRequest str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetTableRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.capabilities = new ClientCapabilities();
-        struct.capabilities.read(iprot);
-        struct.setCapabilitiesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.getColumnStats = iprot.readBool();
-        struct.setGetColumnStatsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list1221 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1221.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1222;
-          for (int _i1223 = 0; _i1223 < _list1221.size; ++_i1223)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.capabilities = new ClientCapabilities();
+          struct.capabilities.read(iprot);
+          struct.setCapabilitiesIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.getColumnStats = iprot.readBool();
+          struct.setGetColumnStatsIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _elem1222 = iprot.readString();
-            struct.processorCapabilities.add(_elem1222);
+            org.apache.thrift.protocol.TList _list1221 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1221.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1222;
+            for (int _i1223 = 0; _i1223 < _list1221.size; ++_i1223)
+            {
+              _elem1222 = iprot.readString();
+              struct.processorCapabilities.add(_elem1222);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
+        if (incoming.get(5)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
index 1c3e287bf564..488d6f107f25 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetTableResult implements org.apache.thrift.TBase<GetTableResult, GetTableResult._Fields>, java.io.Serializable, Cloneable, Comparable<GetTableResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTableResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
+  private static final _Fields[] optionals = {_Fields.IS_STATS_COMPLIANT};
   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);
@@ -119,6 +121,7 @@ public GetTableResult(GetTableResult other) {
     this.isStatsCompliant = other.isStatsCompliant;
   }
 
+  @Override
   public GetTableResult deepCopy() {
     return new GetTableResult(this);
   }
@@ -176,6 +179,7 @@ public void setIsStatsCompliantIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(GetTableResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -371,6 +380,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetTableResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTableResultStandardScheme getScheme() {
       return new GetTableResultStandardScheme();
     }
@@ -378,42 +388,49 @@ public GetTableResultStandardScheme getScheme() {
 
   private static class GetTableResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTableResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetTableResult 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 1: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.table = new Table();
-              struct.table.read(iprot);
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.table = new Table();
+                struct.table.read(iprot);
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -435,6 +452,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTableResult str
   }
 
   private static class GetTableResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTableResultTupleScheme getScheme() {
       return new GetTableResultTupleScheme();
     }
@@ -458,14 +476,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTableResult stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetTableResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.table = new Table();
-      struct.table.read(iprot);
-      struct.setTableIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.table = new Table();
+        struct.table.read(iprot);
+        struct.setTableIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java
index b31c1219896a..d2078b688d37 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetTablesExtRequest implements org.apache.thrift.TBase<GetTablesExtRequest, GetTablesExtRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetTablesExtRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTablesExtRequest");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,7 +114,7 @@ public java.lang.String getFieldName() {
   private static final int __REQUESTEDFIELDS_ISSET_ID = 0;
   private static final int __LIMIT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LIMIT,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER};
+  private static final _Fields[] optionals = {_Fields.LIMIT,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER};
   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);
@@ -177,6 +179,7 @@ public GetTablesExtRequest(GetTablesExtRequest other) {
     }
   }
 
+  @Override
   public GetTablesExtRequest deepCopy() {
     return new GetTablesExtRequest(this);
   }
@@ -374,6 +377,7 @@ public void setProcessorIdentifierIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG:
@@ -436,6 +440,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG:
@@ -464,6 +469,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -682,14 +688,17 @@ public int compareTo(GetTablesExtRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -796,6 +805,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetTablesExtRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTablesExtRequestStandardScheme getScheme() {
       return new GetTablesExtRequestStandardScheme();
     }
@@ -803,91 +813,98 @@ public GetTablesExtRequestStandardScheme getScheme() {
 
   private static class GetTablesExtRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTablesExtRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetTablesExtRequest 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 1: // CATALOG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalog = iprot.readString();
-              struct.setCatalogIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DATABASE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.database = iprot.readString();
-              struct.setDatabaseIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableNamePattern = iprot.readString();
-              struct.setTableNamePatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // REQUESTED_FIELDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.requestedFields = iprot.readI32();
-              struct.setRequestedFieldsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // LIMIT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.limit = iprot.readI32();
-              struct.setLimitIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1248 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1248.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1249;
-                for (int _i1250 = 0; _i1250 < _list1248.size; ++_i1250)
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalog = iprot.readString();
+                struct.setCatalogIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DATABASE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.database = iprot.readString();
+                struct.setDatabaseIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableNamePattern = iprot.readString();
+                struct.setTableNamePatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // REQUESTED_FIELDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.requestedFields = iprot.readI32();
+                struct.setRequestedFieldsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // LIMIT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.limit = iprot.readI32();
+                struct.setLimitIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1249 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1249);
+                  org.apache.thrift.protocol.TList _list1248 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1248.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1249;
+                  for (int _i1250 = 0; _i1250 < _list1248.size; ++_i1250)
+                  {
+                    _elem1249 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1249);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
+              break;
+            case 7: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetTablesExtRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -943,6 +960,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTablesExtReques
   }
 
   private static class GetTablesExtRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTablesExtRequestTupleScheme getScheme() {
       return new GetTablesExtRequestTupleScheme();
     }
@@ -987,36 +1005,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTablesExtRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetTablesExtRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catalog = iprot.readString();
-      struct.setCatalogIsSet(true);
-      struct.database = iprot.readString();
-      struct.setDatabaseIsSet(true);
-      struct.tableNamePattern = iprot.readString();
-      struct.setTableNamePatternIsSet(true);
-      struct.requestedFields = iprot.readI32();
-      struct.setRequestedFieldsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.limit = iprot.readI32();
-        struct.setLimitIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1253 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1253.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1254;
-          for (int _i1255 = 0; _i1255 < _list1253.size; ++_i1255)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catalog = iprot.readString();
+        struct.setCatalogIsSet(true);
+        struct.database = iprot.readString();
+        struct.setDatabaseIsSet(true);
+        struct.tableNamePattern = iprot.readString();
+        struct.setTableNamePatternIsSet(true);
+        struct.requestedFields = iprot.readI32();
+        struct.setRequestedFieldsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.limit = iprot.readI32();
+          struct.setLimitIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1254 = iprot.readString();
-            struct.processorCapabilities.add(_elem1254);
+            org.apache.thrift.protocol.TList _list1253 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1253.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1254;
+            for (int _i1255 = 0; _i1255 < _list1253.size; ++_i1255)
+            {
+              _elem1254 = iprot.readString();
+              struct.processorCapabilities.add(_elem1254);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
+        if (incoming.get(2)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequestFields.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequestFields.java
index 0b0d30673b00..2acac0d13b81 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequestFields.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequestFields.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum GetTablesExtRequestFields implements org.apache.thrift.TEnum {
   ACCESS_TYPE(1),
   PROCESSOR_CAPABILITIES(2),
@@ -22,6 +22,7 @@ private GetTablesExtRequestFields(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
index b855b4feff7c..24848675f951 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetTablesRequest implements org.apache.thrift.TBase<GetTablesRequest, GetTablesRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetTablesRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTablesRequest");
 
@@ -104,17 +104,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TBL_NAMES,_Fields.CAPABILITIES,_Fields.CAT_NAME,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.PROJECTION_SPEC,_Fields.TABLES_PATTERN};
+  private static final _Fields[] optionals = {_Fields.TBL_NAMES,_Fields.CAPABILITIES,_Fields.CAT_NAME,_Fields.PROCESSOR_CAPABILITIES,_Fields.PROCESSOR_IDENTIFIER,_Fields.PROJECTION_SPEC,_Fields.TABLES_PATTERN};
   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);
@@ -182,6 +184,7 @@ public GetTablesRequest(GetTablesRequest other) {
     }
   }
 
+  @Override
   public GetTablesRequest deepCopy() {
     return new GetTablesRequest(this);
   }
@@ -422,6 +425,7 @@ public void setTablesPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -492,6 +496,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -523,6 +528,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -768,14 +774,17 @@ public int compareTo(GetTablesRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -898,6 +907,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetTablesRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTablesRequestStandardScheme getScheme() {
       return new GetTablesRequestStandardScheme();
     }
@@ -905,111 +915,118 @@ public GetTablesRequestStandardScheme getScheme() {
 
   private static class GetTablesRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTablesRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetTablesRequest 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 1: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // TBL_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1224 = iprot.readListBegin();
-                struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1224.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1225;
-                for (int _i1226 = 0; _i1226 < _list1224.size; ++_i1226)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1225 = iprot.readString();
-                  struct.tblNames.add(_elem1225);
+                  org.apache.thrift.protocol.TList _list1224 = iprot.readListBegin();
+                  struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1224.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1225;
+                  for (int _i1226 = 0; _i1226 < _list1224.size; ++_i1226)
+                  {
+                    _elem1225 = iprot.readString();
+                    struct.tblNames.add(_elem1225);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTblNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTblNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.capabilities = new ClientCapabilities();
-              struct.capabilities.read(iprot);
-              struct.setCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PROCESSOR_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1227 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1227.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1228;
-                for (int _i1229 = 0; _i1229 < _list1227.size; ++_i1229)
+              break;
+            case 3: // CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.capabilities = new ClientCapabilities();
+                struct.capabilities.read(iprot);
+                struct.setCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PROCESSOR_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1228 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1228);
+                  org.apache.thrift.protocol.TList _list1227 = iprot.readListBegin();
+                  struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1227.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1228;
+                  for (int _i1229 = 0; _i1229 < _list1227.size; ++_i1229)
+                  {
+                    _elem1228 = iprot.readString();
+                    struct.processorCapabilities.add(_elem1228);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setProcessorCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setProcessorCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // PROCESSOR_IDENTIFIER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.processorIdentifier = iprot.readString();
-              struct.setProcessorIdentifierIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // PROJECTION_SPEC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.projectionSpec = new GetProjectionsSpec();
-              struct.projectionSpec.read(iprot);
-              struct.setProjectionSpecIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // TABLES_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablesPattern = iprot.readString();
-              struct.setTablesPatternIsSet(true);
-            } else { 
+              break;
+            case 6: // PROCESSOR_IDENTIFIER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.processorIdentifier = iprot.readString();
+                struct.setProcessorIdentifierIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // PROJECTION_SPEC
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.projectionSpec = new GetProjectionsSpec();
+                struct.projectionSpec.read(iprot);
+                struct.setProjectionSpecIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // TABLES_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablesPattern = iprot.readString();
+                struct.setTablesPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetTablesRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1089,6 +1106,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTablesRequest s
   }
 
   private static class GetTablesRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTablesRequestTupleScheme getScheme() {
       return new GetTablesRequestTupleScheme();
     }
@@ -1160,57 +1178,62 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTablesRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetTablesRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list1234 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1234.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1235;
-          for (int _i1236 = 0; _i1236 < _list1234.size; ++_i1236)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
           {
-            _elem1235 = iprot.readString();
-            struct.tblNames.add(_elem1235);
+            org.apache.thrift.protocol.TList _list1234 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1234.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1235;
+            for (int _i1236 = 0; _i1236 < _list1234.size; ++_i1236)
+            {
+              _elem1235 = iprot.readString();
+              struct.tblNames.add(_elem1235);
+            }
           }
+          struct.setTblNamesIsSet(true);
         }
-        struct.setTblNamesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.capabilities = new ClientCapabilities();
-        struct.capabilities.read(iprot);
-        struct.setCapabilitiesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list1237 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1237.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1238;
-          for (int _i1239 = 0; _i1239 < _list1237.size; ++_i1239)
+        if (incoming.get(1)) {
+          struct.capabilities = new ClientCapabilities();
+          struct.capabilities.read(iprot);
+          struct.setCapabilitiesIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _elem1238 = iprot.readString();
-            struct.processorCapabilities.add(_elem1238);
+            org.apache.thrift.protocol.TList _list1237 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1237.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1238;
+            for (int _i1239 = 0; _i1239 < _list1237.size; ++_i1239)
+            {
+              _elem1238 = iprot.readString();
+              struct.processorCapabilities.add(_elem1238);
+            }
           }
+          struct.setProcessorCapabilitiesIsSet(true);
         }
-        struct.setProcessorCapabilitiesIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.processorIdentifier = iprot.readString();
-        struct.setProcessorIdentifierIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.projectionSpec = new GetProjectionsSpec();
-        struct.projectionSpec.read(iprot);
-        struct.setProjectionSpecIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.tablesPattern = iprot.readString();
-        struct.setTablesPatternIsSet(true);
+        if (incoming.get(4)) {
+          struct.processorIdentifier = iprot.readString();
+          struct.setProcessorIdentifierIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.projectionSpec = new GetProjectionsSpec();
+          struct.projectionSpec.read(iprot);
+          struct.setProjectionSpecIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.tablesPattern = iprot.readString();
+          struct.setTablesPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
index f3dfe7aa40c5..3599a14190df 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetTablesResult implements org.apache.thrift.TBase<GetTablesResult, GetTablesResult._Fields>, java.io.Serializable, Cloneable, Comparable<GetTablesResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTablesResult");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetTablesResult(GetTablesResult other) {
     }
   }
 
+  @Override
   public GetTablesResult deepCopy() {
     return new GetTablesResult(this);
   }
@@ -161,6 +164,7 @@ public void setTablesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLES:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLES:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetTablesResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetTablesResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTablesResultStandardScheme getScheme() {
       return new GetTablesResultStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetTablesResultStandardScheme getScheme() {
 
   private static class GetTablesResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetTablesResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetTablesResult 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 1: // TABLES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1240 = iprot.readListBegin();
-                struct.tables = new java.util.ArrayList<Table>(_list1240.size);
-                @org.apache.thrift.annotation.Nullable Table _elem1241;
-                for (int _i1242 = 0; _i1242 < _list1240.size; ++_i1242)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TABLES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1241 = new Table();
-                  _elem1241.read(iprot);
-                  struct.tables.add(_elem1241);
+                  org.apache.thrift.protocol.TList _list1240 = iprot.readListBegin();
+                  struct.tables = new java.util.ArrayList<Table>(_list1240.size);
+                  @org.apache.thrift.annotation.Nullable Table _elem1241;
+                  for (int _i1242 = 0; _i1242 < _list1240.size; ++_i1242)
+                  {
+                    _elem1241 = new Table();
+                    _elem1241.read(iprot);
+                    struct.tables.add(_elem1241);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTablesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTablesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetTablesResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetTablesResult st
   }
 
   private static class GetTablesResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetTablesResultTupleScheme getScheme() {
       return new GetTablesResultTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetTablesResult str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetTablesResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1245 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.tables = new java.util.ArrayList<Table>(_list1245.size);
-        @org.apache.thrift.annotation.Nullable Table _elem1246;
-        for (int _i1247 = 0; _i1247 < _list1245.size; ++_i1247)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1246 = new Table();
-          _elem1246.read(iprot);
-          struct.tables.add(_elem1246);
+          org.apache.thrift.protocol.TList _list1245 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.tables = new java.util.ArrayList<Table>(_list1245.size);
+          @org.apache.thrift.annotation.Nullable Table _elem1246;
+          for (int _i1247 = 0; _i1247 < _list1245.size; ++_i1247)
+          {
+            _elem1246 = new Table();
+            _elem1246.read(iprot);
+            struct.tables.add(_elem1246);
+          }
         }
+        struct.setTablesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setTablesIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
index 08ef1d2149ea..334e1bafbdf2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetValidWriteIdsRequest implements org.apache.thrift.TBase<GetValidWriteIdsRequest, GetValidWriteIdsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetValidWriteIdsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetValidWriteIdsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -91,7 +93,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __WRITEID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.VALID_TXN_LIST,_Fields.WRITE_ID};
+  private static final _Fields[] optionals = {_Fields.VALID_TXN_LIST,_Fields.WRITE_ID};
   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);
@@ -131,6 +133,7 @@ public GetValidWriteIdsRequest(GetValidWriteIdsRequest other) {
     this.writeId = other.writeId;
   }
 
+  @Override
   public GetValidWriteIdsRequest deepCopy() {
     return new GetValidWriteIdsRequest(this);
   }
@@ -229,6 +232,7 @@ public void setWriteIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WRITEID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FULL_TABLE_NAMES:
@@ -259,6 +263,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FULL_TABLE_NAMES:
@@ -275,6 +280,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -395,14 +401,17 @@ public int compareTo(GetValidWriteIdsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -467,6 +476,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetValidWriteIdsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetValidWriteIdsRequestStandardScheme getScheme() {
       return new GetValidWriteIdsRequestStandardScheme();
     }
@@ -474,59 +484,66 @@ public GetValidWriteIdsRequestStandardScheme getScheme() {
 
   private static class GetValidWriteIdsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetValidWriteIdsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetValidWriteIdsRequest 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 1: // FULL_TABLE_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list854 = iprot.readListBegin();
-                struct.fullTableNames = new java.util.ArrayList<java.lang.String>(_list854.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem855;
-                for (int _i856 = 0; _i856 < _list854.size; ++_i856)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FULL_TABLE_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem855 = iprot.readString();
-                  struct.fullTableNames.add(_elem855);
+                  org.apache.thrift.protocol.TList _list854 = iprot.readListBegin();
+                  struct.fullTableNames = new java.util.ArrayList<java.lang.String>(_list854.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem855;
+                  for (int _i856 = 0; _i856 < _list854.size; ++_i856)
+                  {
+                    _elem855 = iprot.readString();
+                    struct.fullTableNames.add(_elem855);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFullTableNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFullTableNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // VALID_TXN_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validTxnList = iprot.readString();
-              struct.setValidTxnListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
+              break;
+            case 2: // VALID_TXN_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validTxnList = iprot.readString();
+                struct.setValidTxnListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetValidWriteIdsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -562,6 +579,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetValidWriteIdsRe
   }
 
   private static class GetValidWriteIdsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetValidWriteIdsRequestTupleScheme getScheme() {
       return new GetValidWriteIdsRequestTupleScheme();
     }
@@ -597,26 +615,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list859 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.fullTableNames = new java.util.ArrayList<java.lang.String>(_list859.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem860;
-        for (int _i861 = 0; _i861 < _list859.size; ++_i861)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem860 = iprot.readString();
-          struct.fullTableNames.add(_elem860);
+          org.apache.thrift.protocol.TList _list859 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.fullTableNames = new java.util.ArrayList<java.lang.String>(_list859.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem860;
+          for (int _i861 = 0; _i861 < _list859.size; ++_i861)
+          {
+            _elem860 = iprot.readString();
+            struct.fullTableNames.add(_elem860);
+          }
         }
-      }
-      struct.setFullTableNamesIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.validTxnList = iprot.readString();
-        struct.setValidTxnListIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
+        struct.setFullTableNamesIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.validTxnList = iprot.readString();
+          struct.setValidTxnListIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java
index 43d1d710644e..8a0cd2c0afc9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetValidWriteIdsResponse implements org.apache.thrift.TBase<GetValidWriteIdsResponse, GetValidWriteIdsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetValidWriteIdsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetValidWriteIdsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public GetValidWriteIdsResponse(GetValidWriteIdsResponse other) {
     }
   }
 
+  @Override
   public GetValidWriteIdsResponse deepCopy() {
     return new GetValidWriteIdsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setTblValidWriteIdsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TBL_VALID_WRITE_IDS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TBL_VALID_WRITE_IDS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(GetValidWriteIdsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GetValidWriteIdsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetValidWriteIdsResponseStandardScheme getScheme() {
       return new GetValidWriteIdsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public GetValidWriteIdsResponseStandardScheme getScheme() {
 
   private static class GetValidWriteIdsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetValidWriteIdsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GetValidWriteIdsResponse 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 1: // TBL_VALID_WRITE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list870 = iprot.readListBegin();
-                struct.tblValidWriteIds = new java.util.ArrayList<TableValidWriteIds>(_list870.size);
-                @org.apache.thrift.annotation.Nullable TableValidWriteIds _elem871;
-                for (int _i872 = 0; _i872 < _list870.size; ++_i872)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TBL_VALID_WRITE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem871 = new TableValidWriteIds();
-                  _elem871.read(iprot);
-                  struct.tblValidWriteIds.add(_elem871);
+                  org.apache.thrift.protocol.TList _list870 = iprot.readListBegin();
+                  struct.tblValidWriteIds = new java.util.ArrayList<TableValidWriteIds>(_list870.size);
+                  @org.apache.thrift.annotation.Nullable TableValidWriteIds _elem871;
+                  for (int _i872 = 0; _i872 < _list870.size; ++_i872)
+                  {
+                    _elem871 = new TableValidWriteIds();
+                    _elem871.read(iprot);
+                    struct.tblValidWriteIds.add(_elem871);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTblValidWriteIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTblValidWriteIdsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GetValidWriteIdsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GetValidWriteIdsRe
   }
 
   private static class GetValidWriteIdsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GetValidWriteIdsResponseTupleScheme getScheme() {
       return new GetValidWriteIdsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsRes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list875 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.tblValidWriteIds = new java.util.ArrayList<TableValidWriteIds>(_list875.size);
-        @org.apache.thrift.annotation.Nullable TableValidWriteIds _elem876;
-        for (int _i877 = 0; _i877 < _list875.size; ++_i877)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem876 = new TableValidWriteIds();
-          _elem876.read(iprot);
-          struct.tblValidWriteIds.add(_elem876);
+          org.apache.thrift.protocol.TList _list875 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.tblValidWriteIds = new java.util.ArrayList<TableValidWriteIds>(_list875.size);
+          @org.apache.thrift.annotation.Nullable TableValidWriteIds _elem876;
+          for (int _i877 = 0; _i877 < _list875.size; ++_i877)
+          {
+            _elem876 = new TableValidWriteIds();
+            _elem876.read(iprot);
+            struct.tblValidWriteIds.add(_elem876);
+          }
         }
+        struct.setTblValidWriteIdsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setTblValidWriteIdsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
index 3bbdf1fdb494..dee81fd20b0f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GrantRevokePrivilegeRequest implements org.apache.thrift.TBase<GrantRevokePrivilegeRequest, GrantRevokePrivilegeRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GrantRevokePrivilegeRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GrantRevokePrivilegeRequest");
 
@@ -83,10 +83,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -95,7 +97,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __REVOKEGRANTOPTION_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.REVOKE_GRANT_OPTION};
+  private static final _Fields[] optionals = {_Fields.REVOKE_GRANT_OPTION};
   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);
@@ -135,6 +137,7 @@ public GrantRevokePrivilegeRequest(GrantRevokePrivilegeRequest other) {
     this.revokeGrantOption = other.revokeGrantOption;
   }
 
+  @Override
   public GrantRevokePrivilegeRequest deepCopy() {
     return new GrantRevokePrivilegeRequest(this);
   }
@@ -225,6 +228,7 @@ public void setRevokeGrantOptionIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REVOKEGRANTOPTION_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case REQUEST_TYPE:
@@ -255,6 +259,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case REQUEST_TYPE:
@@ -271,6 +276,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -391,14 +397,17 @@ public int compareTo(GrantRevokePrivilegeRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -460,6 +469,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GrantRevokePrivilegeRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokePrivilegeRequestStandardScheme getScheme() {
       return new GrantRevokePrivilegeRequestStandardScheme();
     }
@@ -467,50 +477,57 @@ public GrantRevokePrivilegeRequestStandardScheme getScheme() {
 
   private static class GrantRevokePrivilegeRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GrantRevokePrivilegeRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GrantRevokePrivilegeRequest 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 1: // REQUEST_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
-              struct.setRequestTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.privileges = new PrivilegeBag();
-              struct.privileges.read(iprot);
-              struct.setPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // REVOKE_GRANT_OPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.revokeGrantOption = iprot.readBool();
-              struct.setRevokeGrantOptionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // REQUEST_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
+                struct.setRequestTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.privileges = new PrivilegeBag();
+                struct.privileges.read(iprot);
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // REVOKE_GRANT_OPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.revokeGrantOption = iprot.readBool();
+                struct.setRevokeGrantOptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokePrivilegeRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -537,6 +554,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokePrivile
   }
 
   private static class GrantRevokePrivilegeRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokePrivilegeRequestTupleScheme getScheme() {
       return new GrantRevokePrivilegeRequestTupleScheme();
     }
@@ -571,20 +589,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GrantRevokePrivileg
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GrantRevokePrivilegeRequest 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.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
-        struct.setRequestTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.privileges = new PrivilegeBag();
-        struct.privileges.read(iprot);
-        struct.setPrivilegesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.revokeGrantOption = iprot.readBool();
-        struct.setRevokeGrantOptionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
+          struct.setRequestTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.privileges = new PrivilegeBag();
+          struct.privileges.read(iprot);
+          struct.setPrivilegesIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.revokeGrantOption = iprot.readBool();
+          struct.setRevokeGrantOptionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
index 7ed4f2735d42..e1525ed2c561 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GrantRevokePrivilegeResponse implements org.apache.thrift.TBase<GrantRevokePrivilegeResponse, GrantRevokePrivilegeResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GrantRevokePrivilegeResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GrantRevokePrivilegeResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __SUCCESS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SUCCESS};
+  private static final _Fields[] optionals = {_Fields.SUCCESS};
   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);
@@ -102,6 +104,7 @@ public GrantRevokePrivilegeResponse(GrantRevokePrivilegeResponse other) {
     this.success = other.success;
   }
 
+  @Override
   public GrantRevokePrivilegeResponse deepCopy() {
     return new GrantRevokePrivilegeResponse(this);
   }
@@ -134,6 +137,7 @@ public void setSuccessIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SUCCESS:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SUCCESS:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(GrantRevokePrivilegeResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GrantRevokePrivilegeResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokePrivilegeResponseStandardScheme getScheme() {
       return new GrantRevokePrivilegeResponseStandardScheme();
     }
@@ -285,33 +295,40 @@ public GrantRevokePrivilegeResponseStandardScheme getScheme() {
 
   private static class GrantRevokePrivilegeResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GrantRevokePrivilegeResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GrantRevokePrivilegeResponse 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 1: // SUCCESS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.success = iprot.readBool();
-              struct.setSuccessIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.success = iprot.readBool();
+                struct.setSuccessIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokePrivilegeResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokePrivile
   }
 
   private static class GrantRevokePrivilegeResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokePrivilegeResponseTupleScheme getScheme() {
       return new GrantRevokePrivilegeResponseTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GrantRevokePrivileg
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GrantRevokePrivilegeResponse 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 = iprot.readBool();
-        struct.setSuccessIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        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 = iprot.readBool();
+          struct.setSuccessIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
index f2a7f0e5fc66..964bdc8d217d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GrantRevokeRoleRequest implements org.apache.thrift.TBase<GrantRevokeRoleRequest, GrantRevokeRoleRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GrantRevokeRoleRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GrantRevokeRoleRequest");
 
@@ -111,10 +111,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,7 +125,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __GRANTOPTION_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.GRANTOR,_Fields.GRANTOR_TYPE,_Fields.GRANT_OPTION};
+  private static final _Fields[] optionals = {_Fields.GRANTOR,_Fields.GRANTOR_TYPE,_Fields.GRANT_OPTION};
   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);
@@ -187,6 +189,7 @@ public GrantRevokeRoleRequest(GrantRevokeRoleRequest other) {
     this.grantOption = other.grantOption;
   }
 
+  @Override
   public GrantRevokeRoleRequest deepCopy() {
     return new GrantRevokeRoleRequest(this);
   }
@@ -393,6 +396,7 @@ public void setGrantOptionIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __GRANTOPTION_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case REQUEST_TYPE:
@@ -455,6 +459,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case REQUEST_TYPE:
@@ -483,6 +488,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -703,14 +709,17 @@ public int compareTo(GrantRevokeRoleRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -805,6 +814,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GrantRevokeRoleRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokeRoleRequestStandardScheme getScheme() {
       return new GrantRevokeRoleRequestStandardScheme();
     }
@@ -812,81 +822,88 @@ public GrantRevokeRoleRequestStandardScheme getScheme() {
 
   private static class GrantRevokeRoleRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<GrantRevokeRoleRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GrantRevokeRoleRequest 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 1: // REQUEST_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
-              struct.setRequestTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ROLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.roleName = iprot.readString();
-              struct.setRoleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PRINCIPAL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.principalName = iprot.readString();
-              struct.setPrincipalNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setPrincipalTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // GRANTOR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.grantor = iprot.readString();
-              struct.setGrantorIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // GRANTOR_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setGrantorTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 7: // GRANT_OPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.grantOption = iprot.readBool();
-              struct.setGrantOptionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // REQUEST_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
+                struct.setRequestTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ROLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.roleName = iprot.readString();
+                struct.setRoleNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PRINCIPAL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.principalName = iprot.readString();
+                struct.setPrincipalNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PRINCIPAL_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setPrincipalTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // GRANTOR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.grantor = iprot.readString();
+                struct.setGrantorIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // GRANTOR_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setGrantorTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // GRANT_OPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.grantOption = iprot.readBool();
+                struct.setGrantOptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokeRoleRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -937,6 +954,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokeRoleReq
   }
 
   private static class GrantRevokeRoleRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokeRoleRequestTupleScheme getScheme() {
       return new GrantRevokeRoleRequestTupleScheme();
     }
@@ -995,35 +1013,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GrantRevokeRoleRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GrantRevokeRoleRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
-        struct.setRequestTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.roleName = iprot.readString();
-        struct.setRoleNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.principalName = iprot.readString();
-        struct.setPrincipalNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setPrincipalTypeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.grantor = iprot.readString();
-        struct.setGrantorIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setGrantorTypeIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.grantOption = iprot.readBool();
-        struct.setGrantOptionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.requestType = org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
+          struct.setRequestTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.roleName = iprot.readString();
+          struct.setRoleNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.principalName = iprot.readString();
+          struct.setPrincipalNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setPrincipalTypeIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.grantor = iprot.readString();
+          struct.setGrantorIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setGrantorTypeIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.grantOption = iprot.readBool();
+          struct.setGrantOptionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
index 90933d1697e0..b843a062aa8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GrantRevokeRoleResponse implements org.apache.thrift.TBase<GrantRevokeRoleResponse, GrantRevokeRoleResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GrantRevokeRoleResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GrantRevokeRoleResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -81,7 +83,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __SUCCESS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SUCCESS};
+  private static final _Fields[] optionals = {_Fields.SUCCESS};
   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);
@@ -102,6 +104,7 @@ public GrantRevokeRoleResponse(GrantRevokeRoleResponse other) {
     this.success = other.success;
   }
 
+  @Override
   public GrantRevokeRoleResponse deepCopy() {
     return new GrantRevokeRoleResponse(this);
   }
@@ -134,6 +137,7 @@ public void setSuccessIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SUCCESS:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SUCCESS:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(GrantRevokeRoleResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -278,6 +287,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class GrantRevokeRoleResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokeRoleResponseStandardScheme getScheme() {
       return new GrantRevokeRoleResponseStandardScheme();
     }
@@ -285,33 +295,40 @@ public GrantRevokeRoleResponseStandardScheme getScheme() {
 
   private static class GrantRevokeRoleResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<GrantRevokeRoleResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, GrantRevokeRoleResponse 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 1: // SUCCESS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.success = iprot.readBool();
-              struct.setSuccessIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.success = iprot.readBool();
+                struct.setSuccessIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokeRoleResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -328,6 +345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GrantRevokeRoleRes
   }
 
   private static class GrantRevokeRoleResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public GrantRevokeRoleResponseTupleScheme getScheme() {
       return new GrantRevokeRoleResponseTupleScheme();
     }
@@ -350,11 +368,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, GrantRevokeRoleResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GrantRevokeRoleResponse 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 = iprot.readBool();
-        struct.setSuccessIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        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 = iprot.readBool();
+          struct.setSuccessIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
index fe2d6b7c5e87..01cd0f30f1c5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum GrantRevokeType implements org.apache.thrift.TEnum {
   GRANT(1),
   REVOKE(2);
@@ -21,6 +21,7 @@ private GrantRevokeType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java
index 6f753b5f8079..564ed1e2d7c0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class HeartbeatRequest implements org.apache.thrift.TBase<HeartbeatRequest, HeartbeatRequest._Fields>, java.io.Serializable, Cloneable, Comparable<HeartbeatRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HeartbeatRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -87,7 +89,7 @@ public java.lang.String getFieldName() {
   private static final int __LOCKID_ISSET_ID = 0;
   private static final int __TXNID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LOCKID,_Fields.TXNID};
+  private static final _Fields[] optionals = {_Fields.LOCKID,_Fields.TXNID};
   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);
@@ -111,6 +113,7 @@ public HeartbeatRequest(HeartbeatRequest other) {
     this.txnid = other.txnid;
   }
 
+  @Override
   public HeartbeatRequest deepCopy() {
     return new HeartbeatRequest(this);
   }
@@ -167,6 +170,7 @@ public void setTxnidIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCKID:
@@ -189,6 +193,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCKID:
@@ -202,6 +207,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -297,14 +303,17 @@ public int compareTo(HeartbeatRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -353,6 +362,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class HeartbeatRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HeartbeatRequestStandardScheme getScheme() {
       return new HeartbeatRequestStandardScheme();
     }
@@ -360,41 +370,48 @@ public HeartbeatRequestStandardScheme getScheme() {
 
   private static class HeartbeatRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<HeartbeatRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, HeartbeatRequest 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 1: // LOCKID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lockid = iprot.readI64();
-              struct.setLockidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOCKID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lockid = iprot.readI64();
+                struct.setLockidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, HeartbeatRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -416,6 +433,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HeartbeatRequest s
   }
 
   private static class HeartbeatRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HeartbeatRequestTupleScheme getScheme() {
       return new HeartbeatRequestTupleScheme();
     }
@@ -444,15 +462,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HeartbeatRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, HeartbeatRequest 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.lockid = iprot.readI64();
-        struct.setLockidIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.txnid = iprot.readI64();
-        struct.setTxnidIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.lockid = iprot.readI64();
+          struct.setLockidIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.txnid = iprot.readI64();
+          struct.setTxnidIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java
index 7e6ba00f2c8f..9602395655fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class HeartbeatTxnRangeRequest implements org.apache.thrift.TBase<HeartbeatTxnRangeRequest, HeartbeatTxnRangeRequest._Fields>, java.io.Serializable, Cloneable, Comparable<HeartbeatTxnRangeRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HeartbeatTxnRangeRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public HeartbeatTxnRangeRequest(HeartbeatTxnRangeRequest other) {
     this.max = other.max;
   }
 
+  @Override
   public HeartbeatTxnRangeRequest deepCopy() {
     return new HeartbeatTxnRangeRequest(this);
   }
@@ -177,6 +180,7 @@ public void setMaxIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MIN:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MIN:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -303,14 +309,17 @@ public int compareTo(HeartbeatTxnRangeRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -363,6 +372,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class HeartbeatTxnRangeRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HeartbeatTxnRangeRequestStandardScheme getScheme() {
       return new HeartbeatTxnRangeRequestStandardScheme();
     }
@@ -370,41 +380,48 @@ public HeartbeatTxnRangeRequestStandardScheme getScheme() {
 
   private static class HeartbeatTxnRangeRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<HeartbeatTxnRangeRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, HeartbeatTxnRangeRequest 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 1: // MIN
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.min = iprot.readI64();
-              struct.setMinIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // MAX
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.max = iprot.readI64();
-              struct.setMaxIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MIN
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.min = iprot.readI64();
+                struct.setMinIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MAX
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.max = iprot.readI64();
+                struct.setMaxIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, HeartbeatTxnRangeRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -422,6 +439,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HeartbeatTxnRangeR
   }
 
   private static class HeartbeatTxnRangeRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HeartbeatTxnRangeRequestTupleScheme getScheme() {
       return new HeartbeatTxnRangeRequestTupleScheme();
     }
@@ -438,11 +456,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HeartbeatTxnRangeRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, HeartbeatTxnRangeRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.min = iprot.readI64();
-      struct.setMinIsSet(true);
-      struct.max = iprot.readI64();
-      struct.setMaxIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.min = iprot.readI64();
+        struct.setMinIsSet(true);
+        struct.max = iprot.readI64();
+        struct.setMaxIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
index 44a9c9415d36..2d3014fab8ca 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class HeartbeatTxnRangeResponse implements org.apache.thrift.TBase<HeartbeatTxnRangeResponse, HeartbeatTxnRangeResponse._Fields>, java.io.Serializable, Cloneable, Comparable<HeartbeatTxnRangeResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HeartbeatTxnRangeResponse");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public HeartbeatTxnRangeResponse(HeartbeatTxnRangeResponse other) {
     }
   }
 
+  @Override
   public HeartbeatTxnRangeResponse deepCopy() {
     return new HeartbeatTxnRangeResponse(this);
   }
@@ -213,6 +216,7 @@ public void setNosuchIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ABORTED:
@@ -235,6 +239,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ABORTED:
@@ -248,6 +253,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -343,14 +349,17 @@ public int compareTo(HeartbeatTxnRangeResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -409,6 +418,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class HeartbeatTxnRangeResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HeartbeatTxnRangeResponseStandardScheme getScheme() {
       return new HeartbeatTxnRangeResponseStandardScheme();
     }
@@ -416,61 +426,68 @@ public HeartbeatTxnRangeResponseStandardScheme getScheme() {
 
   private static class HeartbeatTxnRangeResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<HeartbeatTxnRangeResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, HeartbeatTxnRangeResponse 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 1: // ABORTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set918 = iprot.readSetBegin();
-                struct.aborted = new java.util.HashSet<java.lang.Long>(2*_set918.size);
-                long _elem919;
-                for (int _i920 = 0; _i920 < _set918.size; ++_i920)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // ABORTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem919 = iprot.readI64();
-                  struct.aborted.add(_elem919);
+                  org.apache.thrift.protocol.TSet _set918 = iprot.readSetBegin();
+                  struct.aborted = new java.util.HashSet<java.lang.Long>(2*_set918.size);
+                  long _elem919;
+                  for (int _i920 = 0; _i920 < _set918.size; ++_i920)
+                  {
+                    _elem919 = iprot.readI64();
+                    struct.aborted.add(_elem919);
+                  }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setAbortedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setAbortedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NOSUCH
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set921 = iprot.readSetBegin();
-                struct.nosuch = new java.util.HashSet<java.lang.Long>(2*_set921.size);
-                long _elem922;
-                for (int _i923 = 0; _i923 < _set921.size; ++_i923)
+              break;
+            case 2: // NOSUCH
+              if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  _elem922 = iprot.readI64();
-                  struct.nosuch.add(_elem922);
+                  org.apache.thrift.protocol.TSet _set921 = iprot.readSetBegin();
+                  struct.nosuch = new java.util.HashSet<java.lang.Long>(2*_set921.size);
+                  long _elem922;
+                  for (int _i923 = 0; _i923 < _set921.size; ++_i923)
+                  {
+                    _elem922 = iprot.readI64();
+                    struct.nosuch.add(_elem922);
+                  }
+                  iprot.readSetEnd();
                 }
-                iprot.readSetEnd();
+                struct.setNosuchIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNosuchIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, HeartbeatTxnRangeResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -506,6 +523,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HeartbeatTxnRangeR
   }
 
   private static class HeartbeatTxnRangeResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HeartbeatTxnRangeResponseTupleScheme getScheme() {
       return new HeartbeatTxnRangeResponseTupleScheme();
     }
@@ -534,29 +552,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HeartbeatTxnRangeRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, HeartbeatTxnRangeResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TSet _set928 = iprot.readSetBegin(org.apache.thrift.protocol.TType.I64);
-        struct.aborted = new java.util.HashSet<java.lang.Long>(2*_set928.size);
-        long _elem929;
-        for (int _i930 = 0; _i930 < _set928.size; ++_i930)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem929 = iprot.readI64();
-          struct.aborted.add(_elem929);
+          org.apache.thrift.protocol.TSet _set928 = iprot.readSetBegin(org.apache.thrift.protocol.TType.I64);
+          struct.aborted = new java.util.HashSet<java.lang.Long>(2*_set928.size);
+          long _elem929;
+          for (int _i930 = 0; _i930 < _set928.size; ++_i930)
+          {
+            _elem929 = iprot.readI64();
+            struct.aborted.add(_elem929);
+          }
         }
-      }
-      struct.setAbortedIsSet(true);
-      {
-        org.apache.thrift.protocol.TSet _set931 = iprot.readSetBegin(org.apache.thrift.protocol.TType.I64);
-        struct.nosuch = new java.util.HashSet<java.lang.Long>(2*_set931.size);
-        long _elem932;
-        for (int _i933 = 0; _i933 < _set931.size; ++_i933)
+        struct.setAbortedIsSet(true);
         {
-          _elem932 = iprot.readI64();
-          struct.nosuch.add(_elem932);
+          org.apache.thrift.protocol.TSet _set931 = iprot.readSetBegin(org.apache.thrift.protocol.TType.I64);
+          struct.nosuch = new java.util.HashSet<java.lang.Long>(2*_set931.size);
+          long _elem932;
+          for (int _i933 = 0; _i933 < _set931.size; ++_i933)
+          {
+            _elem932 = iprot.readI64();
+            struct.nosuch.add(_elem932);
+          }
         }
+        struct.setNosuchIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setNosuchIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
index 6a3b350f7146..839f31286398 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class HiveObjectPrivilege implements org.apache.thrift.TBase<HiveObjectPrivilege, HiveObjectPrivilege._Fields>, java.io.Serializable, Cloneable, Comparable<HiveObjectPrivilege> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HiveObjectPrivilege");
 
@@ -93,10 +93,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -159,6 +161,7 @@ public HiveObjectPrivilege(HiveObjectPrivilege other) {
     }
   }
 
+  @Override
   public HiveObjectPrivilege deepCopy() {
     return new HiveObjectPrivilege(this);
   }
@@ -300,6 +303,7 @@ public void setAuthorizerIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case HIVE_OBJECT:
@@ -346,6 +350,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case HIVE_OBJECT:
@@ -368,6 +373,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -538,14 +544,17 @@ public int compareTo(HiveObjectPrivilege other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -626,6 +635,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class HiveObjectPrivilegeStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HiveObjectPrivilegeStandardScheme getScheme() {
       return new HiveObjectPrivilegeStandardScheme();
     }
@@ -633,67 +643,74 @@ public HiveObjectPrivilegeStandardScheme getScheme() {
 
   private static class HiveObjectPrivilegeStandardScheme extends org.apache.thrift.scheme.StandardScheme<HiveObjectPrivilege> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, HiveObjectPrivilege 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 1: // HIVE_OBJECT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.hiveObject = new HiveObjectRef();
-              struct.hiveObject.read(iprot);
-              struct.setHiveObjectIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PRINCIPAL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.principalName = iprot.readString();
-              struct.setPrincipalNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setPrincipalTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // GRANT_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.grantInfo = new PrivilegeGrantInfo();
-              struct.grantInfo.read(iprot);
-              struct.setGrantInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // AUTHORIZER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.authorizer = iprot.readString();
-              struct.setAuthorizerIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // HIVE_OBJECT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.hiveObject = new HiveObjectRef();
+                struct.hiveObject.read(iprot);
+                struct.setHiveObjectIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PRINCIPAL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.principalName = iprot.readString();
+                struct.setPrincipalNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PRINCIPAL_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setPrincipalTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // GRANT_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.grantInfo = new PrivilegeGrantInfo();
+                struct.grantInfo.read(iprot);
+                struct.setGrantInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // AUTHORIZER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.authorizer = iprot.readString();
+                struct.setAuthorizerIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, HiveObjectPrivilege struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -730,6 +747,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HiveObjectPrivileg
   }
 
   private static class HiveObjectPrivilegeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HiveObjectPrivilegeTupleScheme getScheme() {
       return new HiveObjectPrivilegeTupleScheme();
     }
@@ -776,29 +794,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HiveObjectPrivilege
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, HiveObjectPrivilege struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.hiveObject = new HiveObjectRef();
-        struct.hiveObject.read(iprot);
-        struct.setHiveObjectIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.principalName = iprot.readString();
-        struct.setPrincipalNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setPrincipalTypeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.grantInfo = new PrivilegeGrantInfo();
-        struct.grantInfo.read(iprot);
-        struct.setGrantInfoIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.authorizer = iprot.readString();
-        struct.setAuthorizerIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.hiveObject = new HiveObjectRef();
+          struct.hiveObject.read(iprot);
+          struct.setHiveObjectIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.principalName = iprot.readString();
+          struct.setPrincipalNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setPrincipalTypeIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.grantInfo = new PrivilegeGrantInfo();
+          struct.grantInfo.read(iprot);
+          struct.setGrantInfoIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.authorizer = iprot.readString();
+          struct.setAuthorizerIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
index 36216b5d8919..d85f906c8ae4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class HiveObjectRef implements org.apache.thrift.TBase<HiveObjectRef, HiveObjectRef._Fields>, java.io.Serializable, Cloneable, Comparable<HiveObjectRef> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HiveObjectRef");
 
@@ -98,17 +98,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -172,6 +174,7 @@ public HiveObjectRef(HiveObjectRef other) {
     }
   }
 
+  @Override
   public HiveObjectRef deepCopy() {
     return new HiveObjectRef(this);
   }
@@ -354,6 +357,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OBJECT_TYPE:
@@ -408,6 +412,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OBJECT_TYPE:
@@ -433,6 +438,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -628,14 +634,17 @@ public int compareTo(HiveObjectRef other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -720,6 +729,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class HiveObjectRefStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HiveObjectRefStandardScheme getScheme() {
       return new HiveObjectRefStandardScheme();
     }
@@ -727,83 +737,90 @@ public HiveObjectRefStandardScheme getScheme() {
 
   private static class HiveObjectRefStandardScheme extends org.apache.thrift.scheme.StandardScheme<HiveObjectRef> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, HiveObjectRef 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 1: // OBJECT_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.objectType = org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32());
-              struct.setObjectTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // OBJECT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.objectName = iprot.readString();
-              struct.setObjectNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PART_VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list104 = iprot.readListBegin();
-                struct.partValues = new java.util.ArrayList<java.lang.String>(_list104.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem105;
-                for (int _i106 = 0; _i106 < _list104.size; ++_i106)
+          }
+          switch (schemeField.id) {
+            case 1: // OBJECT_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.objectType = org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32());
+                struct.setObjectTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // OBJECT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.objectName = iprot.readString();
+                struct.setObjectNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem105 = iprot.readString();
-                  struct.partValues.add(_elem105);
+                  org.apache.thrift.protocol.TList _list104 = iprot.readListBegin();
+                  struct.partValues = new java.util.ArrayList<java.lang.String>(_list104.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem105;
+                  for (int _i106 = 0; _i106 < _list104.size; ++_i106)
+                  {
+                    _elem105 = iprot.readString();
+                    struct.partValues.add(_elem105);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.columnName = iprot.readString();
-              struct.setColumnNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+              break;
+            case 5: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.columnName = iprot.readString();
+                struct.setColumnNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, HiveObjectRef struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -854,6 +871,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HiveObjectRef stru
   }
 
   private static class HiveObjectRefTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public HiveObjectRefTupleScheme getScheme() {
       return new HiveObjectRefTupleScheme();
     }
@@ -912,40 +930,45 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HiveObjectRef struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, HiveObjectRef struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.objectType = org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32());
-        struct.setObjectTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.objectName = iprot.readString();
-        struct.setObjectNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partValues = new java.util.ArrayList<java.lang.String>(_list109.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem110;
-          for (int _i111 = 0; _i111 < _list109.size; ++_i111)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.objectType = org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32());
+          struct.setObjectTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.objectName = iprot.readString();
+          struct.setObjectNameIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _elem110 = iprot.readString();
-            struct.partValues.add(_elem110);
+            org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partValues = new java.util.ArrayList<java.lang.String>(_list109.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem110;
+            for (int _i111 = 0; _i111 < _list109.size; ++_i111)
+            {
+              _elem110 = iprot.readString();
+              struct.partValues.add(_elem110);
+            }
           }
+          struct.setPartValuesIsSet(true);
         }
-        struct.setPartValuesIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.columnName = iprot.readString();
-        struct.setColumnNameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+        if (incoming.get(4)) {
+          struct.columnName = iprot.readString();
+          struct.setColumnNameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
index 519f0df26588..62908121d441 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum HiveObjectType implements org.apache.thrift.TEnum {
   GLOBAL(1),
   DATABASE(2),
@@ -25,6 +25,7 @@ private HiveObjectType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java
index 3929e02ea5ed..6d374fbd0ab5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ISchema implements org.apache.thrift.TBase<ISchema, ISchema._Fields>, java.io.Serializable, Cloneable, Comparable<ISchema> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ISchema");
 
@@ -121,10 +121,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -133,7 +135,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __CANEVOLVE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SCHEMA_GROUP,_Fields.DESCRIPTION};
+  private static final _Fields[] optionals = {_Fields.SCHEMA_GROUP,_Fields.DESCRIPTION};
   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);
@@ -214,6 +216,7 @@ public ISchema(ISchema other) {
     }
   }
 
+  @Override
   public ISchema deepCopy() {
     return new ISchema(this);
   }
@@ -470,6 +473,7 @@ public void setDescriptionIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEMA_TYPE:
@@ -548,6 +552,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEMA_TYPE:
@@ -582,6 +587,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -850,14 +856,17 @@ public int compareTo(ISchema other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -966,6 +975,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ISchemaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ISchemaStandardScheme getScheme() {
       return new ISchemaStandardScheme();
     }
@@ -973,97 +983,104 @@ public ISchemaStandardScheme getScheme() {
 
   private static class ISchemaStandardScheme extends org.apache.thrift.scheme.StandardScheme<ISchema> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ISchema 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 1: // SCHEMA_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.schemaType = org.apache.hadoop.hive.metastore.api.SchemaType.findByValue(iprot.readI32());
-              struct.setSchemaTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DB_NAME
-            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 5: // COMPATIBILITY
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.compatibility = org.apache.hadoop.hive.metastore.api.SchemaCompatibility.findByValue(iprot.readI32());
-              struct.setCompatibilityIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // VALIDATION_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.validationLevel = org.apache.hadoop.hive.metastore.api.SchemaValidation.findByValue(iprot.readI32());
-              struct.setValidationLevelIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // CAN_EVOLVE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.canEvolve = iprot.readBool();
-              struct.setCanEvolveIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // SCHEMA_GROUP
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaGroup = iprot.readString();
-              struct.setSchemaGroupIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEMA_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.schemaType = org.apache.hadoop.hive.metastore.api.SchemaType.findByValue(iprot.readI32());
+                struct.setSchemaTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DB_NAME
+              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 5: // COMPATIBILITY
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.compatibility = org.apache.hadoop.hive.metastore.api.SchemaCompatibility.findByValue(iprot.readI32());
+                struct.setCompatibilityIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // VALIDATION_LEVEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.validationLevel = org.apache.hadoop.hive.metastore.api.SchemaValidation.findByValue(iprot.readI32());
+                struct.setValidationLevelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // CAN_EVOLVE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.canEvolve = iprot.readBool();
+                struct.setCanEvolveIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // SCHEMA_GROUP
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaGroup = iprot.readString();
+                struct.setSchemaGroupIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ISchema struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1122,6 +1139,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ISchema struct) th
   }
 
   private static class ISchemaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ISchemaTupleScheme getScheme() {
       return new ISchemaTupleScheme();
     }
@@ -1192,43 +1210,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ISchema struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ISchema struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.schemaType = org.apache.hadoop.hive.metastore.api.SchemaType.findByValue(iprot.readI32());
-        struct.setSchemaTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.compatibility = org.apache.hadoop.hive.metastore.api.SchemaCompatibility.findByValue(iprot.readI32());
-        struct.setCompatibilityIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.validationLevel = org.apache.hadoop.hive.metastore.api.SchemaValidation.findByValue(iprot.readI32());
-        struct.setValidationLevelIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.canEvolve = iprot.readBool();
-        struct.setCanEvolveIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.schemaGroup = iprot.readString();
-        struct.setSchemaGroupIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.schemaType = org.apache.hadoop.hive.metastore.api.SchemaType.findByValue(iprot.readI32());
+          struct.setSchemaTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.compatibility = org.apache.hadoop.hive.metastore.api.SchemaCompatibility.findByValue(iprot.readI32());
+          struct.setCompatibilityIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.validationLevel = org.apache.hadoop.hive.metastore.api.SchemaValidation.findByValue(iprot.readI32());
+          struct.setValidationLevelIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.canEvolve = iprot.readBool();
+          struct.setCanEvolveIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.schemaGroup = iprot.readString();
+          struct.setSchemaGroupIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java
index d8671a4506ed..75a2f90b9560 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ISchemaName implements org.apache.thrift.TBase<ISchemaName, ISchemaName._Fields>, java.io.Serializable, Cloneable, Comparable<ISchemaName> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ISchemaName");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public ISchemaName(ISchemaName other) {
     }
   }
 
+  @Override
   public ISchemaName deepCopy() {
     return new ISchemaName(this);
   }
@@ -214,6 +217,7 @@ public void setSchemaNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(ISchemaName other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -446,6 +455,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ISchemaNameStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ISchemaNameStandardScheme getScheme() {
       return new ISchemaNameStandardScheme();
     }
@@ -453,49 +463,56 @@ public ISchemaNameStandardScheme getScheme() {
 
   private static class ISchemaNameStandardScheme extends org.apache.thrift.scheme.StandardScheme<ISchemaName> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ISchemaName 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // SCHEMA_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaName = iprot.readString();
-              struct.setSchemaNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // SCHEMA_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaName = iprot.readString();
+                struct.setSchemaNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ISchemaName struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -522,6 +539,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ISchemaName struct
   }
 
   private static class ISchemaNameTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ISchemaNameTupleScheme getScheme() {
       return new ISchemaNameTupleScheme();
     }
@@ -556,19 +574,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ISchemaName struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ISchemaName 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.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.schemaName = iprot.readString();
-        struct.setSchemaNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.schemaName = iprot.readString();
+          struct.setSchemaNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
index 24e72e3f5cf0..c7c94d13db48 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEventRequestData, InsertEventRequestData._Fields>, java.io.Serializable, Cloneable, Comparable<InsertEventRequestData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InsertEventRequestData");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __REPLACE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.REPLACE,_Fields.FILES_ADDED_CHECKSUM,_Fields.SUB_DIRECTORY_LIST,_Fields.PARTITION_VAL};
+  private static final _Fields[] optionals = {_Fields.REPLACE,_Fields.FILES_ADDED_CHECKSUM,_Fields.SUB_DIRECTORY_LIST,_Fields.PARTITION_VAL};
   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);
@@ -157,6 +159,7 @@ public InsertEventRequestData(InsertEventRequestData other) {
     }
   }
 
+  @Override
   public InsertEventRequestData deepCopy() {
     return new InsertEventRequestData(this);
   }
@@ -353,6 +356,7 @@ public void setPartitionValIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case REPLACE:
@@ -399,6 +403,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case REPLACE:
@@ -421,6 +426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -591,14 +597,17 @@ public int compareTo(InsertEventRequestData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -683,6 +692,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class InsertEventRequestDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InsertEventRequestDataStandardScheme getScheme() {
       return new InsertEventRequestDataStandardScheme();
     }
@@ -690,105 +700,112 @@ public InsertEventRequestDataStandardScheme getScheme() {
 
   private static class InsertEventRequestDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<InsertEventRequestData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, InsertEventRequestData 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 1: // REPLACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.replace = iprot.readBool();
-              struct.setReplaceIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // FILES_ADDED
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1034 = iprot.readListBegin();
-                struct.filesAdded = new java.util.ArrayList<java.lang.String>(_list1034.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1035;
-                for (int _i1036 = 0; _i1036 < _list1034.size; ++_i1036)
+          }
+          switch (schemeField.id) {
+            case 1: // REPLACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.replace = iprot.readBool();
+                struct.setReplaceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // FILES_ADDED
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1035 = iprot.readString();
-                  struct.filesAdded.add(_elem1035);
+                  org.apache.thrift.protocol.TList _list1034 = iprot.readListBegin();
+                  struct.filesAdded = new java.util.ArrayList<java.lang.String>(_list1034.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1035;
+                  for (int _i1036 = 0; _i1036 < _list1034.size; ++_i1036)
+                  {
+                    _elem1035 = iprot.readString();
+                    struct.filesAdded.add(_elem1035);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFilesAddedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFilesAddedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // FILES_ADDED_CHECKSUM
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1037 = iprot.readListBegin();
-                struct.filesAddedChecksum = new java.util.ArrayList<java.lang.String>(_list1037.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1038;
-                for (int _i1039 = 0; _i1039 < _list1037.size; ++_i1039)
+              break;
+            case 3: // FILES_ADDED_CHECKSUM
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1038 = iprot.readString();
-                  struct.filesAddedChecksum.add(_elem1038);
+                  org.apache.thrift.protocol.TList _list1037 = iprot.readListBegin();
+                  struct.filesAddedChecksum = new java.util.ArrayList<java.lang.String>(_list1037.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1038;
+                  for (int _i1039 = 0; _i1039 < _list1037.size; ++_i1039)
+                  {
+                    _elem1038 = iprot.readString();
+                    struct.filesAddedChecksum.add(_elem1038);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFilesAddedChecksumIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFilesAddedChecksumIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // SUB_DIRECTORY_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1040 = iprot.readListBegin();
-                struct.subDirectoryList = new java.util.ArrayList<java.lang.String>(_list1040.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1041;
-                for (int _i1042 = 0; _i1042 < _list1040.size; ++_i1042)
+              break;
+            case 4: // SUB_DIRECTORY_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1041 = iprot.readString();
-                  struct.subDirectoryList.add(_elem1041);
+                  org.apache.thrift.protocol.TList _list1040 = iprot.readListBegin();
+                  struct.subDirectoryList = new java.util.ArrayList<java.lang.String>(_list1040.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1041;
+                  for (int _i1042 = 0; _i1042 < _list1040.size; ++_i1042)
+                  {
+                    _elem1041 = iprot.readString();
+                    struct.subDirectoryList.add(_elem1041);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSubDirectoryListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSubDirectoryListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PARTITION_VAL
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1043 = iprot.readListBegin();
-                struct.partitionVal = new java.util.ArrayList<java.lang.String>(_list1043.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1044;
-                for (int _i1045 = 0; _i1045 < _list1043.size; ++_i1045)
+              break;
+            case 5: // PARTITION_VAL
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1044 = iprot.readString();
-                  struct.partitionVal.add(_elem1044);
+                  org.apache.thrift.protocol.TList _list1043 = iprot.readListBegin();
+                  struct.partitionVal = new java.util.ArrayList<java.lang.String>(_list1043.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1044;
+                  for (int _i1045 = 0; _i1045 < _list1043.size; ++_i1045)
+                  {
+                    _elem1044 = iprot.readString();
+                    struct.partitionVal.add(_elem1044);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionValIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionValIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, InsertEventRequestData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -859,6 +876,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InsertEventRequest
   }
 
   private static class InsertEventRequestDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InsertEventRequestDataTupleScheme getScheme() {
       return new InsertEventRequestDataTupleScheme();
     }
@@ -924,61 +942,66 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InsertEventRequestD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InsertEventRequestData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1054 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.filesAdded = new java.util.ArrayList<java.lang.String>(_list1054.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem1055;
-        for (int _i1056 = 0; _i1056 < _list1054.size; ++_i1056)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1055 = iprot.readString();
-          struct.filesAdded.add(_elem1055);
+          org.apache.thrift.protocol.TList _list1054 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.filesAdded = new java.util.ArrayList<java.lang.String>(_list1054.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1055;
+          for (int _i1056 = 0; _i1056 < _list1054.size; ++_i1056)
+          {
+            _elem1055 = iprot.readString();
+            struct.filesAdded.add(_elem1055);
+          }
         }
-      }
-      struct.setFilesAddedIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.replace = iprot.readBool();
-        struct.setReplaceIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1057 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.filesAddedChecksum = new java.util.ArrayList<java.lang.String>(_list1057.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1058;
-          for (int _i1059 = 0; _i1059 < _list1057.size; ++_i1059)
+        struct.setFilesAddedIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.replace = iprot.readBool();
+          struct.setReplaceIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1058 = iprot.readString();
-            struct.filesAddedChecksum.add(_elem1058);
+            org.apache.thrift.protocol.TList _list1057 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.filesAddedChecksum = new java.util.ArrayList<java.lang.String>(_list1057.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1058;
+            for (int _i1059 = 0; _i1059 < _list1057.size; ++_i1059)
+            {
+              _elem1058 = iprot.readString();
+              struct.filesAddedChecksum.add(_elem1058);
+            }
           }
+          struct.setFilesAddedChecksumIsSet(true);
         }
-        struct.setFilesAddedChecksumIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1060 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.subDirectoryList = new java.util.ArrayList<java.lang.String>(_list1060.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1061;
-          for (int _i1062 = 0; _i1062 < _list1060.size; ++_i1062)
+        if (incoming.get(2)) {
           {
-            _elem1061 = iprot.readString();
-            struct.subDirectoryList.add(_elem1061);
+            org.apache.thrift.protocol.TList _list1060 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.subDirectoryList = new java.util.ArrayList<java.lang.String>(_list1060.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1061;
+            for (int _i1062 = 0; _i1062 < _list1060.size; ++_i1062)
+            {
+              _elem1061 = iprot.readString();
+              struct.subDirectoryList.add(_elem1061);
+            }
           }
+          struct.setSubDirectoryListIsSet(true);
         }
-        struct.setSubDirectoryListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list1063 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partitionVal = new java.util.ArrayList<java.lang.String>(_list1063.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1064;
-          for (int _i1065 = 0; _i1065 < _list1063.size; ++_i1065)
+        if (incoming.get(3)) {
           {
-            _elem1064 = iprot.readString();
-            struct.partitionVal.add(_elem1064);
+            org.apache.thrift.protocol.TList _list1063 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partitionVal = new java.util.ArrayList<java.lang.String>(_list1063.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1064;
+            for (int _i1065 = 0; _i1065 < _list1063.size; ++_i1065)
+            {
+              _elem1064 = iprot.readString();
+              struct.partitionVal.add(_elem1064);
+            }
           }
+          struct.setPartitionValIsSet(true);
         }
-        struct.setPartitionValIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java
index 2fcaf003b21f..2c13456dc561 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class InvalidInputException extends org.apache.thrift.TException implements org.apache.thrift.TBase<InvalidInputException, InvalidInputException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidInputException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidInputException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public InvalidInputException(InvalidInputException other) {
     }
   }
 
+  @Override
   public InvalidInputException deepCopy() {
     return new InvalidInputException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(InvalidInputException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class InvalidInputExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidInputExceptionStandardScheme getScheme() {
       return new InvalidInputExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public InvalidInputExceptionStandardScheme getScheme() {
 
   private static class InvalidInputExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<InvalidInputException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidInputException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidInputException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidInputExcept
   }
 
   private static class InvalidInputExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidInputExceptionTupleScheme getScheme() {
       return new InvalidInputExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidInputExcepti
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InvalidInputException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java
index 85f6de2d37c9..f026f81d3daa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class InvalidObjectException extends org.apache.thrift.TException implements org.apache.thrift.TBase<InvalidObjectException, InvalidObjectException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidObjectException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidObjectException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public InvalidObjectException(InvalidObjectException other) {
     }
   }
 
+  @Override
   public InvalidObjectException deepCopy() {
     return new InvalidObjectException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(InvalidObjectException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class InvalidObjectExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidObjectExceptionStandardScheme getScheme() {
       return new InvalidObjectExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public InvalidObjectExceptionStandardScheme getScheme() {
 
   private static class InvalidObjectExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<InvalidObjectException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidObjectException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidObjectException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidObjectExcep
   }
 
   private static class InvalidObjectExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidObjectExceptionTupleScheme getScheme() {
       return new InvalidObjectExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidObjectExcept
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InvalidObjectException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java
index f95247ceb13e..29f4e450f6fd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class InvalidOperationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<InvalidOperationException, InvalidOperationException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidOperationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperationException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public InvalidOperationException(InvalidOperationException other) {
     }
   }
 
+  @Override
   public InvalidOperationException deepCopy() {
     return new InvalidOperationException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(InvalidOperationException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class InvalidOperationExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidOperationExceptionStandardScheme getScheme() {
       return new InvalidOperationExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public InvalidOperationExceptionStandardScheme getScheme() {
 
   private static class InvalidOperationExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<InvalidOperationException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidOperationException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidOperationException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidOperationEx
   }
 
   private static class InvalidOperationExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidOperationExceptionTupleScheme getScheme() {
       return new InvalidOperationExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidOperationExc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InvalidOperationException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java
index 2a5689a9538b..7b78c4bf13c5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class InvalidPartitionException extends org.apache.thrift.TException implements org.apache.thrift.TBase<InvalidPartitionException, InvalidPartitionException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidPartitionException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidPartitionException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public InvalidPartitionException(InvalidPartitionException other) {
     }
   }
 
+  @Override
   public InvalidPartitionException deepCopy() {
     return new InvalidPartitionException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(InvalidPartitionException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class InvalidPartitionExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidPartitionExceptionStandardScheme getScheme() {
       return new InvalidPartitionExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public InvalidPartitionExceptionStandardScheme getScheme() {
 
   private static class InvalidPartitionExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<InvalidPartitionException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidPartitionException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidPartitionException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidPartitionEx
   }
 
   private static class InvalidPartitionExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public InvalidPartitionExceptionTupleScheme getScheme() {
       return new InvalidPartitionExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidPartitionExc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InvalidPartitionException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListPackageRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListPackageRequest.java
index d70ede23f9f3..11152b7c9491 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListPackageRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListPackageRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ListPackageRequest implements org.apache.thrift.TBase<ListPackageRequest, ListPackageRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ListPackageRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ListPackageRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.DB_NAME};
+  private static final _Fields[] optionals = {_Fields.DB_NAME};
   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);
@@ -118,6 +120,7 @@ public ListPackageRequest(ListPackageRequest other) {
     }
   }
 
+  @Override
   public ListPackageRequest deepCopy() {
     return new ListPackageRequest(this);
   }
@@ -176,6 +179,7 @@ public void setDbNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(ListPackageRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -370,6 +379,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ListPackageRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ListPackageRequestStandardScheme getScheme() {
       return new ListPackageRequestStandardScheme();
     }
@@ -377,41 +387,48 @@ public ListPackageRequestStandardScheme getScheme() {
 
   private static class ListPackageRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ListPackageRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ListPackageRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ListPackageRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -435,6 +452,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ListPackageRequest
   }
 
   private static class ListPackageRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ListPackageRequestTupleScheme getScheme() {
       return new ListPackageRequestTupleScheme();
     }
@@ -458,13 +476,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ListPackageRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ListPackageRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListStoredProcedureRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListStoredProcedureRequest.java
index 0779939f6d0d..84480226f45b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListStoredProcedureRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ListStoredProcedureRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ListStoredProcedureRequest implements org.apache.thrift.TBase<ListStoredProcedureRequest, ListStoredProcedureRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ListStoredProcedureRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ListStoredProcedureRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.DB_NAME};
+  private static final _Fields[] optionals = {_Fields.DB_NAME};
   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);
@@ -118,6 +120,7 @@ public ListStoredProcedureRequest(ListStoredProcedureRequest other) {
     }
   }
 
+  @Override
   public ListStoredProcedureRequest deepCopy() {
     return new ListStoredProcedureRequest(this);
   }
@@ -176,6 +179,7 @@ public void setDbNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -198,6 +202,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -211,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(ListStoredProcedureRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -370,6 +379,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ListStoredProcedureRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ListStoredProcedureRequestStandardScheme getScheme() {
       return new ListStoredProcedureRequestStandardScheme();
     }
@@ -377,41 +387,48 @@ public ListStoredProcedureRequestStandardScheme getScheme() {
 
   private static class ListStoredProcedureRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ListStoredProcedureRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ListStoredProcedureRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ListStoredProcedureRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -435,6 +452,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ListStoredProcedur
   }
 
   private static class ListStoredProcedureRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ListStoredProcedureRequestTupleScheme getScheme() {
       return new ListStoredProcedureRequestTupleScheme();
     }
@@ -458,13 +476,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ListStoredProcedure
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ListStoredProcedureRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java
index 238a6894c56f..4b91d90d767b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class LockComponent implements org.apache.thrift.TBase<LockComponent, LockComponent._Fields>, java.io.Serializable, Cloneable, Comparable<LockComponent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LockComponent");
 
@@ -121,10 +121,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -134,7 +136,7 @@ public java.lang.String getFieldName() {
   private static final int __ISTRANSACTIONAL_ISSET_ID = 0;
   private static final int __ISDYNAMICPARTITIONWRITE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TABLENAME,_Fields.PARTITIONNAME,_Fields.OPERATION_TYPE,_Fields.IS_TRANSACTIONAL,_Fields.IS_DYNAMIC_PARTITION_WRITE,_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.TABLENAME,_Fields.PARTITIONNAME,_Fields.OPERATION_TYPE,_Fields.IS_TRANSACTIONAL,_Fields.IS_DYNAMIC_PARTITION_WRITE,_Fields.CAT_NAME};
   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);
@@ -212,6 +214,7 @@ public LockComponent(LockComponent other) {
     }
   }
 
+  @Override
   public LockComponent deepCopy() {
     return new LockComponent(this);
   }
@@ -469,6 +472,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -547,6 +551,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -581,6 +586,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -851,14 +857,17 @@ public int compareTo(LockComponent other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -983,6 +992,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class LockComponentStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockComponentStandardScheme getScheme() {
       return new LockComponentStandardScheme();
     }
@@ -990,97 +1000,104 @@ public LockComponentStandardScheme getScheme() {
 
   private static class LockComponentStandardScheme extends org.apache.thrift.scheme.StandardScheme<LockComponent> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, LockComponent 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 1: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.level = org.apache.hadoop.hive.metastore.api.LockLevel.findByValue(iprot.readI32());
-              struct.setLevelIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // 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 4: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PARTITIONNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionname = iprot.readString();
-              struct.setPartitionnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // OPERATION_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
-              struct.setOperationTypeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // LEVEL
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.level = org.apache.hadoop.hive.metastore.api.LockLevel.findByValue(iprot.readI32());
+                struct.setLevelIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // 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 4: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARTITIONNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionname = iprot.readString();
+                struct.setPartitionnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // OPERATION_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
+                struct.setOperationTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // IS_TRANSACTIONAL
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isTransactional = iprot.readBool();
+                struct.setIsTransactionalIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // IS_DYNAMIC_PARTITION_WRITE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isDynamicPartitionWrite = iprot.readBool();
+                struct.setIsDynamicPartitionWriteIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // IS_TRANSACTIONAL
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isTransactional = iprot.readBool();
-              struct.setIsTransactionalIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // IS_DYNAMIC_PARTITION_WRITE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isDynamicPartitionWrite = iprot.readBool();
-              struct.setIsDynamicPartitionWriteIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, LockComponent struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1145,6 +1162,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LockComponent stru
   }
 
   private static class LockComponentTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockComponentTupleScheme getScheme() {
       return new LockComponentTupleScheme();
     }
@@ -1200,37 +1218,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LockComponent struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LockComponent struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      struct.level = org.apache.hadoop.hive.metastore.api.LockLevel.findByValue(iprot.readI32());
-      struct.setLevelIsSet(true);
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.tablename = iprot.readString();
-        struct.setTablenameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.partitionname = iprot.readString();
-        struct.setPartitionnameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
-        struct.setOperationTypeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.isTransactional = iprot.readBool();
-        struct.setIsTransactionalIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.isDynamicPartitionWrite = iprot.readBool();
-        struct.setIsDynamicPartitionWriteIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        struct.level = org.apache.hadoop.hive.metastore.api.LockLevel.findByValue(iprot.readI32());
+        struct.setLevelIsSet(true);
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.tablename = iprot.readString();
+          struct.setTablenameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.partitionname = iprot.readString();
+          struct.setPartitionnameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.operationType = org.apache.hadoop.hive.metastore.api.DataOperationType.findByValue(iprot.readI32());
+          struct.setOperationTypeIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.isTransactional = iprot.readBool();
+          struct.setIsTransactionalIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.isDynamicPartitionWrite = iprot.readBool();
+          struct.setIsDynamicPartitionWriteIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java
index e459a6aadd37..22e272c85a43 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum LockLevel implements org.apache.thrift.TEnum {
   DB(1),
   TABLE(2),
@@ -22,6 +22,7 @@ private LockLevel(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockMaterializationRebuildRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockMaterializationRebuildRequest.java
index f33765e94fae..f9373414ff38 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockMaterializationRebuildRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockMaterializationRebuildRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class LockMaterializationRebuildRequest implements org.apache.thrift.TBase<LockMaterializationRebuildRequest, LockMaterializationRebuildRequest._Fields>, java.io.Serializable, Cloneable, Comparable<LockMaterializationRebuildRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LockMaterializationRebuildRequest");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -145,6 +147,7 @@ public LockMaterializationRebuildRequest(LockMaterializationRebuildRequest other
     this.txnId = other.txnId;
   }
 
+  @Override
   public LockMaterializationRebuildRequest deepCopy() {
     return new LockMaterializationRebuildRequest(this);
   }
@@ -252,6 +255,7 @@ public void setTxnIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -290,6 +294,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -309,6 +314,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -452,14 +458,17 @@ public int compareTo(LockMaterializationRebuildRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -540,6 +549,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class LockMaterializationRebuildRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockMaterializationRebuildRequestStandardScheme getScheme() {
       return new LockMaterializationRebuildRequestStandardScheme();
     }
@@ -547,57 +557,64 @@ public LockMaterializationRebuildRequestStandardScheme getScheme() {
 
   private static class LockMaterializationRebuildRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<LockMaterializationRebuildRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, LockMaterializationRebuildRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, LockMaterializationRebuildRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -627,6 +644,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LockMaterializatio
   }
 
   private static class LockMaterializationRebuildRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockMaterializationRebuildRequestTupleScheme getScheme() {
       return new LockMaterializationRebuildRequestTupleScheme();
     }
@@ -645,15 +663,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LockMaterialization
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LockMaterializationRebuildRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      struct.txnId = iprot.readI64();
-      struct.setTxnIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        struct.txnId = iprot.readI64();
+        struct.setTxnIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
index b5b9b6a0ff46..026bc1682805 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class LockRequest implements org.apache.thrift.TBase<LockRequest, LockRequest._Fields>, java.io.Serializable, Cloneable, Comparable<LockRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LockRequest");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,7 +121,7 @@ public java.lang.String getFieldName() {
   private static final int __EXCLUSIVECTAS_ISSET_ID = 2;
   private static final int __LOCKLESSREADSENABLED_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TXNID,_Fields.AGENT_INFO,_Fields.ZERO_WAIT_READ_ENABLED,_Fields.EXCLUSIVE_CTAS,_Fields.LOCKLESS_READS_ENABLED};
+  private static final _Fields[] optionals = {_Fields.TXNID,_Fields.AGENT_INFO,_Fields.ZERO_WAIT_READ_ENABLED,_Fields.EXCLUSIVE_CTAS,_Fields.LOCKLESS_READS_ENABLED};
   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);
@@ -193,6 +195,7 @@ public LockRequest(LockRequest other) {
     this.locklessReadsEnabled = other.locklessReadsEnabled;
   }
 
+  @Override
   public LockRequest deepCopy() {
     return new LockRequest(this);
   }
@@ -414,6 +417,7 @@ public void setLocklessReadsEnabledIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOCKLESSREADSENABLED_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPONENT:
@@ -484,6 +488,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPONENT:
@@ -515,6 +520,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -760,14 +766,17 @@ public int compareTo(LockRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -874,6 +883,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class LockRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockRequestStandardScheme getScheme() {
       return new LockRequestStandardScheme();
     }
@@ -881,100 +891,107 @@ public LockRequestStandardScheme getScheme() {
 
   private static class LockRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<LockRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, LockRequest 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 1: // COMPONENT
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list902 = iprot.readListBegin();
-                struct.component = new java.util.ArrayList<LockComponent>(_list902.size);
-                @org.apache.thrift.annotation.Nullable LockComponent _elem903;
-                for (int _i904 = 0; _i904 < _list902.size; ++_i904)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COMPONENT
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem903 = new LockComponent();
-                  _elem903.read(iprot);
-                  struct.component.add(_elem903);
+                  org.apache.thrift.protocol.TList _list902 = iprot.readListBegin();
+                  struct.component = new java.util.ArrayList<LockComponent>(_list902.size);
+                  @org.apache.thrift.annotation.Nullable LockComponent _elem903;
+                  for (int _i904 = 0; _i904 < _list902.size; ++_i904)
+                  {
+                    _elem903 = new LockComponent();
+                    _elem903.read(iprot);
+                    struct.component.add(_elem903);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setComponentIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setComponentIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // HOSTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hostname = iprot.readString();
-              struct.setHostnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // AGENT_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.agentInfo = iprot.readString();
-              struct.setAgentInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ZERO_WAIT_READ_ENABLED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.zeroWaitReadEnabled = iprot.readBool();
-              struct.setZeroWaitReadEnabledIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // EXCLUSIVE_CTAS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.exclusiveCTAS = iprot.readBool();
-              struct.setExclusiveCTASIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // LOCKLESS_READS_ENABLED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.locklessReadsEnabled = iprot.readBool();
-              struct.setLocklessReadsEnabledIsSet(true);
-            } else { 
+              break;
+            case 2: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // HOSTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.hostname = iprot.readString();
+                struct.setHostnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // AGENT_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.agentInfo = iprot.readString();
+                struct.setAgentInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ZERO_WAIT_READ_ENABLED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.zeroWaitReadEnabled = iprot.readBool();
+                struct.setZeroWaitReadEnabledIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // EXCLUSIVE_CTAS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.exclusiveCTAS = iprot.readBool();
+                struct.setExclusiveCTASIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // LOCKLESS_READS_ENABLED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.locklessReadsEnabled = iprot.readBool();
+                struct.setLocklessReadsEnabledIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, LockRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1035,6 +1052,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LockRequest struct
   }
 
   private static class LockRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockRequestTupleScheme getScheme() {
       return new LockRequestTupleScheme();
     }
@@ -1090,43 +1108,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LockRequest struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LockRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list907 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.component = new java.util.ArrayList<LockComponent>(_list907.size);
-        @org.apache.thrift.annotation.Nullable LockComponent _elem908;
-        for (int _i909 = 0; _i909 < _list907.size; ++_i909)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem908 = new LockComponent();
-          _elem908.read(iprot);
-          struct.component.add(_elem908);
+          org.apache.thrift.protocol.TList _list907 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.component = new java.util.ArrayList<LockComponent>(_list907.size);
+          @org.apache.thrift.annotation.Nullable LockComponent _elem908;
+          for (int _i909 = 0; _i909 < _list907.size; ++_i909)
+          {
+            _elem908 = new LockComponent();
+            _elem908.read(iprot);
+            struct.component.add(_elem908);
+          }
         }
-      }
-      struct.setComponentIsSet(true);
-      struct.user = iprot.readString();
-      struct.setUserIsSet(true);
-      struct.hostname = iprot.readString();
-      struct.setHostnameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.txnid = iprot.readI64();
-        struct.setTxnidIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.agentInfo = iprot.readString();
-        struct.setAgentInfoIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.zeroWaitReadEnabled = iprot.readBool();
-        struct.setZeroWaitReadEnabledIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.exclusiveCTAS = iprot.readBool();
-        struct.setExclusiveCTASIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.locklessReadsEnabled = iprot.readBool();
-        struct.setLocklessReadsEnabledIsSet(true);
+        struct.setComponentIsSet(true);
+        struct.user = iprot.readString();
+        struct.setUserIsSet(true);
+        struct.hostname = iprot.readString();
+        struct.setHostnameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.txnid = iprot.readI64();
+          struct.setTxnidIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.agentInfo = iprot.readString();
+          struct.setAgentInfoIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.zeroWaitReadEnabled = iprot.readBool();
+          struct.setZeroWaitReadEnabledIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.exclusiveCTAS = iprot.readBool();
+          struct.setExclusiveCTASIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.locklessReadsEnabled = iprot.readBool();
+          struct.setLocklessReadsEnabledIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java
index e0a108634f8a..95df79d8e705 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class LockResponse implements org.apache.thrift.TBase<LockResponse, LockResponse._Fields>, java.io.Serializable, Cloneable, Comparable<LockResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LockResponse");
 
@@ -83,10 +83,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -95,7 +97,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __LOCKID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ERROR_MESSAGE};
+  private static final _Fields[] optionals = {_Fields.ERROR_MESSAGE};
   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);
@@ -136,6 +138,7 @@ public LockResponse(LockResponse other) {
     }
   }
 
+  @Override
   public LockResponse deepCopy() {
     return new LockResponse(this);
   }
@@ -226,6 +229,7 @@ public void setErrorMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCKID:
@@ -256,6 +260,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCKID:
@@ -272,6 +277,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -390,14 +396,17 @@ public int compareTo(LockResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -464,6 +473,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class LockResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockResponseStandardScheme getScheme() {
       return new LockResponseStandardScheme();
     }
@@ -471,49 +481,56 @@ public LockResponseStandardScheme getScheme() {
 
   private static class LockResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<LockResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, LockResponse 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 1: // LOCKID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lockid = iprot.readI64();
-              struct.setLockidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // ERROR_MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errorMessage = iprot.readString();
-              struct.setErrorMessageIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOCKID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lockid = iprot.readI64();
+                struct.setLockidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ERROR_MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errorMessage = iprot.readString();
+                struct.setErrorMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, LockResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -540,6 +557,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LockResponse struc
   }
 
   private static class LockResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LockResponseTupleScheme getScheme() {
       return new LockResponseTupleScheme();
     }
@@ -564,15 +582,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LockResponse struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LockResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.lockid = iprot.readI64();
-      struct.setLockidIsSet(true);
-      struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
-      struct.setStateIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.errorMessage = iprot.readString();
-        struct.setErrorMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.lockid = iprot.readI64();
+        struct.setLockidIsSet(true);
+        struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
+        struct.setStateIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.errorMessage = iprot.readString();
+          struct.setErrorMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java
index c48942261c17..bd72d7171c80 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum LockState implements org.apache.thrift.TEnum {
   ACQUIRED(1),
   WAITING(2),
@@ -23,6 +23,7 @@ private LockState(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java
index 394c542d25e7..f79766bcae17 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum LockType implements org.apache.thrift.TEnum {
   SHARED_READ(1),
   SHARED_WRITE(2),
@@ -23,6 +23,7 @@ private LockType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java
index 6c7be430a524..0b08e8828008 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class LongColumnStatsData implements org.apache.thrift.TBase<LongColumnStatsData, LongColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<LongColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LongColumnStatsData");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,7 +111,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMNULLS_ISSET_ID = 2;
   private static final int __NUMDVS_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
+  private static final _Fields[] optionals = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
   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);
@@ -160,6 +162,7 @@ public LongColumnStatsData(LongColumnStatsData other) {
     }
   }
 
+  @Override
   public LongColumnStatsData deepCopy() {
     return new LongColumnStatsData(this);
   }
@@ -330,6 +333,7 @@ public void setHistogramIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOW_VALUE:
@@ -392,6 +396,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOW_VALUE:
@@ -417,6 +422,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -608,14 +614,17 @@ public int compareTo(LongColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -700,6 +709,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class LongColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LongColumnStatsDataStandardScheme getScheme() {
       return new LongColumnStatsDataStandardScheme();
     }
@@ -707,73 +717,80 @@ public LongColumnStatsDataStandardScheme getScheme() {
 
   private static class LongColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<LongColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, LongColumnStatsData 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 1: // LOW_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lowValue = iprot.readI64();
-              struct.setLowValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HIGH_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.highValue = iprot.readI64();
-              struct.setHighValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NUM_DVS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numDVs = iprot.readI64();
-              struct.setNumDVsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // HISTOGRAM
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.histogram = iprot.readBinary();
-              struct.setHistogramIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOW_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lowValue = iprot.readI64();
+                struct.setLowValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // HIGH_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.highValue = iprot.readI64();
+                struct.setHighValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NUM_DVS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numDVs = iprot.readI64();
+                struct.setNumDVsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // HISTOGRAM
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.histogram = iprot.readBinary();
+                struct.setHistogramIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, LongColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -815,6 +832,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LongColumnStatsDat
   }
 
   private static class LongColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public LongColumnStatsDataTupleScheme getScheme() {
       return new LongColumnStatsDataTupleScheme();
     }
@@ -857,27 +875,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LongColumnStatsData
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LongColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      struct.numDVs = iprot.readI64();
-      struct.setNumDVsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.lowValue = iprot.readI64();
-        struct.setLowValueIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.highValue = iprot.readI64();
-        struct.setHighValueIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.histogram = iprot.readBinary();
-        struct.setHistogramIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        struct.numDVs = iprot.readI64();
+        struct.setNumDVsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.lowValue = iprot.readI64();
+          struct.setLowValueIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.highValue = iprot.readI64();
+          struct.setHighValueIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.histogram = iprot.readBinary();
+          struct.setHistogramIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java
index 42a0f14b9f32..ab5035bface2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class MapSchemaVersionToSerdeRequest implements org.apache.thrift.TBase<MapSchemaVersionToSerdeRequest, MapSchemaVersionToSerdeRequest._Fields>, java.io.Serializable, Cloneable, Comparable<MapSchemaVersionToSerdeRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapSchemaVersionToSerdeRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public MapSchemaVersionToSerdeRequest(MapSchemaVersionToSerdeRequest other) {
     }
   }
 
+  @Override
   public MapSchemaVersionToSerdeRequest deepCopy() {
     return new MapSchemaVersionToSerdeRequest(this);
   }
@@ -177,6 +180,7 @@ public void setSerdeNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEMA_VERSION:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEMA_VERSION:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(MapSchemaVersionToSerdeRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -368,6 +377,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MapSchemaVersionToSerdeRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MapSchemaVersionToSerdeRequestStandardScheme getScheme() {
       return new MapSchemaVersionToSerdeRequestStandardScheme();
     }
@@ -375,42 +385,49 @@ public MapSchemaVersionToSerdeRequestStandardScheme getScheme() {
 
   private static class MapSchemaVersionToSerdeRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<MapSchemaVersionToSerdeRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MapSchemaVersionToSerdeRequest 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 1: // SCHEMA_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.schemaVersion = new SchemaVersionDescriptor();
-              struct.schemaVersion.read(iprot);
-              struct.setSchemaVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // SERDE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.serdeName = iprot.readString();
-              struct.setSerdeNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEMA_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.schemaVersion = new SchemaVersionDescriptor();
+                struct.schemaVersion.read(iprot);
+                struct.setSchemaVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SERDE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.serdeName = iprot.readString();
+                struct.setSerdeNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MapSchemaVersionToSerdeRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -432,6 +449,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MapSchemaVersionTo
   }
 
   private static class MapSchemaVersionToSerdeRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MapSchemaVersionToSerdeRequestTupleScheme getScheme() {
       return new MapSchemaVersionToSerdeRequestTupleScheme();
     }
@@ -460,16 +478,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MapSchemaVersionToS
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MapSchemaVersionToSerdeRequest 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.schemaVersion = new SchemaVersionDescriptor();
-        struct.schemaVersion.read(iprot);
-        struct.setSchemaVersionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.serdeName = iprot.readString();
-        struct.setSerdeNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.schemaVersion = new SchemaVersionDescriptor();
+          struct.schemaVersion.read(iprot);
+          struct.setSchemaVersionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.serdeName = iprot.readString();
+          struct.setSerdeNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java
index 40f29a2abfdd..3839cbc85c10 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Materialization implements org.apache.thrift.TBase<Materialization, Materialization._Fields>, java.io.Serializable, Cloneable, Comparable<Materialization> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Materialization");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public Materialization(Materialization other) {
     this.sourceTablesCompacted = other.sourceTablesCompacted;
   }
 
+  @Override
   public Materialization deepCopy() {
     return new Materialization(this);
   }
@@ -177,6 +180,7 @@ public void setSourceTablesCompactedIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SOURCETABLESCOMPACTED_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SOURCE_TABLES_UPDATE_DELETE_MODIFIED:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SOURCE_TABLES_UPDATE_DELETE_MODIFIED:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -303,14 +309,17 @@ public int compareTo(Materialization other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -363,6 +372,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MaterializationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MaterializationStandardScheme getScheme() {
       return new MaterializationStandardScheme();
     }
@@ -370,41 +380,48 @@ public MaterializationStandardScheme getScheme() {
 
   private static class MaterializationStandardScheme extends org.apache.thrift.scheme.StandardScheme<Materialization> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Materialization 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 1: // SOURCE_TABLES_UPDATE_DELETE_MODIFIED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.sourceTablesUpdateDeleteModified = iprot.readBool();
-              struct.setSourceTablesUpdateDeleteModifiedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // SOURCE_TABLES_COMPACTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.sourceTablesCompacted = iprot.readBool();
-              struct.setSourceTablesCompactedIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SOURCE_TABLES_UPDATE_DELETE_MODIFIED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.sourceTablesUpdateDeleteModified = iprot.readBool();
+                struct.setSourceTablesUpdateDeleteModifiedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SOURCE_TABLES_COMPACTED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.sourceTablesCompacted = iprot.readBool();
+                struct.setSourceTablesCompactedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Materialization struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -422,6 +439,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Materialization st
   }
 
   private static class MaterializationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MaterializationTupleScheme getScheme() {
       return new MaterializationTupleScheme();
     }
@@ -438,11 +456,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Materialization str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Materialization struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.sourceTablesUpdateDeleteModified = iprot.readBool();
-      struct.setSourceTablesUpdateDeleteModifiedIsSet(true);
-      struct.sourceTablesCompacted = iprot.readBool();
-      struct.setSourceTablesCompactedIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.sourceTablesUpdateDeleteModified = iprot.readBool();
+        struct.setSourceTablesUpdateDeleteModifiedIsSet(true);
+        struct.sourceTablesCompacted = iprot.readBool();
+        struct.setSourceTablesCompactedIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdRequest.java
index 646dcdc93074..6fd48756f281 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class MaxAllocatedTableWriteIdRequest implements org.apache.thrift.TBase<MaxAllocatedTableWriteIdRequest, MaxAllocatedTableWriteIdRequest._Fields>, java.io.Serializable, Cloneable, Comparable<MaxAllocatedTableWriteIdRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MaxAllocatedTableWriteIdRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public MaxAllocatedTableWriteIdRequest(MaxAllocatedTableWriteIdRequest other) {
     }
   }
 
+  @Override
   public MaxAllocatedTableWriteIdRequest deepCopy() {
     return new MaxAllocatedTableWriteIdRequest(this);
   }
@@ -177,6 +180,7 @@ public void setTableNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(MaxAllocatedTableWriteIdRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -373,6 +382,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MaxAllocatedTableWriteIdRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MaxAllocatedTableWriteIdRequestStandardScheme getScheme() {
       return new MaxAllocatedTableWriteIdRequestStandardScheme();
     }
@@ -380,41 +390,48 @@ public MaxAllocatedTableWriteIdRequestStandardScheme getScheme() {
 
   private static class MaxAllocatedTableWriteIdRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<MaxAllocatedTableWriteIdRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MaxAllocatedTableWriteIdRequest 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 1: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MaxAllocatedTableWriteIdRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -436,6 +453,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MaxAllocatedTableW
   }
 
   private static class MaxAllocatedTableWriteIdRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MaxAllocatedTableWriteIdRequestTupleScheme getScheme() {
       return new MaxAllocatedTableWriteIdRequestTupleScheme();
     }
@@ -452,11 +470,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MaxAllocatedTableWr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MaxAllocatedTableWriteIdRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdResponse.java
index 5efed8bc1571..19b8e6900099 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MaxAllocatedTableWriteIdResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class MaxAllocatedTableWriteIdResponse implements org.apache.thrift.TBase<MaxAllocatedTableWriteIdResponse, MaxAllocatedTableWriteIdResponse._Fields>, java.io.Serializable, Cloneable, Comparable<MaxAllocatedTableWriteIdResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MaxAllocatedTableWriteIdResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public MaxAllocatedTableWriteIdResponse(MaxAllocatedTableWriteIdResponse other)
     this.maxWriteId = other.maxWriteId;
   }
 
+  @Override
   public MaxAllocatedTableWriteIdResponse deepCopy() {
     return new MaxAllocatedTableWriteIdResponse(this);
   }
@@ -141,6 +144,7 @@ public void setMaxWriteIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXWRITEID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MAX_WRITE_ID:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MAX_WRITE_ID:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(MaxAllocatedTableWriteIdResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MaxAllocatedTableWriteIdResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MaxAllocatedTableWriteIdResponseStandardScheme getScheme() {
       return new MaxAllocatedTableWriteIdResponseStandardScheme();
     }
@@ -292,33 +302,40 @@ public MaxAllocatedTableWriteIdResponseStandardScheme getScheme() {
 
   private static class MaxAllocatedTableWriteIdResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<MaxAllocatedTableWriteIdResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MaxAllocatedTableWriteIdResponse 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 1: // MAX_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.maxWriteId = iprot.readI64();
-              struct.setMaxWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MAX_WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.maxWriteId = iprot.readI64();
+                struct.setMaxWriteIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MaxAllocatedTableWriteIdResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MaxAllocatedTableW
   }
 
   private static class MaxAllocatedTableWriteIdResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MaxAllocatedTableWriteIdResponseTupleScheme getScheme() {
       return new MaxAllocatedTableWriteIdResponseTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MaxAllocatedTableWr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MaxAllocatedTableWriteIdResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.maxWriteId = iprot.readI64();
-      struct.setMaxWriteIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.maxWriteId = iprot.readI64();
+        struct.setMaxWriteIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
index 0c0fcea9d08c..8b11622fe0c2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class MetaException extends org.apache.thrift.TException implements org.apache.thrift.TBase<MetaException, MetaException._Fields>, java.io.Serializable, Cloneable, Comparable<MetaException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MetaException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public MetaException(MetaException other) {
     }
   }
 
+  @Override
   public MetaException deepCopy() {
     return new MetaException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(MetaException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MetaExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MetaExceptionStandardScheme getScheme() {
       return new MetaExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public MetaExceptionStandardScheme getScheme() {
 
   private static class MetaExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<MetaException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MetaException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MetaException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MetaException stru
   }
 
   private static class MetaExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MetaExceptionTupleScheme getScheme() {
       return new MetaExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MetaException struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MetaException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java
index bb4fa0793d72..36379d65fe6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class MetadataPpdResult implements org.apache.thrift.TBase<MetadataPpdResult, MetadataPpdResult._Fields>, java.io.Serializable, Cloneable, Comparable<MetadataPpdResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MetadataPpdResult");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.METADATA,_Fields.INCLUDE_BITSET};
+  private static final _Fields[] optionals = {_Fields.METADATA,_Fields.INCLUDE_BITSET};
   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);
@@ -111,6 +113,7 @@ public MetadataPpdResult(MetadataPpdResult other) {
     }
   }
 
+  @Override
   public MetadataPpdResult deepCopy() {
     return new MetadataPpdResult(this);
   }
@@ -185,6 +188,7 @@ public void setIncludeBitsetIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case METADATA:
@@ -215,6 +219,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case METADATA:
@@ -228,6 +233,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -323,14 +329,17 @@ public int compareTo(MetadataPpdResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -385,6 +394,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class MetadataPpdResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MetadataPpdResultStandardScheme getScheme() {
       return new MetadataPpdResultStandardScheme();
     }
@@ -392,41 +402,48 @@ public MetadataPpdResultStandardScheme getScheme() {
 
   private static class MetadataPpdResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<MetadataPpdResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, MetadataPpdResult 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 1: // METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.metadata = iprot.readBinary();
-              struct.setMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // INCLUDE_BITSET
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeBitset = iprot.readBinary();
-              struct.setIncludeBitsetIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.metadata = iprot.readBinary();
+                struct.setMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // INCLUDE_BITSET
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeBitset = iprot.readBinary();
+                struct.setIncludeBitsetIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, MetadataPpdResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -452,6 +469,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, MetadataPpdResult
   }
 
   private static class MetadataPpdResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public MetadataPpdResultTupleScheme getScheme() {
       return new MetadataPpdResultTupleScheme();
     }
@@ -480,15 +498,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, MetadataPpdResult s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MetadataPpdResult 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.metadata = iprot.readBinary();
-        struct.setMetadataIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.includeBitset = iprot.readBinary();
-        struct.setIncludeBitsetIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.metadata = iprot.readBinary();
+          struct.setMetadataIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.includeBitset = iprot.readBinary();
+          struct.setIncludeBitsetIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchCompactionException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchCompactionException.java
index e3b0a8f87100..0e927240dfae 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchCompactionException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchCompactionException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NoSuchCompactionException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoSuchCompactionException, NoSuchCompactionException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchCompactionException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchCompactionException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public NoSuchCompactionException(NoSuchCompactionException other) {
     }
   }
 
+  @Override
   public NoSuchCompactionException deepCopy() {
     return new NoSuchCompactionException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(NoSuchCompactionException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NoSuchCompactionExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchCompactionExceptionStandardScheme getScheme() {
       return new NoSuchCompactionExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public NoSuchCompactionExceptionStandardScheme getScheme() {
 
   private static class NoSuchCompactionExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NoSuchCompactionException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NoSuchCompactionException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchCompactionException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchCompactionEx
   }
 
   private static class NoSuchCompactionExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchCompactionExceptionTupleScheme getScheme() {
       return new NoSuchCompactionExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NoSuchCompactionExc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NoSuchCompactionException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java
index c539cbc6feb3..dabef187c94e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NoSuchLockException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoSuchLockException, NoSuchLockException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchLockException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchLockException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public NoSuchLockException(NoSuchLockException other) {
     }
   }
 
+  @Override
   public NoSuchLockException deepCopy() {
     return new NoSuchLockException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(NoSuchLockException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NoSuchLockExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchLockExceptionStandardScheme getScheme() {
       return new NoSuchLockExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public NoSuchLockExceptionStandardScheme getScheme() {
 
   private static class NoSuchLockExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NoSuchLockException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NoSuchLockException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchLockException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchLockExceptio
   }
 
   private static class NoSuchLockExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchLockExceptionTupleScheme getScheme() {
       return new NoSuchLockExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NoSuchLockException
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NoSuchLockException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java
index 05dd85c40b46..67476b6cf90f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NoSuchObjectException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoSuchObjectException, NoSuchObjectException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchObjectException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchObjectException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public NoSuchObjectException(NoSuchObjectException other) {
     }
   }
 
+  @Override
   public NoSuchObjectException deepCopy() {
     return new NoSuchObjectException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(NoSuchObjectException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NoSuchObjectExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchObjectExceptionStandardScheme getScheme() {
       return new NoSuchObjectExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public NoSuchObjectExceptionStandardScheme getScheme() {
 
   private static class NoSuchObjectExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NoSuchObjectException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NoSuchObjectException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchObjectException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchObjectExcept
   }
 
   private static class NoSuchObjectExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchObjectExceptionTupleScheme getScheme() {
       return new NoSuchObjectExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NoSuchObjectExcepti
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NoSuchObjectException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java
index 92cbbc2d4ba7..c3ebb82d298a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NoSuchTxnException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoSuchTxnException, NoSuchTxnException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchTxnException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchTxnException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public NoSuchTxnException(NoSuchTxnException other) {
     }
   }
 
+  @Override
   public NoSuchTxnException deepCopy() {
     return new NoSuchTxnException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(NoSuchTxnException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NoSuchTxnExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchTxnExceptionStandardScheme getScheme() {
       return new NoSuchTxnExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public NoSuchTxnExceptionStandardScheme getScheme() {
 
   private static class NoSuchTxnExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NoSuchTxnException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NoSuchTxnException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchTxnException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NoSuchTxnException
   }
 
   private static class NoSuchTxnExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NoSuchTxnExceptionTupleScheme getScheme() {
       return new NoSuchTxnExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NoSuchTxnException
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NoSuchTxnException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java
index 3ce9636e9242..e375aa21827a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotNullConstraintsRequest implements org.apache.thrift.TBase<NotNullConstraintsRequest, NotNullConstraintsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<NotNullConstraintsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotNullConstraintsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public NotNullConstraintsRequest(NotNullConstraintsRequest other) {
     }
   }
 
+  @Override
   public NotNullConstraintsRequest deepCopy() {
     return new NotNullConstraintsRequest(this);
   }
@@ -214,6 +217,7 @@ public void setTbl_nameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(NotNullConstraintsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotNullConstraintsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotNullConstraintsRequestStandardScheme getScheme() {
       return new NotNullConstraintsRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public NotNullConstraintsRequestStandardScheme getScheme() {
 
   private static class NotNullConstraintsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotNullConstraintsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotNullConstraintsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotNullConstraintsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotNullConstraints
   }
 
   private static class NotNullConstraintsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotNullConstraintsRequestTupleScheme getScheme() {
       return new NotNullConstraintsRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java
index a0cd17164b5e..65220edefe80 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotNullConstraintsResponse implements org.apache.thrift.TBase<NotNullConstraintsResponse, NotNullConstraintsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<NotNullConstraintsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotNullConstraintsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public NotNullConstraintsResponse(NotNullConstraintsResponse other) {
     }
   }
 
+  @Override
   public NotNullConstraintsResponse deepCopy() {
     return new NotNullConstraintsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setNotNullConstraintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NOT_NULL_CONSTRAINTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NOT_NULL_CONSTRAINTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(NotNullConstraintsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotNullConstraintsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotNullConstraintsResponseStandardScheme getScheme() {
       return new NotNullConstraintsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public NotNullConstraintsResponseStandardScheme getScheme() {
 
   private static class NotNullConstraintsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotNullConstraintsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotNullConstraintsResponse 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 1: // NOT_NULL_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list514 = iprot.readListBegin();
-                struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list514.size);
-                @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem515;
-                for (int _i516 = 0; _i516 < _list514.size; ++_i516)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // NOT_NULL_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem515 = new SQLNotNullConstraint();
-                  _elem515.read(iprot);
-                  struct.notNullConstraints.add(_elem515);
+                  org.apache.thrift.protocol.TList _list514 = iprot.readListBegin();
+                  struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list514.size);
+                  @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem515;
+                  for (int _i516 = 0; _i516 < _list514.size; ++_i516)
+                  {
+                    _elem515 = new SQLNotNullConstraint();
+                    _elem515.read(iprot);
+                    struct.notNullConstraints.add(_elem515);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNotNullConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNotNullConstraintsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotNullConstraintsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotNullConstraints
   }
 
   private static class NotNullConstraintsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotNullConstraintsResponseTupleScheme getScheme() {
       return new NotNullConstraintsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list519 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list519.size);
-        @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem520;
-        for (int _i521 = 0; _i521 < _list519.size; ++_i521)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem520 = new SQLNotNullConstraint();
-          _elem520.read(iprot);
-          struct.notNullConstraints.add(_elem520);
+          org.apache.thrift.protocol.TList _list519 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list519.size);
+          @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem520;
+          for (int _i521 = 0; _i521 < _list519.size; ++_i521)
+          {
+            _elem520 = new SQLNotNullConstraint();
+            _elem520.read(iprot);
+            struct.notNullConstraints.add(_elem520);
+          }
         }
+        struct.setNotNullConstraintsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setNotNullConstraintsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java
index c4ffd080725a..0509d8532939 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotificationEvent implements org.apache.thrift.TBase<NotificationEvent, NotificationEvent._Fields>, java.io.Serializable, Cloneable, Comparable<NotificationEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotificationEvent");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -117,7 +119,7 @@ public java.lang.String getFieldName() {
   private static final int __EVENTID_ISSET_ID = 0;
   private static final int __EVENTTIME_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.MESSAGE_FORMAT,_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.MESSAGE_FORMAT,_Fields.CAT_NAME};
   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);
@@ -186,6 +188,7 @@ public NotificationEvent(NotificationEvent other) {
     }
   }
 
+  @Override
   public NotificationEvent deepCopy() {
     return new NotificationEvent(this);
   }
@@ -392,6 +395,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EVENT_ID:
@@ -462,6 +466,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EVENT_ID:
@@ -493,6 +498,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -734,14 +740,17 @@ public int compareTo(NotificationEvent other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -858,6 +867,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotificationEventStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventStandardScheme getScheme() {
       return new NotificationEventStandardScheme();
     }
@@ -865,89 +875,96 @@ public NotificationEventStandardScheme getScheme() {
 
   private static class NotificationEventStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotificationEvent> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotificationEvent 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 1: // EVENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.eventId = iprot.readI64();
-              struct.setEventIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // EVENT_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.eventTime = iprot.readI32();
-              struct.setEventTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // EVENT_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.eventType = iprot.readString();
-              struct.setEventTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DB_NAME
-            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 5: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 7: // MESSAGE_FORMAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.messageFormat = iprot.readString();
-              struct.setMessageFormatIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // EVENT_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.eventId = iprot.readI64();
+                struct.setEventIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // EVENT_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.eventTime = iprot.readI32();
+                struct.setEventTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // EVENT_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.eventType = iprot.readString();
+                struct.setEventTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DB_NAME
+              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 5: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // MESSAGE_FORMAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.messageFormat = iprot.readString();
+                struct.setMessageFormatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEvent struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1003,6 +1020,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEvent
   }
 
   private static class NotificationEventTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventTupleScheme getScheme() {
       return new NotificationEventTupleScheme();
     }
@@ -1047,31 +1065,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotificationEvent s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEvent struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.eventId = iprot.readI64();
-      struct.setEventIdIsSet(true);
-      struct.eventTime = iprot.readI32();
-      struct.setEventTimeIsSet(true);
-      struct.eventType = iprot.readString();
-      struct.setEventTypeIsSet(true);
-      struct.message = iprot.readString();
-      struct.setMessageIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.messageFormat = iprot.readString();
-        struct.setMessageFormatIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.eventId = iprot.readI64();
+        struct.setEventIdIsSet(true);
+        struct.eventTime = iprot.readI32();
+        struct.setEventTimeIsSet(true);
+        struct.eventType = iprot.readString();
+        struct.setEventTypeIsSet(true);
+        struct.message = iprot.readString();
+        struct.setMessageIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.messageFormat = iprot.readString();
+          struct.setMessageFormatIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java
index ad306f55571a..95167f5c992b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotificationEventRequest implements org.apache.thrift.TBase<NotificationEventRequest, NotificationEventRequest._Fields>, java.io.Serializable, Cloneable, Comparable<NotificationEventRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotificationEventRequest");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,7 +114,7 @@ public java.lang.String getFieldName() {
   private static final int __LASTEVENT_ISSET_ID = 0;
   private static final int __MAXEVENTS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MAX_EVENTS,_Fields.EVENT_TYPE_SKIP_LIST,_Fields.CAT_NAME,_Fields.DB_NAME,_Fields.TABLE_NAMES,_Fields.EVENT_TYPE_LIST};
+  private static final _Fields[] optionals = {_Fields.MAX_EVENTS,_Fields.EVENT_TYPE_SKIP_LIST,_Fields.CAT_NAME,_Fields.DB_NAME,_Fields.TABLE_NAMES,_Fields.EVENT_TYPE_LIST};
   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);
@@ -175,6 +177,7 @@ public NotificationEventRequest(NotificationEventRequest other) {
     }
   }
 
+  @Override
   public NotificationEventRequest deepCopy() {
     return new NotificationEventRequest(this);
   }
@@ -404,6 +407,7 @@ public void setEventTypeListIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LAST_EVENT:
@@ -466,6 +470,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LAST_EVENT:
@@ -494,6 +499,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -712,14 +718,17 @@ public int compareTo(NotificationEventRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -820,6 +829,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotificationEventRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventRequestStandardScheme getScheme() {
       return new NotificationEventRequestStandardScheme();
     }
@@ -827,111 +837,118 @@ public NotificationEventRequestStandardScheme getScheme() {
 
   private static class NotificationEventRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotificationEventRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotificationEventRequest 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 1: // LAST_EVENT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastEvent = iprot.readI64();
-              struct.setLastEventIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // MAX_EVENTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.maxEvents = iprot.readI32();
-              struct.setMaxEventsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // EVENT_TYPE_SKIP_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list994 = iprot.readListBegin();
-                struct.eventTypeSkipList = new java.util.ArrayList<java.lang.String>(_list994.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem995;
-                for (int _i996 = 0; _i996 < _list994.size; ++_i996)
+          }
+          switch (schemeField.id) {
+            case 1: // LAST_EVENT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lastEvent = iprot.readI64();
+                struct.setLastEventIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MAX_EVENTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.maxEvents = iprot.readI32();
+                struct.setMaxEventsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // EVENT_TYPE_SKIP_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem995 = iprot.readString();
-                  struct.eventTypeSkipList.add(_elem995);
+                  org.apache.thrift.protocol.TList _list994 = iprot.readListBegin();
+                  struct.eventTypeSkipList = new java.util.ArrayList<java.lang.String>(_list994.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem995;
+                  for (int _i996 = 0; _i996 < _list994.size; ++_i996)
+                  {
+                    _elem995 = iprot.readString();
+                    struct.eventTypeSkipList.add(_elem995);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setEventTypeSkipListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setEventTypeSkipListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // DB_NAME
-            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 6: // TABLE_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list997 = iprot.readListBegin();
-                struct.tableNames = new java.util.ArrayList<java.lang.String>(_list997.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem998;
-                for (int _i999 = 0; _i999 < _list997.size; ++_i999)
+              break;
+            case 4: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // DB_NAME
+              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 6: // TABLE_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem998 = iprot.readString();
-                  struct.tableNames.add(_elem998);
+                  org.apache.thrift.protocol.TList _list997 = iprot.readListBegin();
+                  struct.tableNames = new java.util.ArrayList<java.lang.String>(_list997.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem998;
+                  for (int _i999 = 0; _i999 < _list997.size; ++_i999)
+                  {
+                    _elem998 = iprot.readString();
+                    struct.tableNames.add(_elem998);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTableNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTableNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // EVENT_TYPE_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1000 = iprot.readListBegin();
-                struct.eventTypeList = new java.util.ArrayList<java.lang.String>(_list1000.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1001;
-                for (int _i1002 = 0; _i1002 < _list1000.size; ++_i1002)
+              break;
+            case 7: // EVENT_TYPE_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1001 = iprot.readString();
-                  struct.eventTypeList.add(_elem1001);
+                  org.apache.thrift.protocol.TList _list1000 = iprot.readListBegin();
+                  struct.eventTypeList = new java.util.ArrayList<java.lang.String>(_list1000.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1001;
+                  for (int _i1002 = 0; _i1002 < _list1000.size; ++_i1002)
+                  {
+                    _elem1001 = iprot.readString();
+                    struct.eventTypeList.add(_elem1001);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setEventTypeListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setEventTypeListIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEventRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1007,6 +1024,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEventR
   }
 
   private static class NotificationEventRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventRequestTupleScheme getScheme() {
       return new NotificationEventRequestTupleScheme();
     }
@@ -1078,60 +1096,65 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotificationEventRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEventRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.lastEvent = iprot.readI64();
-      struct.setLastEventIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.maxEvents = iprot.readI32();
-        struct.setMaxEventsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1009 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.eventTypeSkipList = new java.util.ArrayList<java.lang.String>(_list1009.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1010;
-          for (int _i1011 = 0; _i1011 < _list1009.size; ++_i1011)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.lastEvent = iprot.readI64();
+        struct.setLastEventIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.maxEvents = iprot.readI32();
+          struct.setMaxEventsIsSet(true);
+        }
+        if (incoming.get(1)) {
           {
-            _elem1010 = iprot.readString();
-            struct.eventTypeSkipList.add(_elem1010);
+            org.apache.thrift.protocol.TList _list1009 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.eventTypeSkipList = new java.util.ArrayList<java.lang.String>(_list1009.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1010;
+            for (int _i1011 = 0; _i1011 < _list1009.size; ++_i1011)
+            {
+              _elem1010 = iprot.readString();
+              struct.eventTypeSkipList.add(_elem1010);
+            }
           }
+          struct.setEventTypeSkipListIsSet(true);
         }
-        struct.setEventTypeSkipListIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list1012 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.tableNames = new java.util.ArrayList<java.lang.String>(_list1012.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1013;
-          for (int _i1014 = 0; _i1014 < _list1012.size; ++_i1014)
+        if (incoming.get(2)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _elem1013 = iprot.readString();
-            struct.tableNames.add(_elem1013);
+            org.apache.thrift.protocol.TList _list1012 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.tableNames = new java.util.ArrayList<java.lang.String>(_list1012.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1013;
+            for (int _i1014 = 0; _i1014 < _list1012.size; ++_i1014)
+            {
+              _elem1013 = iprot.readString();
+              struct.tableNames.add(_elem1013);
+            }
           }
+          struct.setTableNamesIsSet(true);
         }
-        struct.setTableNamesIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list1015 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.eventTypeList = new java.util.ArrayList<java.lang.String>(_list1015.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1016;
-          for (int _i1017 = 0; _i1017 < _list1015.size; ++_i1017)
+        if (incoming.get(5)) {
           {
-            _elem1016 = iprot.readString();
-            struct.eventTypeList.add(_elem1016);
+            org.apache.thrift.protocol.TList _list1015 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.eventTypeList = new java.util.ArrayList<java.lang.String>(_list1015.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1016;
+            for (int _i1017 = 0; _i1017 < _list1015.size; ++_i1017)
+            {
+              _elem1016 = iprot.readString();
+              struct.eventTypeList.add(_elem1016);
+            }
           }
+          struct.setEventTypeListIsSet(true);
         }
-        struct.setEventTypeListIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java
index f677bc675912..127e06081ce3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotificationEventResponse implements org.apache.thrift.TBase<NotificationEventResponse, NotificationEventResponse._Fields>, java.io.Serializable, Cloneable, Comparable<NotificationEventResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotificationEventResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public NotificationEventResponse(NotificationEventResponse other) {
     }
   }
 
+  @Override
   public NotificationEventResponse deepCopy() {
     return new NotificationEventResponse(this);
   }
@@ -161,6 +164,7 @@ public void setEventsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EVENTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EVENTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(NotificationEventResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotificationEventResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventResponseStandardScheme getScheme() {
       return new NotificationEventResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public NotificationEventResponseStandardScheme getScheme() {
 
   private static class NotificationEventResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotificationEventResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotificationEventResponse 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 1: // EVENTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1018 = iprot.readListBegin();
-                struct.events = new java.util.ArrayList<NotificationEvent>(_list1018.size);
-                @org.apache.thrift.annotation.Nullable NotificationEvent _elem1019;
-                for (int _i1020 = 0; _i1020 < _list1018.size; ++_i1020)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // EVENTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1019 = new NotificationEvent();
-                  _elem1019.read(iprot);
-                  struct.events.add(_elem1019);
+                  org.apache.thrift.protocol.TList _list1018 = iprot.readListBegin();
+                  struct.events = new java.util.ArrayList<NotificationEvent>(_list1018.size);
+                  @org.apache.thrift.annotation.Nullable NotificationEvent _elem1019;
+                  for (int _i1020 = 0; _i1020 < _list1018.size; ++_i1020)
+                  {
+                    _elem1019 = new NotificationEvent();
+                    _elem1019.read(iprot);
+                    struct.events.add(_elem1019);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setEventsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setEventsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEventResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEventR
   }
 
   private static class NotificationEventResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventResponseTupleScheme getScheme() {
       return new NotificationEventResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotificationEventRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEventResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1023 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.events = new java.util.ArrayList<NotificationEvent>(_list1023.size);
-        @org.apache.thrift.annotation.Nullable NotificationEvent _elem1024;
-        for (int _i1025 = 0; _i1025 < _list1023.size; ++_i1025)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1024 = new NotificationEvent();
-          _elem1024.read(iprot);
-          struct.events.add(_elem1024);
+          org.apache.thrift.protocol.TList _list1023 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.events = new java.util.ArrayList<NotificationEvent>(_list1023.size);
+          @org.apache.thrift.annotation.Nullable NotificationEvent _elem1024;
+          for (int _i1025 = 0; _i1025 < _list1023.size; ++_i1025)
+          {
+            _elem1024 = new NotificationEvent();
+            _elem1024.read(iprot);
+            struct.events.add(_elem1024);
+          }
         }
+        struct.setEventsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setEventsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java
index c6d6f9a6bc8f..aafdf5020651 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotificationEventsCountRequest implements org.apache.thrift.TBase<NotificationEventsCountRequest, NotificationEventsCountRequest._Fields>, java.io.Serializable, Cloneable, Comparable<NotificationEventsCountRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotificationEventsCountRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -108,7 +110,7 @@ public java.lang.String getFieldName() {
   private static final int __TOEVENTID_ISSET_ID = 1;
   private static final int __LIMIT_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.TO_EVENT_ID,_Fields.LIMIT,_Fields.TABLE_NAMES};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.TO_EVENT_ID,_Fields.LIMIT,_Fields.TABLE_NAMES};
   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);
@@ -162,6 +164,7 @@ public NotificationEventsCountRequest(NotificationEventsCountRequest other) {
     }
   }
 
+  @Override
   public NotificationEventsCountRequest deepCopy() {
     return new NotificationEventsCountRequest(this);
   }
@@ -333,6 +336,7 @@ public void setTableNamesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FROM_EVENT_ID:
@@ -387,6 +391,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FROM_EVENT_ID:
@@ -412,6 +417,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -605,14 +611,17 @@ public int compareTo(NotificationEventsCountRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -701,6 +710,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotificationEventsCountRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventsCountRequestStandardScheme getScheme() {
       return new NotificationEventsCountRequestStandardScheme();
     }
@@ -708,83 +718,90 @@ public NotificationEventsCountRequestStandardScheme getScheme() {
 
   private static class NotificationEventsCountRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotificationEventsCountRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotificationEventsCountRequest 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 1: // FROM_EVENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.fromEventId = iprot.readI64();
-              struct.setFromEventIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TO_EVENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.toEventId = iprot.readI64();
-              struct.setToEventIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // LIMIT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.limit = iprot.readI64();
-              struct.setLimitIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // TABLE_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1026 = iprot.readListBegin();
-                struct.tableNames = new java.util.ArrayList<java.lang.String>(_list1026.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1027;
-                for (int _i1028 = 0; _i1028 < _list1026.size; ++_i1028)
+          }
+          switch (schemeField.id) {
+            case 1: // FROM_EVENT_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.fromEventId = iprot.readI64();
+                struct.setFromEventIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TO_EVENT_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.toEventId = iprot.readI64();
+                struct.setToEventIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // LIMIT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.limit = iprot.readI64();
+                struct.setLimitIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // TABLE_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1027 = iprot.readString();
-                  struct.tableNames.add(_elem1027);
+                  org.apache.thrift.protocol.TList _list1026 = iprot.readListBegin();
+                  struct.tableNames = new java.util.ArrayList<java.lang.String>(_list1026.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1027;
+                  for (int _i1028 = 0; _i1028 < _list1026.size; ++_i1028)
+                  {
+                    _elem1027 = iprot.readString();
+                    struct.tableNames.add(_elem1027);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTableNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTableNamesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEventsCountRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -835,6 +852,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEvents
   }
 
   private static class NotificationEventsCountRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventsCountRequestTupleScheme getScheme() {
       return new NotificationEventsCountRequestTupleScheme();
     }
@@ -883,36 +901,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotificationEventsC
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEventsCountRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.fromEventId = iprot.readI64();
-      struct.setFromEventIdIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.toEventId = iprot.readI64();
-        struct.setToEventIdIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.limit = iprot.readI64();
-        struct.setLimitIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list1031 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.tableNames = new java.util.ArrayList<java.lang.String>(_list1031.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1032;
-          for (int _i1033 = 0; _i1033 < _list1031.size; ++_i1033)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.fromEventId = iprot.readI64();
+        struct.setFromEventIdIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.toEventId = iprot.readI64();
+          struct.setToEventIdIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.limit = iprot.readI64();
+          struct.setLimitIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _elem1032 = iprot.readString();
-            struct.tableNames.add(_elem1032);
+            org.apache.thrift.protocol.TList _list1031 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.tableNames = new java.util.ArrayList<java.lang.String>(_list1031.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1032;
+            for (int _i1033 = 0; _i1033 < _list1031.size; ++_i1033)
+            {
+              _elem1032 = iprot.readString();
+              struct.tableNames.add(_elem1032);
+            }
           }
+          struct.setTableNamesIsSet(true);
         }
-        struct.setTableNamesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java
index 496daf594560..1b026a7e7be9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotificationEventsCountResponse implements org.apache.thrift.TBase<NotificationEventsCountResponse, NotificationEventsCountResponse._Fields>, java.io.Serializable, Cloneable, Comparable<NotificationEventsCountResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotificationEventsCountResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public NotificationEventsCountResponse(NotificationEventsCountResponse other) {
     this.eventsCount = other.eventsCount;
   }
 
+  @Override
   public NotificationEventsCountResponse deepCopy() {
     return new NotificationEventsCountResponse(this);
   }
@@ -141,6 +144,7 @@ public void setEventsCountIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EVENTSCOUNT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EVENTS_COUNT:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EVENTS_COUNT:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(NotificationEventsCountResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class NotificationEventsCountResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventsCountResponseStandardScheme getScheme() {
       return new NotificationEventsCountResponseStandardScheme();
     }
@@ -292,33 +302,40 @@ public NotificationEventsCountResponseStandardScheme getScheme() {
 
   private static class NotificationEventsCountResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotificationEventsCountResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, NotificationEventsCountResponse 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 1: // EVENTS_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.eventsCount = iprot.readI64();
-              struct.setEventsCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // EVENTS_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.eventsCount = iprot.readI64();
+                struct.setEventsCountIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEventsCountResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEvents
   }
 
   private static class NotificationEventsCountResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public NotificationEventsCountResponseTupleScheme getScheme() {
       return new NotificationEventsCountResponseTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotificationEventsC
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEventsCountResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.eventsCount = iprot.readI64();
-      struct.setEventsCountIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.eventsCount = iprot.readI64();
+        struct.setEventsCountIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ObjectDictionary.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ObjectDictionary.java
index e085ce1fda51..de73f993d733 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ObjectDictionary.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ObjectDictionary.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ObjectDictionary implements org.apache.thrift.TBase<ObjectDictionary, ObjectDictionary._Fields>, java.io.Serializable, Cloneable, Comparable<ObjectDictionary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ObjectDictionary");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -122,6 +124,7 @@ public ObjectDictionary(ObjectDictionary other) {
     }
   }
 
+  @Override
   public ObjectDictionary deepCopy() {
     return new ObjectDictionary(this);
   }
@@ -166,6 +169,7 @@ public void setValuesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -180,6 +184,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -190,6 +195,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -260,14 +266,17 @@ public int compareTo(ObjectDictionary other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -314,6 +323,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ObjectDictionaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ObjectDictionaryStandardScheme getScheme() {
       return new ObjectDictionaryStandardScheme();
     }
@@ -321,55 +331,62 @@ public ObjectDictionaryStandardScheme getScheme() {
 
   private static class ObjectDictionaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<ObjectDictionary> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ObjectDictionary 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map352 = iprot.readMapBegin();
-                struct.values = new java.util.HashMap<java.lang.String,java.util.List<java.nio.ByteBuffer>>(2*_map352.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key353;
-                @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> _val354;
-                for (int _i355 = 0; _i355 < _map352.size; ++_i355)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key353 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map352 = iprot.readMapBegin();
+                  struct.values = new java.util.HashMap<java.lang.String,java.util.List<java.nio.ByteBuffer>>(2*_map352.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key353;
+                  @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> _val354;
+                  for (int _i355 = 0; _i355 < _map352.size; ++_i355)
                   {
-                    org.apache.thrift.protocol.TList _list356 = iprot.readListBegin();
-                    _val354 = new java.util.ArrayList<java.nio.ByteBuffer>(_list356.size);
-                    @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem357;
-                    for (int _i358 = 0; _i358 < _list356.size; ++_i358)
+                    _key353 = iprot.readString();
                     {
-                      _elem357 = iprot.readBinary();
-                      _val354.add(_elem357);
+                      org.apache.thrift.protocol.TList _list356 = iprot.readListBegin();
+                      _val354 = new java.util.ArrayList<java.nio.ByteBuffer>(_list356.size);
+                      @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem357;
+                      for (int _i358 = 0; _i358 < _list356.size; ++_i358)
+                      {
+                        _elem357 = iprot.readBinary();
+                        _val354.add(_elem357);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.values.put(_key353, _val354);
                   }
-                  struct.values.put(_key353, _val354);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ObjectDictionary struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -401,6 +418,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ObjectDictionary s
   }
 
   private static class ObjectDictionaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ObjectDictionaryTupleScheme getScheme() {
       return new ObjectDictionaryTupleScheme();
     }
@@ -429,29 +447,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ObjectDictionary st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ObjectDictionary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map363 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
-        struct.values = new java.util.HashMap<java.lang.String,java.util.List<java.nio.ByteBuffer>>(2*_map363.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _key364;
-        @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> _val365;
-        for (int _i366 = 0; _i366 < _map363.size; ++_i366)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key364 = iprot.readString();
+          org.apache.thrift.protocol.TMap _map363 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
+          struct.values = new java.util.HashMap<java.lang.String,java.util.List<java.nio.ByteBuffer>>(2*_map363.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key364;
+          @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> _val365;
+          for (int _i366 = 0; _i366 < _map363.size; ++_i366)
           {
-            org.apache.thrift.protocol.TList _list367 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            _val365 = new java.util.ArrayList<java.nio.ByteBuffer>(_list367.size);
-            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem368;
-            for (int _i369 = 0; _i369 < _list367.size; ++_i369)
+            _key364 = iprot.readString();
             {
-              _elem368 = iprot.readBinary();
-              _val365.add(_elem368);
+              org.apache.thrift.protocol.TList _list367 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              _val365 = new java.util.ArrayList<java.nio.ByteBuffer>(_list367.size);
+              @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem368;
+              for (int _i369 = 0; _i369 < _list367.size; ++_i369)
+              {
+                _elem368 = iprot.readBinary();
+                _val365.add(_elem368);
+              }
             }
+            struct.values.put(_key364, _val365);
           }
-          struct.values.put(_key364, _val365);
         }
+        struct.setValuesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setValuesIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java
index 1ecee4f2b336..13ae2bd75c5a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class OpenTxnRequest implements org.apache.thrift.TBase<OpenTxnRequest, OpenTxnRequest._Fields>, java.io.Serializable, Cloneable, Comparable<OpenTxnRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OpenTxnRequest");
 
@@ -103,10 +103,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -115,7 +117,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __NUM_TXNS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.AGENT_INFO,_Fields.REPL_POLICY,_Fields.REPL_SRC_TXN_IDS,_Fields.TXN_TYPE};
+  private static final _Fields[] optionals = {_Fields.AGENT_INFO,_Fields.REPL_POLICY,_Fields.REPL_SRC_TXN_IDS,_Fields.TXN_TYPE};
   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);
@@ -184,6 +186,7 @@ public OpenTxnRequest(OpenTxnRequest other) {
     }
   }
 
+  @Override
   public OpenTxnRequest deepCopy() {
     return new OpenTxnRequest(this);
   }
@@ -392,6 +395,7 @@ public void setTxn_typeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUM_TXNS:
@@ -454,6 +458,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUM_TXNS:
@@ -482,6 +487,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -700,14 +706,17 @@ public int compareTo(OpenTxnRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -816,6 +825,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class OpenTxnRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OpenTxnRequestStandardScheme getScheme() {
       return new OpenTxnRequestStandardScheme();
     }
@@ -823,91 +833,98 @@ public OpenTxnRequestStandardScheme getScheme() {
 
   private static class OpenTxnRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<OpenTxnRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, OpenTxnRequest 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 1: // NUM_TXNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.num_txns = iprot.readI32();
-              struct.setNum_txnsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // HOSTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hostname = iprot.readString();
-              struct.setHostnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // AGENT_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.agentInfo = iprot.readString();
-              struct.setAgentInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // REPL_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.replPolicy = iprot.readString();
-              struct.setReplPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // REPL_SRC_TXN_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list806 = iprot.readListBegin();
-                struct.replSrcTxnIds = new java.util.ArrayList<java.lang.Long>(_list806.size);
-                long _elem807;
-                for (int _i808 = 0; _i808 < _list806.size; ++_i808)
+          }
+          switch (schemeField.id) {
+            case 1: // NUM_TXNS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.num_txns = iprot.readI32();
+                struct.setNum_txnsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // HOSTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.hostname = iprot.readString();
+                struct.setHostnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // AGENT_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.agentInfo = iprot.readString();
+                struct.setAgentInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // REPL_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.replPolicy = iprot.readString();
+                struct.setReplPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // REPL_SRC_TXN_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem807 = iprot.readI64();
-                  struct.replSrcTxnIds.add(_elem807);
+                  org.apache.thrift.protocol.TList _list806 = iprot.readListBegin();
+                  struct.replSrcTxnIds = new java.util.ArrayList<java.lang.Long>(_list806.size);
+                  long _elem807;
+                  for (int _i808 = 0; _i808 < _list806.size; ++_i808)
+                  {
+                    _elem807 = iprot.readI64();
+                    struct.replSrcTxnIds.add(_elem807);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setReplSrcTxnIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setReplSrcTxnIdsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TXN_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-              struct.setTxn_typeIsSet(true);
-            } else { 
+              break;
+            case 7: // TXN_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+                struct.setTxn_typeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, OpenTxnRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -967,6 +984,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, OpenTxnRequest str
   }
 
   private static class OpenTxnRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OpenTxnRequestTupleScheme getScheme() {
       return new OpenTxnRequestTupleScheme();
     }
@@ -1016,38 +1034,43 @@ public void write(org.apache.thrift.protocol.TProtocol prot, OpenTxnRequest stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, OpenTxnRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.num_txns = iprot.readI32();
-      struct.setNum_txnsIsSet(true);
-      struct.user = iprot.readString();
-      struct.setUserIsSet(true);
-      struct.hostname = iprot.readString();
-      struct.setHostnameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.agentInfo = iprot.readString();
-        struct.setAgentInfoIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.replPolicy = iprot.readString();
-        struct.setReplPolicyIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list811 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-          struct.replSrcTxnIds = new java.util.ArrayList<java.lang.Long>(_list811.size);
-          long _elem812;
-          for (int _i813 = 0; _i813 < _list811.size; ++_i813)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.num_txns = iprot.readI32();
+        struct.setNum_txnsIsSet(true);
+        struct.user = iprot.readString();
+        struct.setUserIsSet(true);
+        struct.hostname = iprot.readString();
+        struct.setHostnameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.agentInfo = iprot.readString();
+          struct.setAgentInfoIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.replPolicy = iprot.readString();
+          struct.setReplPolicyIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem812 = iprot.readI64();
-            struct.replSrcTxnIds.add(_elem812);
+            org.apache.thrift.protocol.TList _list811 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+            struct.replSrcTxnIds = new java.util.ArrayList<java.lang.Long>(_list811.size);
+            long _elem812;
+            for (int _i813 = 0; _i813 < _list811.size; ++_i813)
+            {
+              _elem812 = iprot.readI64();
+              struct.replSrcTxnIds.add(_elem812);
+            }
           }
+          struct.setReplSrcTxnIdsIsSet(true);
         }
-        struct.setReplSrcTxnIdsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
-        struct.setTxn_typeIsSet(true);
+        if (incoming.get(3)) {
+          struct.txn_type = org.apache.hadoop.hive.metastore.api.TxnType.findByValue(iprot.readI32());
+          struct.setTxn_typeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java
index 2207f6ad1b68..f8f421844bf4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class OpenTxnsResponse implements org.apache.thrift.TBase<OpenTxnsResponse, OpenTxnsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<OpenTxnsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OpenTxnsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public OpenTxnsResponse(OpenTxnsResponse other) {
     }
   }
 
+  @Override
   public OpenTxnsResponse deepCopy() {
     return new OpenTxnsResponse(this);
   }
@@ -158,6 +161,7 @@ public void setTxn_idsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_IDS:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_IDS:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(OpenTxnsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -306,6 +315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class OpenTxnsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OpenTxnsResponseStandardScheme getScheme() {
       return new OpenTxnsResponseStandardScheme();
     }
@@ -313,43 +323,50 @@ public OpenTxnsResponseStandardScheme getScheme() {
 
   private static class OpenTxnsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<OpenTxnsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, OpenTxnsResponse 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 1: // TXN_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list814 = iprot.readListBegin();
-                struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list814.size);
-                long _elem815;
-                for (int _i816 = 0; _i816 < _list814.size; ++_i816)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TXN_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem815 = iprot.readI64();
-                  struct.txn_ids.add(_elem815);
+                  org.apache.thrift.protocol.TList _list814 = iprot.readListBegin();
+                  struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list814.size);
+                  long _elem815;
+                  for (int _i816 = 0; _i816 < _list814.size; ++_i816)
+                  {
+                    _elem815 = iprot.readI64();
+                    struct.txn_ids.add(_elem815);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTxn_idsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTxn_idsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, OpenTxnsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, OpenTxnsResponse s
   }
 
   private static class OpenTxnsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OpenTxnsResponseTupleScheme getScheme() {
       return new OpenTxnsResponseTupleScheme();
     }
@@ -394,18 +412,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, OpenTxnsResponse st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, OpenTxnsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list819 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list819.size);
-        long _elem820;
-        for (int _i821 = 0; _i821 < _list819.size; ++_i821)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem820 = iprot.readI64();
-          struct.txn_ids.add(_elem820);
+          org.apache.thrift.protocol.TList _list819 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.txn_ids = new java.util.ArrayList<java.lang.Long>(_list819.size);
+          long _elem820;
+          for (int _i821 = 0; _i821 < _list819.size; ++_i821)
+          {
+            _elem820 = iprot.readI64();
+            struct.txn_ids.add(_elem820);
+          }
         }
+        struct.setTxn_idsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setTxn_idsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OptionalCompactionInfoStruct.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OptionalCompactionInfoStruct.java
index 594cc6c40f8b..c0d0a1e6b47f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OptionalCompactionInfoStruct.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OptionalCompactionInfoStruct.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class OptionalCompactionInfoStruct implements org.apache.thrift.TBase<OptionalCompactionInfoStruct, OptionalCompactionInfoStruct._Fields>, java.io.Serializable, Cloneable, Comparable<OptionalCompactionInfoStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OptionalCompactionInfoStruct");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CI};
+  private static final _Fields[] optionals = {_Fields.CI};
   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);
@@ -101,6 +103,7 @@ public OptionalCompactionInfoStruct(OptionalCompactionInfoStruct other) {
     }
   }
 
+  @Override
   public OptionalCompactionInfoStruct deepCopy() {
     return new OptionalCompactionInfoStruct(this);
   }
@@ -134,6 +137,7 @@ public void setCiIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CI:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CI:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(OptionalCompactionInfoStruct other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class OptionalCompactionInfoStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OptionalCompactionInfoStructStandardScheme getScheme() {
       return new OptionalCompactionInfoStructStandardScheme();
     }
@@ -290,34 +300,41 @@ public OptionalCompactionInfoStructStandardScheme getScheme() {
 
   private static class OptionalCompactionInfoStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<OptionalCompactionInfoStruct> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, OptionalCompactionInfoStruct 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 1: // CI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.ci = new CompactionInfoStruct();
-              struct.ci.read(iprot);
-              struct.setCiIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // CI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.ci = new CompactionInfoStruct();
+                struct.ci.read(iprot);
+                struct.setCiIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, OptionalCompactionInfoStruct struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, OptionalCompaction
   }
 
   private static class OptionalCompactionInfoStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OptionalCompactionInfoStructTupleScheme getScheme() {
       return new OptionalCompactionInfoStructTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, OptionalCompactionI
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, OptionalCompactionInfoStruct 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.ci = new CompactionInfoStruct();
-        struct.ci.read(iprot);
-        struct.setCiIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.ci = new CompactionInfoStruct();
+          struct.ci.read(iprot);
+          struct.setCiIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
index de457ef2cbc3..4265e71d745f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Order implements org.apache.thrift.TBase<Order, Order._Fields>, java.io.Serializable, Cloneable, Comparable<Order> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Order");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public Order(Order other) {
     this.order = other.order;
   }
 
+  @Override
   public Order deepCopy() {
     return new Order(this);
   }
@@ -178,6 +181,7 @@ public void setOrderIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ORDER_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COL:
@@ -200,6 +204,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL:
@@ -213,6 +218,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(Order other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -362,6 +371,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class OrderStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OrderStandardScheme getScheme() {
       return new OrderStandardScheme();
     }
@@ -369,41 +379,48 @@ public OrderStandardScheme getScheme() {
 
   private static class OrderStandardScheme extends org.apache.thrift.scheme.StandardScheme<Order> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Order 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 1: // COL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.col = iprot.readString();
-              struct.setColIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.order = iprot.readI32();
-              struct.setOrderIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // COL
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.col = iprot.readString();
+                struct.setColIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ORDER
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.order = iprot.readI32();
+                struct.setOrderIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Order struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -423,6 +440,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Order struct) thro
   }
 
   private static class OrderTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public OrderTupleScheme getScheme() {
       return new OrderTupleScheme();
     }
@@ -451,15 +469,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Order struct) throw
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Order 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.col = iprot.readString();
-        struct.setColIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.order = iprot.readI32();
-        struct.setOrderIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.col = iprot.readString();
+          struct.setColIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.order = iprot.readI32();
+          struct.setOrderIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Package.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Package.java
index a304b2910cec..460dad1e977e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Package.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Package.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Package implements org.apache.thrift.TBase<Package, Package._Fields>, java.io.Serializable, Cloneable, Comparable<Package> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Package");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -167,6 +169,7 @@ public Package(Package other) {
     }
   }
 
+  @Override
   public Package deepCopy() {
     return new Package(this);
   }
@@ -325,6 +328,7 @@ public void setBodyIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -379,6 +383,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -404,6 +409,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -599,14 +605,17 @@ public int compareTo(Package other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -689,6 +698,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PackageStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PackageStandardScheme getScheme() {
       return new PackageStandardScheme();
     }
@@ -696,73 +706,80 @@ public PackageStandardScheme getScheme() {
 
   private static class PackageStandardScheme extends org.apache.thrift.scheme.StandardScheme<Package> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Package 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PACKAGE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.packageName = iprot.readString();
-              struct.setPackageNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // PACKAGE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.packageName = iprot.readString();
+                struct.setPackageNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // HEADER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.header = iprot.readString();
+                struct.setHeaderIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // BODY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.body = iprot.readString();
+                struct.setBodyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // HEADER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.header = iprot.readString();
-              struct.setHeaderIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // BODY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.body = iprot.readString();
-              struct.setBodyIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Package struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -804,6 +821,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Package struct) th
   }
 
   private static class PackageTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PackageTupleScheme getScheme() {
       return new PackageTupleScheme();
     }
@@ -856,31 +874,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Package struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Package struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.packageName = iprot.readString();
-        struct.setPackageNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.header = iprot.readString();
-        struct.setHeaderIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.body = iprot.readString();
-        struct.setBodyIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.packageName = iprot.readString();
+          struct.setPackageNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.header = iprot.readString();
+          struct.setHeaderIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.body = iprot.readString();
+          struct.setBodyIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
index e2af62f0658d..892ec5520365 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Partition implements org.apache.thrift.TBase<Partition, Partition._Fields>, java.io.Serializable, Cloneable, Comparable<Partition> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Partition");
 
@@ -129,10 +129,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -144,7 +146,7 @@ public java.lang.String getFieldName() {
   private static final int __WRITEID_ISSET_ID = 2;
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.CAT_NAME,_Fields.WRITE_ID,_Fields.IS_STATS_COMPLIANT,_Fields.COL_STATS,_Fields.FILE_METADATA};
+  private static final _Fields[] optionals = {_Fields.PRIVILEGES,_Fields.CAT_NAME,_Fields.WRITE_ID,_Fields.IS_STATS_COMPLIANT,_Fields.COL_STATS,_Fields.FILE_METADATA};
   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);
@@ -247,6 +249,7 @@ public Partition(Partition other) {
     }
   }
 
+  @Override
   public Partition deepCopy() {
     return new Partition(this);
   }
@@ -603,6 +606,7 @@ public void setFileMetadataIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -713,6 +717,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -759,6 +764,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1125,14 +1131,17 @@ public int compareTo(Partition other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1281,6 +1290,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionStandardScheme getScheme() {
       return new PartitionStandardScheme();
     }
@@ -1288,155 +1298,162 @@ public PartitionStandardScheme getScheme() {
 
   private static class PartitionStandardScheme extends org.apache.thrift.scheme.StandardScheme<Partition> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Partition 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list404 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.String>(_list404.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem405;
-                for (int _i406 = 0; _i406 < _list404.size; ++_i406)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem405 = iprot.readString();
-                  struct.values.add(_elem405);
+                  org.apache.thrift.protocol.TList _list404 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.String>(_list404.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem405;
+                  for (int _i406 = 0; _i406 < _list404.size; ++_i406)
+                  {
+                    _elem405 = iprot.readString();
+                    struct.values.add(_elem405);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // LAST_ACCESS_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.lastAccessTime = iprot.readI32();
-              struct.setLastAccessTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // SD
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sd = new StorageDescriptor();
-              struct.sd.read(iprot);
-              struct.setSdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map407 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map407.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key408;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val409;
-                for (int _i410 = 0; _i410 < _map407.size; ++_i410)
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // LAST_ACCESS_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.lastAccessTime = iprot.readI32();
+                struct.setLastAccessTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // SD
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sd = new StorageDescriptor();
+                struct.sd.read(iprot);
+                struct.setSdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key408 = iprot.readString();
-                  _val409 = iprot.readString();
-                  struct.parameters.put(_key408, _val409);
+                  org.apache.thrift.protocol.TMap _map407 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map407.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key408;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val409;
+                  for (int _i410 = 0; _i410 < _map407.size; ++_i410)
+                  {
+                    _key408 = iprot.readString();
+                    _val409 = iprot.readString();
+                    struct.parameters.put(_key408, _val409);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.privileges = new PrincipalPrivilegeSet();
-              struct.privileges.read(iprot);
-              struct.setPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // COL_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.colStats = new ColumnStatistics();
-              struct.colStats.read(iprot);
-              struct.setColStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // FILE_METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.fileMetadata = new FileMetadata();
-              struct.fileMetadata.read(iprot);
-              struct.setFileMetadataIsSet(true);
-            } else { 
+              break;
+            case 8: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.privileges = new PrincipalPrivilegeSet();
+                struct.privileges.read(iprot);
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // COL_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.colStats = new ColumnStatistics();
+                struct.colStats.read(iprot);
+                struct.setColStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // FILE_METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.fileMetadata = new FileMetadata();
+                struct.fileMetadata.read(iprot);
+                struct.setFileMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Partition struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1532,6 +1549,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Partition struct)
   }
 
   private static class PartitionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionTupleScheme getScheme() {
       return new PartitionTupleScheme();
     }
@@ -1639,83 +1657,88 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Partition struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Partition struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(13);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list415 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.values = new java.util.ArrayList<java.lang.String>(_list415.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem416;
-          for (int _i417 = 0; _i417 < _list415.size; ++_i417)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(13);
+        if (incoming.get(0)) {
           {
-            _elem416 = iprot.readString();
-            struct.values.add(_elem416);
+            org.apache.thrift.protocol.TList _list415 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.values = new java.util.ArrayList<java.lang.String>(_list415.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem416;
+            for (int _i417 = 0; _i417 < _list415.size; ++_i417)
+            {
+              _elem416 = iprot.readString();
+              struct.values.add(_elem416);
+            }
           }
+          struct.setValuesIsSet(true);
         }
-        struct.setValuesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.lastAccessTime = iprot.readI32();
-        struct.setLastAccessTimeIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.sd = new StorageDescriptor();
-        struct.sd.read(iprot);
-        struct.setSdIsSet(true);
-      }
-      if (incoming.get(6)) {
-        {
-          org.apache.thrift.protocol.TMap _map418 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map418.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key419;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val420;
-          for (int _i421 = 0; _i421 < _map418.size; ++_i421)
+        if (incoming.get(1)) {
+          struct.dbName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.tableName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.lastAccessTime = iprot.readI32();
+          struct.setLastAccessTimeIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.sd = new StorageDescriptor();
+          struct.sd.read(iprot);
+          struct.setSdIsSet(true);
+        }
+        if (incoming.get(6)) {
           {
-            _key419 = iprot.readString();
-            _val420 = iprot.readString();
-            struct.parameters.put(_key419, _val420);
+            org.apache.thrift.protocol.TMap _map418 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map418.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key419;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val420;
+            for (int _i421 = 0; _i421 < _map418.size; ++_i421)
+            {
+              _key419 = iprot.readString();
+              _val420 = iprot.readString();
+              struct.parameters.put(_key419, _val420);
+            }
           }
+          struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.privileges = new PrincipalPrivilegeSet();
+          struct.privileges.read(iprot);
+          struct.setPrivilegesIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.colStats = new ColumnStatistics();
+          struct.colStats.read(iprot);
+          struct.setColStatsIsSet(true);
+        }
+        if (incoming.get(12)) {
+          struct.fileMetadata = new FileMetadata();
+          struct.fileMetadata.read(iprot);
+          struct.setFileMetadataIsSet(true);
         }
-        struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.privileges = new PrincipalPrivilegeSet();
-        struct.privileges.read(iprot);
-        struct.setPrivilegesIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.colStats = new ColumnStatistics();
-        struct.colStats.read(iprot);
-        struct.setColStatsIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.fileMetadata = new FileMetadata();
-        struct.fileMetadata.read(iprot);
-        struct.setFileMetadataIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java
index ccd44f39f79f..cec44edf8e24 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum PartitionEventType implements org.apache.thrift.TEnum {
   LOAD_DONE(1);
 
@@ -20,6 +20,7 @@ private PartitionEventType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionFilterMode.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionFilterMode.java
index feaad71f5a4a..dde583efcd54 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionFilterMode.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionFilterMode.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum PartitionFilterMode implements org.apache.thrift.TEnum {
   BY_NAMES(0),
   BY_VALUES(1),
@@ -22,6 +22,7 @@ private PartitionFilterMode(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java
index 5c4cee791f80..8be540424bd0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionListComposingSpec implements org.apache.thrift.TBase<PartitionListComposingSpec, PartitionListComposingSpec._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionListComposingSpec> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionListComposingSpec");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public PartitionListComposingSpec(PartitionListComposingSpec other) {
     }
   }
 
+  @Override
   public PartitionListComposingSpec deepCopy() {
     return new PartitionListComposingSpec(this);
   }
@@ -161,6 +164,7 @@ public void setPartitionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(PartitionListComposingSpec other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -305,6 +314,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionListComposingSpecStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionListComposingSpecStandardScheme getScheme() {
       return new PartitionListComposingSpecStandardScheme();
     }
@@ -312,44 +322,51 @@ public PartitionListComposingSpecStandardScheme getScheme() {
 
   private static class PartitionListComposingSpecStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionListComposingSpec> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionListComposingSpec 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list448 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list448.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem449;
-                for (int _i450 = 0; _i450 < _list448.size; ++_i450)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem449 = new Partition();
-                  _elem449.read(iprot);
-                  struct.partitions.add(_elem449);
+                  org.apache.thrift.protocol.TList _list448 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list448.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem449;
+                  for (int _i450 = 0; _i450 < _list448.size; ++_i450)
+                  {
+                    _elem449 = new Partition();
+                    _elem449.read(iprot);
+                    struct.partitions.add(_elem449);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionListComposingSpec struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionListCompo
   }
 
   private static class PartitionListComposingSpecTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionListComposingSpecTupleScheme getScheme() {
       return new PartitionListComposingSpecTupleScheme();
     }
@@ -401,21 +419,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionListCompos
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionListComposingSpec 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 _list453 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitions = new java.util.ArrayList<Partition>(_list453.size);
-          @org.apache.thrift.annotation.Nullable Partition _elem454;
-          for (int _i455 = 0; _i455 < _list453.size; ++_i455)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem454 = new Partition();
-            _elem454.read(iprot);
-            struct.partitions.add(_elem454);
+            org.apache.thrift.protocol.TList _list453 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitions = new java.util.ArrayList<Partition>(_list453.size);
+            @org.apache.thrift.annotation.Nullable Partition _elem454;
+            for (int _i455 = 0; _i455 < _list453.size; ++_i455)
+            {
+              _elem454 = new Partition();
+              _elem454.read(iprot);
+              struct.partitions.add(_elem454);
+            }
           }
+          struct.setPartitionsIsSet(true);
         }
-        struct.setPartitionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java
index 99d27a6da095..0574b718690d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionSpec implements org.apache.thrift.TBase<PartitionSpec, PartitionSpec._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionSpec> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionSpec");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -117,7 +119,7 @@ public java.lang.String getFieldName() {
   private static final int __WRITEID_ISSET_ID = 0;
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SHARED_SDPARTITION_SPEC,_Fields.PARTITION_LIST,_Fields.CAT_NAME,_Fields.WRITE_ID,_Fields.IS_STATS_COMPLIANT};
+  private static final _Fields[] optionals = {_Fields.SHARED_SDPARTITION_SPEC,_Fields.PARTITION_LIST,_Fields.CAT_NAME,_Fields.WRITE_ID,_Fields.IS_STATS_COMPLIANT};
   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);
@@ -184,6 +186,7 @@ public PartitionSpec(PartitionSpec other) {
     this.isStatsCompliant = other.isStatsCompliant;
   }
 
+  @Override
   public PartitionSpec deepCopy() {
     return new PartitionSpec(this);
   }
@@ -390,6 +393,7 @@ public void setIsStatsCompliantIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -460,6 +464,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -491,6 +496,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -736,14 +742,17 @@ public int compareTo(PartitionSpec other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -852,6 +861,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionSpecStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionSpecStandardScheme getScheme() {
       return new PartitionSpecStandardScheme();
     }
@@ -859,91 +869,98 @@ public PartitionSpecStandardScheme getScheme() {
 
   private static class PartitionSpecStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionSpec> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionSpec 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 1: // DB_NAME
-            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: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ROOT_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.rootPath = iprot.readString();
-              struct.setRootPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // SHARED_SDPARTITION_SPEC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sharedSDPartitionSpec = new PartitionSpecWithSharedSD();
-              struct.sharedSDPartitionSpec.read(iprot);
-              struct.setSharedSDPartitionSpecIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PARTITION_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.partitionList = new PartitionListComposingSpec();
-              struct.partitionList.read(iprot);
-              struct.setPartitionListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ROOT_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.rootPath = iprot.readString();
+                struct.setRootPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // SHARED_SDPARTITION_SPEC
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sharedSDPartitionSpec = new PartitionSpecWithSharedSD();
+                struct.sharedSDPartitionSpec.read(iprot);
+                struct.setSharedSDPartitionSpecIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARTITION_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.partitionList = new PartitionListComposingSpec();
+                struct.partitionList.read(iprot);
+                struct.setPartitionListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionSpec struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1001,6 +1018,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionSpec stru
   }
 
   private static class PartitionSpecTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionSpecTupleScheme getScheme() {
       return new PartitionSpecTupleScheme();
     }
@@ -1065,41 +1083,46 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionSpec struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionSpec struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.rootPath = iprot.readString();
-        struct.setRootPathIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.sharedSDPartitionSpec = new PartitionSpecWithSharedSD();
-        struct.sharedSDPartitionSpec.read(iprot);
-        struct.setSharedSDPartitionSpecIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.partitionList = new PartitionListComposingSpec();
-        struct.partitionList.read(iprot);
-        struct.setPartitionListIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.rootPath = iprot.readString();
+          struct.setRootPathIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.sharedSDPartitionSpec = new PartitionSpecWithSharedSD();
+          struct.sharedSDPartitionSpec.read(iprot);
+          struct.setSharedSDPartitionSpecIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.partitionList = new PartitionListComposingSpec();
+          struct.partitionList.read(iprot);
+          struct.setPartitionListIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java
index d87b86821634..d6b946702544 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionSpecWithSharedSD implements org.apache.thrift.TBase<PartitionSpecWithSharedSD, PartitionSpecWithSharedSD._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionSpecWithSharedSD> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionSpecWithSharedSD");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,6 +126,7 @@ public PartitionSpecWithSharedSD(PartitionSpecWithSharedSD other) {
     }
   }
 
+  @Override
   public PartitionSpecWithSharedSD deepCopy() {
     return new PartitionSpecWithSharedSD(this);
   }
@@ -198,6 +201,7 @@ public void setSdIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -220,6 +224,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -233,6 +238,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -328,14 +334,17 @@ public int compareTo(PartitionSpecWithSharedSD other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -389,6 +398,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionSpecWithSharedSDStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionSpecWithSharedSDStandardScheme getScheme() {
       return new PartitionSpecWithSharedSDStandardScheme();
     }
@@ -396,53 +406,60 @@ public PartitionSpecWithSharedSDStandardScheme getScheme() {
 
   private static class PartitionSpecWithSharedSDStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionSpecWithSharedSD> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionSpecWithSharedSD 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list440 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<PartitionWithoutSD>(_list440.size);
-                @org.apache.thrift.annotation.Nullable PartitionWithoutSD _elem441;
-                for (int _i442 = 0; _i442 < _list440.size; ++_i442)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem441 = new PartitionWithoutSD();
-                  _elem441.read(iprot);
-                  struct.partitions.add(_elem441);
+                  org.apache.thrift.protocol.TList _list440 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<PartitionWithoutSD>(_list440.size);
+                  @org.apache.thrift.annotation.Nullable PartitionWithoutSD _elem441;
+                  for (int _i442 = 0; _i442 < _list440.size; ++_i442)
+                  {
+                    _elem441 = new PartitionWithoutSD();
+                    _elem441.read(iprot);
+                    struct.partitions.add(_elem441);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SD
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sd = new StorageDescriptor();
-              struct.sd.read(iprot);
-              struct.setSdIsSet(true);
-            } else { 
+              break;
+            case 2: // SD
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sd = new StorageDescriptor();
+                struct.sd.read(iprot);
+                struct.setSdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionSpecWithSharedSD struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -471,6 +488,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionSpecWithS
   }
 
   private static class PartitionSpecWithSharedSDTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionSpecWithSharedSDTupleScheme getScheme() {
       return new PartitionSpecWithSharedSDTupleScheme();
     }
@@ -505,26 +523,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionSpecWithSh
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionSpecWithSharedSD struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list445 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitions = new java.util.ArrayList<PartitionWithoutSD>(_list445.size);
-          @org.apache.thrift.annotation.Nullable PartitionWithoutSD _elem446;
-          for (int _i447 = 0; _i447 < _list445.size; ++_i447)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
           {
-            _elem446 = new PartitionWithoutSD();
-            _elem446.read(iprot);
-            struct.partitions.add(_elem446);
+            org.apache.thrift.protocol.TList _list445 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitions = new java.util.ArrayList<PartitionWithoutSD>(_list445.size);
+            @org.apache.thrift.annotation.Nullable PartitionWithoutSD _elem446;
+            for (int _i447 = 0; _i447 < _list445.size; ++_i447)
+            {
+              _elem446 = new PartitionWithoutSD();
+              _elem446.read(iprot);
+              struct.partitions.add(_elem446);
+            }
           }
+          struct.setPartitionsIsSet(true);
         }
-        struct.setPartitionsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.sd = new StorageDescriptor();
-        struct.sd.read(iprot);
-        struct.setSdIsSet(true);
+        if (incoming.get(1)) {
+          struct.sd = new StorageDescriptor();
+          struct.sd.read(iprot);
+          struct.setSdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java
index 16adf0321446..d1c3f34f05ff 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionValuesRequest implements org.apache.thrift.TBase<PartitionValuesRequest, PartitionValuesRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionValuesRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionValuesRequest");
 
@@ -114,10 +114,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -128,7 +130,7 @@ public java.lang.String getFieldName() {
   private static final int __ASCENDING_ISSET_ID = 1;
   private static final int __MAXPARTS_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.APPLY_DISTINCT,_Fields.FILTER,_Fields.PARTITION_ORDER,_Fields.ASCENDING,_Fields.MAX_PARTS,_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST};
+  private static final _Fields[] optionals = {_Fields.APPLY_DISTINCT,_Fields.FILTER,_Fields.PARTITION_ORDER,_Fields.ASCENDING,_Fields.MAX_PARTS,_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST};
   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);
@@ -217,6 +219,7 @@ public PartitionValuesRequest(PartitionValuesRequest other) {
     }
   }
 
+  @Override
   public PartitionValuesRequest deepCopy() {
     return new PartitionValuesRequest(this);
   }
@@ -504,6 +507,7 @@ public void setValidWriteIdListIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -590,6 +594,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -627,6 +632,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -922,14 +928,17 @@ public int compareTo(PartitionValuesRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1060,6 +1069,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionValuesRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionValuesRequestStandardScheme getScheme() {
       return new PartitionValuesRequestStandardScheme();
     }
@@ -1067,127 +1077,134 @@ public PartitionValuesRequestStandardScheme getScheme() {
 
   private static class PartitionValuesRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionValuesRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionValuesRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PARTITION_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list716 = iprot.readListBegin();
-                struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list716.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem717;
-                for (int _i718 = 0; _i718 < _list716.size; ++_i718)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITION_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem717 = new FieldSchema();
-                  _elem717.read(iprot);
-                  struct.partitionKeys.add(_elem717);
+                  org.apache.thrift.protocol.TList _list716 = iprot.readListBegin();
+                  struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list716.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem717;
+                  for (int _i718 = 0; _i718 < _list716.size; ++_i718)
+                  {
+                    _elem717 = new FieldSchema();
+                    _elem717.read(iprot);
+                    struct.partitionKeys.add(_elem717);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // APPLY_DISTINCT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.applyDistinct = iprot.readBool();
-              struct.setApplyDistinctIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.filter = iprot.readString();
-              struct.setFilterIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // PARTITION_ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list719 = iprot.readListBegin();
-                struct.partitionOrder = new java.util.ArrayList<FieldSchema>(_list719.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem720;
-                for (int _i721 = 0; _i721 < _list719.size; ++_i721)
+              break;
+            case 4: // APPLY_DISTINCT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.applyDistinct = iprot.readBool();
+                struct.setApplyDistinctIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // FILTER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.filter = iprot.readString();
+                struct.setFilterIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // PARTITION_ORDER
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem720 = new FieldSchema();
-                  _elem720.read(iprot);
-                  struct.partitionOrder.add(_elem720);
+                  org.apache.thrift.protocol.TList _list719 = iprot.readListBegin();
+                  struct.partitionOrder = new java.util.ArrayList<FieldSchema>(_list719.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem720;
+                  for (int _i721 = 0; _i721 < _list719.size; ++_i721)
+                  {
+                    _elem720 = new FieldSchema();
+                    _elem720.read(iprot);
+                    struct.partitionOrder.add(_elem720);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionOrderIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionOrderIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ASCENDING
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.ascending = iprot.readBool();
-              struct.setAscendingIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // MAX_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.maxParts = iprot.readI64();
-              struct.setMaxPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
+              break;
+            case 7: // ASCENDING
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.ascending = iprot.readBool();
+                struct.setAscendingIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // MAX_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.maxParts = iprot.readI64();
+                struct.setMaxPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionValuesRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1271,6 +1288,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionValuesReq
   }
 
   private static class PartitionValuesRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionValuesRequestTupleScheme getScheme() {
       return new PartitionValuesRequestTupleScheme();
     }
@@ -1344,61 +1362,66 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionValuesRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionValuesRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list726 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list726.size);
-        @org.apache.thrift.annotation.Nullable FieldSchema _elem727;
-        for (int _i728 = 0; _i728 < _list726.size; ++_i728)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
         {
-          _elem727 = new FieldSchema();
-          _elem727.read(iprot);
-          struct.partitionKeys.add(_elem727);
+          org.apache.thrift.protocol.TList _list726 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list726.size);
+          @org.apache.thrift.annotation.Nullable FieldSchema _elem727;
+          for (int _i728 = 0; _i728 < _list726.size; ++_i728)
+          {
+            _elem727 = new FieldSchema();
+            _elem727.read(iprot);
+            struct.partitionKeys.add(_elem727);
+          }
         }
-      }
-      struct.setPartitionKeysIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.applyDistinct = iprot.readBool();
-        struct.setApplyDistinctIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.filter = iprot.readString();
-        struct.setFilterIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list729 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitionOrder = new java.util.ArrayList<FieldSchema>(_list729.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem730;
-          for (int _i731 = 0; _i731 < _list729.size; ++_i731)
+        struct.setPartitionKeysIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.applyDistinct = iprot.readBool();
+          struct.setApplyDistinctIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.filter = iprot.readString();
+          struct.setFilterIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem730 = new FieldSchema();
-            _elem730.read(iprot);
-            struct.partitionOrder.add(_elem730);
+            org.apache.thrift.protocol.TList _list729 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitionOrder = new java.util.ArrayList<FieldSchema>(_list729.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem730;
+            for (int _i731 = 0; _i731 < _list729.size; ++_i731)
+            {
+              _elem730 = new FieldSchema();
+              _elem730.read(iprot);
+              struct.partitionOrder.add(_elem730);
+            }
           }
+          struct.setPartitionOrderIsSet(true);
         }
-        struct.setPartitionOrderIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ascending = iprot.readBool();
-        struct.setAscendingIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.maxParts = iprot.readI64();
-        struct.setMaxPartsIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
+        if (incoming.get(3)) {
+          struct.ascending = iprot.readBool();
+          struct.setAscendingIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.maxParts = iprot.readI64();
+          struct.setMaxPartsIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java
index b1a05fb3b178..1bb3c5b0b941 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionValuesResponse implements org.apache.thrift.TBase<PartitionValuesResponse, PartitionValuesResponse._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionValuesResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionValuesResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public PartitionValuesResponse(PartitionValuesResponse other) {
     }
   }
 
+  @Override
   public PartitionValuesResponse deepCopy() {
     return new PartitionValuesResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPartitionValuesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITION_VALUES:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITION_VALUES:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(PartitionValuesResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionValuesResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionValuesResponseStandardScheme getScheme() {
       return new PartitionValuesResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public PartitionValuesResponseStandardScheme getScheme() {
 
   private static class PartitionValuesResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionValuesResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionValuesResponse 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 1: // PARTITION_VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list740 = iprot.readListBegin();
-                struct.partitionValues = new java.util.ArrayList<PartitionValuesRow>(_list740.size);
-                @org.apache.thrift.annotation.Nullable PartitionValuesRow _elem741;
-                for (int _i742 = 0; _i742 < _list740.size; ++_i742)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITION_VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem741 = new PartitionValuesRow();
-                  _elem741.read(iprot);
-                  struct.partitionValues.add(_elem741);
+                  org.apache.thrift.protocol.TList _list740 = iprot.readListBegin();
+                  struct.partitionValues = new java.util.ArrayList<PartitionValuesRow>(_list740.size);
+                  @org.apache.thrift.annotation.Nullable PartitionValuesRow _elem741;
+                  for (int _i742 = 0; _i742 < _list740.size; ++_i742)
+                  {
+                    _elem741 = new PartitionValuesRow();
+                    _elem741.read(iprot);
+                    struct.partitionValues.add(_elem741);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionValuesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionValuesResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionValuesRes
   }
 
   private static class PartitionValuesResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionValuesResponseTupleScheme getScheme() {
       return new PartitionValuesResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionValuesResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionValuesResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list745 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitionValues = new java.util.ArrayList<PartitionValuesRow>(_list745.size);
-        @org.apache.thrift.annotation.Nullable PartitionValuesRow _elem746;
-        for (int _i747 = 0; _i747 < _list745.size; ++_i747)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem746 = new PartitionValuesRow();
-          _elem746.read(iprot);
-          struct.partitionValues.add(_elem746);
+          org.apache.thrift.protocol.TList _list745 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitionValues = new java.util.ArrayList<PartitionValuesRow>(_list745.size);
+          @org.apache.thrift.annotation.Nullable PartitionValuesRow _elem746;
+          for (int _i747 = 0; _i747 < _list745.size; ++_i747)
+          {
+            _elem746 = new PartitionValuesRow();
+            _elem746.read(iprot);
+            struct.partitionValues.add(_elem746);
+          }
         }
+        struct.setPartitionValuesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPartitionValuesIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java
index 36422e05936f..3264864d3d78 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionValuesRow implements org.apache.thrift.TBase<PartitionValuesRow, PartitionValuesRow._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionValuesRow> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionValuesRow");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public PartitionValuesRow(PartitionValuesRow other) {
     }
   }
 
+  @Override
   public PartitionValuesRow deepCopy() {
     return new PartitionValuesRow(this);
   }
@@ -158,6 +161,7 @@ public void setRowIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ROW:
@@ -172,6 +176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ROW:
@@ -182,6 +187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -252,14 +258,17 @@ public int compareTo(PartitionValuesRow other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -306,6 +315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionValuesRowStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionValuesRowStandardScheme getScheme() {
       return new PartitionValuesRowStandardScheme();
     }
@@ -313,43 +323,50 @@ public PartitionValuesRowStandardScheme getScheme() {
 
   private static class PartitionValuesRowStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionValuesRow> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionValuesRow 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 1: // ROW
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list732 = iprot.readListBegin();
-                struct.row = new java.util.ArrayList<java.lang.String>(_list732.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem733;
-                for (int _i734 = 0; _i734 < _list732.size; ++_i734)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // ROW
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem733 = iprot.readString();
-                  struct.row.add(_elem733);
+                  org.apache.thrift.protocol.TList _list732 = iprot.readListBegin();
+                  struct.row = new java.util.ArrayList<java.lang.String>(_list732.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem733;
+                  for (int _i734 = 0; _i734 < _list732.size; ++_i734)
+                  {
+                    _elem733 = iprot.readString();
+                    struct.row.add(_elem733);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRowIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRowIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionValuesRow struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionValuesRow
   }
 
   private static class PartitionValuesRowTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionValuesRowTupleScheme getScheme() {
       return new PartitionValuesRowTupleScheme();
     }
@@ -394,18 +412,23 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionValuesRow
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionValuesRow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list737 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.row = new java.util.ArrayList<java.lang.String>(_list737.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem738;
-        for (int _i739 = 0; _i739 < _list737.size; ++_i739)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem738 = iprot.readString();
-          struct.row.add(_elem738);
+          org.apache.thrift.protocol.TList _list737 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.row = new java.util.ArrayList<java.lang.String>(_list737.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem738;
+          for (int _i739 = 0; _i739 < _list737.size; ++_i739)
+          {
+            _elem738 = iprot.readString();
+            struct.row.add(_elem738);
+          }
         }
+        struct.setRowIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setRowIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java
index 76c596dc14cd..6d57ea3fe8e4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionWithoutSD implements org.apache.thrift.TBase<PartitionWithoutSD, PartitionWithoutSD._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionWithoutSD> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionWithoutSD");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __CREATETIME_ISSET_ID = 0;
   private static final int __LASTACCESSTIME_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PRIVILEGES};
+  private static final _Fields[] optionals = {_Fields.PRIVILEGES};
   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);
@@ -173,6 +175,7 @@ public PartitionWithoutSD(PartitionWithoutSD other) {
     }
   }
 
+  @Override
   public PartitionWithoutSD deepCopy() {
     return new PartitionWithoutSD(this);
   }
@@ -356,6 +359,7 @@ public void setPrivilegesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALUES:
@@ -410,6 +414,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALUES:
@@ -435,6 +440,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -626,14 +632,17 @@ public int compareTo(PartitionWithoutSD other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -715,6 +724,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionWithoutSDStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionWithoutSDStandardScheme getScheme() {
       return new PartitionWithoutSDStandardScheme();
     }
@@ -722,96 +732,103 @@ public PartitionWithoutSDStandardScheme getScheme() {
 
   private static class PartitionWithoutSDStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionWithoutSD> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionWithoutSD 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 1: // VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list422 = iprot.readListBegin();
-                struct.values = new java.util.ArrayList<java.lang.String>(_list422.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem423;
-                for (int _i424 = 0; _i424 < _list422.size; ++_i424)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem423 = iprot.readString();
-                  struct.values.add(_elem423);
+                  org.apache.thrift.protocol.TList _list422 = iprot.readListBegin();
+                  struct.values = new java.util.ArrayList<java.lang.String>(_list422.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem423;
+                  for (int _i424 = 0; _i424 < _list422.size; ++_i424)
+                  {
+                    _elem423 = iprot.readString();
+                    struct.values.add(_elem423);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // LAST_ACCESS_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.lastAccessTime = iprot.readI32();
-              struct.setLastAccessTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // RELATIVE_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.relativePath = iprot.readString();
-              struct.setRelativePathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map425 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map425.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key426;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val427;
-                for (int _i428 = 0; _i428 < _map425.size; ++_i428)
+              break;
+            case 2: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // LAST_ACCESS_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.lastAccessTime = iprot.readI32();
+                struct.setLastAccessTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // RELATIVE_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.relativePath = iprot.readString();
+                struct.setRelativePathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key426 = iprot.readString();
-                  _val427 = iprot.readString();
-                  struct.parameters.put(_key426, _val427);
+                  org.apache.thrift.protocol.TMap _map425 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map425.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key426;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val427;
+                  for (int _i428 = 0; _i428 < _map425.size; ++_i428)
+                  {
+                    _key426 = iprot.readString();
+                    _val427 = iprot.readString();
+                    struct.parameters.put(_key426, _val427);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.privileges = new PrincipalPrivilegeSet();
-              struct.privileges.read(iprot);
-              struct.setPrivilegesIsSet(true);
-            } else { 
+              break;
+            case 6: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.privileges = new PrincipalPrivilegeSet();
+                struct.privileges.read(iprot);
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionWithoutSD struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -866,6 +883,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionWithoutSD
   }
 
   private static class PartitionWithoutSDTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionWithoutSDTupleScheme getScheme() {
       return new PartitionWithoutSDTupleScheme();
     }
@@ -931,52 +949,57 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionWithoutSD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionWithoutSD struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list433 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.values = new java.util.ArrayList<java.lang.String>(_list433.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem434;
-          for (int _i435 = 0; _i435 < _list433.size; ++_i435)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
           {
-            _elem434 = iprot.readString();
-            struct.values.add(_elem434);
+            org.apache.thrift.protocol.TList _list433 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.values = new java.util.ArrayList<java.lang.String>(_list433.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem434;
+            for (int _i435 = 0; _i435 < _list433.size; ++_i435)
+            {
+              _elem434 = iprot.readString();
+              struct.values.add(_elem434);
+            }
           }
+          struct.setValuesIsSet(true);
         }
-        struct.setValuesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.lastAccessTime = iprot.readI32();
-        struct.setLastAccessTimeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.relativePath = iprot.readString();
-        struct.setRelativePathIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map436.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key437;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val438;
-          for (int _i439 = 0; _i439 < _map436.size; ++_i439)
+        if (incoming.get(1)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.lastAccessTime = iprot.readI32();
+          struct.setLastAccessTimeIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.relativePath = iprot.readString();
+          struct.setRelativePathIsSet(true);
+        }
+        if (incoming.get(4)) {
           {
-            _key437 = iprot.readString();
-            _val438 = iprot.readString();
-            struct.parameters.put(_key437, _val438);
+            org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map436.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key437;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val438;
+            for (int _i439 = 0; _i439 < _map436.size; ++_i439)
+            {
+              _key437 = iprot.readString();
+              _val438 = iprot.readString();
+              struct.parameters.put(_key437, _val438);
+            }
           }
+          struct.setParametersIsSet(true);
         }
-        struct.setParametersIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.privileges = new PrincipalPrivilegeSet();
-        struct.privileges.read(iprot);
-        struct.setPrivilegesIsSet(true);
+        if (incoming.get(5)) {
+          struct.privileges = new PrincipalPrivilegeSet();
+          struct.privileges.read(iprot);
+          struct.setPrivilegesIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java
index 7ae789bf46cb..37053fc777c6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsByExprRequest implements org.apache.thrift.TBase<PartitionsByExprRequest, PartitionsByExprRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsByExprRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsByExprRequest");
 
@@ -124,10 +124,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,7 +140,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 1;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DEFAULT_PARTITION_NAME,_Fields.MAX_PARTS,_Fields.CAT_NAME,_Fields.ORDER,_Fields.VALID_WRITE_ID_LIST,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
+  private static final _Fields[] optionals = {_Fields.DEFAULT_PARTITION_NAME,_Fields.MAX_PARTS,_Fields.CAT_NAME,_Fields.ORDER,_Fields.VALID_WRITE_ID_LIST,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
   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);
@@ -225,6 +227,7 @@ public PartitionsByExprRequest(PartitionsByExprRequest other) {
     }
   }
 
+  @Override
   public PartitionsByExprRequest deepCopy() {
     return new PartitionsByExprRequest(this);
   }
@@ -538,6 +541,7 @@ public void setExcludeParamKeyPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -644,6 +648,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -687,6 +692,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1032,14 +1038,17 @@ public int compareTo(PartitionsByExprRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1190,6 +1199,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsByExprRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsByExprRequestStandardScheme getScheme() {
       return new PartitionsByExprRequestStandardScheme();
     }
@@ -1197,121 +1207,128 @@ public PartitionsByExprRequestStandardScheme getScheme() {
 
   private static class PartitionsByExprRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsByExprRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsByExprRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // EXPR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expr = iprot.readBinary();
-              struct.setExprIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DEFAULT_PARTITION_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.defaultPartitionName = iprot.readString();
-              struct.setDefaultPartitionNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // MAX_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.maxParts = iprot.readI16();
-              struct.setMaxPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 7: // ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.order = iprot.readString();
-              struct.setOrderIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // EXPR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expr = iprot.readBinary();
+                struct.setExprIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DEFAULT_PARTITION_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.defaultPartitionName = iprot.readString();
+                struct.setDefaultPartitionNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // MAX_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.maxParts = iprot.readI16();
+                struct.setMaxPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ORDER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.order = iprot.readString();
+                struct.setOrderIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // INCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeParamKeyPattern = iprot.readString();
+                struct.setIncludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // EXCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.excludeParamKeyPattern = iprot.readString();
+                struct.setExcludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // INCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeParamKeyPattern = iprot.readString();
-              struct.setIncludeParamKeyPatternIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // EXCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.excludeParamKeyPattern = iprot.readString();
-              struct.setExcludeParamKeyPatternIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsByExprRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1395,6 +1412,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsByExprRe
   }
 
   private static class PartitionsByExprRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsByExprRequestTupleScheme getScheme() {
       return new PartitionsByExprRequestTupleScheme();
     }
@@ -1468,49 +1486,54 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsByExprReq
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsByExprRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      struct.expr = iprot.readBinary();
-      struct.setExprIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.defaultPartitionName = iprot.readString();
-        struct.setDefaultPartitionNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.maxParts = iprot.readI16();
-        struct.setMaxPartsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.order = iprot.readString();
-        struct.setOrderIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.includeParamKeyPattern = iprot.readString();
-        struct.setIncludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.excludeParamKeyPattern = iprot.readString();
-        struct.setExcludeParamKeyPatternIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        struct.expr = iprot.readBinary();
+        struct.setExprIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.defaultPartitionName = iprot.readString();
+          struct.setDefaultPartitionNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.maxParts = iprot.readI16();
+          struct.setMaxPartsIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.order = iprot.readString();
+          struct.setOrderIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.includeParamKeyPattern = iprot.readString();
+          struct.setIncludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.excludeParamKeyPattern = iprot.readString();
+          struct.setExcludeParamKeyPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
index 08c5c2402d44..834ab7f989db 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsByExprResult implements org.apache.thrift.TBase<PartitionsByExprResult, PartitionsByExprResult._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsByExprResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsByExprResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -126,6 +128,7 @@ public PartitionsByExprResult(PartitionsByExprResult other) {
     this.hasUnknownPartitions = other.hasUnknownPartitions;
   }
 
+  @Override
   public PartitionsByExprResult deepCopy() {
     return new PartitionsByExprResult(this);
   }
@@ -199,6 +202,7 @@ public void setHasUnknownPartitionsIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASUNKNOWNPARTITIONS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -221,6 +225,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -234,6 +239,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -327,14 +333,17 @@ public int compareTo(PartitionsByExprResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -391,6 +400,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsByExprResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsByExprResultStandardScheme getScheme() {
       return new PartitionsByExprResultStandardScheme();
     }
@@ -398,52 +408,59 @@ public PartitionsByExprResultStandardScheme getScheme() {
 
   private static class PartitionsByExprResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsByExprResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsByExprResult 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list586 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list586.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem587;
-                for (int _i588 = 0; _i588 < _list586.size; ++_i588)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem587 = new Partition();
-                  _elem587.read(iprot);
-                  struct.partitions.add(_elem587);
+                  org.apache.thrift.protocol.TList _list586 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list586.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem587;
+                  for (int _i588 = 0; _i588 < _list586.size; ++_i588)
+                  {
+                    _elem587 = new Partition();
+                    _elem587.read(iprot);
+                    struct.partitions.add(_elem587);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HAS_UNKNOWN_PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.hasUnknownPartitions = iprot.readBool();
-              struct.setHasUnknownPartitionsIsSet(true);
-            } else { 
+              break;
+            case 2: // HAS_UNKNOWN_PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.hasUnknownPartitions = iprot.readBool();
+                struct.setHasUnknownPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsByExprResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -470,6 +487,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsByExprRe
   }
 
   private static class PartitionsByExprResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsByExprResultTupleScheme getScheme() {
       return new PartitionsByExprResultTupleScheme();
     }
@@ -492,21 +510,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsByExprRes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsByExprResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list591 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitions = new java.util.ArrayList<Partition>(_list591.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem592;
-        for (int _i593 = 0; _i593 < _list591.size; ++_i593)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem592 = new Partition();
-          _elem592.read(iprot);
-          struct.partitions.add(_elem592);
+          org.apache.thrift.protocol.TList _list591 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitions = new java.util.ArrayList<Partition>(_list591.size);
+          @org.apache.thrift.annotation.Nullable Partition _elem592;
+          for (int _i593 = 0; _i593 < _list591.size; ++_i593)
+          {
+            _elem592 = new Partition();
+            _elem592.read(iprot);
+            struct.partitions.add(_elem592);
+          }
         }
+        struct.setPartitionsIsSet(true);
+        struct.hasUnknownPartitions = iprot.readBool();
+        struct.setHasUnknownPartitionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPartitionsIsSet(true);
-      struct.hasUnknownPartitions = iprot.readBool();
-      struct.setHasUnknownPartitionsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsRequest.java
index 69c241ccad78..0ae20a4a5f3e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsRequest implements org.apache.thrift.TBase<PartitionsRequest, PartitionsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsRequest");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,7 +125,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 1;
   private static final int __SKIPCOLUMNSCHEMAFORPARTITION_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.MAX_PARTS,_Fields.VALID_WRITE_ID_LIST,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.MAX_PARTS,_Fields.VALID_WRITE_ID_LIST,_Fields.ID,_Fields.SKIP_COLUMN_SCHEMA_FOR_PARTITION,_Fields.INCLUDE_PARAM_KEY_PATTERN,_Fields.EXCLUDE_PARAM_KEY_PATTERN};
   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);
@@ -193,6 +195,7 @@ public PartitionsRequest(PartitionsRequest other) {
     }
   }
 
+  @Override
   public PartitionsRequest deepCopy() {
     return new PartitionsRequest(this);
   }
@@ -423,6 +426,7 @@ public void setExcludeParamKeyPatternIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -501,6 +505,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -535,6 +540,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -805,14 +811,17 @@ public int compareTo(PartitionsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -931,6 +940,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsRequestStandardScheme getScheme() {
       return new PartitionsRequestStandardScheme();
     }
@@ -938,97 +948,104 @@ public PartitionsRequestStandardScheme getScheme() {
 
   private static class PartitionsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // MAX_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-              struct.maxParts = iprot.readI16();
-              struct.setMaxPartsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.skipColumnSchemaForPartition = iprot.readBool();
-              struct.setSkipColumnSchemaForPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // INCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.includeParamKeyPattern = iprot.readString();
-              struct.setIncludeParamKeyPatternIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // MAX_PARTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                struct.maxParts = iprot.readI16();
+                struct.setMaxPartsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // SKIP_COLUMN_SCHEMA_FOR_PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.skipColumnSchemaForPartition = iprot.readBool();
+                struct.setSkipColumnSchemaForPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // INCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.includeParamKeyPattern = iprot.readString();
+                struct.setIncludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // EXCLUDE_PARAM_KEY_PATTERN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.excludeParamKeyPattern = iprot.readString();
+                struct.setExcludeParamKeyPatternIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // EXCLUDE_PARAM_KEY_PATTERN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.excludeParamKeyPattern = iprot.readString();
-              struct.setExcludeParamKeyPatternIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1093,6 +1110,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsRequest
   }
 
   private static class PartitionsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsRequestTupleScheme getScheme() {
       return new PartitionsRequestTupleScheme();
     }
@@ -1153,39 +1171,44 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.maxParts = iprot.readI16();
-        struct.setMaxPartsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.skipColumnSchemaForPartition = iprot.readBool();
-        struct.setSkipColumnSchemaForPartitionIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.includeParamKeyPattern = iprot.readString();
-        struct.setIncludeParamKeyPatternIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.excludeParamKeyPattern = iprot.readString();
-        struct.setExcludeParamKeyPatternIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.maxParts = iprot.readI16();
+          struct.setMaxPartsIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.skipColumnSchemaForPartition = iprot.readBool();
+          struct.setSkipColumnSchemaForPartitionIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.includeParamKeyPattern = iprot.readString();
+          struct.setIncludeParamKeyPatternIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.excludeParamKeyPattern = iprot.readString();
+          struct.setExcludeParamKeyPatternIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsResponse.java
index ab0e9cea5aee..bbb10677840f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsResponse implements org.apache.thrift.TBase<PartitionsResponse, PartitionsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public PartitionsResponse(PartitionsResponse other) {
     }
   }
 
+  @Override
   public PartitionsResponse deepCopy() {
     return new PartitionsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPartitionsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(PartitionsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsResponseStandardScheme getScheme() {
       return new PartitionsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public PartitionsResponseStandardScheme getScheme() {
 
   private static class PartitionsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsResponse 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 1: // PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1548 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list1548.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem1549;
-                for (int _i1550 = 0; _i1550 < _list1548.size; ++_i1550)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1549 = new Partition();
-                  _elem1549.read(iprot);
-                  struct.partitions.add(_elem1549);
+                  org.apache.thrift.protocol.TList _list1548 = iprot.readListBegin();
+                  struct.partitions = new java.util.ArrayList<Partition>(_list1548.size);
+                  @org.apache.thrift.annotation.Nullable Partition _elem1549;
+                  for (int _i1550 = 0; _i1550 < _list1548.size; ++_i1550)
+                  {
+                    _elem1549 = new Partition();
+                    _elem1549.read(iprot);
+                    struct.partitions.add(_elem1549);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsResponse
   }
 
   private static class PartitionsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsResponseTupleScheme getScheme() {
       return new PartitionsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1553 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitions = new java.util.ArrayList<Partition>(_list1553.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem1554;
-        for (int _i1555 = 0; _i1555 < _list1553.size; ++_i1555)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1554 = new Partition();
-          _elem1554.read(iprot);
-          struct.partitions.add(_elem1554);
+          org.apache.thrift.protocol.TList _list1553 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitions = new java.util.ArrayList<Partition>(_list1553.size);
+          @org.apache.thrift.annotation.Nullable Partition _elem1554;
+          for (int _i1555 = 0; _i1555 < _list1553.size; ++_i1555)
+          {
+            _elem1554 = new Partition();
+            _elem1554.read(iprot);
+            struct.partitions.add(_elem1554);
+          }
         }
+        struct.setPartitionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPartitionsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsSpecByExprResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsSpecByExprResult.java
index 71c94e930b43..461dbc7ca08a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsSpecByExprResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsSpecByExprResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsSpecByExprResult implements org.apache.thrift.TBase<PartitionsSpecByExprResult, PartitionsSpecByExprResult._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsSpecByExprResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsSpecByExprResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -126,6 +128,7 @@ public PartitionsSpecByExprResult(PartitionsSpecByExprResult other) {
     this.hasUnknownPartitions = other.hasUnknownPartitions;
   }
 
+  @Override
   public PartitionsSpecByExprResult deepCopy() {
     return new PartitionsSpecByExprResult(this);
   }
@@ -199,6 +202,7 @@ public void setHasUnknownPartitionsIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASUNKNOWNPARTITIONS_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PARTITIONS_SPEC:
@@ -221,6 +225,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PARTITIONS_SPEC:
@@ -234,6 +239,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -327,14 +333,17 @@ public int compareTo(PartitionsSpecByExprResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -391,6 +400,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsSpecByExprResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsSpecByExprResultStandardScheme getScheme() {
       return new PartitionsSpecByExprResultStandardScheme();
     }
@@ -398,52 +408,59 @@ public PartitionsSpecByExprResultStandardScheme getScheme() {
 
   private static class PartitionsSpecByExprResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsSpecByExprResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsSpecByExprResult 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 1: // PARTITIONS_SPEC
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list594 = iprot.readListBegin();
-                struct.partitionsSpec = new java.util.ArrayList<PartitionSpec>(_list594.size);
-                @org.apache.thrift.annotation.Nullable PartitionSpec _elem595;
-                for (int _i596 = 0; _i596 < _list594.size; ++_i596)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PARTITIONS_SPEC
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem595 = new PartitionSpec();
-                  _elem595.read(iprot);
-                  struct.partitionsSpec.add(_elem595);
+                  org.apache.thrift.protocol.TList _list594 = iprot.readListBegin();
+                  struct.partitionsSpec = new java.util.ArrayList<PartitionSpec>(_list594.size);
+                  @org.apache.thrift.annotation.Nullable PartitionSpec _elem595;
+                  for (int _i596 = 0; _i596 < _list594.size; ++_i596)
+                  {
+                    _elem595 = new PartitionSpec();
+                    _elem595.read(iprot);
+                    struct.partitionsSpec.add(_elem595);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionsSpecIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionsSpecIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HAS_UNKNOWN_PARTITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.hasUnknownPartitions = iprot.readBool();
-              struct.setHasUnknownPartitionsIsSet(true);
-            } else { 
+              break;
+            case 2: // HAS_UNKNOWN_PARTITIONS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.hasUnknownPartitions = iprot.readBool();
+                struct.setHasUnknownPartitionsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsSpecByExprResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -470,6 +487,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsSpecByEx
   }
 
   private static class PartitionsSpecByExprResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsSpecByExprResultTupleScheme getScheme() {
       return new PartitionsSpecByExprResultTupleScheme();
     }
@@ -492,21 +510,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsSpecByExp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsSpecByExprResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list599 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.partitionsSpec = new java.util.ArrayList<PartitionSpec>(_list599.size);
-        @org.apache.thrift.annotation.Nullable PartitionSpec _elem600;
-        for (int _i601 = 0; _i601 < _list599.size; ++_i601)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem600 = new PartitionSpec();
-          _elem600.read(iprot);
-          struct.partitionsSpec.add(_elem600);
+          org.apache.thrift.protocol.TList _list599 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.partitionsSpec = new java.util.ArrayList<PartitionSpec>(_list599.size);
+          @org.apache.thrift.annotation.Nullable PartitionSpec _elem600;
+          for (int _i601 = 0; _i601 < _list599.size; ++_i601)
+          {
+            _elem600 = new PartitionSpec();
+            _elem600.read(iprot);
+            struct.partitionsSpec.add(_elem600);
+          }
         }
+        struct.setPartitionsSpecIsSet(true);
+        struct.hasUnknownPartitions = iprot.readBool();
+        struct.setHasUnknownPartitionsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPartitionsSpecIsSet(true);
-      struct.hasUnknownPartitions = iprot.readBool();
-      struct.setHasUnknownPartitionsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
index ab94336f0684..ca1d6e983e2d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsStatsRequest implements org.apache.thrift.TBase<PartitionsStatsRequest, PartitionsStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsStatsRequest");
 
@@ -99,17 +99,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.ENGINE};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.ENGINE};
   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);
@@ -180,6 +182,7 @@ public PartitionsStatsRequest(PartitionsStatsRequest other) {
     }
   }
 
+  @Override
   public PartitionsStatsRequest deepCopy() {
     return new PartitionsStatsRequest(this);
   }
@@ -396,6 +399,7 @@ public void setEngineIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -458,6 +462,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -486,6 +491,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -706,14 +712,17 @@ public int compareTo(PartitionsStatsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -826,6 +835,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsStatsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsStatsRequestStandardScheme getScheme() {
       return new PartitionsStatsRequestStandardScheme();
     }
@@ -833,101 +843,108 @@ public PartitionsStatsRequestStandardScheme getScheme() {
 
   private static class PartitionsStatsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsStatsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsStatsRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // COL_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list636 = iprot.readListBegin();
-                struct.colNames = new java.util.ArrayList<java.lang.String>(_list636.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem637;
-                for (int _i638 = 0; _i638 < _list636.size; ++_i638)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // COL_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem637 = iprot.readString();
-                  struct.colNames.add(_elem637);
+                  org.apache.thrift.protocol.TList _list636 = iprot.readListBegin();
+                  struct.colNames = new java.util.ArrayList<java.lang.String>(_list636.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem637;
+                  for (int _i638 = 0; _i638 < _list636.size; ++_i638)
+                  {
+                    _elem637 = iprot.readString();
+                    struct.colNames.add(_elem637);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PART_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list639 = iprot.readListBegin();
-                struct.partNames = new java.util.ArrayList<java.lang.String>(_list639.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem640;
-                for (int _i641 = 0; _i641 < _list639.size; ++_i641)
+              break;
+            case 4: // PART_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem640 = iprot.readString();
-                  struct.partNames.add(_elem640);
+                  org.apache.thrift.protocol.TList _list639 = iprot.readListBegin();
+                  struct.partNames = new java.util.ArrayList<java.lang.String>(_list639.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem640;
+                  for (int _i641 = 0; _i641 < _list639.size; ++_i641)
+                  {
+                    _elem640 = iprot.readString();
+                    struct.partNames.add(_elem640);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
+              break;
+            case 5: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsStatsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -994,6 +1011,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsStatsReq
   }
 
   private static class PartitionsStatsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsStatsRequestTupleScheme getScheme() {
       return new PartitionsStatsRequestTupleScheme();
     }
@@ -1044,45 +1062,50 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list646 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.colNames = new java.util.ArrayList<java.lang.String>(_list646.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem647;
-        for (int _i648 = 0; _i648 < _list646.size; ++_i648)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
         {
-          _elem647 = iprot.readString();
-          struct.colNames.add(_elem647);
+          org.apache.thrift.protocol.TList _list646 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.colNames = new java.util.ArrayList<java.lang.String>(_list646.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem647;
+          for (int _i648 = 0; _i648 < _list646.size; ++_i648)
+          {
+            _elem647 = iprot.readString();
+            struct.colNames.add(_elem647);
+          }
         }
-      }
-      struct.setColNamesIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list649 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.partNames = new java.util.ArrayList<java.lang.String>(_list649.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem650;
-        for (int _i651 = 0; _i651 < _list649.size; ++_i651)
+        struct.setColNamesIsSet(true);
         {
-          _elem650 = iprot.readString();
-          struct.partNames.add(_elem650);
+          org.apache.thrift.protocol.TList _list649 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.partNames = new java.util.ArrayList<java.lang.String>(_list649.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem650;
+          for (int _i651 = 0; _i651 < _list649.size; ++_i651)
+          {
+            _elem650 = iprot.readString();
+            struct.partNames.add(_elem650);
+          }
         }
-      }
-      struct.setPartNamesIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
+        struct.setPartNamesIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
index cd0071ae4a53..2614f8df4043 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PartitionsStatsResult implements org.apache.thrift.TBase<PartitionsStatsResult, PartitionsStatsResult._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsStatsResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsStatsResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
+  private static final _Fields[] optionals = {_Fields.IS_STATS_COMPLIANT};
   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);
@@ -137,6 +139,7 @@ public PartitionsStatsResult(PartitionsStatsResult other) {
     this.isStatsCompliant = other.isStatsCompliant;
   }
 
+  @Override
   public PartitionsStatsResult deepCopy() {
     return new PartitionsStatsResult(this);
   }
@@ -205,6 +208,7 @@ public void setIsStatsCompliantIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PART_STATS:
@@ -227,6 +231,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PART_STATS:
@@ -240,6 +245,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -335,14 +341,17 @@ public int compareTo(PartitionsStatsResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -397,6 +406,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PartitionsStatsResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsStatsResultStandardScheme getScheme() {
       return new PartitionsStatsResultStandardScheme();
     }
@@ -404,64 +414,71 @@ public PartitionsStatsResultStandardScheme getScheme() {
 
   private static class PartitionsStatsResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<PartitionsStatsResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsStatsResult 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 1: // PART_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map610 = iprot.readMapBegin();
-                struct.partStats = new java.util.HashMap<java.lang.String,java.util.List<ColumnStatisticsObj>>(2*_map610.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key611;
-                @org.apache.thrift.annotation.Nullable java.util.List<ColumnStatisticsObj> _val612;
-                for (int _i613 = 0; _i613 < _map610.size; ++_i613)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PART_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key611 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map610 = iprot.readMapBegin();
+                  struct.partStats = new java.util.HashMap<java.lang.String,java.util.List<ColumnStatisticsObj>>(2*_map610.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key611;
+                  @org.apache.thrift.annotation.Nullable java.util.List<ColumnStatisticsObj> _val612;
+                  for (int _i613 = 0; _i613 < _map610.size; ++_i613)
                   {
-                    org.apache.thrift.protocol.TList _list614 = iprot.readListBegin();
-                    _val612 = new java.util.ArrayList<ColumnStatisticsObj>(_list614.size);
-                    @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem615;
-                    for (int _i616 = 0; _i616 < _list614.size; ++_i616)
+                    _key611 = iprot.readString();
                     {
-                      _elem615 = new ColumnStatisticsObj();
-                      _elem615.read(iprot);
-                      _val612.add(_elem615);
+                      org.apache.thrift.protocol.TList _list614 = iprot.readListBegin();
+                      _val612 = new java.util.ArrayList<ColumnStatisticsObj>(_list614.size);
+                      @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem615;
+                      for (int _i616 = 0; _i616 < _list614.size; ++_i616)
+                      {
+                        _elem615 = new ColumnStatisticsObj();
+                        _elem615.read(iprot);
+                        _val612.add(_elem615);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.partStats.put(_key611, _val612);
                   }
-                  struct.partStats.put(_key611, _val612);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setPartStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
+              break;
+            case 2: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -498,6 +515,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsStatsRes
   }
 
   private static class PartitionsStatsResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PartitionsStatsResultTupleScheme getScheme() {
       return new PartitionsStatsResultTupleScheme();
     }
@@ -534,34 +552,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsResu
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map621 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
-        struct.partStats = new java.util.HashMap<java.lang.String,java.util.List<ColumnStatisticsObj>>(2*_map621.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _key622;
-        @org.apache.thrift.annotation.Nullable java.util.List<ColumnStatisticsObj> _val623;
-        for (int _i624 = 0; _i624 < _map621.size; ++_i624)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _key622 = iprot.readString();
+          org.apache.thrift.protocol.TMap _map621 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
+          struct.partStats = new java.util.HashMap<java.lang.String,java.util.List<ColumnStatisticsObj>>(2*_map621.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key622;
+          @org.apache.thrift.annotation.Nullable java.util.List<ColumnStatisticsObj> _val623;
+          for (int _i624 = 0; _i624 < _map621.size; ++_i624)
           {
-            org.apache.thrift.protocol.TList _list625 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            _val623 = new java.util.ArrayList<ColumnStatisticsObj>(_list625.size);
-            @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem626;
-            for (int _i627 = 0; _i627 < _list625.size; ++_i627)
+            _key622 = iprot.readString();
             {
-              _elem626 = new ColumnStatisticsObj();
-              _elem626.read(iprot);
-              _val623.add(_elem626);
+              org.apache.thrift.protocol.TList _list625 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              _val623 = new java.util.ArrayList<ColumnStatisticsObj>(_list625.size);
+              @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem626;
+              for (int _i627 = 0; _i627 < _list625.size; ++_i627)
+              {
+                _elem626 = new ColumnStatisticsObj();
+                _elem626.read(iprot);
+                _val623.add(_elem626);
+              }
             }
+            struct.partStats.put(_key622, _val623);
           }
-          struct.partStats.put(_key622, _val623);
         }
-      }
-      struct.setPartStatsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
+        struct.setPartStatsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
index 156194b98a70..179d239490aa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PrimaryKeysRequest implements org.apache.thrift.TBase<PrimaryKeysRequest, PrimaryKeysRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PrimaryKeysRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrimaryKeysRequest");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -130,6 +132,7 @@ public PrimaryKeysRequest(PrimaryKeysRequest other) {
     }
   }
 
+  @Override
   public PrimaryKeysRequest deepCopy() {
     return new PrimaryKeysRequest(this);
   }
@@ -213,6 +216,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -243,6 +247,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -259,6 +264,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -379,14 +385,17 @@ public int compareTo(PrimaryKeysRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -455,6 +464,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PrimaryKeysRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrimaryKeysRequestStandardScheme getScheme() {
       return new PrimaryKeysRequestStandardScheme();
     }
@@ -462,49 +472,56 @@ public PrimaryKeysRequestStandardScheme getScheme() {
 
   private static class PrimaryKeysRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PrimaryKeysRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PrimaryKeysRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -533,6 +550,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysRequest
   }
 
   private static class PrimaryKeysRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrimaryKeysRequestTupleScheme getScheme() {
       return new PrimaryKeysRequestTupleScheme();
     }
@@ -557,15 +575,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
index c28495ce09ca..3ca8775e0389 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PrimaryKeysResponse implements org.apache.thrift.TBase<PrimaryKeysResponse, PrimaryKeysResponse._Fields>, java.io.Serializable, Cloneable, Comparable<PrimaryKeysResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrimaryKeysResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public PrimaryKeysResponse(PrimaryKeysResponse other) {
     }
   }
 
+  @Override
   public PrimaryKeysResponse deepCopy() {
     return new PrimaryKeysResponse(this);
   }
@@ -161,6 +164,7 @@ public void setPrimaryKeysIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRIMARY_KEYS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIMARY_KEYS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(PrimaryKeysResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PrimaryKeysResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrimaryKeysResponseStandardScheme getScheme() {
       return new PrimaryKeysResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public PrimaryKeysResponseStandardScheme getScheme() {
 
   private static class PrimaryKeysResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<PrimaryKeysResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PrimaryKeysResponse 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 1: // PRIMARY_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list490 = iprot.readListBegin();
-                struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list490.size);
-                @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem491;
-                for (int _i492 = 0; _i492 < _list490.size; ++_i492)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PRIMARY_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem491 = new SQLPrimaryKey();
-                  _elem491.read(iprot);
-                  struct.primaryKeys.add(_elem491);
+                  org.apache.thrift.protocol.TList _list490 = iprot.readListBegin();
+                  struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list490.size);
+                  @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem491;
+                  for (int _i492 = 0; _i492 < _list490.size; ++_i492)
+                  {
+                    _elem491 = new SQLPrimaryKey();
+                    _elem491.read(iprot);
+                    struct.primaryKeys.add(_elem491);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrimaryKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrimaryKeysIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysRespons
   }
 
   private static class PrimaryKeysResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrimaryKeysResponseTupleScheme getScheme() {
       return new PrimaryKeysResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list495 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list495.size);
-        @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem496;
-        for (int _i497 = 0; _i497 < _list495.size; ++_i497)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem496 = new SQLPrimaryKey();
-          _elem496.read(iprot);
-          struct.primaryKeys.add(_elem496);
+          org.apache.thrift.protocol.TList _list495 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list495.size);
+          @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem496;
+          for (int _i497 = 0; _i497 < _list495.size; ++_i497)
+          {
+            _elem496 = new SQLPrimaryKey();
+            _elem496.read(iprot);
+            struct.primaryKeys.add(_elem496);
+          }
         }
+        struct.setPrimaryKeysIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setPrimaryKeysIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
index 5717cb7b7566..0ba1cce83c97 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalPrivilegeSet, PrincipalPrivilegeSet._Fields>, java.io.Serializable, Cloneable, Comparable<PrincipalPrivilegeSet> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrincipalPrivilegeSet");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -185,6 +187,7 @@ public PrincipalPrivilegeSet(PrincipalPrivilegeSet other) {
     }
   }
 
+  @Override
   public PrincipalPrivilegeSet deepCopy() {
     return new PrincipalPrivilegeSet(this);
   }
@@ -301,6 +304,7 @@ public void setRolePrivilegesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case USER_PRIVILEGES:
@@ -331,6 +335,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case USER_PRIVILEGES:
@@ -347,6 +352,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -467,14 +473,17 @@ public int compareTo(PrincipalPrivilegeSet other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -533,6 +542,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PrincipalPrivilegeSetStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrincipalPrivilegeSetStandardScheme getScheme() {
       return new PrincipalPrivilegeSetStandardScheme();
     }
@@ -540,118 +550,125 @@ public PrincipalPrivilegeSetStandardScheme getScheme() {
 
   private static class PrincipalPrivilegeSetStandardScheme extends org.apache.thrift.scheme.StandardScheme<PrincipalPrivilegeSet> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PrincipalPrivilegeSet 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 1: // USER_PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map120 = iprot.readMapBegin();
-                struct.userPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map120.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key121;
-                @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val122;
-                for (int _i123 = 0; _i123 < _map120.size; ++_i123)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // USER_PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key121 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map120 = iprot.readMapBegin();
+                  struct.userPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map120.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key121;
+                  @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val122;
+                  for (int _i123 = 0; _i123 < _map120.size; ++_i123)
                   {
-                    org.apache.thrift.protocol.TList _list124 = iprot.readListBegin();
-                    _val122 = new java.util.ArrayList<PrivilegeGrantInfo>(_list124.size);
-                    @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem125;
-                    for (int _i126 = 0; _i126 < _list124.size; ++_i126)
+                    _key121 = iprot.readString();
                     {
-                      _elem125 = new PrivilegeGrantInfo();
-                      _elem125.read(iprot);
-                      _val122.add(_elem125);
+                      org.apache.thrift.protocol.TList _list124 = iprot.readListBegin();
+                      _val122 = new java.util.ArrayList<PrivilegeGrantInfo>(_list124.size);
+                      @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem125;
+                      for (int _i126 = 0; _i126 < _list124.size; ++_i126)
+                      {
+                        _elem125 = new PrivilegeGrantInfo();
+                        _elem125.read(iprot);
+                        _val122.add(_elem125);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.userPrivileges.put(_key121, _val122);
                   }
-                  struct.userPrivileges.put(_key121, _val122);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setUserPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setUserPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // GROUP_PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map127 = iprot.readMapBegin();
-                struct.groupPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map127.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key128;
-                @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val129;
-                for (int _i130 = 0; _i130 < _map127.size; ++_i130)
+              break;
+            case 2: // GROUP_PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key128 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map127 = iprot.readMapBegin();
+                  struct.groupPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map127.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key128;
+                  @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val129;
+                  for (int _i130 = 0; _i130 < _map127.size; ++_i130)
                   {
-                    org.apache.thrift.protocol.TList _list131 = iprot.readListBegin();
-                    _val129 = new java.util.ArrayList<PrivilegeGrantInfo>(_list131.size);
-                    @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem132;
-                    for (int _i133 = 0; _i133 < _list131.size; ++_i133)
+                    _key128 = iprot.readString();
                     {
-                      _elem132 = new PrivilegeGrantInfo();
-                      _elem132.read(iprot);
-                      _val129.add(_elem132);
+                      org.apache.thrift.protocol.TList _list131 = iprot.readListBegin();
+                      _val129 = new java.util.ArrayList<PrivilegeGrantInfo>(_list131.size);
+                      @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem132;
+                      for (int _i133 = 0; _i133 < _list131.size; ++_i133)
+                      {
+                        _elem132 = new PrivilegeGrantInfo();
+                        _elem132.read(iprot);
+                        _val129.add(_elem132);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.groupPrivileges.put(_key128, _val129);
                   }
-                  struct.groupPrivileges.put(_key128, _val129);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setGroupPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setGroupPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ROLE_PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map134 = iprot.readMapBegin();
-                struct.rolePrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map134.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key135;
-                @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val136;
-                for (int _i137 = 0; _i137 < _map134.size; ++_i137)
+              break;
+            case 3: // ROLE_PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key135 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map134 = iprot.readMapBegin();
+                  struct.rolePrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map134.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key135;
+                  @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val136;
+                  for (int _i137 = 0; _i137 < _map134.size; ++_i137)
                   {
-                    org.apache.thrift.protocol.TList _list138 = iprot.readListBegin();
-                    _val136 = new java.util.ArrayList<PrivilegeGrantInfo>(_list138.size);
-                    @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem139;
-                    for (int _i140 = 0; _i140 < _list138.size; ++_i140)
+                    _key135 = iprot.readString();
                     {
-                      _elem139 = new PrivilegeGrantInfo();
-                      _elem139.read(iprot);
-                      _val136.add(_elem139);
+                      org.apache.thrift.protocol.TList _list138 = iprot.readListBegin();
+                      _val136 = new java.util.ArrayList<PrivilegeGrantInfo>(_list138.size);
+                      @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem139;
+                      for (int _i140 = 0; _i140 < _list138.size; ++_i140)
+                      {
+                        _elem139 = new PrivilegeGrantInfo();
+                        _elem139.read(iprot);
+                        _val136.add(_elem139);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.rolePrivileges.put(_key135, _val136);
                   }
-                  struct.rolePrivileges.put(_key135, _val136);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setRolePrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRolePrivilegesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PrincipalPrivilegeSet struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -723,6 +740,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PrincipalPrivilege
   }
 
   private static class PrincipalPrivilegeSetTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrincipalPrivilegeSetTupleScheme getScheme() {
       return new PrincipalPrivilegeSetTupleScheme();
     }
@@ -796,82 +814,87 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PrincipalPrivilegeS
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PrincipalPrivilegeSet 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)) {
-        {
-          org.apache.thrift.protocol.TMap _map153 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
-          struct.userPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map153.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key154;
-          @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val155;
-          for (int _i156 = 0; _i156 < _map153.size; ++_i156)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _key154 = iprot.readString();
+            org.apache.thrift.protocol.TMap _map153 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
+            struct.userPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map153.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key154;
+            @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val155;
+            for (int _i156 = 0; _i156 < _map153.size; ++_i156)
             {
-              org.apache.thrift.protocol.TList _list157 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-              _val155 = new java.util.ArrayList<PrivilegeGrantInfo>(_list157.size);
-              @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem158;
-              for (int _i159 = 0; _i159 < _list157.size; ++_i159)
+              _key154 = iprot.readString();
               {
-                _elem158 = new PrivilegeGrantInfo();
-                _elem158.read(iprot);
-                _val155.add(_elem158);
+                org.apache.thrift.protocol.TList _list157 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+                _val155 = new java.util.ArrayList<PrivilegeGrantInfo>(_list157.size);
+                @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem158;
+                for (int _i159 = 0; _i159 < _list157.size; ++_i159)
+                {
+                  _elem158 = new PrivilegeGrantInfo();
+                  _elem158.read(iprot);
+                  _val155.add(_elem158);
+                }
               }
+              struct.userPrivileges.put(_key154, _val155);
             }
-            struct.userPrivileges.put(_key154, _val155);
           }
+          struct.setUserPrivilegesIsSet(true);
         }
-        struct.setUserPrivilegesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TMap _map160 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
-          struct.groupPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map160.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key161;
-          @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val162;
-          for (int _i163 = 0; _i163 < _map160.size; ++_i163)
+        if (incoming.get(1)) {
           {
-            _key161 = iprot.readString();
+            org.apache.thrift.protocol.TMap _map160 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
+            struct.groupPrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map160.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key161;
+            @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val162;
+            for (int _i163 = 0; _i163 < _map160.size; ++_i163)
             {
-              org.apache.thrift.protocol.TList _list164 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-              _val162 = new java.util.ArrayList<PrivilegeGrantInfo>(_list164.size);
-              @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem165;
-              for (int _i166 = 0; _i166 < _list164.size; ++_i166)
+              _key161 = iprot.readString();
               {
-                _elem165 = new PrivilegeGrantInfo();
-                _elem165.read(iprot);
-                _val162.add(_elem165);
+                org.apache.thrift.protocol.TList _list164 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+                _val162 = new java.util.ArrayList<PrivilegeGrantInfo>(_list164.size);
+                @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem165;
+                for (int _i166 = 0; _i166 < _list164.size; ++_i166)
+                {
+                  _elem165 = new PrivilegeGrantInfo();
+                  _elem165.read(iprot);
+                  _val162.add(_elem165);
+                }
               }
+              struct.groupPrivileges.put(_key161, _val162);
             }
-            struct.groupPrivileges.put(_key161, _val162);
           }
+          struct.setGroupPrivilegesIsSet(true);
         }
-        struct.setGroupPrivilegesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map167 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
-          struct.rolePrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map167.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key168;
-          @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val169;
-          for (int _i170 = 0; _i170 < _map167.size; ++_i170)
+        if (incoming.get(2)) {
           {
-            _key168 = iprot.readString();
+            org.apache.thrift.protocol.TMap _map167 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST); 
+            struct.rolePrivileges = new java.util.HashMap<java.lang.String,java.util.List<PrivilegeGrantInfo>>(2*_map167.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key168;
+            @org.apache.thrift.annotation.Nullable java.util.List<PrivilegeGrantInfo> _val169;
+            for (int _i170 = 0; _i170 < _map167.size; ++_i170)
             {
-              org.apache.thrift.protocol.TList _list171 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-              _val169 = new java.util.ArrayList<PrivilegeGrantInfo>(_list171.size);
-              @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem172;
-              for (int _i173 = 0; _i173 < _list171.size; ++_i173)
+              _key168 = iprot.readString();
               {
-                _elem172 = new PrivilegeGrantInfo();
-                _elem172.read(iprot);
-                _val169.add(_elem172);
+                org.apache.thrift.protocol.TList _list171 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+                _val169 = new java.util.ArrayList<PrivilegeGrantInfo>(_list171.size);
+                @org.apache.thrift.annotation.Nullable PrivilegeGrantInfo _elem172;
+                for (int _i173 = 0; _i173 < _list171.size; ++_i173)
+                {
+                  _elem172 = new PrivilegeGrantInfo();
+                  _elem172.read(iprot);
+                  _val169.add(_elem172);
+                }
               }
+              struct.rolePrivileges.put(_key168, _val169);
             }
-            struct.rolePrivileges.put(_key168, _val169);
           }
+          struct.setRolePrivilegesIsSet(true);
         }
-        struct.setRolePrivilegesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
index 825d0fb803f1..4b2e3a106ae8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum PrincipalType implements org.apache.thrift.TEnum {
   USER(1),
   ROLE(2),
@@ -22,6 +22,7 @@ private PrincipalType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
index 690221e21d2a..4312272d5f4e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, PrivilegeBag._Fields>, java.io.Serializable, Cloneable, Comparable<PrivilegeBag> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivilegeBag");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public PrivilegeBag(PrivilegeBag other) {
     }
   }
 
+  @Override
   public PrivilegeBag deepCopy() {
     return new PrivilegeBag(this);
   }
@@ -161,6 +164,7 @@ public void setPrivilegesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRIVILEGES:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIVILEGES:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(PrivilegeBag other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -305,6 +314,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PrivilegeBagStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrivilegeBagStandardScheme getScheme() {
       return new PrivilegeBagStandardScheme();
     }
@@ -312,44 +322,51 @@ public PrivilegeBagStandardScheme getScheme() {
 
   private static class PrivilegeBagStandardScheme extends org.apache.thrift.scheme.StandardScheme<PrivilegeBag> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PrivilegeBag 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 1: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list112 = iprot.readListBegin();
-                struct.privileges = new java.util.ArrayList<HiveObjectPrivilege>(_list112.size);
-                @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem113;
-                for (int _i114 = 0; _i114 < _list112.size; ++_i114)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem113 = new HiveObjectPrivilege();
-                  _elem113.read(iprot);
-                  struct.privileges.add(_elem113);
+                  org.apache.thrift.protocol.TList _list112 = iprot.readListBegin();
+                  struct.privileges = new java.util.ArrayList<HiveObjectPrivilege>(_list112.size);
+                  @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem113;
+                  for (int _i114 = 0; _i114 < _list112.size; ++_i114)
+                  {
+                    _elem113 = new HiveObjectPrivilege();
+                    _elem113.read(iprot);
+                    struct.privileges.add(_elem113);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrivilegesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PrivilegeBag struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PrivilegeBag struc
   }
 
   private static class PrivilegeBagTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrivilegeBagTupleScheme getScheme() {
       return new PrivilegeBagTupleScheme();
     }
@@ -401,21 +419,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PrivilegeBag struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PrivilegeBag 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 _list117 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.privileges = new java.util.ArrayList<HiveObjectPrivilege>(_list117.size);
-          @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem118;
-          for (int _i119 = 0; _i119 < _list117.size; ++_i119)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem118 = new HiveObjectPrivilege();
-            _elem118.read(iprot);
-            struct.privileges.add(_elem118);
+            org.apache.thrift.protocol.TList _list117 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.privileges = new java.util.ArrayList<HiveObjectPrivilege>(_list117.size);
+            @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem118;
+            for (int _i119 = 0; _i119 < _list117.size; ++_i119)
+            {
+              _elem118 = new HiveObjectPrivilege();
+              _elem118.read(iprot);
+              struct.privileges.add(_elem118);
+            }
           }
+          struct.setPrivilegesIsSet(true);
         }
-        struct.setPrivilegesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
index 613ff2da1675..5434b1aacbca 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGrantInfo, PrivilegeGrantInfo._Fields>, java.io.Serializable, Cloneable, Comparable<PrivilegeGrantInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivilegeGrantInfo");
 
@@ -93,10 +93,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -161,6 +163,7 @@ public PrivilegeGrantInfo(PrivilegeGrantInfo other) {
     this.grantOption = other.grantOption;
   }
 
+  @Override
   public PrivilegeGrantInfo deepCopy() {
     return new PrivilegeGrantInfo(this);
   }
@@ -300,6 +303,7 @@ public void setGrantOptionIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __GRANTOPTION_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRIVILEGE:
@@ -346,6 +350,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIVILEGE:
@@ -368,6 +373,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -534,14 +540,17 @@ public int compareTo(PrivilegeGrantInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -610,6 +619,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PrivilegeGrantInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrivilegeGrantInfoStandardScheme getScheme() {
       return new PrivilegeGrantInfoStandardScheme();
     }
@@ -617,65 +627,72 @@ public PrivilegeGrantInfoStandardScheme getScheme() {
 
   private static class PrivilegeGrantInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<PrivilegeGrantInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PrivilegeGrantInfo 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 1: // PRIVILEGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.privilege = iprot.readString();
-              struct.setPrivilegeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // GRANTOR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.grantor = iprot.readString();
-              struct.setGrantorIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // GRANTOR_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setGrantorTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // GRANT_OPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.grantOption = iprot.readBool();
-              struct.setGrantOptionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // PRIVILEGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.privilege = iprot.readString();
+                struct.setPrivilegeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // GRANTOR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.grantor = iprot.readString();
+                struct.setGrantorIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // GRANTOR_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setGrantorTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // GRANT_OPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.grantOption = iprot.readBool();
+                struct.setGrantOptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PrivilegeGrantInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -708,6 +725,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PrivilegeGrantInfo
   }
 
   private static class PrivilegeGrantInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PrivilegeGrantInfoTupleScheme getScheme() {
       return new PrivilegeGrantInfoTupleScheme();
     }
@@ -754,27 +772,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PrivilegeGrantInfo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PrivilegeGrantInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.privilege = iprot.readString();
-        struct.setPrivilegeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.grantor = iprot.readString();
-        struct.setGrantorIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setGrantorTypeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.grantOption = iprot.readBool();
-        struct.setGrantOptionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.privilege = iprot.readString();
+          struct.setPrivilegeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.grantor = iprot.readString();
+          struct.setGrantorIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setGrantorTypeIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.grantOption = iprot.readBool();
+          struct.setGrantOptionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetRequest.java
index ecbb682b59b4..d7b107491532 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PropertyGetRequest implements org.apache.thrift.TBase<PropertyGetRequest, PropertyGetRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PropertyGetRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyGetRequest");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.MAP_PREDICATE,_Fields.MAP_SELECTION};
+  private static final _Fields[] optionals = {_Fields.MAP_PREDICATE,_Fields.MAP_SELECTION};
   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);
@@ -142,6 +144,7 @@ public PropertyGetRequest(PropertyGetRequest other) {
     }
   }
 
+  @Override
   public PropertyGetRequest deepCopy() {
     return new PropertyGetRequest(this);
   }
@@ -266,6 +269,7 @@ public void setMapSelectionIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME_SPACE:
@@ -304,6 +308,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME_SPACE:
@@ -323,6 +328,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -468,14 +474,17 @@ public int compareTo(PropertyGetRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -550,6 +559,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PropertyGetRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PropertyGetRequestStandardScheme getScheme() {
       return new PropertyGetRequestStandardScheme();
     }
@@ -557,67 +567,74 @@ public PropertyGetRequestStandardScheme getScheme() {
 
   private static class PropertyGetRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PropertyGetRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PropertyGetRequest 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 1: // NAME_SPACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nameSpace = iprot.readString();
-              struct.setNameSpaceIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // MAP_PREFIX
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.mapPrefix = iprot.readString();
-              struct.setMapPrefixIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // MAP_PREDICATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.mapPredicate = iprot.readString();
-              struct.setMapPredicateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // MAP_SELECTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list76 = iprot.readListBegin();
-                struct.mapSelection = new java.util.ArrayList<java.lang.String>(_list76.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem77;
-                for (int _i78 = 0; _i78 < _list76.size; ++_i78)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME_SPACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nameSpace = iprot.readString();
+                struct.setNameSpaceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // MAP_PREFIX
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.mapPrefix = iprot.readString();
+                struct.setMapPrefixIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // MAP_PREDICATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.mapPredicate = iprot.readString();
+                struct.setMapPredicateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // MAP_SELECTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem77 = iprot.readString();
-                  struct.mapSelection.add(_elem77);
+                  org.apache.thrift.protocol.TList _list76 = iprot.readListBegin();
+                  struct.mapSelection = new java.util.ArrayList<java.lang.String>(_list76.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem77;
+                  for (int _i78 = 0; _i78 < _list76.size; ++_i78)
+                  {
+                    _elem77 = iprot.readString();
+                    struct.mapSelection.add(_elem77);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setMapSelectionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMapSelectionIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PropertyGetRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -660,6 +677,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PropertyGetRequest
   }
 
   private static class PropertyGetRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PropertyGetRequestTupleScheme getScheme() {
       return new PropertyGetRequestTupleScheme();
     }
@@ -701,30 +719,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PropertyGetRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PropertyGetRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.nameSpace = iprot.readString();
-      struct.setNameSpaceIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.mapPrefix = iprot.readString();
-        struct.setMapPrefixIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.mapPredicate = iprot.readString();
-        struct.setMapPredicateIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list81 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.mapSelection = new java.util.ArrayList<java.lang.String>(_list81.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem82;
-          for (int _i83 = 0; _i83 < _list81.size; ++_i83)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.nameSpace = iprot.readString();
+        struct.setNameSpaceIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.mapPrefix = iprot.readString();
+          struct.setMapPrefixIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.mapPredicate = iprot.readString();
+          struct.setMapPredicateIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem82 = iprot.readString();
-            struct.mapSelection.add(_elem82);
+            org.apache.thrift.protocol.TList _list81 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.mapSelection = new java.util.ArrayList<java.lang.String>(_list81.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem82;
+            for (int _i83 = 0; _i83 < _list81.size; ++_i83)
+            {
+              _elem82 = iprot.readString();
+              struct.mapSelection.add(_elem82);
+            }
           }
+          struct.setMapSelectionIsSet(true);
         }
-        struct.setMapSelectionIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetResponse.java
index 7351177732e3..5a60a6f20a66 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertyGetResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PropertyGetResponse implements org.apache.thrift.TBase<PropertyGetResponse, PropertyGetResponse._Fields>, java.io.Serializable, Cloneable, Comparable<PropertyGetResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyGetResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public PropertyGetResponse(PropertyGetResponse other) {
     }
   }
 
+  @Override
   public PropertyGetResponse deepCopy() {
     return new PropertyGetResponse(this);
   }
@@ -167,6 +170,7 @@ public void setPropertiesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PROPERTIES:
@@ -181,6 +185,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PROPERTIES:
@@ -191,6 +196,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -261,14 +267,17 @@ public int compareTo(PropertyGetResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -311,6 +320,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PropertyGetResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PropertyGetResponseStandardScheme getScheme() {
       return new PropertyGetResponseStandardScheme();
     }
@@ -318,57 +328,64 @@ public PropertyGetResponseStandardScheme getScheme() {
 
   private static class PropertyGetResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<PropertyGetResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PropertyGetResponse 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 1: // PROPERTIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin();
-                struct.properties = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map84.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key85;
-                @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val86;
-                for (int _i87 = 0; _i87 < _map84.size; ++_i87)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key85 = iprot.readString();
+                  org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin();
+                  struct.properties = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map84.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key85;
+                  @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val86;
+                  for (int _i87 = 0; _i87 < _map84.size; ++_i87)
                   {
-                    org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin();
-                    _val86 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map88.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _key89;
-                    @org.apache.thrift.annotation.Nullable java.lang.String _val90;
-                    for (int _i91 = 0; _i91 < _map88.size; ++_i91)
+                    _key85 = iprot.readString();
                     {
-                      _key89 = iprot.readString();
-                      _val90 = iprot.readString();
-                      _val86.put(_key89, _val90);
+                      org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin();
+                      _val86 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map88.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _key89;
+                      @org.apache.thrift.annotation.Nullable java.lang.String _val90;
+                      for (int _i91 = 0; _i91 < _map88.size; ++_i91)
+                      {
+                        _key89 = iprot.readString();
+                        _val90 = iprot.readString();
+                        _val86.put(_key89, _val90);
+                      }
+                      iprot.readMapEnd();
                     }
-                    iprot.readMapEnd();
+                    struct.properties.put(_key85, _val86);
                   }
-                  struct.properties.put(_key85, _val86);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setPropertiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPropertiesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PropertyGetResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -401,6 +418,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PropertyGetRespons
   }
 
   private static class PropertyGetResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PropertyGetResponseTupleScheme getScheme() {
       return new PropertyGetResponseTupleScheme();
     }
@@ -437,33 +455,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PropertyGetResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PropertyGetResponse 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.TMap _map96 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
-          struct.properties = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map96.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key97;
-          @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val98;
-          for (int _i99 = 0; _i99 < _map96.size; ++_i99)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _key97 = iprot.readString();
+            org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
+            struct.properties = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map96.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key97;
+            @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val98;
+            for (int _i99 = 0; _i99 < _map96.size; ++_i99)
             {
-              org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-              _val98 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map100.size);
-              @org.apache.thrift.annotation.Nullable java.lang.String _key101;
-              @org.apache.thrift.annotation.Nullable java.lang.String _val102;
-              for (int _i103 = 0; _i103 < _map100.size; ++_i103)
+              _key97 = iprot.readString();
               {
-                _key101 = iprot.readString();
-                _val102 = iprot.readString();
-                _val98.put(_key101, _val102);
+                org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+                _val98 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map100.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _key101;
+                @org.apache.thrift.annotation.Nullable java.lang.String _val102;
+                for (int _i103 = 0; _i103 < _map100.size; ++_i103)
+                {
+                  _key101 = iprot.readString();
+                  _val102 = iprot.readString();
+                  _val98.put(_key101, _val102);
+                }
               }
+              struct.properties.put(_key97, _val98);
             }
-            struct.properties.put(_key97, _val98);
           }
+          struct.setPropertiesIsSet(true);
         }
-        struct.setPropertiesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertySetRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertySetRequest.java
index 4df3d265b774..1a04ae3ee7bd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertySetRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PropertySetRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PropertySetRequest implements org.apache.thrift.TBase<PropertySetRequest, PropertySetRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PropertySetRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertySetRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -122,6 +124,7 @@ public PropertySetRequest(PropertySetRequest other) {
     }
   }
 
+  @Override
   public PropertySetRequest deepCopy() {
     return new PropertySetRequest(this);
   }
@@ -191,6 +194,7 @@ public void setPropertyMapIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME_SPACE:
@@ -213,6 +217,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME_SPACE:
@@ -226,6 +231,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -321,14 +327,17 @@ public int compareTo(PropertySetRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -383,6 +392,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PropertySetRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PropertySetRequestStandardScheme getScheme() {
       return new PropertySetRequestStandardScheme();
     }
@@ -390,53 +400,60 @@ public PropertySetRequestStandardScheme getScheme() {
 
   private static class PropertySetRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PropertySetRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PropertySetRequest 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 1: // NAME_SPACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nameSpace = iprot.readString();
-              struct.setNameSpaceIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // PROPERTY_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map66 = iprot.readMapBegin();
-                struct.propertyMap = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map66.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key67;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val68;
-                for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME_SPACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nameSpace = iprot.readString();
+                struct.setNameSpaceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PROPERTY_MAP
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key67 = iprot.readString();
-                  _val68 = iprot.readString();
-                  struct.propertyMap.put(_key67, _val68);
+                  org.apache.thrift.protocol.TMap _map66 = iprot.readMapBegin();
+                  struct.propertyMap = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map66.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key67;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val68;
+                  for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+                  {
+                    _key67 = iprot.readString();
+                    _val68 = iprot.readString();
+                    struct.propertyMap.put(_key67, _val68);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setPropertyMapIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPropertyMapIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PropertySetRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -466,6 +483,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PropertySetRequest
   }
 
   private static class PropertySetRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PropertySetRequestTupleScheme getScheme() {
       return new PropertySetRequestTupleScheme();
     }
@@ -496,24 +514,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PropertySetRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PropertySetRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.nameSpace = iprot.readString();
-      struct.setNameSpaceIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TMap _map72 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.propertyMap = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map72.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key73;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val74;
-          for (int _i75 = 0; _i75 < _map72.size; ++_i75)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.nameSpace = iprot.readString();
+        struct.setNameSpaceIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _key73 = iprot.readString();
-            _val74 = iprot.readString();
-            struct.propertyMap.put(_key73, _val74);
+            org.apache.thrift.protocol.TMap _map72 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.propertyMap = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map72.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key73;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val74;
+            for (int _i75 = 0; _i75 < _map72.size; ++_i75)
+            {
+              _key73 = iprot.readString();
+              _val74 = iprot.readString();
+              struct.propertyMap.put(_key73, _val74);
+            }
           }
+          struct.setPropertyMapIsSet(true);
         }
-        struct.setPropertyMapIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
index 3b71eebe1f4c..8ceb73b6f1a4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PutFileMetadataRequest implements org.apache.thrift.TBase<PutFileMetadataRequest, PutFileMetadataRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PutFileMetadataRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PutFileMetadataRequest");
 
@@ -83,17 +83,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TYPE};
+  private static final _Fields[] optionals = {_Fields.TYPE};
   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);
@@ -138,6 +140,7 @@ public PutFileMetadataRequest(PutFileMetadataRequest other) {
     }
   }
 
+  @Override
   public PutFileMetadataRequest deepCopy() {
     return new PutFileMetadataRequest(this);
   }
@@ -261,6 +264,7 @@ public void setTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FILE_IDS:
@@ -291,6 +295,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FILE_IDS:
@@ -307,6 +312,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -427,14 +433,17 @@ public int compareTo(PutFileMetadataRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -503,6 +512,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PutFileMetadataRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PutFileMetadataRequestStandardScheme getScheme() {
       return new PutFileMetadataRequestStandardScheme();
     }
@@ -510,69 +520,76 @@ public PutFileMetadataRequestStandardScheme getScheme() {
 
   private static class PutFileMetadataRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<PutFileMetadataRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PutFileMetadataRequest 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 1: // FILE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1168 = iprot.readListBegin();
-                struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1168.size);
-                long _elem1169;
-                for (int _i1170 = 0; _i1170 < _list1168.size; ++_i1170)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FILE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1169 = iprot.readI64();
-                  struct.fileIds.add(_elem1169);
+                  org.apache.thrift.protocol.TList _list1168 = iprot.readListBegin();
+                  struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1168.size);
+                  long _elem1169;
+                  for (int _i1170 = 0; _i1170 < _list1168.size; ++_i1170)
+                  {
+                    _elem1169 = iprot.readI64();
+                    struct.fileIds.add(_elem1169);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFileIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFileIdsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1171 = iprot.readListBegin();
-                struct.metadata = new java.util.ArrayList<java.nio.ByteBuffer>(_list1171.size);
-                @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem1172;
-                for (int _i1173 = 0; _i1173 < _list1171.size; ++_i1173)
+              break;
+            case 2: // METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1172 = iprot.readBinary();
-                  struct.metadata.add(_elem1172);
+                  org.apache.thrift.protocol.TList _list1171 = iprot.readListBegin();
+                  struct.metadata = new java.util.ArrayList<java.nio.ByteBuffer>(_list1171.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem1172;
+                  for (int _i1173 = 0; _i1173 < _list1171.size; ++_i1173)
+                  {
+                    _elem1172 = iprot.readBinary();
+                    struct.metadata.add(_elem1172);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
+              break;
+            case 3: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PutFileMetadataRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -615,6 +632,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PutFileMetadataReq
   }
 
   private static class PutFileMetadataRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PutFileMetadataRequestTupleScheme getScheme() {
       return new PutFileMetadataRequestTupleScheme();
     }
@@ -651,33 +669,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PutFileMetadataRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PutFileMetadataRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1178 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1178.size);
-        long _elem1179;
-        for (int _i1180 = 0; _i1180 < _list1178.size; ++_i1180)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1179 = iprot.readI64();
-          struct.fileIds.add(_elem1179);
+          org.apache.thrift.protocol.TList _list1178 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.fileIds = new java.util.ArrayList<java.lang.Long>(_list1178.size);
+          long _elem1179;
+          for (int _i1180 = 0; _i1180 < _list1178.size; ++_i1180)
+          {
+            _elem1179 = iprot.readI64();
+            struct.fileIds.add(_elem1179);
+          }
         }
-      }
-      struct.setFileIdsIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list1181 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.metadata = new java.util.ArrayList<java.nio.ByteBuffer>(_list1181.size);
-        @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem1182;
-        for (int _i1183 = 0; _i1183 < _list1181.size; ++_i1183)
+        struct.setFileIdsIsSet(true);
         {
-          _elem1182 = iprot.readBinary();
-          struct.metadata.add(_elem1182);
+          org.apache.thrift.protocol.TList _list1181 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.metadata = new java.util.ArrayList<java.nio.ByteBuffer>(_list1181.size);
+          @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem1182;
+          for (int _i1183 = 0; _i1183 < _list1181.size; ++_i1183)
+          {
+            _elem1182 = iprot.readBinary();
+            struct.metadata.add(_elem1182);
+          }
         }
-      }
-      struct.setMetadataIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
+        struct.setMetadataIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
+          struct.setTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java
index 3d828f938f46..0c68a0089bf2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class PutFileMetadataResult implements org.apache.thrift.TBase<PutFileMetadataResult, PutFileMetadataResult._Fields>, java.io.Serializable, Cloneable, Comparable<PutFileMetadataResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PutFileMetadataResult");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public PutFileMetadataResult() {
   public PutFileMetadataResult(PutFileMetadataResult other) {
   }
 
+  @Override
   public PutFileMetadataResult deepCopy() {
     return new PutFileMetadataResult(this);
   }
@@ -97,12 +100,14 @@ public PutFileMetadataResult deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(PutFileMetadataResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PutFileMetadataResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PutFileMetadataResultStandardScheme getScheme() {
       return new PutFileMetadataResultStandardScheme();
     }
@@ -205,25 +215,32 @@ public PutFileMetadataResultStandardScheme getScheme() {
 
   private static class PutFileMetadataResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<PutFileMetadataResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PutFileMetadataResult 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PutFileMetadataResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PutFileMetadataRes
   }
 
   private static class PutFileMetadataResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PutFileMetadataResultTupleScheme getScheme() {
       return new PutFileMetadataResultTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PutFileMetadataResu
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PutFileMetadataResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/QueryState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/QueryState.java
index 53a97b01806a..697791440931 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/QueryState.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/QueryState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum QueryState implements org.apache.thrift.TEnum {
   INITED(0),
   EXECUTING(1),
@@ -25,6 +25,7 @@ private QueryState(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
index 129d8e3afaea..f7f18f32d25b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class RenamePartitionRequest implements org.apache.thrift.TBase<RenamePartitionRequest, RenamePartitionRequest._Fields>, java.io.Serializable, Cloneable, Comparable<RenamePartitionRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RenamePartitionRequest");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -117,7 +119,7 @@ public java.lang.String getFieldName() {
   private static final int __TXNID_ISSET_ID = 0;
   private static final int __CLONEPART_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.TXN_ID,_Fields.CLONE_PART};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.TXN_ID,_Fields.CLONE_PART};
   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);
@@ -186,6 +188,7 @@ public RenamePartitionRequest(RenamePartitionRequest other) {
     this.clonePart = other.clonePart;
   }
 
+  @Override
   public RenamePartitionRequest deepCopy() {
     return new RenamePartitionRequest(this);
   }
@@ -408,6 +411,7 @@ public void setClonePartIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CLONEPART_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -478,6 +482,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -509,6 +514,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -754,14 +760,17 @@ public int compareTo(RenamePartitionRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -881,6 +890,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class RenamePartitionRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RenamePartitionRequestStandardScheme getScheme() {
       return new RenamePartitionRequestStandardScheme();
     }
@@ -888,100 +898,107 @@ public RenamePartitionRequestStandardScheme getScheme() {
 
   private static class RenamePartitionRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<RenamePartitionRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, RenamePartitionRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PART_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1466 = iprot.readListBegin();
-                struct.partVals = new java.util.ArrayList<java.lang.String>(_list1466.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1467;
-                for (int _i1468 = 0; _i1468 < _list1466.size; ++_i1468)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PART_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1467 = iprot.readString();
-                  struct.partVals.add(_elem1467);
+                  org.apache.thrift.protocol.TList _list1466 = iprot.readListBegin();
+                  struct.partVals = new java.util.ArrayList<java.lang.String>(_list1466.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1467;
+                  for (int _i1468 = 0; _i1468 < _list1466.size; ++_i1468)
+                  {
+                    _elem1467 = iprot.readString();
+                    struct.partVals.add(_elem1467);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartValsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // NEW_PART
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.newPart = new Partition();
-              struct.newPart.read(iprot);
-              struct.setNewPartIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // CLONE_PART
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.clonePart = iprot.readBool();
-              struct.setClonePartIsSet(true);
-            } else { 
+              break;
+            case 5: // NEW_PART
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.newPart = new Partition();
+                struct.newPart.read(iprot);
+                struct.setNewPartIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // CLONE_PART
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.clonePart = iprot.readBool();
+                struct.setClonePartIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, RenamePartitionRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1044,6 +1061,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RenamePartitionReq
   }
 
   private static class RenamePartitionRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RenamePartitionRequestTupleScheme getScheme() {
       return new RenamePartitionRequestTupleScheme();
     }
@@ -1094,41 +1112,46 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RenamePartitionRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, RenamePartitionRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list1471 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.partVals = new java.util.ArrayList<java.lang.String>(_list1471.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem1472;
-        for (int _i1473 = 0; _i1473 < _list1471.size; ++_i1473)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
         {
-          _elem1472 = iprot.readString();
-          struct.partVals.add(_elem1472);
+          org.apache.thrift.protocol.TList _list1471 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.partVals = new java.util.ArrayList<java.lang.String>(_list1471.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1472;
+          for (int _i1473 = 0; _i1473 < _list1471.size; ++_i1473)
+          {
+            _elem1472 = iprot.readString();
+            struct.partVals.add(_elem1472);
+          }
         }
-      }
-      struct.setPartValsIsSet(true);
-      struct.newPart = new Partition();
-      struct.newPart.read(iprot);
-      struct.setNewPartIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.txnId = iprot.readI64();
-        struct.setTxnIdIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.clonePart = iprot.readBool();
-        struct.setClonePartIsSet(true);
+        struct.setPartValsIsSet(true);
+        struct.newPart = new Partition();
+        struct.newPart.read(iprot);
+        struct.setNewPartIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.txnId = iprot.readI64();
+          struct.setTxnIdIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.clonePart = iprot.readBool();
+          struct.setClonePartIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionResponse.java
index 6f970315ceed..ddf308ef0835 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class RenamePartitionResponse implements org.apache.thrift.TBase<RenamePartitionResponse, RenamePartitionResponse._Fields>, java.io.Serializable, Cloneable, Comparable<RenamePartitionResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RenamePartitionResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public RenamePartitionResponse() {
   public RenamePartitionResponse(RenamePartitionResponse other) {
   }
 
+  @Override
   public RenamePartitionResponse deepCopy() {
     return new RenamePartitionResponse(this);
   }
@@ -97,12 +100,14 @@ public RenamePartitionResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(RenamePartitionResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class RenamePartitionResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RenamePartitionResponseStandardScheme getScheme() {
       return new RenamePartitionResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public RenamePartitionResponseStandardScheme getScheme() {
 
   private static class RenamePartitionResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<RenamePartitionResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, RenamePartitionResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, RenamePartitionResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RenamePartitionRes
   }
 
   private static class RenamePartitionResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RenamePartitionResponseTupleScheme getScheme() {
       return new RenamePartitionResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RenamePartitionResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, RenamePartitionResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplLastIdInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplLastIdInfo.java
index 65653c33740e..967ccdc76398 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplLastIdInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplLastIdInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ReplLastIdInfo implements org.apache.thrift.TBase<ReplLastIdInfo, ReplLastIdInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ReplLastIdInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplLastIdInfo");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __LASTREPLID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TABLE,_Fields.CATALOG,_Fields.PARTITION_LIST};
+  private static final _Fields[] optionals = {_Fields.TABLE,_Fields.CATALOG,_Fields.PARTITION_LIST};
   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);
@@ -154,6 +156,7 @@ public ReplLastIdInfo(ReplLastIdInfo other) {
     }
   }
 
+  @Override
   public ReplLastIdInfo deepCopy() {
     return new ReplLastIdInfo(this);
   }
@@ -302,6 +305,7 @@ public void setPartitionListIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DATABASE:
@@ -348,6 +352,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATABASE:
@@ -370,6 +375,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -538,14 +544,17 @@ public int compareTo(ReplLastIdInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -632,6 +641,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ReplLastIdInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplLastIdInfoStandardScheme getScheme() {
       return new ReplLastIdInfoStandardScheme();
     }
@@ -639,75 +649,82 @@ public ReplLastIdInfoStandardScheme getScheme() {
 
   private static class ReplLastIdInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReplLastIdInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ReplLastIdInfo 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 1: // DATABASE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.database = iprot.readString();
-              struct.setDatabaseIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // LAST_REPL_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastReplId = iprot.readI64();
-              struct.setLastReplIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table = iprot.readString();
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CATALOG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalog = iprot.readString();
-              struct.setCatalogIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // PARTITION_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list830 = iprot.readListBegin();
-                struct.partitionList = new java.util.ArrayList<java.lang.String>(_list830.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem831;
-                for (int _i832 = 0; _i832 < _list830.size; ++_i832)
+          }
+          switch (schemeField.id) {
+            case 1: // DATABASE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.database = iprot.readString();
+                struct.setDatabaseIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // LAST_REPL_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lastReplId = iprot.readI64();
+                struct.setLastReplIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table = iprot.readString();
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CATALOG
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalog = iprot.readString();
+                struct.setCatalogIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARTITION_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem831 = iprot.readString();
-                  struct.partitionList.add(_elem831);
+                  org.apache.thrift.protocol.TList _list830 = iprot.readListBegin();
+                  struct.partitionList = new java.util.ArrayList<java.lang.String>(_list830.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem831;
+                  for (int _i832 = 0; _i832 < _list830.size; ++_i832)
+                  {
+                    _elem831 = iprot.readString();
+                    struct.partitionList.add(_elem831);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionListIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ReplLastIdInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -755,6 +772,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ReplLastIdInfo str
   }
 
   private static class ReplLastIdInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplLastIdInfoTupleScheme getScheme() {
       return new ReplLastIdInfoTupleScheme();
     }
@@ -797,32 +815,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ReplLastIdInfo stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ReplLastIdInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.database = iprot.readString();
-      struct.setDatabaseIsSet(true);
-      struct.lastReplId = iprot.readI64();
-      struct.setLastReplIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.table = iprot.readString();
-        struct.setTableIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.catalog = iprot.readString();
-        struct.setCatalogIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list835 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partitionList = new java.util.ArrayList<java.lang.String>(_list835.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem836;
-          for (int _i837 = 0; _i837 < _list835.size; ++_i837)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.database = iprot.readString();
+        struct.setDatabaseIsSet(true);
+        struct.lastReplId = iprot.readI64();
+        struct.setLastReplIdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.table = iprot.readString();
+          struct.setTableIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.catalog = iprot.readString();
+          struct.setCatalogIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _elem836 = iprot.readString();
-            struct.partitionList.add(_elem836);
+            org.apache.thrift.protocol.TList _list835 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partitionList = new java.util.ArrayList<java.lang.String>(_list835.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem836;
+            for (int _i837 = 0; _i837 < _list835.size; ++_i837)
+            {
+              _elem836 = iprot.readString();
+              struct.partitionList.add(_elem836);
+            }
           }
+          struct.setPartitionListIsSet(true);
         }
-        struct.setPartitionListIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java
index 714ef2733cfd..cf235702a157 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ReplTblWriteIdStateRequest implements org.apache.thrift.TBase<ReplTblWriteIdStateRequest, ReplTblWriteIdStateRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ReplTblWriteIdStateRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplTblWriteIdStateRequest");
 
@@ -94,17 +94,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.PART_NAMES};
+  private static final _Fields[] optionals = {_Fields.PART_NAMES};
   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);
@@ -168,6 +170,7 @@ public ReplTblWriteIdStateRequest(ReplTblWriteIdStateRequest other) {
     }
   }
 
+  @Override
   public ReplTblWriteIdStateRequest deepCopy() {
     return new ReplTblWriteIdStateRequest(this);
   }
@@ -342,6 +345,7 @@ public void setPartNamesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VALID_WRITE_IDLIST:
@@ -396,6 +400,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VALID_WRITE_IDLIST:
@@ -421,6 +426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -616,14 +622,17 @@ public int compareTo(ReplTblWriteIdStateRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -728,6 +737,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ReplTblWriteIdStateRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplTblWriteIdStateRequestStandardScheme getScheme() {
       return new ReplTblWriteIdStateRequestStandardScheme();
     }
@@ -735,83 +745,90 @@ public ReplTblWriteIdStateRequestStandardScheme getScheme() {
 
   private static class ReplTblWriteIdStateRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReplTblWriteIdStateRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ReplTblWriteIdStateRequest 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 1: // VALID_WRITE_IDLIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdlist = iprot.readString();
-              struct.setValidWriteIdlistIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // HOST_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hostName = iprot.readString();
-              struct.setHostNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DB_NAME
-            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 5: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // PART_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list846 = iprot.readListBegin();
-                struct.partNames = new java.util.ArrayList<java.lang.String>(_list846.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem847;
-                for (int _i848 = 0; _i848 < _list846.size; ++_i848)
+          }
+          switch (schemeField.id) {
+            case 1: // VALID_WRITE_IDLIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdlist = iprot.readString();
+                struct.setValidWriteIdlistIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // HOST_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.hostName = iprot.readString();
+                struct.setHostNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DB_NAME
+              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 5: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // PART_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem847 = iprot.readString();
-                  struct.partNames.add(_elem847);
+                  org.apache.thrift.protocol.TList _list846 = iprot.readListBegin();
+                  struct.partNames = new java.util.ArrayList<java.lang.String>(_list846.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem847;
+                  for (int _i848 = 0; _i848 < _list846.size; ++_i848)
+                  {
+                    _elem847 = iprot.readString();
+                    struct.partNames.add(_elem847);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartNamesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ReplTblWriteIdStateRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -862,6 +879,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ReplTblWriteIdStat
   }
 
   private static class ReplTblWriteIdStateRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplTblWriteIdStateRequestTupleScheme getScheme() {
       return new ReplTblWriteIdStateRequestTupleScheme();
     }
@@ -895,30 +913,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ReplTblWriteIdState
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ReplTblWriteIdStateRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.validWriteIdlist = iprot.readString();
-      struct.setValidWriteIdlistIsSet(true);
-      struct.user = iprot.readString();
-      struct.setUserIsSet(true);
-      struct.hostName = iprot.readString();
-      struct.setHostNameIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list851 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partNames = new java.util.ArrayList<java.lang.String>(_list851.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem852;
-          for (int _i853 = 0; _i853 < _list851.size; ++_i853)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.validWriteIdlist = iprot.readString();
+        struct.setValidWriteIdlistIsSet(true);
+        struct.user = iprot.readString();
+        struct.setUserIsSet(true);
+        struct.hostName = iprot.readString();
+        struct.setHostNameIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem852 = iprot.readString();
-            struct.partNames.add(_elem852);
+            org.apache.thrift.protocol.TList _list851 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partNames = new java.util.ArrayList<java.lang.String>(_list851.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem852;
+            for (int _i853 = 0; _i853 < _list851.size; ++_i853)
+            {
+              _elem852 = iprot.readString();
+              struct.partNames.add(_elem852);
+            }
           }
+          struct.setPartNamesIsSet(true);
         }
-        struct.setPartNamesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplayedTxnsForPolicyResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplayedTxnsForPolicyResult.java
index c665bcfd4966..98c64142e645 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplayedTxnsForPolicyResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplayedTxnsForPolicyResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ReplayedTxnsForPolicyResult implements org.apache.thrift.TBase<ReplayedTxnsForPolicyResult, ReplayedTxnsForPolicyResult._Fields>, java.io.Serializable, Cloneable, Comparable<ReplayedTxnsForPolicyResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplayedTxnsForPolicyResult");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -110,6 +112,7 @@ public ReplayedTxnsForPolicyResult(ReplayedTxnsForPolicyResult other) {
     }
   }
 
+  @Override
   public ReplayedTxnsForPolicyResult deepCopy() {
     return new ReplayedTxnsForPolicyResult(this);
   }
@@ -154,6 +157,7 @@ public void setReplTxnMapEntryIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case REPL_TXN_MAP_ENTRY:
@@ -168,6 +172,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case REPL_TXN_MAP_ENTRY:
@@ -178,6 +183,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -248,14 +254,17 @@ public int compareTo(ReplayedTxnsForPolicyResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -298,6 +307,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ReplayedTxnsForPolicyResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplayedTxnsForPolicyResultStandardScheme getScheme() {
       return new ReplayedTxnsForPolicyResultStandardScheme();
     }
@@ -305,45 +315,52 @@ public ReplayedTxnsForPolicyResultStandardScheme getScheme() {
 
   private static class ReplayedTxnsForPolicyResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReplayedTxnsForPolicyResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ReplayedTxnsForPolicyResult 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 1: // REPL_TXN_MAP_ENTRY
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map1636 = iprot.readMapBegin();
-                struct.replTxnMapEntry = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1636.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1637;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val1638;
-                for (int _i1639 = 0; _i1639 < _map1636.size; ++_i1639)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // REPL_TXN_MAP_ENTRY
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1637 = iprot.readString();
-                  _val1638 = iprot.readString();
-                  struct.replTxnMapEntry.put(_key1637, _val1638);
+                  org.apache.thrift.protocol.TMap _map1636 = iprot.readMapBegin();
+                  struct.replTxnMapEntry = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1636.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1637;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val1638;
+                  for (int _i1639 = 0; _i1639 < _map1636.size; ++_i1639)
+                  {
+                    _key1637 = iprot.readString();
+                    _val1638 = iprot.readString();
+                    struct.replTxnMapEntry.put(_key1637, _val1638);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setReplTxnMapEntryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setReplTxnMapEntryIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ReplayedTxnsForPolicyResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -368,6 +385,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ReplayedTxnsForPol
   }
 
   private static class ReplayedTxnsForPolicyResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplayedTxnsForPolicyResultTupleScheme getScheme() {
       return new ReplayedTxnsForPolicyResultTupleScheme();
     }
@@ -397,22 +415,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ReplayedTxnsForPoli
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ReplayedTxnsForPolicyResult 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.TMap _map1642 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.replTxnMapEntry = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1642.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key1643;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val1644;
-          for (int _i1645 = 0; _i1645 < _map1642.size; ++_i1645)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _key1643 = iprot.readString();
-            _val1644 = iprot.readString();
-            struct.replTxnMapEntry.put(_key1643, _val1644);
+            org.apache.thrift.protocol.TMap _map1642 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.replTxnMapEntry = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1642.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key1643;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val1644;
+            for (int _i1645 = 0; _i1645 < _map1642.size; ++_i1645)
+            {
+              _key1643 = iprot.readString();
+              _val1644 = iprot.readString();
+              struct.replTxnMapEntry.put(_key1643, _val1644);
+            }
           }
+          struct.setReplTxnMapEntryIsSet(true);
         }
-        struct.setReplTxnMapEntryIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetricList.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetricList.java
index 32d2c259027d..126b360b90cf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetricList.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetricList.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ReplicationMetricList implements org.apache.thrift.TBase<ReplicationMetricList, ReplicationMetricList._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicationMetricList> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplicationMetricList");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public ReplicationMetricList(ReplicationMetricList other) {
     }
   }
 
+  @Override
   public ReplicationMetricList deepCopy() {
     return new ReplicationMetricList(this);
   }
@@ -161,6 +164,7 @@ public void setReplicationMetricListIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case REPLICATION_METRIC_LIST:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case REPLICATION_METRIC_LIST:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(ReplicationMetricList other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ReplicationMetricListStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplicationMetricListStandardScheme getScheme() {
       return new ReplicationMetricListStandardScheme();
     }
@@ -316,44 +326,51 @@ public ReplicationMetricListStandardScheme getScheme() {
 
   private static class ReplicationMetricListStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReplicationMetricList> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ReplicationMetricList 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 1: // REPLICATION_METRIC_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1604 = iprot.readListBegin();
-                struct.replicationMetricList = new java.util.ArrayList<ReplicationMetrics>(_list1604.size);
-                @org.apache.thrift.annotation.Nullable ReplicationMetrics _elem1605;
-                for (int _i1606 = 0; _i1606 < _list1604.size; ++_i1606)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // REPLICATION_METRIC_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1605 = new ReplicationMetrics();
-                  _elem1605.read(iprot);
-                  struct.replicationMetricList.add(_elem1605);
+                  org.apache.thrift.protocol.TList _list1604 = iprot.readListBegin();
+                  struct.replicationMetricList = new java.util.ArrayList<ReplicationMetrics>(_list1604.size);
+                  @org.apache.thrift.annotation.Nullable ReplicationMetrics _elem1605;
+                  for (int _i1606 = 0; _i1606 < _list1604.size; ++_i1606)
+                  {
+                    _elem1605 = new ReplicationMetrics();
+                    _elem1605.read(iprot);
+                    struct.replicationMetricList.add(_elem1605);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setReplicationMetricListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setReplicationMetricListIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ReplicationMetricList struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ReplicationMetricL
   }
 
   private static class ReplicationMetricListTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplicationMetricListTupleScheme getScheme() {
       return new ReplicationMetricListTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ReplicationMetricLi
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ReplicationMetricList struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list1609 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.replicationMetricList = new java.util.ArrayList<ReplicationMetrics>(_list1609.size);
-        @org.apache.thrift.annotation.Nullable ReplicationMetrics _elem1610;
-        for (int _i1611 = 0; _i1611 < _list1609.size; ++_i1611)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem1610 = new ReplicationMetrics();
-          _elem1610.read(iprot);
-          struct.replicationMetricList.add(_elem1610);
+          org.apache.thrift.protocol.TList _list1609 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.replicationMetricList = new java.util.ArrayList<ReplicationMetrics>(_list1609.size);
+          @org.apache.thrift.annotation.Nullable ReplicationMetrics _elem1610;
+          for (int _i1611 = 0; _i1611 < _list1609.size; ++_i1611)
+          {
+            _elem1610 = new ReplicationMetrics();
+            _elem1610.read(iprot);
+            struct.replicationMetricList.add(_elem1610);
+          }
         }
+        struct.setReplicationMetricListIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setReplicationMetricListIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetrics.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetrics.java
index c61f0ce58b98..7b9474751f1c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetrics.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplicationMetrics.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ReplicationMetrics implements org.apache.thrift.TBase<ReplicationMetrics, ReplicationMetrics._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicationMetrics> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplicationMetrics");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __SCHEDULEDEXECUTIONID_ISSET_ID = 0;
   private static final int __DUMPEXECUTIONID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.METADATA,_Fields.PROGRESS,_Fields.MESSAGE_FORMAT};
+  private static final _Fields[] optionals = {_Fields.METADATA,_Fields.PROGRESS,_Fields.MESSAGE_FORMAT};
   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);
@@ -164,6 +166,7 @@ public ReplicationMetrics(ReplicationMetrics other) {
     }
   }
 
+  @Override
   public ReplicationMetrics deepCopy() {
     return new ReplicationMetrics(this);
   }
@@ -320,6 +323,7 @@ public void setMessageFormatIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEDULED_EXECUTION_ID:
@@ -374,6 +378,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEDULED_EXECUTION_ID:
@@ -399,6 +404,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -590,14 +596,17 @@ public int compareTo(ReplicationMetrics other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -692,6 +701,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ReplicationMetricsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplicationMetricsStandardScheme getScheme() {
       return new ReplicationMetricsStandardScheme();
     }
@@ -699,73 +709,80 @@ public ReplicationMetricsStandardScheme getScheme() {
 
   private static class ReplicationMetricsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReplicationMetrics> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ReplicationMetrics 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 1: // SCHEDULED_EXECUTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.scheduledExecutionId = iprot.readI64();
-              struct.setScheduledExecutionIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.policy = iprot.readString();
-              struct.setPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // DUMP_EXECUTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.dumpExecutionId = iprot.readI64();
-              struct.setDumpExecutionIdIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEDULED_EXECUTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.scheduledExecutionId = iprot.readI64();
+                struct.setScheduledExecutionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.policy = iprot.readString();
+                struct.setPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DUMP_EXECUTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.dumpExecutionId = iprot.readI64();
+                struct.setDumpExecutionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.metadata = iprot.readString();
+                struct.setMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PROGRESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.progress = iprot.readString();
+                struct.setProgressIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // MESSAGE_FORMAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.messageFormat = iprot.readString();
+                struct.setMessageFormatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.metadata = iprot.readString();
-              struct.setMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PROGRESS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.progress = iprot.readString();
-              struct.setProgressIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // MESSAGE_FORMAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.messageFormat = iprot.readString();
-              struct.setMessageFormatIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ReplicationMetrics struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -809,6 +826,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ReplicationMetrics
   }
 
   private static class ReplicationMetricsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ReplicationMetricsTupleScheme getScheme() {
       return new ReplicationMetricsTupleScheme();
     }
@@ -846,25 +864,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ReplicationMetrics
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ReplicationMetrics struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.scheduledExecutionId = iprot.readI64();
-      struct.setScheduledExecutionIdIsSet(true);
-      struct.policy = iprot.readString();
-      struct.setPolicyIsSet(true);
-      struct.dumpExecutionId = iprot.readI64();
-      struct.setDumpExecutionIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.metadata = iprot.readString();
-        struct.setMetadataIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.progress = iprot.readString();
-        struct.setProgressIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.messageFormat = iprot.readString();
-        struct.setMessageFormatIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.scheduledExecutionId = iprot.readI64();
+        struct.setScheduledExecutionIdIsSet(true);
+        struct.policy = iprot.readString();
+        struct.setPolicyIsSet(true);
+        struct.dumpExecutionId = iprot.readI64();
+        struct.setDumpExecutionIdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.metadata = iprot.readString();
+          struct.setMetadataIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.progress = iprot.readString();
+          struct.setProgressIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.messageFormat = iprot.readString();
+          struct.setMessageFormatIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
index ceae83babdd9..9885a1f3c873 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec, RequestPartsSpec._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestPartsSpec");
   private static final org.apache.thrift.protocol.TField NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("names", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -67,10 +67,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -100,6 +102,7 @@ public RequestPartsSpec(_Fields setField, java.lang.Object value) {
   public RequestPartsSpec(RequestPartsSpec other) {
     super(other);
   }
+  @Override
   public RequestPartsSpec deepCopy() {
     return new RequestPartsSpec(this);
   }
@@ -313,6 +316,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java
index dd666f42ca8f..88c56c838271 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum ResourceType implements org.apache.thrift.TEnum {
   JAR(1),
   FILE(2),
@@ -22,6 +22,7 @@ private ResourceType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java
index f62c9f558b06..a65cf9580f1d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ResourceUri implements org.apache.thrift.TBase<ResourceUri, ResourceUri._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceUri> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceUri");
 
@@ -78,10 +78,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public ResourceUri(ResourceUri other) {
     }
   }
 
+  @Override
   public ResourceUri deepCopy() {
     return new ResourceUri(this);
   }
@@ -189,6 +192,7 @@ public void setUriIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_TYPE:
@@ -211,6 +215,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_TYPE:
@@ -224,6 +229,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -319,14 +325,17 @@ public int compareTo(ResourceUri other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -377,6 +386,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ResourceUriStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ResourceUriStandardScheme getScheme() {
       return new ResourceUriStandardScheme();
     }
@@ -384,41 +394,48 @@ public ResourceUriStandardScheme getScheme() {
 
   private static class ResourceUriStandardScheme extends org.apache.thrift.scheme.StandardScheme<ResourceUri> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ResourceUri 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 1: // RESOURCE_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
-              struct.setResourceTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.uri = iprot.readString();
-              struct.setUriIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
+                struct.setResourceTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // URI
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.uri = iprot.readString();
+                struct.setUriIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ResourceUri struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -440,6 +457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ResourceUri struct
   }
 
   private static class ResourceUriTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ResourceUriTupleScheme getScheme() {
       return new ResourceUriTupleScheme();
     }
@@ -468,15 +486,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ResourceUri struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ResourceUri 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.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.uri = iprot.readString();
-        struct.setUriIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
+          struct.setResourceTypeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.uri = iprot.readString();
+          struct.setUriIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
index a83f8664ac0f..a626453f93b6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Role implements org.apache.thrift.TBase<Role, Role._Fields>, java.io.Serializable, Cloneable, Comparable<Role> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Role");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -133,6 +135,7 @@ public Role(Role other) {
     }
   }
 
+  @Override
   public Role deepCopy() {
     return new Role(this);
   }
@@ -215,6 +218,7 @@ public void setOwnerNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ROLE_NAME:
@@ -245,6 +249,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ROLE_NAME:
@@ -261,6 +266,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -379,14 +385,17 @@ public int compareTo(Role other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -443,6 +452,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class RoleStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RoleStandardScheme getScheme() {
       return new RoleStandardScheme();
     }
@@ -450,49 +460,56 @@ public RoleStandardScheme getScheme() {
 
   private static class RoleStandardScheme extends org.apache.thrift.scheme.StandardScheme<Role> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Role 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 1: // ROLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.roleName = iprot.readString();
-              struct.setRoleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ROLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.roleName = iprot.readString();
+                struct.setRoleNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Role struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -517,6 +534,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Role struct) throw
   }
 
   private static class RoleTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RoleTupleScheme getScheme() {
       return new RoleTupleScheme();
     }
@@ -551,19 +569,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Role struct) throws
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Role 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.roleName = iprot.readString();
-        struct.setRoleNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.roleName = iprot.readString();
+          struct.setRoleNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java
index 27d7a71001c6..53a6e117dc65 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class RolePrincipalGrant implements org.apache.thrift.TBase<RolePrincipalGrant, RolePrincipalGrant._Fields>, java.io.Serializable, Cloneable, Comparable<RolePrincipalGrant> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RolePrincipalGrant");
 
@@ -107,10 +107,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -189,6 +191,7 @@ public RolePrincipalGrant(RolePrincipalGrant other) {
     }
   }
 
+  @Override
   public RolePrincipalGrant deepCopy() {
     return new RolePrincipalGrant(this);
   }
@@ -386,6 +389,7 @@ public void setGrantorPrincipalTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ROLE_NAME:
@@ -448,6 +452,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ROLE_NAME:
@@ -476,6 +481,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -692,14 +698,17 @@ public int compareTo(RolePrincipalGrant other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -784,6 +793,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class RolePrincipalGrantStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RolePrincipalGrantStandardScheme getScheme() {
       return new RolePrincipalGrantStandardScheme();
     }
@@ -791,81 +801,88 @@ public RolePrincipalGrantStandardScheme getScheme() {
 
   private static class RolePrincipalGrantStandardScheme extends org.apache.thrift.scheme.StandardScheme<RolePrincipalGrant> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, RolePrincipalGrant 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 1: // ROLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.roleName = iprot.readString();
-              struct.setRoleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PRINCIPAL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.principalName = iprot.readString();
-              struct.setPrincipalNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setPrincipalTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // GRANT_OPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.grantOption = iprot.readBool();
-              struct.setGrantOptionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ROLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.roleName = iprot.readString();
+                struct.setRoleNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PRINCIPAL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.principalName = iprot.readString();
+                struct.setPrincipalNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PRINCIPAL_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setPrincipalTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // GRANT_OPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.grantOption = iprot.readBool();
+                struct.setGrantOptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // GRANT_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.grantTime = iprot.readI32();
+                struct.setGrantTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // GRANTOR_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.grantorName = iprot.readString();
+                struct.setGrantorNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // GRANTOR_PRINCIPAL_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.grantorPrincipalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setGrantorPrincipalTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // GRANT_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantTime = iprot.readI32();
-              struct.setGrantTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // GRANTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.grantorName = iprot.readString();
-              struct.setGrantorNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // GRANTOR_PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantorPrincipalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setGrantorPrincipalTypeIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, RolePrincipalGrant struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -908,6 +925,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RolePrincipalGrant
   }
 
   private static class RolePrincipalGrantTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RolePrincipalGrantTupleScheme getScheme() {
       return new RolePrincipalGrantTupleScheme();
     }
@@ -966,35 +984,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RolePrincipalGrant
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, RolePrincipalGrant struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.roleName = iprot.readString();
-        struct.setRoleNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.principalName = iprot.readString();
-        struct.setPrincipalNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setPrincipalTypeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.grantOption = iprot.readBool();
-        struct.setGrantOptionIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.grantTime = iprot.readI32();
-        struct.setGrantTimeIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.grantorName = iprot.readString();
-        struct.setGrantorNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.grantorPrincipalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setGrantorPrincipalTypeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.roleName = iprot.readString();
+          struct.setRoleNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.principalName = iprot.readString();
+          struct.setPrincipalNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setPrincipalTypeIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.grantOption = iprot.readBool();
+          struct.setGrantOptionIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.grantTime = iprot.readI32();
+          struct.setGrantTimeIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.grantorName = iprot.readString();
+          struct.setGrantorNameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.grantorPrincipalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setGrantorPrincipalTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java
index 98a1b836ebb0..aed16462aa67 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class RuntimeStat implements org.apache.thrift.TBase<RuntimeStat, RuntimeStat._Fields>, java.io.Serializable, Cloneable, Comparable<RuntimeStat> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RuntimeStat");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -92,7 +94,7 @@ public java.lang.String getFieldName() {
   private static final int __CREATETIME_ISSET_ID = 0;
   private static final int __WEIGHT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CREATE_TIME};
+  private static final _Fields[] optionals = {_Fields.CREATE_TIME};
   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);
@@ -131,6 +133,7 @@ public RuntimeStat(RuntimeStat other) {
     }
   }
 
+  @Override
   public RuntimeStat deepCopy() {
     return new RuntimeStat(this);
   }
@@ -220,6 +223,7 @@ public void setPayloadIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CREATE_TIME:
@@ -254,6 +258,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CREATE_TIME:
@@ -270,6 +275,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -388,14 +394,17 @@ public int compareTo(RuntimeStat other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class RuntimeStatStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RuntimeStatStandardScheme getScheme() {
       return new RuntimeStatStandardScheme();
     }
@@ -465,49 +475,56 @@ public RuntimeStatStandardScheme getScheme() {
 
   private static class RuntimeStatStandardScheme extends org.apache.thrift.scheme.StandardScheme<RuntimeStat> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, RuntimeStat 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 1: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WEIGHT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.weight = iprot.readI32();
-              struct.setWeightIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PAYLOAD
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.payload = iprot.readBinary();
-              struct.setPayloadIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // WEIGHT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.weight = iprot.readI32();
+                struct.setWeightIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PAYLOAD
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.payload = iprot.readBinary();
+                struct.setPayloadIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, RuntimeStat struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -532,6 +549,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RuntimeStat struct
   }
 
   private static class RuntimeStatTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public RuntimeStatTupleScheme getScheme() {
       return new RuntimeStatTupleScheme();
     }
@@ -556,15 +574,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RuntimeStat struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, RuntimeStat struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.weight = iprot.readI32();
-      struct.setWeightIsSet(true);
-      struct.payload = iprot.readBinary();
-      struct.setPayloadIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.weight = iprot.readI32();
+        struct.setWeightIsSet(true);
+        struct.payload = iprot.readBinary();
+        struct.setPayloadIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLAllTableConstraints.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLAllTableConstraints.java
index b2f33c64a7bd..2aeaa1c382ed 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLAllTableConstraints.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLAllTableConstraints.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLAllTableConstraints implements org.apache.thrift.TBase<SQLAllTableConstraints, SQLAllTableConstraints._Fields>, java.io.Serializable, Cloneable, Comparable<SQLAllTableConstraints> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLAllTableConstraints");
 
@@ -94,17 +94,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.PRIMARY_KEYS,_Fields.FOREIGN_KEYS,_Fields.UNIQUE_CONSTRAINTS,_Fields.NOT_NULL_CONSTRAINTS,_Fields.DEFAULT_CONSTRAINTS,_Fields.CHECK_CONSTRAINTS};
+  private static final _Fields[] optionals = {_Fields.PRIMARY_KEYS,_Fields.FOREIGN_KEYS,_Fields.UNIQUE_CONSTRAINTS,_Fields.NOT_NULL_CONSTRAINTS,_Fields.DEFAULT_CONSTRAINTS,_Fields.CHECK_CONSTRAINTS};
   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);
@@ -181,6 +183,7 @@ public SQLAllTableConstraints(SQLAllTableConstraints other) {
     }
   }
 
+  @Override
   public SQLAllTableConstraints deepCopy() {
     return new SQLAllTableConstraints(this);
   }
@@ -435,6 +438,7 @@ public void setCheckConstraintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PRIMARY_KEYS:
@@ -489,6 +493,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIMARY_KEYS:
@@ -514,6 +519,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -709,14 +715,17 @@ public int compareTo(SQLAllTableConstraints other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -811,6 +820,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLAllTableConstraintsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLAllTableConstraintsStandardScheme getScheme() {
       return new SQLAllTableConstraintsStandardScheme();
     }
@@ -818,139 +828,146 @@ public SQLAllTableConstraintsStandardScheme getScheme() {
 
   private static class SQLAllTableConstraintsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLAllTableConstraints> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLAllTableConstraints 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 1: // PRIMARY_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list10 = iprot.readListBegin();
-                struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list10.size);
-                @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem11;
-                for (int _i12 = 0; _i12 < _list10.size; ++_i12)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // PRIMARY_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem11 = new SQLPrimaryKey();
-                  _elem11.read(iprot);
-                  struct.primaryKeys.add(_elem11);
+                  org.apache.thrift.protocol.TList _list10 = iprot.readListBegin();
+                  struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list10.size);
+                  @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem11;
+                  for (int _i12 = 0; _i12 < _list10.size; ++_i12)
+                  {
+                    _elem11 = new SQLPrimaryKey();
+                    _elem11.read(iprot);
+                    struct.primaryKeys.add(_elem11);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPrimaryKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPrimaryKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FOREIGN_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list13 = iprot.readListBegin();
-                struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list13.size);
-                @org.apache.thrift.annotation.Nullable SQLForeignKey _elem14;
-                for (int _i15 = 0; _i15 < _list13.size; ++_i15)
+              break;
+            case 2: // FOREIGN_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem14 = new SQLForeignKey();
-                  _elem14.read(iprot);
-                  struct.foreignKeys.add(_elem14);
+                  org.apache.thrift.protocol.TList _list13 = iprot.readListBegin();
+                  struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list13.size);
+                  @org.apache.thrift.annotation.Nullable SQLForeignKey _elem14;
+                  for (int _i15 = 0; _i15 < _list13.size; ++_i15)
+                  {
+                    _elem14 = new SQLForeignKey();
+                    _elem14.read(iprot);
+                    struct.foreignKeys.add(_elem14);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setForeignKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setForeignKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // UNIQUE_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
-                struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list16.size);
-                @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem17;
-                for (int _i18 = 0; _i18 < _list16.size; ++_i18)
+              break;
+            case 3: // UNIQUE_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem17 = new SQLUniqueConstraint();
-                  _elem17.read(iprot);
-                  struct.uniqueConstraints.add(_elem17);
+                  org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+                  struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list16.size);
+                  @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem17;
+                  for (int _i18 = 0; _i18 < _list16.size; ++_i18)
+                  {
+                    _elem17 = new SQLUniqueConstraint();
+                    _elem17.read(iprot);
+                    struct.uniqueConstraints.add(_elem17);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setUniqueConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setUniqueConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NOT_NULL_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list19 = iprot.readListBegin();
-                struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list19.size);
-                @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem20;
-                for (int _i21 = 0; _i21 < _list19.size; ++_i21)
+              break;
+            case 4: // NOT_NULL_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem20 = new SQLNotNullConstraint();
-                  _elem20.read(iprot);
-                  struct.notNullConstraints.add(_elem20);
+                  org.apache.thrift.protocol.TList _list19 = iprot.readListBegin();
+                  struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list19.size);
+                  @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem20;
+                  for (int _i21 = 0; _i21 < _list19.size; ++_i21)
+                  {
+                    _elem20 = new SQLNotNullConstraint();
+                    _elem20.read(iprot);
+                    struct.notNullConstraints.add(_elem20);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setNotNullConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setNotNullConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // DEFAULT_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
-                struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list22.size);
-                @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem23;
-                for (int _i24 = 0; _i24 < _list22.size; ++_i24)
+              break;
+            case 5: // DEFAULT_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem23 = new SQLDefaultConstraint();
-                  _elem23.read(iprot);
-                  struct.defaultConstraints.add(_elem23);
+                  org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
+                  struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list22.size);
+                  @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem23;
+                  for (int _i24 = 0; _i24 < _list22.size; ++_i24)
+                  {
+                    _elem23 = new SQLDefaultConstraint();
+                    _elem23.read(iprot);
+                    struct.defaultConstraints.add(_elem23);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setDefaultConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setDefaultConstraintsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CHECK_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list25 = iprot.readListBegin();
-                struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list25.size);
-                @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem26;
-                for (int _i27 = 0; _i27 < _list25.size; ++_i27)
+              break;
+            case 6: // CHECK_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem26 = new SQLCheckConstraint();
-                  _elem26.read(iprot);
-                  struct.checkConstraints.add(_elem26);
+                  org.apache.thrift.protocol.TList _list25 = iprot.readListBegin();
+                  struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list25.size);
+                  @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem26;
+                  for (int _i27 = 0; _i27 < _list25.size; ++_i27)
+                  {
+                    _elem26 = new SQLCheckConstraint();
+                    _elem26.read(iprot);
+                    struct.checkConstraints.add(_elem26);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCheckConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCheckConstraintsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLAllTableConstraints struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1046,6 +1063,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLAllTableConstra
   }
 
   private static class SQLAllTableConstraintsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLAllTableConstraintsTupleScheme getScheme() {
       return new SQLAllTableConstraintsTupleScheme();
     }
@@ -1134,91 +1152,96 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLAllTableConstrai
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLAllTableConstraints struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list40 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list40.size);
-          @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem41;
-          for (int _i42 = 0; _i42 < _list40.size; ++_i42)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
           {
-            _elem41 = new SQLPrimaryKey();
-            _elem41.read(iprot);
-            struct.primaryKeys.add(_elem41);
+            org.apache.thrift.protocol.TList _list40 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list40.size);
+            @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem41;
+            for (int _i42 = 0; _i42 < _list40.size; ++_i42)
+            {
+              _elem41 = new SQLPrimaryKey();
+              _elem41.read(iprot);
+              struct.primaryKeys.add(_elem41);
+            }
           }
+          struct.setPrimaryKeysIsSet(true);
         }
-        struct.setPrimaryKeysIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list43 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list43.size);
-          @org.apache.thrift.annotation.Nullable SQLForeignKey _elem44;
-          for (int _i45 = 0; _i45 < _list43.size; ++_i45)
+        if (incoming.get(1)) {
           {
-            _elem44 = new SQLForeignKey();
-            _elem44.read(iprot);
-            struct.foreignKeys.add(_elem44);
+            org.apache.thrift.protocol.TList _list43 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list43.size);
+            @org.apache.thrift.annotation.Nullable SQLForeignKey _elem44;
+            for (int _i45 = 0; _i45 < _list43.size; ++_i45)
+            {
+              _elem44 = new SQLForeignKey();
+              _elem44.read(iprot);
+              struct.foreignKeys.add(_elem44);
+            }
           }
+          struct.setForeignKeysIsSet(true);
         }
-        struct.setForeignKeysIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list46 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list46.size);
-          @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem47;
-          for (int _i48 = 0; _i48 < _list46.size; ++_i48)
+        if (incoming.get(2)) {
           {
-            _elem47 = new SQLUniqueConstraint();
-            _elem47.read(iprot);
-            struct.uniqueConstraints.add(_elem47);
+            org.apache.thrift.protocol.TList _list46 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list46.size);
+            @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem47;
+            for (int _i48 = 0; _i48 < _list46.size; ++_i48)
+            {
+              _elem47 = new SQLUniqueConstraint();
+              _elem47.read(iprot);
+              struct.uniqueConstraints.add(_elem47);
+            }
           }
+          struct.setUniqueConstraintsIsSet(true);
         }
-        struct.setUniqueConstraintsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list49 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list49.size);
-          @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem50;
-          for (int _i51 = 0; _i51 < _list49.size; ++_i51)
+        if (incoming.get(3)) {
           {
-            _elem50 = new SQLNotNullConstraint();
-            _elem50.read(iprot);
-            struct.notNullConstraints.add(_elem50);
+            org.apache.thrift.protocol.TList _list49 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list49.size);
+            @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem50;
+            for (int _i51 = 0; _i51 < _list49.size; ++_i51)
+            {
+              _elem50 = new SQLNotNullConstraint();
+              _elem50.read(iprot);
+              struct.notNullConstraints.add(_elem50);
+            }
           }
+          struct.setNotNullConstraintsIsSet(true);
         }
-        struct.setNotNullConstraintsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list52.size);
-          @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem53;
-          for (int _i54 = 0; _i54 < _list52.size; ++_i54)
+        if (incoming.get(4)) {
           {
-            _elem53 = new SQLDefaultConstraint();
-            _elem53.read(iprot);
-            struct.defaultConstraints.add(_elem53);
+            org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list52.size);
+            @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem53;
+            for (int _i54 = 0; _i54 < _list52.size; ++_i54)
+            {
+              _elem53 = new SQLDefaultConstraint();
+              _elem53.read(iprot);
+              struct.defaultConstraints.add(_elem53);
+            }
           }
+          struct.setDefaultConstraintsIsSet(true);
         }
-        struct.setDefaultConstraintsIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list55 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list55.size);
-          @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem56;
-          for (int _i57 = 0; _i57 < _list55.size; ++_i57)
+        if (incoming.get(5)) {
           {
-            _elem56 = new SQLCheckConstraint();
-            _elem56.read(iprot);
-            struct.checkConstraints.add(_elem56);
+            org.apache.thrift.protocol.TList _list55 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list55.size);
+            @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem56;
+            for (int _i57 = 0; _i57 < _list55.size; ++_i57)
+            {
+              _elem56 = new SQLCheckConstraint();
+              _elem56.read(iprot);
+              struct.checkConstraints.add(_elem56);
+            }
           }
+          struct.setCheckConstraintsIsSet(true);
         }
-        struct.setCheckConstraintsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
index 6249a38fd16a..3216a9bc8f08 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLCheckConstraint implements org.apache.thrift.TBase<SQLCheckConstraint, SQLCheckConstraint._Fields>, java.io.Serializable, Cloneable, Comparable<SQLCheckConstraint> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLCheckConstraint");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -205,6 +207,7 @@ public SQLCheckConstraint(SQLCheckConstraint other) {
     this.rely_cstr = other.rely_cstr;
   }
 
+  @Override
   public SQLCheckConstraint deepCopy() {
     return new SQLCheckConstraint(this);
   }
@@ -435,6 +438,7 @@ public void setRely_cstrIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RELY_CSTR_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -513,6 +517,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -547,6 +552,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -811,14 +817,17 @@ public int compareTo(SQLCheckConstraint other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -915,6 +924,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLCheckConstraintStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLCheckConstraintStandardScheme getScheme() {
       return new SQLCheckConstraintStandardScheme();
     }
@@ -922,97 +932,104 @@ public SQLCheckConstraintStandardScheme getScheme() {
 
   private static class SQLCheckConstraintStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLCheckConstraint> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLCheckConstraint 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_db = iprot.readString();
-              struct.setTable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_name = iprot.readString();
-              struct.setTable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_name = iprot.readString();
-              struct.setColumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // CHECK_EXPRESSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.check_expression = iprot.readString();
-              struct.setCheck_expressionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DC_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dc_name = iprot.readString();
-              struct.setDc_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENABLE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enable_cstr = iprot.readBool();
-              struct.setEnable_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // VALIDATE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.validate_cstr = iprot.readBool();
-              struct.setValidate_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // RELY_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rely_cstr = iprot.readBool();
-              struct.setRely_cstrIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_db = iprot.readString();
+                struct.setTable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_name = iprot.readString();
+                struct.setTable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.column_name = iprot.readString();
+                struct.setColumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // CHECK_EXPRESSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.check_expression = iprot.readString();
+                struct.setCheck_expressionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // DC_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dc_name = iprot.readString();
+                struct.setDc_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENABLE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enable_cstr = iprot.readBool();
+                struct.setEnable_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // VALIDATE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.validate_cstr = iprot.readBool();
+                struct.setValidate_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // RELY_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rely_cstr = iprot.readBool();
+                struct.setRely_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLCheckConstraint struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1063,6 +1080,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLCheckConstraint
   }
 
   private static class SQLCheckConstraintTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLCheckConstraintTupleScheme getScheme() {
       return new SQLCheckConstraintTupleScheme();
     }
@@ -1133,43 +1151,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLCheckConstraint
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLCheckConstraint struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.table_db = iprot.readString();
-        struct.setTable_dbIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.table_name = iprot.readString();
-        struct.setTable_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.column_name = iprot.readString();
-        struct.setColumn_nameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.check_expression = iprot.readString();
-        struct.setCheck_expressionIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.dc_name = iprot.readString();
-        struct.setDc_nameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.enable_cstr = iprot.readBool();
-        struct.setEnable_cstrIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.validate_cstr = iprot.readBool();
-        struct.setValidate_cstrIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.rely_cstr = iprot.readBool();
-        struct.setRely_cstrIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.table_db = iprot.readString();
+          struct.setTable_dbIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.table_name = iprot.readString();
+          struct.setTable_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.column_name = iprot.readString();
+          struct.setColumn_nameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.check_expression = iprot.readString();
+          struct.setCheck_expressionIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.dc_name = iprot.readString();
+          struct.setDc_nameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.enable_cstr = iprot.readBool();
+          struct.setEnable_cstrIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.validate_cstr = iprot.readBool();
+          struct.setValidate_cstrIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.rely_cstr = iprot.readBool();
+          struct.setRely_cstrIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java
index 2041931ed33d..a212320883bd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLDefaultConstraint implements org.apache.thrift.TBase<SQLDefaultConstraint, SQLDefaultConstraint._Fields>, java.io.Serializable, Cloneable, Comparable<SQLDefaultConstraint> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLDefaultConstraint");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -205,6 +207,7 @@ public SQLDefaultConstraint(SQLDefaultConstraint other) {
     this.rely_cstr = other.rely_cstr;
   }
 
+  @Override
   public SQLDefaultConstraint deepCopy() {
     return new SQLDefaultConstraint(this);
   }
@@ -435,6 +438,7 @@ public void setRely_cstrIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RELY_CSTR_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -513,6 +517,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -547,6 +552,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -811,14 +817,17 @@ public int compareTo(SQLDefaultConstraint other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -915,6 +924,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLDefaultConstraintStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLDefaultConstraintStandardScheme getScheme() {
       return new SQLDefaultConstraintStandardScheme();
     }
@@ -922,97 +932,104 @@ public SQLDefaultConstraintStandardScheme getScheme() {
 
   private static class SQLDefaultConstraintStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLDefaultConstraint> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLDefaultConstraint 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_db = iprot.readString();
-              struct.setTable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_name = iprot.readString();
-              struct.setTable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_name = iprot.readString();
-              struct.setColumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // DEFAULT_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.default_value = iprot.readString();
-              struct.setDefault_valueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DC_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dc_name = iprot.readString();
-              struct.setDc_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENABLE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enable_cstr = iprot.readBool();
-              struct.setEnable_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // VALIDATE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.validate_cstr = iprot.readBool();
-              struct.setValidate_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // RELY_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rely_cstr = iprot.readBool();
-              struct.setRely_cstrIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_db = iprot.readString();
+                struct.setTable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_name = iprot.readString();
+                struct.setTable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.column_name = iprot.readString();
+                struct.setColumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // DEFAULT_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.default_value = iprot.readString();
+                struct.setDefault_valueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // DC_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dc_name = iprot.readString();
+                struct.setDc_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENABLE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enable_cstr = iprot.readBool();
+                struct.setEnable_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // VALIDATE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.validate_cstr = iprot.readBool();
+                struct.setValidate_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // RELY_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rely_cstr = iprot.readBool();
+                struct.setRely_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLDefaultConstraint struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1063,6 +1080,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLDefaultConstrai
   }
 
   private static class SQLDefaultConstraintTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLDefaultConstraintTupleScheme getScheme() {
       return new SQLDefaultConstraintTupleScheme();
     }
@@ -1133,43 +1151,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLDefaultConstrain
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLDefaultConstraint struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.table_db = iprot.readString();
-        struct.setTable_dbIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.table_name = iprot.readString();
-        struct.setTable_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.column_name = iprot.readString();
-        struct.setColumn_nameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.default_value = iprot.readString();
-        struct.setDefault_valueIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.dc_name = iprot.readString();
-        struct.setDc_nameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.enable_cstr = iprot.readBool();
-        struct.setEnable_cstrIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.validate_cstr = iprot.readBool();
-        struct.setValidate_cstrIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.rely_cstr = iprot.readBool();
-        struct.setRely_cstrIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.table_db = iprot.readString();
+          struct.setTable_dbIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.table_name = iprot.readString();
+          struct.setTable_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.column_name = iprot.readString();
+          struct.setColumn_nameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.default_value = iprot.readString();
+          struct.setDefault_valueIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.dc_name = iprot.readString();
+          struct.setDc_nameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.enable_cstr = iprot.readBool();
+          struct.setEnable_cstrIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.validate_cstr = iprot.readBool();
+          struct.setValidate_cstrIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.rely_cstr = iprot.readBool();
+          struct.setRely_cstrIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java
index e053de7faebe..a3ab2cbcebdf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLForeignKey implements org.apache.thrift.TBase<SQLForeignKey, SQLForeignKey._Fields>, java.io.Serializable, Cloneable, Comparable<SQLForeignKey> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLForeignKey");
 
@@ -139,10 +139,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -156,7 +158,7 @@ public java.lang.String getFieldName() {
   private static final int __VALIDATE_CSTR_ISSET_ID = 4;
   private static final int __RELY_CSTR_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -276,6 +278,7 @@ public SQLForeignKey(SQLForeignKey other) {
     }
   }
 
+  @Override
   public SQLForeignKey deepCopy() {
     return new SQLForeignKey(this);
   }
@@ -653,6 +656,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PKTABLE_DB:
@@ -779,6 +783,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PKTABLE_DB:
@@ -831,6 +836,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1239,14 +1245,17 @@ public int compareTo(SQLForeignKey other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1381,6 +1390,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLForeignKeyStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLForeignKeyStandardScheme getScheme() {
       return new SQLForeignKeyStandardScheme();
     }
@@ -1388,145 +1398,152 @@ public SQLForeignKeyStandardScheme getScheme() {
 
   private static class SQLForeignKeyStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLForeignKey> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLForeignKey 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 1: // PKTABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pktable_db = iprot.readString();
-              struct.setPktable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PKTABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pktable_name = iprot.readString();
-              struct.setPktable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PKCOLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pkcolumn_name = iprot.readString();
-              struct.setPkcolumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FKTABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fktable_db = iprot.readString();
-              struct.setFktable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // FKTABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fktable_name = iprot.readString();
-              struct.setFktable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // FKCOLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fkcolumn_name = iprot.readString();
-              struct.setFkcolumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // KEY_SEQ
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.key_seq = iprot.readI32();
-              struct.setKey_seqIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // UPDATE_RULE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.update_rule = iprot.readI32();
-              struct.setUpdate_ruleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // DELETE_RULE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.delete_rule = iprot.readI32();
-              struct.setDelete_ruleIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 10: // FK_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fk_name = iprot.readString();
-              struct.setFk_nameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // PKTABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pktable_db = iprot.readString();
+                struct.setPktable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // PKTABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pktable_name = iprot.readString();
+                struct.setPktable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PKCOLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pkcolumn_name = iprot.readString();
+                struct.setPkcolumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FKTABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.fktable_db = iprot.readString();
+                struct.setFktable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // FKTABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.fktable_name = iprot.readString();
+                struct.setFktable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // FKCOLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.fkcolumn_name = iprot.readString();
+                struct.setFkcolumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // KEY_SEQ
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.key_seq = iprot.readI32();
+                struct.setKey_seqIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // UPDATE_RULE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.update_rule = iprot.readI32();
+                struct.setUpdate_ruleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // DELETE_RULE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.delete_rule = iprot.readI32();
+                struct.setDelete_ruleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // FK_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.fk_name = iprot.readString();
+                struct.setFk_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // PK_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pk_name = iprot.readString();
+                struct.setPk_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // ENABLE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enable_cstr = iprot.readBool();
+                struct.setEnable_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // VALIDATE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.validate_cstr = iprot.readBool();
+                struct.setValidate_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 14: // RELY_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rely_cstr = iprot.readBool();
+                struct.setRely_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 15: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // PK_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pk_name = iprot.readString();
-              struct.setPk_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // ENABLE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enable_cstr = iprot.readBool();
-              struct.setEnable_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // VALIDATE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.validate_cstr = iprot.readBool();
-              struct.setValidate_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // RELY_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rely_cstr = iprot.readBool();
-              struct.setRely_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLForeignKey struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1603,6 +1620,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLForeignKey stru
   }
 
   private static class SQLForeignKeyTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLForeignKeyTupleScheme getScheme() {
       return new SQLForeignKeyTupleScheme();
     }
@@ -1709,67 +1727,72 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLForeignKey struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLForeignKey struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(15);
-      if (incoming.get(0)) {
-        struct.pktable_db = iprot.readString();
-        struct.setPktable_dbIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.pktable_name = iprot.readString();
-        struct.setPktable_nameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.pkcolumn_name = iprot.readString();
-        struct.setPkcolumn_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.fktable_db = iprot.readString();
-        struct.setFktable_dbIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.fktable_name = iprot.readString();
-        struct.setFktable_nameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.fkcolumn_name = iprot.readString();
-        struct.setFkcolumn_nameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.key_seq = iprot.readI32();
-        struct.setKey_seqIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.update_rule = iprot.readI32();
-        struct.setUpdate_ruleIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.delete_rule = iprot.readI32();
-        struct.setDelete_ruleIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.fk_name = iprot.readString();
-        struct.setFk_nameIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.pk_name = iprot.readString();
-        struct.setPk_nameIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.enable_cstr = iprot.readBool();
-        struct.setEnable_cstrIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.validate_cstr = iprot.readBool();
-        struct.setValidate_cstrIsSet(true);
-      }
-      if (incoming.get(13)) {
-        struct.rely_cstr = iprot.readBool();
-        struct.setRely_cstrIsSet(true);
-      }
-      if (incoming.get(14)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(15);
+        if (incoming.get(0)) {
+          struct.pktable_db = iprot.readString();
+          struct.setPktable_dbIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.pktable_name = iprot.readString();
+          struct.setPktable_nameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.pkcolumn_name = iprot.readString();
+          struct.setPkcolumn_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.fktable_db = iprot.readString();
+          struct.setFktable_dbIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.fktable_name = iprot.readString();
+          struct.setFktable_nameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.fkcolumn_name = iprot.readString();
+          struct.setFkcolumn_nameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.key_seq = iprot.readI32();
+          struct.setKey_seqIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.update_rule = iprot.readI32();
+          struct.setUpdate_ruleIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.delete_rule = iprot.readI32();
+          struct.setDelete_ruleIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.fk_name = iprot.readString();
+          struct.setFk_nameIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.pk_name = iprot.readString();
+          struct.setPk_nameIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.enable_cstr = iprot.readBool();
+          struct.setEnable_cstrIsSet(true);
+        }
+        if (incoming.get(12)) {
+          struct.validate_cstr = iprot.readBool();
+          struct.setValidate_cstrIsSet(true);
+        }
+        if (incoming.get(13)) {
+          struct.rely_cstr = iprot.readBool();
+          struct.setRely_cstrIsSet(true);
+        }
+        if (incoming.get(14)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java
index a84fda8159ec..88e4bfb3e9d9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLNotNullConstraint implements org.apache.thrift.TBase<SQLNotNullConstraint, SQLNotNullConstraint._Fields>, java.io.Serializable, Cloneable, Comparable<SQLNotNullConstraint> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLNotNullConstraint");
 
@@ -104,10 +104,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -193,6 +195,7 @@ public SQLNotNullConstraint(SQLNotNullConstraint other) {
     this.rely_cstr = other.rely_cstr;
   }
 
+  @Override
   public SQLNotNullConstraint deepCopy() {
     return new SQLNotNullConstraint(this);
   }
@@ -398,6 +401,7 @@ public void setRely_cstrIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RELY_CSTR_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -468,6 +472,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -499,6 +504,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -738,14 +744,17 @@ public int compareTo(SQLNotNullConstraint other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -834,6 +843,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLNotNullConstraintStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLNotNullConstraintStandardScheme getScheme() {
       return new SQLNotNullConstraintStandardScheme();
     }
@@ -841,89 +851,96 @@ public SQLNotNullConstraintStandardScheme getScheme() {
 
   private static class SQLNotNullConstraintStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLNotNullConstraint> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLNotNullConstraint 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_db = iprot.readString();
-              struct.setTable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_name = iprot.readString();
-              struct.setTable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_name = iprot.readString();
-              struct.setColumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // NN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.nn_name = iprot.readString();
-              struct.setNn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ENABLE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enable_cstr = iprot.readBool();
-              struct.setEnable_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // VALIDATE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.validate_cstr = iprot.readBool();
-              struct.setValidate_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // RELY_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rely_cstr = iprot.readBool();
-              struct.setRely_cstrIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_db = iprot.readString();
+                struct.setTable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_name = iprot.readString();
+                struct.setTable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.column_name = iprot.readString();
+                struct.setColumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // NN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.nn_name = iprot.readString();
+                struct.setNn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ENABLE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enable_cstr = iprot.readBool();
+                struct.setEnable_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // VALIDATE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.validate_cstr = iprot.readBool();
+                struct.setValidate_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // RELY_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rely_cstr = iprot.readBool();
+                struct.setRely_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLNotNullConstraint struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -969,6 +986,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLNotNullConstrai
   }
 
   private static class SQLNotNullConstraintTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLNotNullConstraintTupleScheme getScheme() {
       return new SQLNotNullConstraintTupleScheme();
     }
@@ -1033,39 +1051,44 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLNotNullConstrain
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLNotNullConstraint struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(8);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.table_db = iprot.readString();
-        struct.setTable_dbIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.table_name = iprot.readString();
-        struct.setTable_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.column_name = iprot.readString();
-        struct.setColumn_nameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.nn_name = iprot.readString();
-        struct.setNn_nameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.enable_cstr = iprot.readBool();
-        struct.setEnable_cstrIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.validate_cstr = iprot.readBool();
-        struct.setValidate_cstrIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.rely_cstr = iprot.readBool();
-        struct.setRely_cstrIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(8);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.table_db = iprot.readString();
+          struct.setTable_dbIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.table_name = iprot.readString();
+          struct.setTable_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.column_name = iprot.readString();
+          struct.setColumn_nameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.nn_name = iprot.readString();
+          struct.setNn_nameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.enable_cstr = iprot.readBool();
+          struct.setEnable_cstrIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.validate_cstr = iprot.readBool();
+          struct.setValidate_cstrIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.rely_cstr = iprot.readBool();
+          struct.setRely_cstrIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java
index 170b60cb1d70..58a51cf2c44a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLPrimaryKey implements org.apache.thrift.TBase<SQLPrimaryKey, SQLPrimaryKey._Fields>, java.io.Serializable, Cloneable, Comparable<SQLPrimaryKey> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLPrimaryKey");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,7 +126,7 @@ public java.lang.String getFieldName() {
   private static final int __VALIDATE_CSTR_ISSET_ID = 2;
   private static final int __RELY_CSTR_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME};
   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);
@@ -204,6 +206,7 @@ public SQLPrimaryKey(SQLPrimaryKey other) {
     }
   }
 
+  @Override
   public SQLPrimaryKey deepCopy() {
     return new SQLPrimaryKey(this);
   }
@@ -433,6 +436,7 @@ public void setCatNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE_DB:
@@ -511,6 +515,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE_DB:
@@ -545,6 +550,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -807,14 +813,17 @@ public int compareTo(SQLPrimaryKey other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -909,6 +918,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLPrimaryKeyStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLPrimaryKeyStandardScheme getScheme() {
       return new SQLPrimaryKeyStandardScheme();
     }
@@ -916,97 +926,104 @@ public SQLPrimaryKeyStandardScheme getScheme() {
 
   private static class SQLPrimaryKeyStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLPrimaryKey> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLPrimaryKey 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 1: // TABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_db = iprot.readString();
-              struct.setTable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_name = iprot.readString();
-              struct.setTable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_name = iprot.readString();
-              struct.setColumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // KEY_SEQ
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.key_seq = iprot.readI32();
-              struct.setKey_seqIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PK_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pk_name = iprot.readString();
-              struct.setPk_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ENABLE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enable_cstr = iprot.readBool();
-              struct.setEnable_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // VALIDATE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.validate_cstr = iprot.readBool();
-              struct.setValidate_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // RELY_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rely_cstr = iprot.readBool();
-              struct.setRely_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_db = iprot.readString();
+                struct.setTable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_name = iprot.readString();
+                struct.setTable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.column_name = iprot.readString();
+                struct.setColumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // KEY_SEQ
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.key_seq = iprot.readI32();
+                struct.setKey_seqIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PK_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pk_name = iprot.readString();
+                struct.setPk_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ENABLE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enable_cstr = iprot.readBool();
+                struct.setEnable_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // VALIDATE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.validate_cstr = iprot.readBool();
+                struct.setValidate_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // RELY_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rely_cstr = iprot.readBool();
+                struct.setRely_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLPrimaryKey struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1057,6 +1074,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLPrimaryKey stru
   }
 
   private static class SQLPrimaryKeyTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLPrimaryKeyTupleScheme getScheme() {
       return new SQLPrimaryKeyTupleScheme();
     }
@@ -1127,43 +1145,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLPrimaryKey struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLPrimaryKey struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.table_db = iprot.readString();
-        struct.setTable_dbIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.table_name = iprot.readString();
-        struct.setTable_nameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.column_name = iprot.readString();
-        struct.setColumn_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.key_seq = iprot.readI32();
-        struct.setKey_seqIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.pk_name = iprot.readString();
-        struct.setPk_nameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.enable_cstr = iprot.readBool();
-        struct.setEnable_cstrIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.validate_cstr = iprot.readBool();
-        struct.setValidate_cstrIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.rely_cstr = iprot.readBool();
-        struct.setRely_cstrIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.table_db = iprot.readString();
+          struct.setTable_dbIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.table_name = iprot.readString();
+          struct.setTable_nameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.column_name = iprot.readString();
+          struct.setColumn_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.key_seq = iprot.readI32();
+          struct.setKey_seqIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.pk_name = iprot.readString();
+          struct.setPk_nameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.enable_cstr = iprot.readBool();
+          struct.setEnable_cstrIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.validate_cstr = iprot.readBool();
+          struct.setValidate_cstrIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.rely_cstr = iprot.readBool();
+          struct.setRely_cstrIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java
index 0210b6c5bf98..66bcad52b8dc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLUniqueConstraint implements org.apache.thrift.TBase<SQLUniqueConstraint, SQLUniqueConstraint._Fields>, java.io.Serializable, Cloneable, Comparable<SQLUniqueConstraint> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLUniqueConstraint");
 
@@ -109,10 +109,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -205,6 +207,7 @@ public SQLUniqueConstraint(SQLUniqueConstraint other) {
     this.rely_cstr = other.rely_cstr;
   }
 
+  @Override
   public SQLUniqueConstraint deepCopy() {
     return new SQLUniqueConstraint(this);
   }
@@ -434,6 +437,7 @@ public void setRely_cstrIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RELY_CSTR_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -512,6 +516,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -546,6 +551,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -808,14 +814,17 @@ public int compareTo(SQLUniqueConstraint other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -908,6 +917,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SQLUniqueConstraintStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLUniqueConstraintStandardScheme getScheme() {
       return new SQLUniqueConstraintStandardScheme();
     }
@@ -915,97 +925,104 @@ public SQLUniqueConstraintStandardScheme getScheme() {
 
   private static class SQLUniqueConstraintStandardScheme extends org.apache.thrift.scheme.StandardScheme<SQLUniqueConstraint> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SQLUniqueConstraint 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TABLE_DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_db = iprot.readString();
-              struct.setTable_dbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_name = iprot.readString();
-              struct.setTable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COLUMN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_name = iprot.readString();
-              struct.setColumn_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // KEY_SEQ
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.key_seq = iprot.readI32();
-              struct.setKey_seqIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // UK_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.uk_name = iprot.readString();
-              struct.setUk_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENABLE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enable_cstr = iprot.readBool();
-              struct.setEnable_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // VALIDATE_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.validate_cstr = iprot.readBool();
-              struct.setValidate_cstrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // RELY_CSTR
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rely_cstr = iprot.readBool();
-              struct.setRely_cstrIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TABLE_DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_db = iprot.readString();
+                struct.setTable_dbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_name = iprot.readString();
+                struct.setTable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COLUMN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.column_name = iprot.readString();
+                struct.setColumn_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // KEY_SEQ
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.key_seq = iprot.readI32();
+                struct.setKey_seqIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // UK_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.uk_name = iprot.readString();
+                struct.setUk_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ENABLE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enable_cstr = iprot.readBool();
+                struct.setEnable_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // VALIDATE_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.validate_cstr = iprot.readBool();
+                struct.setValidate_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // RELY_CSTR
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rely_cstr = iprot.readBool();
+                struct.setRely_cstrIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SQLUniqueConstraint struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1054,6 +1071,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SQLUniqueConstrain
   }
 
   private static class SQLUniqueConstraintTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SQLUniqueConstraintTupleScheme getScheme() {
       return new SQLUniqueConstraintTupleScheme();
     }
@@ -1124,43 +1142,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SQLUniqueConstraint
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SQLUniqueConstraint struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.table_db = iprot.readString();
-        struct.setTable_dbIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.table_name = iprot.readString();
-        struct.setTable_nameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.column_name = iprot.readString();
-        struct.setColumn_nameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.key_seq = iprot.readI32();
-        struct.setKey_seqIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.uk_name = iprot.readString();
-        struct.setUk_nameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.enable_cstr = iprot.readBool();
-        struct.setEnable_cstrIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.validate_cstr = iprot.readBool();
-        struct.setValidate_cstrIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.rely_cstr = iprot.readBool();
-        struct.setRely_cstrIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.table_db = iprot.readString();
+          struct.setTable_dbIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.table_name = iprot.readString();
+          struct.setTable_nameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.column_name = iprot.readString();
+          struct.setColumn_nameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.key_seq = iprot.readI32();
+          struct.setKey_seqIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.uk_name = iprot.readString();
+          struct.setUk_nameIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.enable_cstr = iprot.readBool();
+          struct.setEnable_cstrIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.validate_cstr = iprot.readBool();
+          struct.setValidate_cstrIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.rely_cstr = iprot.readBool();
+          struct.setRely_cstrIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQuery.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQuery.java
index 07b5e9288746..d165a8d5d751 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQuery.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQuery.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ScheduledQuery implements org.apache.thrift.TBase<ScheduledQuery, ScheduledQuery._Fields>, java.io.Serializable, Cloneable, Comparable<ScheduledQuery> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScheduledQuery");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __ENABLED_ISSET_ID = 0;
   private static final int __NEXTEXECUTION_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ENABLED,_Fields.SCHEDULE,_Fields.USER,_Fields.QUERY,_Fields.NEXT_EXECUTION};
+  private static final _Fields[] optionals = {_Fields.ENABLED,_Fields.SCHEDULE,_Fields.USER,_Fields.QUERY,_Fields.NEXT_EXECUTION};
   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);
@@ -158,6 +160,7 @@ public ScheduledQuery(ScheduledQuery other) {
     this.nextExecution = other.nextExecution;
   }
 
+  @Override
   public ScheduledQuery deepCopy() {
     return new ScheduledQuery(this);
   }
@@ -314,6 +317,7 @@ public void setNextExecutionIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NEXTEXECUTION_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEDULE_KEY:
@@ -368,6 +372,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEDULE_KEY:
@@ -393,6 +398,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -588,14 +594,17 @@ public int compareTo(ScheduledQuery other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -689,6 +698,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ScheduledQueryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryStandardScheme getScheme() {
       return new ScheduledQueryStandardScheme();
     }
@@ -696,74 +706,81 @@ public ScheduledQueryStandardScheme getScheme() {
 
   private static class ScheduledQueryStandardScheme extends org.apache.thrift.scheme.StandardScheme<ScheduledQuery> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ScheduledQuery 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 1: // SCHEDULE_KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.scheduleKey = new ScheduledQueryKey();
-              struct.scheduleKey.read(iprot);
-              struct.setScheduleKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ENABLED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enabled = iprot.readBool();
-              struct.setEnabledIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // SCHEDULE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schedule = iprot.readString();
-              struct.setScheduleIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEDULE_KEY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.scheduleKey = new ScheduledQueryKey();
+                struct.scheduleKey.read(iprot);
+                struct.setScheduleKeyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ENABLED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.enabled = iprot.readBool();
+                struct.setEnabledIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // SCHEDULE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schedule = iprot.readString();
+                struct.setScheduleIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // QUERY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.query = iprot.readString();
+                struct.setQueryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // NEXT_EXECUTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.nextExecution = iprot.readI32();
+                struct.setNextExecutionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // QUERY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.query = iprot.readString();
-              struct.setQueryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // NEXT_EXECUTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.nextExecution = iprot.readI32();
-              struct.setNextExecutionIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQuery struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -811,6 +828,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQuery str
   }
 
   private static class ScheduledQueryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryTupleScheme getScheme() {
       return new ScheduledQueryTupleScheme();
     }
@@ -858,30 +876,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ScheduledQuery stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ScheduledQuery struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.scheduleKey = new ScheduledQueryKey();
-      struct.scheduleKey.read(iprot);
-      struct.setScheduleKeyIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.enabled = iprot.readBool();
-        struct.setEnabledIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.schedule = iprot.readString();
-        struct.setScheduleIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.user = iprot.readString();
-        struct.setUserIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.query = iprot.readString();
-        struct.setQueryIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.nextExecution = iprot.readI32();
-        struct.setNextExecutionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.scheduleKey = new ScheduledQueryKey();
+        struct.scheduleKey.read(iprot);
+        struct.setScheduleKeyIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.enabled = iprot.readBool();
+          struct.setEnabledIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.schedule = iprot.readString();
+          struct.setScheduleIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.user = iprot.readString();
+          struct.setUserIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.query = iprot.readString();
+          struct.setQueryIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.nextExecution = iprot.readI32();
+          struct.setNextExecutionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryKey.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryKey.java
index a19a7e865a04..218e2af42b07 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryKey.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryKey.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ScheduledQueryKey implements org.apache.thrift.TBase<ScheduledQueryKey, ScheduledQueryKey._Fields>, java.io.Serializable, Cloneable, Comparable<ScheduledQueryKey> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScheduledQueryKey");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public ScheduledQueryKey(ScheduledQueryKey other) {
     }
   }
 
+  @Override
   public ScheduledQueryKey deepCopy() {
     return new ScheduledQueryKey(this);
   }
@@ -177,6 +180,7 @@ public void setClusterNamespaceIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEDULE_NAME:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEDULE_NAME:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(ScheduledQueryKey other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -373,6 +382,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ScheduledQueryKeyStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryKeyStandardScheme getScheme() {
       return new ScheduledQueryKeyStandardScheme();
     }
@@ -380,41 +390,48 @@ public ScheduledQueryKeyStandardScheme getScheme() {
 
   private static class ScheduledQueryKeyStandardScheme extends org.apache.thrift.scheme.StandardScheme<ScheduledQueryKey> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ScheduledQueryKey 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 1: // SCHEDULE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.scheduleName = iprot.readString();
-              struct.setScheduleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // CLUSTER_NAMESPACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.clusterNamespace = iprot.readString();
-              struct.setClusterNamespaceIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEDULE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.scheduleName = iprot.readString();
+                struct.setScheduleNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // CLUSTER_NAMESPACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.clusterNamespace = iprot.readString();
+                struct.setClusterNamespaceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryKey struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -436,6 +453,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryKey
   }
 
   private static class ScheduledQueryKeyTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryKeyTupleScheme getScheme() {
       return new ScheduledQueryKeyTupleScheme();
     }
@@ -452,11 +470,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryKey s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryKey struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.scheduleName = iprot.readString();
-      struct.setScheduleNameIsSet(true);
-      struct.clusterNamespace = iprot.readString();
-      struct.setClusterNamespaceIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.scheduleName = iprot.readString();
+        struct.setScheduleNameIsSet(true);
+        struct.clusterNamespace = iprot.readString();
+        struct.setClusterNamespaceIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequest.java
index f2bf6b554252..3aebd61af49d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ScheduledQueryMaintenanceRequest implements org.apache.thrift.TBase<ScheduledQueryMaintenanceRequest, ScheduledQueryMaintenanceRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ScheduledQueryMaintenanceRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScheduledQueryMaintenanceRequest");
 
@@ -78,10 +78,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public ScheduledQueryMaintenanceRequest(ScheduledQueryMaintenanceRequest other)
     }
   }
 
+  @Override
   public ScheduledQueryMaintenanceRequest deepCopy() {
     return new ScheduledQueryMaintenanceRequest(this);
   }
@@ -189,6 +192,7 @@ public void setScheduledQueryIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TYPE:
@@ -211,6 +215,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TYPE:
@@ -224,6 +229,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -319,14 +325,17 @@ public int compareTo(ScheduledQueryMaintenanceRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -388,6 +397,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ScheduledQueryMaintenanceRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryMaintenanceRequestStandardScheme getScheme() {
       return new ScheduledQueryMaintenanceRequestStandardScheme();
     }
@@ -395,42 +405,49 @@ public ScheduledQueryMaintenanceRequestStandardScheme getScheme() {
 
   private static class ScheduledQueryMaintenanceRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ScheduledQueryMaintenanceRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ScheduledQueryMaintenanceRequest 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 1: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.ScheduledQueryMaintenanceRequestType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // SCHEDULED_QUERY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.scheduledQuery = new ScheduledQuery();
-              struct.scheduledQuery.read(iprot);
-              struct.setScheduledQueryIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.ScheduledQueryMaintenanceRequestType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SCHEDULED_QUERY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.scheduledQuery = new ScheduledQuery();
+                struct.scheduledQuery.read(iprot);
+                struct.setScheduledQueryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryMaintenanceRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -452,6 +469,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryMain
   }
 
   private static class ScheduledQueryMaintenanceRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryMaintenanceRequestTupleScheme getScheme() {
       return new ScheduledQueryMaintenanceRequestTupleScheme();
     }
@@ -468,12 +486,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryMaint
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryMaintenanceRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.type = org.apache.hadoop.hive.metastore.api.ScheduledQueryMaintenanceRequestType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      struct.scheduledQuery = new ScheduledQuery();
-      struct.scheduledQuery.read(iprot);
-      struct.setScheduledQueryIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.type = org.apache.hadoop.hive.metastore.api.ScheduledQueryMaintenanceRequestType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        struct.scheduledQuery = new ScheduledQuery();
+        struct.scheduledQuery.read(iprot);
+        struct.setScheduledQueryIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequestType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequestType.java
index e923834244b4..769cd8c3d864 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequestType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryMaintenanceRequestType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum ScheduledQueryMaintenanceRequestType implements org.apache.thrift.TEnum {
   CREATE(1),
   ALTER(2),
@@ -22,6 +22,7 @@ private ScheduledQueryMaintenanceRequestType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollRequest.java
index f3da90a5b31a..59151c169e23 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ScheduledQueryPollRequest implements org.apache.thrift.TBase<ScheduledQueryPollRequest, ScheduledQueryPollRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ScheduledQueryPollRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScheduledQueryPollRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public ScheduledQueryPollRequest(ScheduledQueryPollRequest other) {
     }
   }
 
+  @Override
   public ScheduledQueryPollRequest deepCopy() {
     return new ScheduledQueryPollRequest(this);
   }
@@ -140,6 +143,7 @@ public void setClusterNamespaceIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CLUSTER_NAMESPACE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CLUSTER_NAMESPACE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(ScheduledQueryPollRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -288,6 +297,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ScheduledQueryPollRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryPollRequestStandardScheme getScheme() {
       return new ScheduledQueryPollRequestStandardScheme();
     }
@@ -295,33 +305,40 @@ public ScheduledQueryPollRequestStandardScheme getScheme() {
 
   private static class ScheduledQueryPollRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ScheduledQueryPollRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ScheduledQueryPollRequest 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 1: // CLUSTER_NAMESPACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.clusterNamespace = iprot.readString();
-              struct.setClusterNamespaceIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // CLUSTER_NAMESPACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.clusterNamespace = iprot.readString();
+                struct.setClusterNamespaceIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryPollRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -338,6 +355,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryPoll
   }
 
   private static class ScheduledQueryPollRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryPollRequestTupleScheme getScheme() {
       return new ScheduledQueryPollRequestTupleScheme();
     }
@@ -353,9 +371,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryPollR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryPollRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.clusterNamespace = iprot.readString();
-      struct.setClusterNamespaceIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.clusterNamespace = iprot.readString();
+        struct.setClusterNamespaceIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollResponse.java
index ad540088723c..c60956fa6973 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryPollResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ScheduledQueryPollResponse implements org.apache.thrift.TBase<ScheduledQueryPollResponse, ScheduledQueryPollResponse._Fields>, java.io.Serializable, Cloneable, Comparable<ScheduledQueryPollResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScheduledQueryPollResponse");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -96,7 +98,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __EXECUTIONID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SCHEDULE_KEY,_Fields.EXECUTION_ID,_Fields.QUERY,_Fields.USER};
+  private static final _Fields[] optionals = {_Fields.SCHEDULE_KEY,_Fields.EXECUTION_ID,_Fields.QUERY,_Fields.USER};
   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);
@@ -132,6 +134,7 @@ public ScheduledQueryPollResponse(ScheduledQueryPollResponse other) {
     }
   }
 
+  @Override
   public ScheduledQueryPollResponse deepCopy() {
     return new ScheduledQueryPollResponse(this);
   }
@@ -239,6 +242,7 @@ public void setUserIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEDULE_KEY:
@@ -277,6 +281,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEDULE_KEY:
@@ -296,6 +301,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -441,14 +447,17 @@ public int compareTo(ScheduledQueryPollResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -524,6 +533,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ScheduledQueryPollResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryPollResponseStandardScheme getScheme() {
       return new ScheduledQueryPollResponseStandardScheme();
     }
@@ -531,58 +541,65 @@ public ScheduledQueryPollResponseStandardScheme getScheme() {
 
   private static class ScheduledQueryPollResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<ScheduledQueryPollResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ScheduledQueryPollResponse 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 1: // SCHEDULE_KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.scheduleKey = new ScheduledQueryKey();
-              struct.scheduleKey.read(iprot);
-              struct.setScheduleKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // EXECUTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.executionId = iprot.readI64();
-              struct.setExecutionIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // QUERY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.query = iprot.readString();
-              struct.setQueryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEDULE_KEY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.scheduleKey = new ScheduledQueryKey();
+                struct.scheduleKey.read(iprot);
+                struct.setScheduleKeyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // EXECUTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.executionId = iprot.readI64();
+                struct.setExecutionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // QUERY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.query = iprot.readString();
+                struct.setQueryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryPollResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -620,6 +637,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryPoll
   }
 
   private static class ScheduledQueryPollResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryPollResponseTupleScheme getScheme() {
       return new ScheduledQueryPollResponseTupleScheme();
     }
@@ -660,24 +678,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryPollR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryPollResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.scheduleKey = new ScheduledQueryKey();
-        struct.scheduleKey.read(iprot);
-        struct.setScheduleKeyIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.executionId = iprot.readI64();
-        struct.setExecutionIdIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.query = iprot.readString();
-        struct.setQueryIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.user = iprot.readString();
-        struct.setUserIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.scheduleKey = new ScheduledQueryKey();
+          struct.scheduleKey.read(iprot);
+          struct.setScheduleKeyIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.executionId = iprot.readI64();
+          struct.setExecutionIdIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.query = iprot.readString();
+          struct.setQueryIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.user = iprot.readString();
+          struct.setUserIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryProgressInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryProgressInfo.java
index f2d851dc8ef2..9c99e4acff1b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryProgressInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ScheduledQueryProgressInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ScheduledQueryProgressInfo implements org.apache.thrift.TBase<ScheduledQueryProgressInfo, ScheduledQueryProgressInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ScheduledQueryProgressInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScheduledQueryProgressInfo");
 
@@ -88,10 +88,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -100,7 +102,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __SCHEDULEDEXECUTIONID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ERROR_MESSAGE};
+  private static final _Fields[] optionals = {_Fields.ERROR_MESSAGE};
   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);
@@ -148,6 +150,7 @@ public ScheduledQueryProgressInfo(ScheduledQueryProgressInfo other) {
     }
   }
 
+  @Override
   public ScheduledQueryProgressInfo deepCopy() {
     return new ScheduledQueryProgressInfo(this);
   }
@@ -263,6 +266,7 @@ public void setErrorMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEDULED_EXECUTION_ID:
@@ -301,6 +305,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEDULED_EXECUTION_ID:
@@ -320,6 +325,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -463,14 +469,17 @@ public int compareTo(ScheduledQueryProgressInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -549,6 +558,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ScheduledQueryProgressInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryProgressInfoStandardScheme getScheme() {
       return new ScheduledQueryProgressInfoStandardScheme();
     }
@@ -556,57 +566,64 @@ public ScheduledQueryProgressInfoStandardScheme getScheme() {
 
   private static class ScheduledQueryProgressInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ScheduledQueryProgressInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ScheduledQueryProgressInfo 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 1: // SCHEDULED_EXECUTION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.scheduledExecutionId = iprot.readI64();
-              struct.setScheduledExecutionIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.hadoop.hive.metastore.api.QueryState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // EXECUTOR_QUERY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.executorQueryId = iprot.readString();
-              struct.setExecutorQueryIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // ERROR_MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errorMessage = iprot.readString();
-              struct.setErrorMessageIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEDULED_EXECUTION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.scheduledExecutionId = iprot.readI64();
+                struct.setScheduledExecutionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.state = org.apache.hadoop.hive.metastore.api.QueryState.findByValue(iprot.readI32());
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // EXECUTOR_QUERY_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.executorQueryId = iprot.readString();
+                struct.setExecutorQueryIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ERROR_MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errorMessage = iprot.readString();
+                struct.setErrorMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryProgressInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -638,6 +655,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ScheduledQueryProg
   }
 
   private static class ScheduledQueryProgressInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ScheduledQueryProgressInfoTupleScheme getScheme() {
       return new ScheduledQueryProgressInfoTupleScheme();
     }
@@ -663,17 +681,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryProgr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ScheduledQueryProgressInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.scheduledExecutionId = iprot.readI64();
-      struct.setScheduledExecutionIdIsSet(true);
-      struct.state = org.apache.hadoop.hive.metastore.api.QueryState.findByValue(iprot.readI32());
-      struct.setStateIsSet(true);
-      struct.executorQueryId = iprot.readString();
-      struct.setExecutorQueryIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.errorMessage = iprot.readString();
-        struct.setErrorMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.scheduledExecutionId = iprot.readI64();
+        struct.setScheduledExecutionIdIsSet(true);
+        struct.state = org.apache.hadoop.hive.metastore.api.QueryState.findByValue(iprot.readI32());
+        struct.setStateIsSet(true);
+        struct.executorQueryId = iprot.readString();
+        struct.setExecutorQueryIdIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.errorMessage = iprot.readString();
+          struct.setErrorMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
index 63fe3f27003c..267f7b287abf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Schema implements org.apache.thrift.TBase<Schema, Schema._Fields>, java.io.Serializable, Cloneable, Comparable<Schema> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Schema");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -127,6 +129,7 @@ public Schema(Schema other) {
     }
   }
 
+  @Override
   public Schema deepCopy() {
     return new Schema(this);
   }
@@ -212,6 +215,7 @@ public void setPropertiesIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FIELD_SCHEMAS:
@@ -234,6 +238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELD_SCHEMAS:
@@ -247,6 +252,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -342,14 +348,17 @@ public int compareTo(Schema other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -400,6 +409,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SchemaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SchemaStandardScheme getScheme() {
       return new SchemaStandardScheme();
     }
@@ -407,64 +417,71 @@ public SchemaStandardScheme getScheme() {
 
   private static class SchemaStandardScheme extends org.apache.thrift.scheme.StandardScheme<Schema> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Schema 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 1: // FIELD_SCHEMAS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list472 = iprot.readListBegin();
-                struct.fieldSchemas = new java.util.ArrayList<FieldSchema>(_list472.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem473;
-                for (int _i474 = 0; _i474 < _list472.size; ++_i474)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // FIELD_SCHEMAS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem473 = new FieldSchema();
-                  _elem473.read(iprot);
-                  struct.fieldSchemas.add(_elem473);
+                  org.apache.thrift.protocol.TList _list472 = iprot.readListBegin();
+                  struct.fieldSchemas = new java.util.ArrayList<FieldSchema>(_list472.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem473;
+                  for (int _i474 = 0; _i474 < _list472.size; ++_i474)
+                  {
+                    _elem473 = new FieldSchema();
+                    _elem473.read(iprot);
+                    struct.fieldSchemas.add(_elem473);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFieldSchemasIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFieldSchemasIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PROPERTIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map475 = iprot.readMapBegin();
-                struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map475.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key476;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val477;
-                for (int _i478 = 0; _i478 < _map475.size; ++_i478)
+              break;
+            case 2: // PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key476 = iprot.readString();
-                  _val477 = iprot.readString();
-                  struct.properties.put(_key476, _val477);
+                  org.apache.thrift.protocol.TMap _map475 = iprot.readMapBegin();
+                  struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map475.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key476;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val477;
+                  for (int _i478 = 0; _i478 < _map475.size; ++_i478)
+                  {
+                    _key476 = iprot.readString();
+                    _val477 = iprot.readString();
+                    struct.properties.put(_key476, _val477);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setPropertiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPropertiesIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Schema struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -501,6 +518,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Schema struct) thr
   }
 
   private static class SchemaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SchemaTupleScheme getScheme() {
       return new SchemaTupleScheme();
     }
@@ -542,36 +560,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Schema struct) thro
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Schema struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list483 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.fieldSchemas = new java.util.ArrayList<FieldSchema>(_list483.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem484;
-          for (int _i485 = 0; _i485 < _list483.size; ++_i485)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
           {
-            _elem484 = new FieldSchema();
-            _elem484.read(iprot);
-            struct.fieldSchemas.add(_elem484);
+            org.apache.thrift.protocol.TList _list483 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.fieldSchemas = new java.util.ArrayList<FieldSchema>(_list483.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem484;
+            for (int _i485 = 0; _i485 < _list483.size; ++_i485)
+            {
+              _elem484 = new FieldSchema();
+              _elem484.read(iprot);
+              struct.fieldSchemas.add(_elem484);
+            }
           }
+          struct.setFieldSchemasIsSet(true);
         }
-        struct.setFieldSchemasIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TMap _map486 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map486.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key487;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val488;
-          for (int _i489 = 0; _i489 < _map486.size; ++_i489)
+        if (incoming.get(1)) {
           {
-            _key487 = iprot.readString();
-            _val488 = iprot.readString();
-            struct.properties.put(_key487, _val488);
+            org.apache.thrift.protocol.TMap _map486 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map486.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key487;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val488;
+            for (int _i489 = 0; _i489 < _map486.size; ++_i489)
+            {
+              _key487 = iprot.readString();
+              _val488 = iprot.readString();
+              struct.properties.put(_key487, _val488);
+            }
           }
+          struct.setPropertiesIsSet(true);
         }
-        struct.setPropertiesIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java
index 052a8ebc939a..d1047b1474a6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum SchemaCompatibility implements org.apache.thrift.TEnum {
   NONE(1),
   BACKWARD(2),
@@ -23,6 +23,7 @@ private SchemaCompatibility(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java
index d526efc518eb..60f04ef6a3bc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum SchemaType implements org.apache.thrift.TEnum {
   HIVE(1),
   AVRO(2);
@@ -21,6 +21,7 @@ private SchemaType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java
index a9b5df567930..5122bb0c2490 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum SchemaValidation implements org.apache.thrift.TEnum {
   LATEST(1),
   ALL(2);
@@ -21,6 +21,7 @@ private SchemaValidation(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
index ee32b81e79c5..2b9ec8f81e27 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SchemaVersion implements org.apache.thrift.TBase<SchemaVersion, SchemaVersion._Fields>, java.io.Serializable, Cloneable, Comparable<SchemaVersion> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SchemaVersion");
 
@@ -118,10 +118,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,7 +133,7 @@ public java.lang.String getFieldName() {
   private static final int __VERSION_ISSET_ID = 0;
   private static final int __CREATEDAT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.STATE,_Fields.DESCRIPTION,_Fields.SCHEMA_TEXT,_Fields.FINGERPRINT,_Fields.NAME,_Fields.SER_DE};
+  private static final _Fields[] optionals = {_Fields.STATE,_Fields.DESCRIPTION,_Fields.SCHEMA_TEXT,_Fields.FINGERPRINT,_Fields.NAME,_Fields.SER_DE};
   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);
@@ -215,6 +217,7 @@ public SchemaVersion(SchemaVersion other) {
     }
   }
 
+  @Override
   public SchemaVersion deepCopy() {
     return new SchemaVersion(this);
   }
@@ -495,6 +498,7 @@ public void setSerDeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEMA:
@@ -581,6 +585,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEMA:
@@ -618,6 +623,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -909,14 +915,17 @@ public int compareTo(SchemaVersion other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1043,6 +1052,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SchemaVersionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SchemaVersionStandardScheme getScheme() {
       return new SchemaVersionStandardScheme();
     }
@@ -1050,118 +1060,125 @@ public SchemaVersionStandardScheme getScheme() {
 
   private static class SchemaVersionStandardScheme extends org.apache.thrift.scheme.StandardScheme<SchemaVersion> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SchemaVersion 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 1: // SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.schema = new ISchemaName();
-              struct.schema.read(iprot);
-              struct.setSchemaIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.version = iprot.readI32();
-              struct.setVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // CREATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.createdAt = iprot.readI64();
-              struct.setCreatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1360 = iprot.readListBegin();
-                struct.cols = new java.util.ArrayList<FieldSchema>(_list1360.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem1361;
-                for (int _i1362 = 0; _i1362 < _list1360.size; ++_i1362)
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.schema = new ISchemaName();
+                struct.schema.read(iprot);
+                struct.setSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.version = iprot.readI32();
+                struct.setVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CREATED_AT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.createdAt = iprot.readI64();
+                struct.setCreatedAtIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1361 = new FieldSchema();
-                  _elem1361.read(iprot);
-                  struct.cols.add(_elem1361);
+                  org.apache.thrift.protocol.TList _list1360 = iprot.readListBegin();
+                  struct.cols = new java.util.ArrayList<FieldSchema>(_list1360.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1361;
+                  for (int _i1362 = 0; _i1362 < _list1360.size; ++_i1362)
+                  {
+                    _elem1361 = new FieldSchema();
+                    _elem1361.read(iprot);
+                    struct.cols.add(_elem1361);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // SCHEMA_TEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schemaText = iprot.readString();
-              struct.setSchemaTextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // FINGERPRINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fingerprint = iprot.readString();
-              struct.setFingerprintIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // SER_DE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.serDe = new SerDeInfo();
-              struct.serDe.read(iprot);
-              struct.setSerDeIsSet(true);
-            } else { 
+              break;
+            case 5: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // SCHEMA_TEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schemaText = iprot.readString();
+                struct.setSchemaTextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // FINGERPRINT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.fingerprint = iprot.readString();
+                struct.setFingerprintIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // SER_DE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.serDe = new SerDeInfo();
+                struct.serDe.read(iprot);
+                struct.setSerDeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SchemaVersion struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1238,6 +1255,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SchemaVersion stru
   }
 
   private static class SchemaVersionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SchemaVersionTupleScheme getScheme() {
       return new SchemaVersionTupleScheme();
     }
@@ -1320,59 +1338,64 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SchemaVersion struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SchemaVersion struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(10);
-      if (incoming.get(0)) {
-        struct.schema = new ISchemaName();
-        struct.schema.read(iprot);
-        struct.setSchemaIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.version = iprot.readI32();
-        struct.setVersionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.createdAt = iprot.readI64();
-        struct.setCreatedAtIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list1365 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.cols = new java.util.ArrayList<FieldSchema>(_list1365.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem1366;
-          for (int _i1367 = 0; _i1367 < _list1365.size; ++_i1367)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(10);
+        if (incoming.get(0)) {
+          struct.schema = new ISchemaName();
+          struct.schema.read(iprot);
+          struct.setSchemaIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.version = iprot.readI32();
+          struct.setVersionIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.createdAt = iprot.readI64();
+          struct.setCreatedAtIsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _elem1366 = new FieldSchema();
-            _elem1366.read(iprot);
-            struct.cols.add(_elem1366);
+            org.apache.thrift.protocol.TList _list1365 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.cols = new java.util.ArrayList<FieldSchema>(_list1365.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem1366;
+            for (int _i1367 = 0; _i1367 < _list1365.size; ++_i1367)
+            {
+              _elem1366 = new FieldSchema();
+              _elem1366.read(iprot);
+              struct.cols.add(_elem1366);
+            }
           }
+          struct.setColsIsSet(true);
         }
-        struct.setColsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
-        struct.setStateIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.schemaText = iprot.readString();
-        struct.setSchemaTextIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.fingerprint = iprot.readString();
-        struct.setFingerprintIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.serDe = new SerDeInfo();
-        struct.serDe.read(iprot);
-        struct.setSerDeIsSet(true);
+        if (incoming.get(4)) {
+          struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
+          struct.setStateIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.schemaText = iprot.readString();
+          struct.setSchemaTextIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.fingerprint = iprot.readString();
+          struct.setFingerprintIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.serDe = new SerDeInfo();
+          struct.serDe.read(iprot);
+          struct.setSerDeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java
index 1794b980da1f..7cff42b4b9b1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SchemaVersionDescriptor implements org.apache.thrift.TBase<SchemaVersionDescriptor, SchemaVersionDescriptor._Fields>, java.io.Serializable, Cloneable, Comparable<SchemaVersionDescriptor> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SchemaVersionDescriptor");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public SchemaVersionDescriptor(SchemaVersionDescriptor other) {
     this.version = other.version;
   }
 
+  @Override
   public SchemaVersionDescriptor deepCopy() {
     return new SchemaVersionDescriptor(this);
   }
@@ -178,6 +181,7 @@ public void setVersionIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEMA:
@@ -200,6 +204,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEMA:
@@ -213,6 +218,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -306,14 +312,17 @@ public int compareTo(SchemaVersionDescriptor other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -365,6 +374,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SchemaVersionDescriptorStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SchemaVersionDescriptorStandardScheme getScheme() {
       return new SchemaVersionDescriptorStandardScheme();
     }
@@ -372,42 +382,49 @@ public SchemaVersionDescriptorStandardScheme getScheme() {
 
   private static class SchemaVersionDescriptorStandardScheme extends org.apache.thrift.scheme.StandardScheme<SchemaVersionDescriptor> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SchemaVersionDescriptor 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 1: // SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.schema = new ISchemaName();
-              struct.schema.read(iprot);
-              struct.setSchemaIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.version = iprot.readI32();
-              struct.setVersionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEMA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.schema = new ISchemaName();
+                struct.schema.read(iprot);
+                struct.setSchemaIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.version = iprot.readI32();
+                struct.setVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SchemaVersionDescriptor struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -427,6 +444,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SchemaVersionDescr
   }
 
   private static class SchemaVersionDescriptorTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SchemaVersionDescriptorTupleScheme getScheme() {
       return new SchemaVersionDescriptorTupleScheme();
     }
@@ -455,16 +473,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SchemaVersionDescri
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SchemaVersionDescriptor 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.schema = new ISchemaName();
-        struct.schema.read(iprot);
-        struct.setSchemaIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.version = iprot.readI32();
-        struct.setVersionIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.schema = new ISchemaName();
+          struct.schema.read(iprot);
+          struct.setSchemaIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.version = iprot.readI32();
+          struct.setVersionIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java
index 91d12db16182..53d6426d1391 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum SchemaVersionState implements org.apache.thrift.TEnum {
   INITIATED(1),
   START_REVIEW(2),
@@ -27,6 +27,7 @@ private SchemaVersionState(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTableWriteIdsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTableWriteIdsRequest.java
index 70e51e2c0758..2736bc551a91 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTableWriteIdsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTableWriteIdsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SeedTableWriteIdsRequest implements org.apache.thrift.TBase<SeedTableWriteIdsRequest, SeedTableWriteIdsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<SeedTableWriteIdsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SeedTableWriteIdsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -133,6 +135,7 @@ public SeedTableWriteIdsRequest(SeedTableWriteIdsRequest other) {
     this.seedWriteId = other.seedWriteId;
   }
 
+  @Override
   public SeedTableWriteIdsRequest deepCopy() {
     return new SeedTableWriteIdsRequest(this);
   }
@@ -215,6 +218,7 @@ public void setSeedWriteIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SEEDWRITEID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -245,6 +249,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -261,6 +266,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -379,14 +385,17 @@ public int compareTo(SeedTableWriteIdsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -455,6 +464,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SeedTableWriteIdsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SeedTableWriteIdsRequestStandardScheme getScheme() {
       return new SeedTableWriteIdsRequestStandardScheme();
     }
@@ -462,49 +472,56 @@ public SeedTableWriteIdsRequestStandardScheme getScheme() {
 
   private static class SeedTableWriteIdsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<SeedTableWriteIdsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SeedTableWriteIdsRequest 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 1: // DB_NAME
-            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: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // SEED_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.seedWriteId = iprot.readI64();
-              struct.setSeedWriteIdIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SEED_WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.seedWriteId = iprot.readI64();
+                struct.setSeedWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SeedTableWriteIdsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -529,6 +546,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SeedTableWriteIdsR
   }
 
   private static class SeedTableWriteIdsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SeedTableWriteIdsRequestTupleScheme getScheme() {
       return new SeedTableWriteIdsRequestTupleScheme();
     }
@@ -546,13 +564,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SeedTableWriteIdsRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SeedTableWriteIdsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      struct.seedWriteId = iprot.readI64();
-      struct.setSeedWriteIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        struct.seedWriteId = iprot.readI64();
+        struct.setSeedWriteIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTxnIdRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTxnIdRequest.java
index 0cd227356390..b32cb0cda1be 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTxnIdRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SeedTxnIdRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SeedTxnIdRequest implements org.apache.thrift.TBase<SeedTxnIdRequest, SeedTxnIdRequest._Fields>, java.io.Serializable, Cloneable, Comparable<SeedTxnIdRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SeedTxnIdRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public SeedTxnIdRequest(SeedTxnIdRequest other) {
     this.seedTxnId = other.seedTxnId;
   }
 
+  @Override
   public SeedTxnIdRequest deepCopy() {
     return new SeedTxnIdRequest(this);
   }
@@ -141,6 +144,7 @@ public void setSeedTxnIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SEEDTXNID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SEED_TXN_ID:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SEED_TXN_ID:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(SeedTxnIdRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SeedTxnIdRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SeedTxnIdRequestStandardScheme getScheme() {
       return new SeedTxnIdRequestStandardScheme();
     }
@@ -292,33 +302,40 @@ public SeedTxnIdRequestStandardScheme getScheme() {
 
   private static class SeedTxnIdRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<SeedTxnIdRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SeedTxnIdRequest 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 1: // SEED_TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.seedTxnId = iprot.readI64();
-              struct.setSeedTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SEED_TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.seedTxnId = iprot.readI64();
+                struct.setSeedTxnIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SeedTxnIdRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SeedTxnIdRequest s
   }
 
   private static class SeedTxnIdRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SeedTxnIdRequestTupleScheme getScheme() {
       return new SeedTxnIdRequestTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SeedTxnIdRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SeedTxnIdRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.seedTxnId = iprot.readI64();
-      struct.setSeedTxnIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.seedTxnId = iprot.readI64();
+        struct.setSeedTxnIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
index a7f1efddec55..1a739d2db359 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SerDeInfo implements org.apache.thrift.TBase<SerDeInfo, SerDeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SerDeInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SerDeInfo");
 
@@ -103,17 +103,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.DESCRIPTION,_Fields.SERIALIZER_CLASS,_Fields.DESERIALIZER_CLASS,_Fields.SERDE_TYPE};
+  private static final _Fields[] optionals = {_Fields.DESCRIPTION,_Fields.SERIALIZER_CLASS,_Fields.DESERIALIZER_CLASS,_Fields.SERDE_TYPE};
   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);
@@ -179,6 +181,7 @@ public SerDeInfo(SerDeInfo other) {
     }
   }
 
+  @Override
   public SerDeInfo deepCopy() {
     return new SerDeInfo(this);
   }
@@ -381,6 +384,7 @@ public void setSerdeTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -443,6 +447,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -471,6 +476,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -691,14 +697,17 @@ public int compareTo(SerDeInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -797,6 +806,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SerDeInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SerDeInfoStandardScheme getScheme() {
       return new SerDeInfoStandardScheme();
     }
@@ -804,93 +814,100 @@ public SerDeInfoStandardScheme getScheme() {
 
   private static class SerDeInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<SerDeInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SerDeInfo 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SERIALIZATION_LIB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.serializationLib = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setSerializationLibIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map234 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map234.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key235;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val236;
-                for (int _i237 = 0; _i237 < _map234.size; ++_i237)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // SERIALIZATION_LIB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.serializationLib = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setSerializationLibIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key235 = iprot.readString();
-                  _val236 = iprot.readString();
-                  struct.parameters.put(_key235, _val236);
+                  org.apache.thrift.protocol.TMap _map234 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map234.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key235;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val236;
+                  for (int _i237 = 0; _i237 < _map234.size; ++_i237)
+                  {
+                    _key235 = iprot.readString();
+                    _val236 = iprot.readString();
+                    struct.parameters.put(_key235, _val236);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // SERIALIZER_CLASS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.serializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setSerializerClassIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DESERIALIZER_CLASS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.deserializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setDeserializerClassIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // SERDE_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.serdeType = org.apache.hadoop.hive.metastore.api.SerdeType.findByValue(iprot.readI32());
-              struct.setSerdeTypeIsSet(true);
-            } else { 
+              break;
+            case 4: // DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.description = iprot.readString();
+                struct.setDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // SERIALIZER_CLASS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.serializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setSerializerClassIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // DESERIALIZER_CLASS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.deserializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setDeserializerClassIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // SERDE_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.serdeType = org.apache.hadoop.hive.metastore.api.SerdeType.findByValue(iprot.readI32());
+                struct.setSerdeTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SerDeInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -953,6 +970,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SerDeInfo struct)
   }
 
   private static class SerDeInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SerDeInfoTupleScheme getScheme() {
       return new SerDeInfoTupleScheme();
     }
@@ -1018,46 +1036,51 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SerDeInfo struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SerDeInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.serializationLib = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setSerializationLibIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map240 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map240.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key241;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val242;
-          for (int _i243 = 0; _i243 < _map240.size; ++_i243)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.name = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.serializationLib = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setSerializationLibIsSet(true);
+        }
+        if (incoming.get(2)) {
           {
-            _key241 = iprot.readString();
-            _val242 = iprot.readString();
-            struct.parameters.put(_key241, _val242);
+            org.apache.thrift.protocol.TMap _map240 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map240.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key241;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val242;
+            for (int _i243 = 0; _i243 < _map240.size; ++_i243)
+            {
+              _key241 = iprot.readString();
+              _val242 = iprot.readString();
+              struct.parameters.put(_key241, _val242);
+            }
           }
+          struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
         }
-        struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.serializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setSerializerClassIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.deserializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setDeserializerClassIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.serdeType = org.apache.hadoop.hive.metastore.api.SerdeType.findByValue(iprot.readI32());
-        struct.setSerdeTypeIsSet(true);
+        if (incoming.get(3)) {
+          struct.description = iprot.readString();
+          struct.setDescriptionIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.serializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setSerializerClassIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.deserializerClass = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setDeserializerClassIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.serdeType = org.apache.hadoop.hive.metastore.api.SerdeType.findByValue(iprot.readI32());
+          struct.setSerdeTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java
index ae1f796be56f..fde8113581a0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum SerdeType implements org.apache.thrift.TEnum {
   HIVE(1),
   SCHEMA_REGISTRY(2);
@@ -21,6 +21,7 @@ private SerdeType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java
index 90b8fdaed801..5edfcfd220fe 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SetPartitionsStatsRequest implements org.apache.thrift.TBase<SetPartitionsStatsRequest, SetPartitionsStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<SetPartitionsStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetPartitionsStatsRequest");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -102,7 +104,7 @@ public java.lang.String getFieldName() {
   private static final int __NEEDMERGE_ISSET_ID = 0;
   private static final int __WRITEID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.NEED_MERGE,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.ENGINE};
+  private static final _Fields[] optionals = {_Fields.NEED_MERGE,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.ENGINE};
   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);
@@ -157,6 +159,7 @@ public SetPartitionsStatsRequest(SetPartitionsStatsRequest other) {
     }
   }
 
+  @Override
   public SetPartitionsStatsRequest deepCopy() {
     return new SetPartitionsStatsRequest(this);
   }
@@ -305,6 +308,7 @@ public void setEngineIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COL_STATS:
@@ -351,6 +355,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_STATS:
@@ -373,6 +378,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -543,14 +549,17 @@ public int compareTo(SetPartitionsStatsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -631,6 +640,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SetPartitionsStatsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetPartitionsStatsRequestStandardScheme getScheme() {
       return new SetPartitionsStatsRequestStandardScheme();
     }
@@ -638,76 +648,83 @@ public SetPartitionsStatsRequestStandardScheme getScheme() {
 
   private static class SetPartitionsStatsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<SetPartitionsStatsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SetPartitionsStatsRequest 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 1: // COL_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list464 = iprot.readListBegin();
-                struct.colStats = new java.util.ArrayList<ColumnStatistics>(_list464.size);
-                @org.apache.thrift.annotation.Nullable ColumnStatistics _elem465;
-                for (int _i466 = 0; _i466 < _list464.size; ++_i466)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COL_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem465 = new ColumnStatistics();
-                  _elem465.read(iprot);
-                  struct.colStats.add(_elem465);
+                  org.apache.thrift.protocol.TList _list464 = iprot.readListBegin();
+                  struct.colStats = new java.util.ArrayList<ColumnStatistics>(_list464.size);
+                  @org.apache.thrift.annotation.Nullable ColumnStatistics _elem465;
+                  for (int _i466 = 0; _i466 < _list464.size; ++_i466)
+                  {
+                    _elem465 = new ColumnStatistics();
+                    _elem465.read(iprot);
+                    struct.colStats.add(_elem465);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NEED_MERGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.needMerge = iprot.readBool();
-              struct.setNeedMergeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
+              break;
+            case 2: // NEED_MERGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.needMerge = iprot.readBool();
+                struct.setNeedMergeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SetPartitionsStatsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -755,6 +772,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SetPartitionsStats
   }
 
   private static class SetPartitionsStatsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetPartitionsStatsRequestTupleScheme getScheme() {
       return new SetPartitionsStatsRequestTupleScheme();
     }
@@ -802,35 +820,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SetPartitionsStatsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SetPartitionsStatsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list469 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.colStats = new java.util.ArrayList<ColumnStatistics>(_list469.size);
-        @org.apache.thrift.annotation.Nullable ColumnStatistics _elem470;
-        for (int _i471 = 0; _i471 < _list469.size; ++_i471)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem470 = new ColumnStatistics();
-          _elem470.read(iprot);
-          struct.colStats.add(_elem470);
+          org.apache.thrift.protocol.TList _list469 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.colStats = new java.util.ArrayList<ColumnStatistics>(_list469.size);
+          @org.apache.thrift.annotation.Nullable ColumnStatistics _elem470;
+          for (int _i471 = 0; _i471 < _list469.size; ++_i471)
+          {
+            _elem470 = new ColumnStatistics();
+            _elem470.read(iprot);
+            struct.colStats.add(_elem470);
+          }
         }
-      }
-      struct.setColStatsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.needMerge = iprot.readBool();
-        struct.setNeedMergeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
+        struct.setColStatsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.needMerge = iprot.readBool();
+          struct.setNeedMergeIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsResponse.java
index a2ecbaa4a56f..9ab14c7c8c73 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SetPartitionsStatsResponse implements org.apache.thrift.TBase<SetPartitionsStatsResponse, SetPartitionsStatsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<SetPartitionsStatsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetPartitionsStatsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public SetPartitionsStatsResponse(SetPartitionsStatsResponse other) {
     this.result = other.result;
   }
 
+  @Override
   public SetPartitionsStatsResponse deepCopy() {
     return new SetPartitionsStatsResponse(this);
   }
@@ -141,6 +144,7 @@ public void setResultIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESULT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESULT:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESULT:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(SetPartitionsStatsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SetPartitionsStatsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetPartitionsStatsResponseStandardScheme getScheme() {
       return new SetPartitionsStatsResponseStandardScheme();
     }
@@ -292,33 +302,40 @@ public SetPartitionsStatsResponseStandardScheme getScheme() {
 
   private static class SetPartitionsStatsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<SetPartitionsStatsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SetPartitionsStatsResponse 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 1: // RESULT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.result = iprot.readBool();
-              struct.setResultIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // RESULT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.result = iprot.readBool();
+                struct.setResultIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SetPartitionsStatsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SetPartitionsStats
   }
 
   private static class SetPartitionsStatsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetPartitionsStatsResponseTupleScheme getScheme() {
       return new SetPartitionsStatsResponseTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SetPartitionsStatsR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SetPartitionsStatsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.result = iprot.readBool();
-      struct.setResultIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.result = iprot.readBool();
+        struct.setResultIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java
index 70aa2bb83d06..037185d326d9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SetSchemaVersionStateRequest implements org.apache.thrift.TBase<SetSchemaVersionStateRequest, SetSchemaVersionStateRequest._Fields>, java.io.Serializable, Cloneable, Comparable<SetSchemaVersionStateRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetSchemaVersionStateRequest");
 
@@ -78,10 +78,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -123,6 +125,7 @@ public SetSchemaVersionStateRequest(SetSchemaVersionStateRequest other) {
     }
   }
 
+  @Override
   public SetSchemaVersionStateRequest deepCopy() {
     return new SetSchemaVersionStateRequest(this);
   }
@@ -189,6 +192,7 @@ public void setStateIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCHEMA_VERSION:
@@ -211,6 +215,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCHEMA_VERSION:
@@ -224,6 +229,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -319,14 +325,17 @@ public int compareTo(SetSchemaVersionStateRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -380,6 +389,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SetSchemaVersionStateRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetSchemaVersionStateRequestStandardScheme getScheme() {
       return new SetSchemaVersionStateRequestStandardScheme();
     }
@@ -387,42 +397,49 @@ public SetSchemaVersionStateRequestStandardScheme getScheme() {
 
   private static class SetSchemaVersionStateRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<SetSchemaVersionStateRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SetSchemaVersionStateRequest 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 1: // SCHEMA_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.schemaVersion = new SchemaVersionDescriptor();
-              struct.schemaVersion.read(iprot);
-              struct.setSchemaVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // SCHEMA_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.schemaVersion = new SchemaVersionDescriptor();
+                struct.schemaVersion.read(iprot);
+                struct.setSchemaVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SetSchemaVersionStateRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -444,6 +461,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SetSchemaVersionSt
   }
 
   private static class SetSchemaVersionStateRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SetSchemaVersionStateRequestTupleScheme getScheme() {
       return new SetSchemaVersionStateRequestTupleScheme();
     }
@@ -472,16 +490,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SetSchemaVersionSta
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SetSchemaVersionStateRequest 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.schemaVersion = new SchemaVersionDescriptor();
-        struct.schemaVersion.read(iprot);
-        struct.setSchemaVersionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
-        struct.setStateIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.schemaVersion = new SchemaVersionDescriptor();
+          struct.schemaVersion.read(iprot);
+          struct.setSchemaVersionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.state = org.apache.hadoop.hive.metastore.api.SchemaVersionState.findByValue(iprot.readI32());
+          struct.setStateIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java
index 4f12c519dabb..e7a7269b035f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ShowCompactRequest implements org.apache.thrift.TBase<ShowCompactRequest, ShowCompactRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ShowCompactRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowCompactRequest");
 
@@ -113,10 +113,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -126,7 +128,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 0;
   private static final int __LIMIT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ID,_Fields.POOL_NAME,_Fields.DB_NAME,_Fields.TB_NAME,_Fields.PART_NAME,_Fields.TYPE,_Fields.STATE,_Fields.LIMIT,_Fields.ORDER};
+  private static final _Fields[] optionals = {_Fields.ID,_Fields.POOL_NAME,_Fields.DB_NAME,_Fields.TB_NAME,_Fields.PART_NAME,_Fields.TYPE,_Fields.STATE,_Fields.LIMIT,_Fields.ORDER};
   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);
@@ -185,6 +187,7 @@ public ShowCompactRequest(ShowCompactRequest other) {
     }
   }
 
+  @Override
   public ShowCompactRequest deepCopy() {
     return new ShowCompactRequest(this);
   }
@@ -424,6 +427,7 @@ public void setOrderIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ID:
@@ -502,6 +506,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
@@ -536,6 +541,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -806,14 +812,17 @@ public int compareTo(ShowCompactRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -932,6 +941,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ShowCompactRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowCompactRequestStandardScheme getScheme() {
       return new ShowCompactRequestStandardScheme();
     }
@@ -939,97 +949,104 @@ public ShowCompactRequestStandardScheme getScheme() {
 
   private static class ShowCompactRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShowCompactRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ShowCompactRequest 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 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // POOL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolName = iprot.readString();
-              struct.setPoolNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // DB_NAME
-            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 4: // TB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbName = iprot.readString();
-              struct.setTbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PART_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partName = iprot.readString();
-              struct.setPartNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.state = iprot.readString();
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // LIMIT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.limit = iprot.readI64();
-              struct.setLimitIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 9: // ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.order = iprot.readString();
-              struct.setOrderIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POOL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolName = iprot.readString();
+                struct.setPoolNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DB_NAME
+              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 4: // TB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbName = iprot.readString();
+                struct.setTbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PART_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partName = iprot.readString();
+                struct.setPartNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.state = iprot.readString();
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // LIMIT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.limit = iprot.readI64();
+                struct.setLimitIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // ORDER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.order = iprot.readString();
+                struct.setOrderIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ShowCompactRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1100,6 +1117,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowCompactRequest
   }
 
   private static class ShowCompactRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowCompactRequestTupleScheme getScheme() {
       return new ShowCompactRequestTupleScheme();
     }
@@ -1170,43 +1188,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowCompactRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ShowCompactRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.poolName = iprot.readString();
-        struct.setPoolNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.tbName = iprot.readString();
-        struct.setTbNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.partName = iprot.readString();
-        struct.setPartNameIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.state = iprot.readString();
-        struct.setStateIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.limit = iprot.readI64();
-        struct.setLimitIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.order = iprot.readString();
-        struct.setOrderIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.poolName = iprot.readString();
+          struct.setPoolNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.tbName = iprot.readString();
+          struct.setTbNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.partName = iprot.readString();
+          struct.setPartNameIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+          struct.setTypeIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.state = iprot.readString();
+          struct.setStateIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.limit = iprot.readI64();
+          struct.setLimitIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.order = iprot.readString();
+          struct.setOrderIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
index daaff9b18d75..734dee92f766 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ShowCompactResponse implements org.apache.thrift.TBase<ShowCompactResponse, ShowCompactResponse._Fields>, java.io.Serializable, Cloneable, Comparable<ShowCompactResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowCompactResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public ShowCompactResponse(ShowCompactResponse other) {
     }
   }
 
+  @Override
   public ShowCompactResponse deepCopy() {
     return new ShowCompactResponse(this);
   }
@@ -161,6 +164,7 @@ public void setCompactsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COMPACTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPACTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(ShowCompactResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ShowCompactResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowCompactResponseStandardScheme getScheme() {
       return new ShowCompactResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public ShowCompactResponseStandardScheme getScheme() {
 
   private static class ShowCompactResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShowCompactResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ShowCompactResponse 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 1: // COMPACTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list944 = iprot.readListBegin();
-                struct.compacts = new java.util.ArrayList<ShowCompactResponseElement>(_list944.size);
-                @org.apache.thrift.annotation.Nullable ShowCompactResponseElement _elem945;
-                for (int _i946 = 0; _i946 < _list944.size; ++_i946)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COMPACTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem945 = new ShowCompactResponseElement();
-                  _elem945.read(iprot);
-                  struct.compacts.add(_elem945);
+                  org.apache.thrift.protocol.TList _list944 = iprot.readListBegin();
+                  struct.compacts = new java.util.ArrayList<ShowCompactResponseElement>(_list944.size);
+                  @org.apache.thrift.annotation.Nullable ShowCompactResponseElement _elem945;
+                  for (int _i946 = 0; _i946 < _list944.size; ++_i946)
+                  {
+                    _elem945 = new ShowCompactResponseElement();
+                    _elem945.read(iprot);
+                    struct.compacts.add(_elem945);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setCompactsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setCompactsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ShowCompactResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowCompactRespons
   }
 
   private static class ShowCompactResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowCompactResponseTupleScheme getScheme() {
       return new ShowCompactResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowCompactResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ShowCompactResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list949 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.compacts = new java.util.ArrayList<ShowCompactResponseElement>(_list949.size);
-        @org.apache.thrift.annotation.Nullable ShowCompactResponseElement _elem950;
-        for (int _i951 = 0; _i951 < _list949.size; ++_i951)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem950 = new ShowCompactResponseElement();
-          _elem950.read(iprot);
-          struct.compacts.add(_elem950);
+          org.apache.thrift.protocol.TList _list949 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.compacts = new java.util.ArrayList<ShowCompactResponseElement>(_list949.size);
+          @org.apache.thrift.annotation.Nullable ShowCompactResponseElement _elem950;
+          for (int _i951 = 0; _i951 < _list949.size; ++_i951)
+          {
+            _elem950 = new ShowCompactResponseElement();
+            _elem950.read(iprot);
+            struct.compacts.add(_elem950);
+          }
         }
+        struct.setCompactsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setCompactsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java
index ee0f4bf50187..1da0c718476f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowCompactResponseElement, ShowCompactResponseElement._Fields>, java.io.Serializable, Cloneable, Comparable<ShowCompactResponseElement> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowCompactResponseElement");
 
@@ -188,10 +188,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -209,7 +211,7 @@ public java.lang.String getFieldName() {
   private static final int __COMMITTIME_ISSET_ID = 8;
   private static final int __HIGHTESTWRITEID_ISSET_ID = 9;
   private short __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITIONNAME,_Fields.WORKERID,_Fields.START,_Fields.RUN_AS,_Fields.HIGHTEST_TXN_ID,_Fields.META_INFO,_Fields.END_TIME,_Fields.HADOOP_JOB_ID,_Fields.ID,_Fields.ERROR_MESSAGE,_Fields.ENQUEUE_TIME,_Fields.WORKER_VERSION,_Fields.INITIATOR_ID,_Fields.INITIATOR_VERSION,_Fields.CLEANER_START,_Fields.POOL_NAME,_Fields.NEXT_TXN_ID,_Fields.TXN_ID,_Fields.COMMIT_TIME,_Fields.HIGHTEST_WRITE_ID};
+  private static final _Fields[] optionals = {_Fields.PARTITIONNAME,_Fields.WORKERID,_Fields.START,_Fields.RUN_AS,_Fields.HIGHTEST_TXN_ID,_Fields.META_INFO,_Fields.END_TIME,_Fields.HADOOP_JOB_ID,_Fields.ID,_Fields.ERROR_MESSAGE,_Fields.ENQUEUE_TIME,_Fields.WORKER_VERSION,_Fields.INITIATOR_ID,_Fields.INITIATOR_VERSION,_Fields.CLEANER_START,_Fields.POOL_NAME,_Fields.NEXT_TXN_ID,_Fields.TXN_ID,_Fields.COMMIT_TIME,_Fields.HIGHTEST_WRITE_ID};
   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);
@@ -342,6 +344,7 @@ public ShowCompactResponseElement(ShowCompactResponseElement other) {
     this.hightestWriteId = other.hightestWriteId;
   }
 
+  @Override
   public ShowCompactResponseElement deepCopy() {
     return new ShowCompactResponseElement(this);
   }
@@ -949,6 +952,7 @@ public void setHightestWriteIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HIGHTESTWRITEID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DBNAME:
@@ -1147,6 +1151,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DBNAME:
@@ -1226,6 +1231,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1871,14 +1877,17 @@ public int compareTo(ShowCompactResponseElement other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -2123,6 +2132,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ShowCompactResponseElementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowCompactResponseElementStandardScheme getScheme() {
       return new ShowCompactResponseElementStandardScheme();
     }
@@ -2130,217 +2140,224 @@ public ShowCompactResponseElementStandardScheme getScheme() {
 
   private static class ShowCompactResponseElementStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShowCompactResponseElement> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ShowCompactResponseElement 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 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: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PARTITIONNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionname = iprot.readString();
-              struct.setPartitionnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.state = iprot.readString();
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // WORKERID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.workerid = iprot.readString();
-              struct.setWorkeridIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // START
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.start = iprot.readI64();
-              struct.setStartIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // RUN_AS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.runAs = iprot.readString();
-              struct.setRunAsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // HIGHTEST_TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.hightestTxnId = iprot.readI64();
-              struct.setHightestTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // META_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.metaInfo = iprot.readString();
-              struct.setMetaInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // END_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.endTime = iprot.readI64();
-              struct.setEndTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // HADOOP_JOB_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hadoopJobId = iprot.readString();
-              struct.setHadoopJobIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // ERROR_MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.errorMessage = iprot.readString();
-              struct.setErrorMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // ENQUEUE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.enqueueTime = iprot.readI64();
-              struct.setEnqueueTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 16: // WORKER_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.workerVersion = iprot.readString();
-              struct.setWorkerVersionIsSet(true);
-            } else { 
+          }
+          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: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTITIONNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionname = iprot.readString();
+                struct.setPartitionnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.state = iprot.readString();
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // WORKERID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.workerid = iprot.readString();
+                struct.setWorkeridIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // START
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.start = iprot.readI64();
+                struct.setStartIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // RUN_AS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.runAs = iprot.readString();
+                struct.setRunAsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // HIGHTEST_TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.hightestTxnId = iprot.readI64();
+                struct.setHightestTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // META_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.metaInfo = iprot.readString();
+                struct.setMetaInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // END_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.endTime = iprot.readI64();
+                struct.setEndTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // HADOOP_JOB_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.hadoopJobId = iprot.readString();
+                struct.setHadoopJobIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 14: // ERROR_MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.errorMessage = iprot.readString();
+                struct.setErrorMessageIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 15: // ENQUEUE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.enqueueTime = iprot.readI64();
+                struct.setEnqueueTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 16: // WORKER_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.workerVersion = iprot.readString();
+                struct.setWorkerVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 17: // INITIATOR_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.initiatorId = iprot.readString();
+                struct.setInitiatorIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 18: // INITIATOR_VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.initiatorVersion = iprot.readString();
+                struct.setInitiatorVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 19: // CLEANER_START
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.cleanerStart = iprot.readI64();
+                struct.setCleanerStartIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 20: // POOL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolName = iprot.readString();
+                struct.setPoolNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 21: // NEXT_TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.nextTxnId = iprot.readI64();
+                struct.setNextTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 22: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 23: // COMMIT_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.commitTime = iprot.readI64();
+                struct.setCommitTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 24: // HIGHTEST_WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.hightestWriteId = iprot.readI64();
+                struct.setHightestWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 17: // INITIATOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.initiatorId = iprot.readString();
-              struct.setInitiatorIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 18: // INITIATOR_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.initiatorVersion = iprot.readString();
-              struct.setInitiatorVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 19: // CLEANER_START
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.cleanerStart = iprot.readI64();
-              struct.setCleanerStartIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 20: // POOL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolName = iprot.readString();
-              struct.setPoolNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 21: // NEXT_TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.nextTxnId = iprot.readI64();
-              struct.setNextTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 22: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 23: // COMMIT_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.commitTime = iprot.readI64();
-              struct.setCommitTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 24: // HIGHTEST_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.hightestWriteId = iprot.readI64();
-              struct.setHightestWriteIdIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ShowCompactResponseElement struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -2492,6 +2509,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowCompactRespons
   }
 
   private static class ShowCompactResponseElementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowCompactResponseElementTupleScheme getScheme() {
       return new ShowCompactResponseElementTupleScheme();
     }
@@ -2632,95 +2650,100 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowCompactResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ShowCompactResponseElement struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.tablename = iprot.readString();
-      struct.setTablenameIsSet(true);
-      struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      struct.state = iprot.readString();
-      struct.setStateIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(20);
-      if (incoming.get(0)) {
-        struct.partitionname = iprot.readString();
-        struct.setPartitionnameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.workerid = iprot.readString();
-        struct.setWorkeridIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.start = iprot.readI64();
-        struct.setStartIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.runAs = iprot.readString();
-        struct.setRunAsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.hightestTxnId = iprot.readI64();
-        struct.setHightestTxnIdIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.metaInfo = iprot.readString();
-        struct.setMetaInfoIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.endTime = iprot.readI64();
-        struct.setEndTimeIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.hadoopJobId = iprot.readString();
-        struct.setHadoopJobIdIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.errorMessage = iprot.readString();
-        struct.setErrorMessageIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.enqueueTime = iprot.readI64();
-        struct.setEnqueueTimeIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.workerVersion = iprot.readString();
-        struct.setWorkerVersionIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.initiatorId = iprot.readString();
-        struct.setInitiatorIdIsSet(true);
-      }
-      if (incoming.get(13)) {
-        struct.initiatorVersion = iprot.readString();
-        struct.setInitiatorVersionIsSet(true);
-      }
-      if (incoming.get(14)) {
-        struct.cleanerStart = iprot.readI64();
-        struct.setCleanerStartIsSet(true);
-      }
-      if (incoming.get(15)) {
-        struct.poolName = iprot.readString();
-        struct.setPoolNameIsSet(true);
-      }
-      if (incoming.get(16)) {
-        struct.nextTxnId = iprot.readI64();
-        struct.setNextTxnIdIsSet(true);
-      }
-      if (incoming.get(17)) {
-        struct.txnId = iprot.readI64();
-        struct.setTxnIdIsSet(true);
-      }
-      if (incoming.get(18)) {
-        struct.commitTime = iprot.readI64();
-        struct.setCommitTimeIsSet(true);
-      }
-      if (incoming.get(19)) {
-        struct.hightestWriteId = iprot.readI64();
-        struct.setHightestWriteIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.tablename = iprot.readString();
+        struct.setTablenameIsSet(true);
+        struct.type = org.apache.hadoop.hive.metastore.api.CompactionType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        struct.state = iprot.readString();
+        struct.setStateIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(20);
+        if (incoming.get(0)) {
+          struct.partitionname = iprot.readString();
+          struct.setPartitionnameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.workerid = iprot.readString();
+          struct.setWorkeridIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.start = iprot.readI64();
+          struct.setStartIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.runAs = iprot.readString();
+          struct.setRunAsIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.hightestTxnId = iprot.readI64();
+          struct.setHightestTxnIdIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.metaInfo = iprot.readString();
+          struct.setMetaInfoIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.endTime = iprot.readI64();
+          struct.setEndTimeIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.hadoopJobId = iprot.readString();
+          struct.setHadoopJobIdIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(9)) {
+          struct.errorMessage = iprot.readString();
+          struct.setErrorMessageIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.enqueueTime = iprot.readI64();
+          struct.setEnqueueTimeIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.workerVersion = iprot.readString();
+          struct.setWorkerVersionIsSet(true);
+        }
+        if (incoming.get(12)) {
+          struct.initiatorId = iprot.readString();
+          struct.setInitiatorIdIsSet(true);
+        }
+        if (incoming.get(13)) {
+          struct.initiatorVersion = iprot.readString();
+          struct.setInitiatorVersionIsSet(true);
+        }
+        if (incoming.get(14)) {
+          struct.cleanerStart = iprot.readI64();
+          struct.setCleanerStartIsSet(true);
+        }
+        if (incoming.get(15)) {
+          struct.poolName = iprot.readString();
+          struct.setPoolNameIsSet(true);
+        }
+        if (incoming.get(16)) {
+          struct.nextTxnId = iprot.readI64();
+          struct.setNextTxnIdIsSet(true);
+        }
+        if (incoming.get(17)) {
+          struct.txnId = iprot.readI64();
+          struct.setTxnIdIsSet(true);
+        }
+        if (incoming.get(18)) {
+          struct.commitTime = iprot.readI64();
+          struct.setCommitTimeIsSet(true);
+        }
+        if (incoming.get(19)) {
+          struct.hightestWriteId = iprot.readI64();
+          struct.setHightestWriteIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java
index 554fe817b110..910de568a11f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksRequest, ShowLocksRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ShowLocksRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowLocksRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __ISEXTENDED_ISSET_ID = 0;
   private static final int __TXNID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTNAME,_Fields.IS_EXTENDED,_Fields.TXNID,_Fields.CATNAME};
+  private static final _Fields[] optionals = {_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTNAME,_Fields.IS_EXTENDED,_Fields.TXNID,_Fields.CATNAME};
   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);
@@ -155,6 +157,7 @@ public ShowLocksRequest(ShowLocksRequest other) {
     }
   }
 
+  @Override
   public ShowLocksRequest deepCopy() {
     return new ShowLocksRequest(this);
   }
@@ -312,6 +315,7 @@ public void setCatnameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DBNAME:
@@ -366,6 +370,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DBNAME:
@@ -391,6 +396,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -586,14 +592,17 @@ public int compareTo(ShowLocksRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -682,6 +691,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ShowLocksRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowLocksRequestStandardScheme getScheme() {
       return new ShowLocksRequestStandardScheme();
     }
@@ -689,73 +699,80 @@ public ShowLocksRequestStandardScheme getScheme() {
 
   private static class ShowLocksRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShowLocksRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ShowLocksRequest 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 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: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PARTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partname = iprot.readString();
-              struct.setPartnameIsSet(true);
-            } else { 
+          }
+          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: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PARTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partname = iprot.readString();
+                struct.setPartnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // IS_EXTENDED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isExtended = iprot.readBool();
+                struct.setIsExtendedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // CATNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catname = iprot.readString();
+                struct.setCatnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // IS_EXTENDED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isExtended = iprot.readBool();
-              struct.setIsExtendedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // CATNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catname = iprot.readString();
-              struct.setCatnameIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -805,6 +822,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksRequest s
   }
 
   private static class ShowLocksRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowLocksRequestTupleScheme getScheme() {
       return new ShowLocksRequestTupleScheme();
     }
@@ -857,31 +875,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowLocksRequest st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ShowLocksRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.dbname = iprot.readString();
-        struct.setDbnameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.tablename = iprot.readString();
-        struct.setTablenameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.partname = iprot.readString();
-        struct.setPartnameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.isExtended = iprot.readBool();
-        struct.setIsExtendedIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.txnid = iprot.readI64();
-        struct.setTxnidIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.catname = iprot.readString();
-        struct.setCatnameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.dbname = iprot.readString();
+          struct.setDbnameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.tablename = iprot.readString();
+          struct.setTablenameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.partname = iprot.readString();
+          struct.setPartnameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.isExtended = iprot.readBool();
+          struct.setIsExtendedIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.txnid = iprot.readI64();
+          struct.setTxnidIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.catname = iprot.readString();
+          struct.setCatnameIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
index da84630b9732..d6b5c89f4b58 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ShowLocksResponse implements org.apache.thrift.TBase<ShowLocksResponse, ShowLocksResponse._Fields>, java.io.Serializable, Cloneable, Comparable<ShowLocksResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowLocksResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public ShowLocksResponse(ShowLocksResponse other) {
     }
   }
 
+  @Override
   public ShowLocksResponse deepCopy() {
     return new ShowLocksResponse(this);
   }
@@ -161,6 +164,7 @@ public void setLocksIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCKS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCKS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(ShowLocksResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -305,6 +314,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ShowLocksResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowLocksResponseStandardScheme getScheme() {
       return new ShowLocksResponseStandardScheme();
     }
@@ -312,44 +322,51 @@ public ShowLocksResponseStandardScheme getScheme() {
 
   private static class ShowLocksResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShowLocksResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ShowLocksResponse 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 1: // LOCKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list910 = iprot.readListBegin();
-                struct.locks = new java.util.ArrayList<ShowLocksResponseElement>(_list910.size);
-                @org.apache.thrift.annotation.Nullable ShowLocksResponseElement _elem911;
-                for (int _i912 = 0; _i912 < _list910.size; ++_i912)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // LOCKS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem911 = new ShowLocksResponseElement();
-                  _elem911.read(iprot);
-                  struct.locks.add(_elem911);
+                  org.apache.thrift.protocol.TList _list910 = iprot.readListBegin();
+                  struct.locks = new java.util.ArrayList<ShowLocksResponseElement>(_list910.size);
+                  @org.apache.thrift.annotation.Nullable ShowLocksResponseElement _elem911;
+                  for (int _i912 = 0; _i912 < _list910.size; ++_i912)
+                  {
+                    _elem911 = new ShowLocksResponseElement();
+                    _elem911.read(iprot);
+                    struct.locks.add(_elem911);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setLocksIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setLocksIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -373,6 +390,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksResponse
   }
 
   private static class ShowLocksResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowLocksResponseTupleScheme getScheme() {
       return new ShowLocksResponseTupleScheme();
     }
@@ -401,21 +419,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponse s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponse 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 _list915 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.locks = new java.util.ArrayList<ShowLocksResponseElement>(_list915.size);
-          @org.apache.thrift.annotation.Nullable ShowLocksResponseElement _elem916;
-          for (int _i917 = 0; _i917 < _list915.size; ++_i917)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem916 = new ShowLocksResponseElement();
-            _elem916.read(iprot);
-            struct.locks.add(_elem916);
+            org.apache.thrift.protocol.TList _list915 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.locks = new java.util.ArrayList<ShowLocksResponseElement>(_list915.size);
+            @org.apache.thrift.annotation.Nullable ShowLocksResponseElement _elem916;
+            for (int _i917 = 0; _i917 < _list915.size; ++_i917)
+            {
+              _elem916 = new ShowLocksResponseElement();
+              _elem916.read(iprot);
+              struct.locks.add(_elem916);
+            }
           }
+          struct.setLocksIsSet(true);
         }
-        struct.setLocksIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java
index 4840f121c828..a20d8e25ec91 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLocksResponseElement, ShowLocksResponseElement._Fields>, java.io.Serializable, Cloneable, Comparable<ShowLocksResponseElement> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowLocksResponseElement");
 
@@ -157,10 +157,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -176,7 +178,7 @@ public java.lang.String getFieldName() {
   private static final int __BLOCKEDBYINTID_ISSET_ID = 6;
   private static final int __LOCKIDINTERNAL_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TABLENAME,_Fields.PARTNAME,_Fields.TXNID,_Fields.ACQUIREDAT,_Fields.HEARTBEAT_COUNT,_Fields.AGENT_INFO,_Fields.BLOCKED_BY_EXT_ID,_Fields.BLOCKED_BY_INT_ID,_Fields.LOCK_ID_INTERNAL};
+  private static final _Fields[] optionals = {_Fields.TABLENAME,_Fields.PARTNAME,_Fields.TXNID,_Fields.ACQUIREDAT,_Fields.HEARTBEAT_COUNT,_Fields.AGENT_INFO,_Fields.BLOCKED_BY_EXT_ID,_Fields.BLOCKED_BY_INT_ID,_Fields.LOCK_ID_INTERNAL};
   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);
@@ -288,6 +290,7 @@ public ShowLocksResponseElement(ShowLocksResponseElement other) {
     }
   }
 
+  @Override
   public ShowLocksResponseElement deepCopy() {
     return new ShowLocksResponseElement(this);
   }
@@ -729,6 +732,7 @@ public void setCatnameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCKID:
@@ -871,6 +875,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCKID:
@@ -929,6 +934,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1395,14 +1401,17 @@ public int compareTo(ShowLocksResponseElement other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1593,6 +1602,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ShowLocksResponseElementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowLocksResponseElementStandardScheme getScheme() {
       return new ShowLocksResponseElementStandardScheme();
     }
@@ -1600,161 +1610,168 @@ public ShowLocksResponseElementStandardScheme getScheme() {
 
   private static class ShowLocksResponseElementStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShowLocksResponseElement> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, ShowLocksResponseElement 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 1: // LOCKID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lockid = iprot.readI64();
-              struct.setLockidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // 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 3: // TABLENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tablename = iprot.readString();
-              struct.setTablenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // PARTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partname = iprot.readString();
-              struct.setPartnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // TXNID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnid = iprot.readI64();
-              struct.setTxnidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // LASTHEARTBEAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastheartbeat = iprot.readI64();
-              struct.setLastheartbeatIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // ACQUIREDAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.acquiredat = iprot.readI64();
-              struct.setAcquiredatIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // HOSTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hostname = iprot.readString();
-              struct.setHostnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // HEARTBEAT_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.heartbeatCount = iprot.readI32();
-              struct.setHeartbeatCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // AGENT_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.agentInfo = iprot.readString();
-              struct.setAgentInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // BLOCKED_BY_EXT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.blockedByExtId = iprot.readI64();
-              struct.setBlockedByExtIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // BLOCKED_BY_INT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.blockedByIntId = iprot.readI64();
-              struct.setBlockedByIntIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 16: // LOCK_ID_INTERNAL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lockIdInternal = iprot.readI64();
-              struct.setLockIdInternalIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 17: // CATNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catname = iprot.readString();
-              struct.setCatnameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOCKID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lockid = iprot.readI64();
+                struct.setLockidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // 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 3: // TABLENAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tablename = iprot.readString();
+                struct.setTablenameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partname = iprot.readString();
+                struct.setPartnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // TXNID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnid = iprot.readI64();
+                struct.setTxnidIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // LASTHEARTBEAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lastheartbeat = iprot.readI64();
+                struct.setLastheartbeatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // ACQUIREDAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.acquiredat = iprot.readI64();
+                struct.setAcquiredatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 10: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // HOSTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.hostname = iprot.readString();
+                struct.setHostnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // HEARTBEAT_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.heartbeatCount = iprot.readI32();
+                struct.setHeartbeatCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // AGENT_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.agentInfo = iprot.readString();
+                struct.setAgentInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 14: // BLOCKED_BY_EXT_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.blockedByExtId = iprot.readI64();
+                struct.setBlockedByExtIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 15: // BLOCKED_BY_INT_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.blockedByIntId = iprot.readI64();
+                struct.setBlockedByIntIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 16: // LOCK_ID_INTERNAL
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lockIdInternal = iprot.readI64();
+                struct.setLockIdInternalIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 17: // CATNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catname = iprot.readString();
+                struct.setCatnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksResponseElement struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1853,6 +1870,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksResponseE
   }
 
   private static class ShowLocksResponseElementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ShowLocksResponseElementTupleScheme getScheme() {
       return new ShowLocksResponseElementTupleScheme();
     }
@@ -1931,59 +1949,64 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponseEl
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponseElement struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.lockid = iprot.readI64();
-      struct.setLockidIsSet(true);
-      struct.dbname = iprot.readString();
-      struct.setDbnameIsSet(true);
-      struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
-      struct.setStateIsSet(true);
-      struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      struct.lastheartbeat = iprot.readI64();
-      struct.setLastheartbeatIsSet(true);
-      struct.user = iprot.readString();
-      struct.setUserIsSet(true);
-      struct.hostname = iprot.readString();
-      struct.setHostnameIsSet(true);
-      struct.catname = iprot.readString();
-      struct.setCatnameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(9);
-      if (incoming.get(0)) {
-        struct.tablename = iprot.readString();
-        struct.setTablenameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.partname = iprot.readString();
-        struct.setPartnameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.txnid = iprot.readI64();
-        struct.setTxnidIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.acquiredat = iprot.readI64();
-        struct.setAcquiredatIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.heartbeatCount = iprot.readI32();
-        struct.setHeartbeatCountIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.agentInfo = iprot.readString();
-        struct.setAgentInfoIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.blockedByExtId = iprot.readI64();
-        struct.setBlockedByExtIdIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.blockedByIntId = iprot.readI64();
-        struct.setBlockedByIntIdIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.lockIdInternal = iprot.readI64();
-        struct.setLockIdInternalIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.lockid = iprot.readI64();
+        struct.setLockidIsSet(true);
+        struct.dbname = iprot.readString();
+        struct.setDbnameIsSet(true);
+        struct.state = org.apache.hadoop.hive.metastore.api.LockState.findByValue(iprot.readI32());
+        struct.setStateIsSet(true);
+        struct.type = org.apache.hadoop.hive.metastore.api.LockType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
+        struct.lastheartbeat = iprot.readI64();
+        struct.setLastheartbeatIsSet(true);
+        struct.user = iprot.readString();
+        struct.setUserIsSet(true);
+        struct.hostname = iprot.readString();
+        struct.setHostnameIsSet(true);
+        struct.catname = iprot.readString();
+        struct.setCatnameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(9);
+        if (incoming.get(0)) {
+          struct.tablename = iprot.readString();
+          struct.setTablenameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.partname = iprot.readString();
+          struct.setPartnameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.txnid = iprot.readI64();
+          struct.setTxnidIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.acquiredat = iprot.readI64();
+          struct.setAcquiredatIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.heartbeatCount = iprot.readI32();
+          struct.setHeartbeatCountIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.agentInfo = iprot.readString();
+          struct.setAgentInfoIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.blockedByExtId = iprot.readI64();
+          struct.setBlockedByExtIdIsSet(true);
+        }
+        if (incoming.get(7)) {
+          struct.blockedByIntId = iprot.readI64();
+          struct.setBlockedByIntIdIsSet(true);
+        }
+        if (incoming.get(8)) {
+          struct.lockIdInternal = iprot.readI64();
+          struct.setLockIdInternalIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
index 18f44ff46331..784159ab94c7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SkewedInfo implements org.apache.thrift.TBase<SkewedInfo, SkewedInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SkewedInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SkewedInfo");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -155,6 +157,7 @@ public SkewedInfo(SkewedInfo other) {
     }
   }
 
+  @Override
   public SkewedInfo deepCopy() {
     return new SkewedInfo(this);
   }
@@ -281,6 +284,7 @@ public void setSkewedColValueLocationMapsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SKEWED_COL_NAMES:
@@ -311,6 +315,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SKEWED_COL_NAMES:
@@ -327,6 +332,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -447,14 +453,17 @@ public int compareTo(SkewedInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -513,6 +522,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SkewedInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SkewedInfoStandardScheme getScheme() {
       return new SkewedInfoStandardScheme();
     }
@@ -520,101 +530,108 @@ public SkewedInfoStandardScheme getScheme() {
 
   private static class SkewedInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<SkewedInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SkewedInfo 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 1: // SKEWED_COL_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list244 = iprot.readListBegin();
-                struct.skewedColNames = new java.util.ArrayList<java.lang.String>(_list244.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem245;
-                for (int _i246 = 0; _i246 < _list244.size; ++_i246)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // SKEWED_COL_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem245 = iprot.readString();
-                  struct.skewedColNames.add(_elem245);
+                  org.apache.thrift.protocol.TList _list244 = iprot.readListBegin();
+                  struct.skewedColNames = new java.util.ArrayList<java.lang.String>(_list244.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem245;
+                  for (int _i246 = 0; _i246 < _list244.size; ++_i246)
+                  {
+                    _elem245 = iprot.readString();
+                    struct.skewedColNames.add(_elem245);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSkewedColNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSkewedColNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SKEWED_COL_VALUES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list247 = iprot.readListBegin();
-                struct.skewedColValues = new java.util.ArrayList<java.util.List<java.lang.String>>(_list247.size);
-                @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem248;
-                for (int _i249 = 0; _i249 < _list247.size; ++_i249)
+              break;
+            case 2: // SKEWED_COL_VALUES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
+                  org.apache.thrift.protocol.TList _list247 = iprot.readListBegin();
+                  struct.skewedColValues = new java.util.ArrayList<java.util.List<java.lang.String>>(_list247.size);
+                  @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem248;
+                  for (int _i249 = 0; _i249 < _list247.size; ++_i249)
                   {
-                    org.apache.thrift.protocol.TList _list250 = iprot.readListBegin();
-                    _elem248 = new java.util.ArrayList<java.lang.String>(_list250.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _elem251;
-                    for (int _i252 = 0; _i252 < _list250.size; ++_i252)
                     {
-                      _elem251 = iprot.readString();
-                      _elem248.add(_elem251);
+                      org.apache.thrift.protocol.TList _list250 = iprot.readListBegin();
+                      _elem248 = new java.util.ArrayList<java.lang.String>(_list250.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _elem251;
+                      for (int _i252 = 0; _i252 < _list250.size; ++_i252)
+                      {
+                        _elem251 = iprot.readString();
+                        _elem248.add(_elem251);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    struct.skewedColValues.add(_elem248);
                   }
-                  struct.skewedColValues.add(_elem248);
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSkewedColValuesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSkewedColValuesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SKEWED_COL_VALUE_LOCATION_MAPS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map253 = iprot.readMapBegin();
-                struct.skewedColValueLocationMaps = new java.util.HashMap<java.util.List<java.lang.String>,java.lang.String>(2*_map253.size);
-                @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _key254;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val255;
-                for (int _i256 = 0; _i256 < _map253.size; ++_i256)
+              break;
+            case 3: // SKEWED_COL_VALUE_LOCATION_MAPS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
+                  org.apache.thrift.protocol.TMap _map253 = iprot.readMapBegin();
+                  struct.skewedColValueLocationMaps = new java.util.HashMap<java.util.List<java.lang.String>,java.lang.String>(2*_map253.size);
+                  @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _key254;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val255;
+                  for (int _i256 = 0; _i256 < _map253.size; ++_i256)
                   {
-                    org.apache.thrift.protocol.TList _list257 = iprot.readListBegin();
-                    _key254 = new java.util.ArrayList<java.lang.String>(_list257.size);
-                    @org.apache.thrift.annotation.Nullable java.lang.String _elem258;
-                    for (int _i259 = 0; _i259 < _list257.size; ++_i259)
                     {
-                      _elem258 = iprot.readString();
-                      _key254.add(_elem258);
+                      org.apache.thrift.protocol.TList _list257 = iprot.readListBegin();
+                      _key254 = new java.util.ArrayList<java.lang.String>(_list257.size);
+                      @org.apache.thrift.annotation.Nullable java.lang.String _elem258;
+                      for (int _i259 = 0; _i259 < _list257.size; ++_i259)
+                      {
+                        _elem258 = iprot.readString();
+                        _key254.add(_elem258);
+                      }
+                      iprot.readListEnd();
                     }
-                    iprot.readListEnd();
+                    _val255 = iprot.readString();
+                    struct.skewedColValueLocationMaps.put(_key254, _val255);
                   }
-                  _val255 = iprot.readString();
-                  struct.skewedColValueLocationMaps.put(_key254, _val255);
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setSkewedColValueLocationMapsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSkewedColValueLocationMapsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SkewedInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -677,6 +694,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SkewedInfo struct)
   }
 
   private static class SkewedInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SkewedInfoTupleScheme getScheme() {
       return new SkewedInfoTupleScheme();
     }
@@ -742,66 +760,71 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SkewedInfo struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SkewedInfo 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)) {
-        {
-          org.apache.thrift.protocol.TList _list270 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.skewedColNames = new java.util.ArrayList<java.lang.String>(_list270.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem271;
-          for (int _i272 = 0; _i272 < _list270.size; ++_i272)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _elem271 = iprot.readString();
-            struct.skewedColNames.add(_elem271);
+            org.apache.thrift.protocol.TList _list270 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.skewedColNames = new java.util.ArrayList<java.lang.String>(_list270.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem271;
+            for (int _i272 = 0; _i272 < _list270.size; ++_i272)
+            {
+              _elem271 = iprot.readString();
+              struct.skewedColNames.add(_elem271);
+            }
           }
+          struct.setSkewedColNamesIsSet(true);
         }
-        struct.setSkewedColNamesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list273 = iprot.readListBegin(org.apache.thrift.protocol.TType.LIST);
-          struct.skewedColValues = new java.util.ArrayList<java.util.List<java.lang.String>>(_list273.size);
-          @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem274;
-          for (int _i275 = 0; _i275 < _list273.size; ++_i275)
+        if (incoming.get(1)) {
           {
+            org.apache.thrift.protocol.TList _list273 = iprot.readListBegin(org.apache.thrift.protocol.TType.LIST);
+            struct.skewedColValues = new java.util.ArrayList<java.util.List<java.lang.String>>(_list273.size);
+            @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _elem274;
+            for (int _i275 = 0; _i275 < _list273.size; ++_i275)
             {
-              org.apache.thrift.protocol.TList _list276 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-              _elem274 = new java.util.ArrayList<java.lang.String>(_list276.size);
-              @org.apache.thrift.annotation.Nullable java.lang.String _elem277;
-              for (int _i278 = 0; _i278 < _list276.size; ++_i278)
               {
-                _elem277 = iprot.readString();
-                _elem274.add(_elem277);
+                org.apache.thrift.protocol.TList _list276 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+                _elem274 = new java.util.ArrayList<java.lang.String>(_list276.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem277;
+                for (int _i278 = 0; _i278 < _list276.size; ++_i278)
+                {
+                  _elem277 = iprot.readString();
+                  _elem274.add(_elem277);
+                }
               }
+              struct.skewedColValues.add(_elem274);
             }
-            struct.skewedColValues.add(_elem274);
           }
+          struct.setSkewedColValuesIsSet(true);
         }
-        struct.setSkewedColValuesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map279 = iprot.readMapBegin(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRING); 
-          struct.skewedColValueLocationMaps = new java.util.HashMap<java.util.List<java.lang.String>,java.lang.String>(2*_map279.size);
-          @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _key280;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val281;
-          for (int _i282 = 0; _i282 < _map279.size; ++_i282)
+        if (incoming.get(2)) {
           {
+            org.apache.thrift.protocol.TMap _map279 = iprot.readMapBegin(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRING); 
+            struct.skewedColValueLocationMaps = new java.util.HashMap<java.util.List<java.lang.String>,java.lang.String>(2*_map279.size);
+            @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> _key280;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val281;
+            for (int _i282 = 0; _i282 < _map279.size; ++_i282)
             {
-              org.apache.thrift.protocol.TList _list283 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-              _key280 = new java.util.ArrayList<java.lang.String>(_list283.size);
-              @org.apache.thrift.annotation.Nullable java.lang.String _elem284;
-              for (int _i285 = 0; _i285 < _list283.size; ++_i285)
               {
-                _elem284 = iprot.readString();
-                _key280.add(_elem284);
+                org.apache.thrift.protocol.TList _list283 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+                _key280 = new java.util.ArrayList<java.lang.String>(_list283.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem284;
+                for (int _i285 = 0; _i285 < _list283.size; ++_i285)
+                {
+                  _elem284 = iprot.readString();
+                  _key280.add(_elem284);
+                }
               }
+              _val281 = iprot.readString();
+              struct.skewedColValueLocationMaps.put(_key280, _val281);
             }
-            _val281 = iprot.readString();
-            struct.skewedColValueLocationMaps.put(_key280, _val281);
           }
+          struct.setSkewedColValueLocationMapsIsSet(true);
         }
-        struct.setSkewedColValueLocationMapsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SourceTable.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SourceTable.java
index 1c9898ae6e4a..f761534b3783 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SourceTable.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SourceTable.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SourceTable implements org.apache.thrift.TBase<SourceTable, SourceTable._Fields>, java.io.Serializable, Cloneable, Comparable<SourceTable> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SourceTable");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -145,6 +147,7 @@ public SourceTable(SourceTable other) {
     this.deletedCount = other.deletedCount;
   }
 
+  @Override
   public SourceTable deepCopy() {
     return new SourceTable(this);
   }
@@ -250,6 +253,7 @@ public void setDeletedCountIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DELETEDCOUNT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE:
@@ -288,6 +292,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE:
@@ -307,6 +312,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -446,14 +452,17 @@ public int compareTo(SourceTable other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -529,6 +538,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class SourceTableStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SourceTableStandardScheme getScheme() {
       return new SourceTableStandardScheme();
     }
@@ -536,58 +546,65 @@ public SourceTableStandardScheme getScheme() {
 
   private static class SourceTableStandardScheme extends org.apache.thrift.scheme.StandardScheme<SourceTable> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, SourceTable 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 1: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.table = new Table();
-              struct.table.read(iprot);
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // INSERTED_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.insertedCount = iprot.readI64();
-              struct.setInsertedCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // UPDATED_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.updatedCount = iprot.readI64();
-              struct.setUpdatedCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // DELETED_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.deletedCount = iprot.readI64();
-              struct.setDeletedCountIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.table = new Table();
+                struct.table.read(iprot);
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // INSERTED_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.insertedCount = iprot.readI64();
+                struct.setInsertedCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // UPDATED_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.updatedCount = iprot.readI64();
+                struct.setUpdatedCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DELETED_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.deletedCount = iprot.readI64();
+                struct.setDeletedCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, SourceTable struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -613,6 +630,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SourceTable struct
   }
 
   private static class SourceTableTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public SourceTableTupleScheme getScheme() {
       return new SourceTableTupleScheme();
     }
@@ -631,16 +649,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SourceTable struct)
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SourceTable struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.table = new Table();
-      struct.table.read(iprot);
-      struct.setTableIsSet(true);
-      struct.insertedCount = iprot.readI64();
-      struct.setInsertedCountIsSet(true);
-      struct.updatedCount = iprot.readI64();
-      struct.setUpdatedCountIsSet(true);
-      struct.deletedCount = iprot.readI64();
-      struct.setDeletedCountIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.table = new Table();
+        struct.table.read(iprot);
+        struct.setTableIsSet(true);
+        struct.insertedCount = iprot.readI64();
+        struct.setInsertedCountIsSet(true);
+        struct.updatedCount = iprot.readI64();
+        struct.setUpdatedCountIsSet(true);
+        struct.deletedCount = iprot.readI64();
+        struct.setDeletedCountIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
index d30976506188..f0407a3b76f2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescriptor, StorageDescriptor._Fields>, java.io.Serializable, Cloneable, Comparable<StorageDescriptor> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageDescriptor");
 
@@ -124,10 +124,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -138,7 +140,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMBUCKETS_ISSET_ID = 1;
   private static final int __STOREDASSUBDIRECTORIES_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.SKEWED_INFO,_Fields.STORED_AS_SUB_DIRECTORIES};
+  private static final _Fields[] optionals = {_Fields.SKEWED_INFO,_Fields.STORED_AS_SUB_DIRECTORIES};
   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);
@@ -252,6 +254,7 @@ public StorageDescriptor(StorageDescriptor other) {
     this.storedAsSubDirectories = other.storedAsSubDirectories;
   }
 
+  @Override
   public StorageDescriptor deepCopy() {
     return new StorageDescriptor(this);
   }
@@ -616,6 +619,7 @@ public void setStoredAsSubDirectoriesIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STOREDASSUBDIRECTORIES_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case COLS:
@@ -718,6 +722,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COLS:
@@ -761,6 +766,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -1102,14 +1108,17 @@ public int compareTo(StorageDescriptor other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1240,6 +1249,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class StorageDescriptorStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StorageDescriptorStandardScheme getScheme() {
       return new StorageDescriptorStandardScheme();
     }
@@ -1247,167 +1257,174 @@ public StorageDescriptorStandardScheme getScheme() {
 
   private static class StorageDescriptorStandardScheme extends org.apache.thrift.scheme.StandardScheme<StorageDescriptor> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, StorageDescriptor 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 1: // COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list286 = iprot.readListBegin();
-                struct.cols = new java.util.ArrayList<FieldSchema>(_list286.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem287;
-                for (int _i288 = 0; _i288 < _list286.size; ++_i288)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem287 = new FieldSchema();
-                  _elem287.read(iprot);
-                  struct.cols.add(_elem287);
+                  org.apache.thrift.protocol.TList _list286 = iprot.readListBegin();
+                  struct.cols = new java.util.ArrayList<FieldSchema>(_list286.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem287;
+                  for (int _i288 = 0; _i288 < _list286.size; ++_i288)
+                  {
+                    _elem287 = new FieldSchema();
+                    _elem287.read(iprot);
+                    struct.cols.add(_elem287);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // LOCATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.location = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setLocationIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // INPUT_FORMAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.inputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setInputFormatIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // OUTPUT_FORMAT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.outputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-              struct.setOutputFormatIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COMPRESSED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.compressed = iprot.readBool();
-              struct.setCompressedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NUM_BUCKETS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.numBuckets = iprot.readI32();
-              struct.setNumBucketsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // SERDE_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.serdeInfo = new SerDeInfo();
-              struct.serdeInfo.read(iprot);
-              struct.setSerdeInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // BUCKET_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list289 = iprot.readListBegin();
-                struct.bucketCols = new java.util.ArrayList<java.lang.String>(_list289.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem290;
-                for (int _i291 = 0; _i291 < _list289.size; ++_i291)
+              break;
+            case 2: // LOCATION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.location = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setLocationIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // INPUT_FORMAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.inputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setInputFormatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // OUTPUT_FORMAT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.outputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+                struct.setOutputFormatIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // COMPRESSED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.compressed = iprot.readBool();
+                struct.setCompressedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // NUM_BUCKETS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.numBuckets = iprot.readI32();
+                struct.setNumBucketsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // SERDE_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.serdeInfo = new SerDeInfo();
+                struct.serdeInfo.read(iprot);
+                struct.setSerdeInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // BUCKET_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem290 = iprot.readString();
-                  struct.bucketCols.add(_elem290);
+                  org.apache.thrift.protocol.TList _list289 = iprot.readListBegin();
+                  struct.bucketCols = new java.util.ArrayList<java.lang.String>(_list289.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem290;
+                  for (int _i291 = 0; _i291 < _list289.size; ++_i291)
+                  {
+                    _elem290 = iprot.readString();
+                    struct.bucketCols.add(_elem290);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.bucketCols = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.bucketCols); struct.setBucketColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.bucketCols = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.bucketCols); struct.setBucketColsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // SORT_COLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list292 = iprot.readListBegin();
-                struct.sortCols = new java.util.ArrayList<Order>(_list292.size);
-                @org.apache.thrift.annotation.Nullable Order _elem293;
-                for (int _i294 = 0; _i294 < _list292.size; ++_i294)
+              break;
+            case 9: // SORT_COLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem293 = new Order();
-                  _elem293.read(iprot);
-                  struct.sortCols.add(_elem293);
+                  org.apache.thrift.protocol.TList _list292 = iprot.readListBegin();
+                  struct.sortCols = new java.util.ArrayList<Order>(_list292.size);
+                  @org.apache.thrift.annotation.Nullable Order _elem293;
+                  for (int _i294 = 0; _i294 < _list292.size; ++_i294)
+                  {
+                    _elem293 = new Order();
+                    _elem293.read(iprot);
+                    struct.sortCols.add(_elem293);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setSortColsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setSortColsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map295 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map295.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key296;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val297;
-                for (int _i298 = 0; _i298 < _map295.size; ++_i298)
+              break;
+            case 10: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key296 = iprot.readString();
-                  _val297 = iprot.readString();
-                  struct.parameters.put(_key296, _val297);
+                  org.apache.thrift.protocol.TMap _map295 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map295.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key296;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val297;
+                  for (int _i298 = 0; _i298 < _map295.size; ++_i298)
+                  {
+                    _key296 = iprot.readString();
+                    _val297 = iprot.readString();
+                    struct.parameters.put(_key296, _val297);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // SKEWED_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.skewedInfo = new SkewedInfo();
-              struct.skewedInfo.read(iprot);
-              struct.setSkewedInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // STORED_AS_SUB_DIRECTORIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.storedAsSubDirectories = iprot.readBool();
-              struct.setStoredAsSubDirectoriesIsSet(true);
-            } else { 
+              break;
+            case 11: // SKEWED_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.skewedInfo = new SkewedInfo();
+                struct.skewedInfo.read(iprot);
+                struct.setSkewedInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // STORED_AS_SUB_DIRECTORIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.storedAsSubDirectories = iprot.readBool();
+                struct.setStoredAsSubDirectoriesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, StorageDescriptor struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1506,6 +1523,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StorageDescriptor
   }
 
   private static class StorageDescriptorTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StorageDescriptorTupleScheme getScheme() {
       return new StorageDescriptorTupleScheme();
     }
@@ -1619,97 +1637,102 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StorageDescriptor s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, StorageDescriptor struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(12);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list307 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.cols = new java.util.ArrayList<FieldSchema>(_list307.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem308;
-          for (int _i309 = 0; _i309 < _list307.size; ++_i309)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(12);
+        if (incoming.get(0)) {
           {
-            _elem308 = new FieldSchema();
-            _elem308.read(iprot);
-            struct.cols.add(_elem308);
+            org.apache.thrift.protocol.TList _list307 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.cols = new java.util.ArrayList<FieldSchema>(_list307.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem308;
+            for (int _i309 = 0; _i309 < _list307.size; ++_i309)
+            {
+              _elem308 = new FieldSchema();
+              _elem308.read(iprot);
+              struct.cols.add(_elem308);
+            }
           }
+          struct.setColsIsSet(true);
         }
-        struct.setColsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.location = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setLocationIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.inputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setInputFormatIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.outputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
-        struct.setOutputFormatIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.compressed = iprot.readBool();
-        struct.setCompressedIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.numBuckets = iprot.readI32();
-        struct.setNumBucketsIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.serdeInfo = new SerDeInfo();
-        struct.serdeInfo.read(iprot);
-        struct.setSerdeInfoIsSet(true);
-      }
-      if (incoming.get(7)) {
-        {
-          org.apache.thrift.protocol.TList _list310 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.bucketCols = new java.util.ArrayList<java.lang.String>(_list310.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem311;
-          for (int _i312 = 0; _i312 < _list310.size; ++_i312)
+        if (incoming.get(1)) {
+          struct.location = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setLocationIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.inputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setInputFormatIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.outputFormat = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot.readString());
+          struct.setOutputFormatIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.compressed = iprot.readBool();
+          struct.setCompressedIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.numBuckets = iprot.readI32();
+          struct.setNumBucketsIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.serdeInfo = new SerDeInfo();
+          struct.serdeInfo.read(iprot);
+          struct.setSerdeInfoIsSet(true);
+        }
+        if (incoming.get(7)) {
           {
-            _elem311 = iprot.readString();
-            struct.bucketCols.add(_elem311);
+            org.apache.thrift.protocol.TList _list310 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.bucketCols = new java.util.ArrayList<java.lang.String>(_list310.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem311;
+            for (int _i312 = 0; _i312 < _list310.size; ++_i312)
+            {
+              _elem311 = iprot.readString();
+              struct.bucketCols.add(_elem311);
+            }
           }
+          struct.bucketCols = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.bucketCols); struct.setBucketColsIsSet(true);
         }
-        struct.bucketCols = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.bucketCols); struct.setBucketColsIsSet(true);
-      }
-      if (incoming.get(8)) {
-        {
-          org.apache.thrift.protocol.TList _list313 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.sortCols = new java.util.ArrayList<Order>(_list313.size);
-          @org.apache.thrift.annotation.Nullable Order _elem314;
-          for (int _i315 = 0; _i315 < _list313.size; ++_i315)
+        if (incoming.get(8)) {
           {
-            _elem314 = new Order();
-            _elem314.read(iprot);
-            struct.sortCols.add(_elem314);
+            org.apache.thrift.protocol.TList _list313 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.sortCols = new java.util.ArrayList<Order>(_list313.size);
+            @org.apache.thrift.annotation.Nullable Order _elem314;
+            for (int _i315 = 0; _i315 < _list313.size; ++_i315)
+            {
+              _elem314 = new Order();
+              _elem314.read(iprot);
+              struct.sortCols.add(_elem314);
+            }
           }
+          struct.setSortColsIsSet(true);
         }
-        struct.setSortColsIsSet(true);
-      }
-      if (incoming.get(9)) {
-        {
-          org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map316.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key317;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val318;
-          for (int _i319 = 0; _i319 < _map316.size; ++_i319)
+        if (incoming.get(9)) {
           {
-            _key317 = iprot.readString();
-            _val318 = iprot.readString();
-            struct.parameters.put(_key317, _val318);
+            org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map316.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key317;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val318;
+            for (int _i319 = 0; _i319 < _map316.size; ++_i319)
+            {
+              _key317 = iprot.readString();
+              _val318 = iprot.readString();
+              struct.parameters.put(_key317, _val318);
+            }
           }
+          struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
         }
-        struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.skewedInfo = new SkewedInfo();
-        struct.skewedInfo.read(iprot);
-        struct.setSkewedInfoIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.storedAsSubDirectories = iprot.readBool();
-        struct.setStoredAsSubDirectoriesIsSet(true);
+        if (incoming.get(10)) {
+          struct.skewedInfo = new SkewedInfo();
+          struct.skewedInfo.read(iprot);
+          struct.setSkewedInfoIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.storedAsSubDirectories = iprot.readBool();
+          struct.setStoredAsSubDirectoriesIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedure.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedure.java
index 18cdb8183589..1429deda9e86 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedure.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedure.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class StoredProcedure implements org.apache.thrift.TBase<StoredProcedure, StoredProcedure._Fields>, java.io.Serializable, Cloneable, Comparable<StoredProcedure> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoredProcedure");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -155,6 +157,7 @@ public StoredProcedure(StoredProcedure other) {
     }
   }
 
+  @Override
   public StoredProcedure deepCopy() {
     return new StoredProcedure(this);
   }
@@ -288,6 +291,7 @@ public void setSourceIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -334,6 +338,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -356,6 +361,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -526,14 +532,17 @@ public int compareTo(StoredProcedure other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -608,6 +617,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class StoredProcedureStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StoredProcedureStandardScheme getScheme() {
       return new StoredProcedureStandardScheme();
     }
@@ -615,65 +625,72 @@ public StoredProcedureStandardScheme getScheme() {
 
   private static class StoredProcedureStandardScheme extends org.apache.thrift.scheme.StandardScheme<StoredProcedure> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, StoredProcedure 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // SOURCE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.source = iprot.readString();
-              struct.setSourceIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // SOURCE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.source = iprot.readString();
+                struct.setSourceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, StoredProcedure struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -710,6 +727,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StoredProcedure st
   }
 
   private static class StoredProcedureTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StoredProcedureTupleScheme getScheme() {
       return new StoredProcedureTupleScheme();
     }
@@ -756,27 +774,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StoredProcedure str
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, StoredProcedure struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.source = iprot.readString();
-        struct.setSourceIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.source = iprot.readString();
+          struct.setSourceIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedureRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedureRequest.java
index 0a98605527f9..dd98cc1c2c84 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedureRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StoredProcedureRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class StoredProcedureRequest implements org.apache.thrift.TBase<StoredProcedureRequest, StoredProcedureRequest._Fields>, java.io.Serializable, Cloneable, Comparable<StoredProcedureRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoredProcedureRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public StoredProcedureRequest(StoredProcedureRequest other) {
     }
   }
 
+  @Override
   public StoredProcedureRequest deepCopy() {
     return new StoredProcedureRequest(this);
   }
@@ -214,6 +217,7 @@ public void setProcNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(StoredProcedureRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class StoredProcedureRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StoredProcedureRequestStandardScheme getScheme() {
       return new StoredProcedureRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public StoredProcedureRequestStandardScheme getScheme() {
 
   private static class StoredProcedureRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<StoredProcedureRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, StoredProcedureRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PROC_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.procName = iprot.readString();
-              struct.setProcNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // PROC_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.procName = iprot.readString();
+                struct.setProcNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, StoredProcedureRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StoredProcedureReq
   }
 
   private static class StoredProcedureRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StoredProcedureRequestTupleScheme getScheme() {
       return new StoredProcedureRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StoredProcedureRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, StoredProcedureRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.procName = iprot.readString();
-      struct.setProcNameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.procName = iprot.readString();
+        struct.setProcNameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
index a0b470955a6f..e2cee90af120 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class StringColumnStatsData implements org.apache.thrift.TBase<StringColumnStatsData, StringColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<StringColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StringColumnStatsData");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -104,7 +106,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMNULLS_ISSET_ID = 2;
   private static final int __NUMDVS_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.BIT_VECTORS};
+  private static final _Fields[] optionals = {_Fields.BIT_VECTORS};
   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);
@@ -156,6 +158,7 @@ public StringColumnStatsData(StringColumnStatsData other) {
     }
   }
 
+  @Override
   public StringColumnStatsData deepCopy() {
     return new StringColumnStatsData(this);
   }
@@ -293,6 +296,7 @@ public void setBitVectorsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MAX_COL_LEN:
@@ -343,6 +347,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MAX_COL_LEN:
@@ -365,6 +370,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -527,14 +533,17 @@ public int compareTo(StringColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -613,6 +622,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class StringColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StringColumnStatsDataStandardScheme getScheme() {
       return new StringColumnStatsDataStandardScheme();
     }
@@ -620,65 +630,72 @@ public StringColumnStatsDataStandardScheme getScheme() {
 
   private static class StringColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<StringColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, StringColumnStatsData 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 1: // MAX_COL_LEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.maxColLen = iprot.readI64();
-              struct.setMaxColLenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // AVG_COL_LEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.avgColLen = iprot.readDouble();
-              struct.setAvgColLenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NUM_DVS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numDVs = iprot.readI64();
-              struct.setNumDVsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MAX_COL_LEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.maxColLen = iprot.readI64();
+                struct.setMaxColLenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // AVG_COL_LEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.avgColLen = iprot.readDouble();
+                struct.setAvgColLenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NUM_DVS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numDVs = iprot.readI64();
+                struct.setNumDVsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, StringColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -709,6 +726,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StringColumnStatsD
   }
 
   private static class StringColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public StringColumnStatsDataTupleScheme getScheme() {
       return new StringColumnStatsDataTupleScheme();
     }
@@ -735,19 +753,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StringColumnStatsDa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, StringColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.maxColLen = iprot.readI64();
-      struct.setMaxColLenIsSet(true);
-      struct.avgColLen = iprot.readDouble();
-      struct.setAvgColLenIsSet(true);
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      struct.numDVs = iprot.readI64();
-      struct.setNumDVsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.maxColLen = iprot.readI64();
+        struct.setMaxColLenIsSet(true);
+        struct.avgColLen = iprot.readDouble();
+        struct.setAvgColLenIsSet(true);
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        struct.numDVs = iprot.readI64();
+        struct.setNumDVsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
index 3eda05d156d6..6ff2aaa187ea 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, java.io.Serializable, Cloneable, Comparable<Table> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Table");
 
@@ -208,10 +208,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -229,7 +231,7 @@ public java.lang.String getFieldName() {
   private static final int __ID_ISSET_ID = 8;
   private static final int __TXNID_ISSET_ID = 9;
   private short __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED,_Fields.CREATION_METADATA,_Fields.CAT_NAME,_Fields.OWNER_TYPE,_Fields.WRITE_ID,_Fields.IS_STATS_COMPLIANT,_Fields.COL_STATS,_Fields.ACCESS_TYPE,_Fields.REQUIRED_READ_CAPABILITIES,_Fields.REQUIRED_WRITE_CAPABILITIES,_Fields.ID,_Fields.FILE_METADATA,_Fields.DICTIONARY,_Fields.TXN_ID};
+  private static final _Fields[] optionals = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED,_Fields.CREATION_METADATA,_Fields.CAT_NAME,_Fields.OWNER_TYPE,_Fields.WRITE_ID,_Fields.IS_STATS_COMPLIANT,_Fields.COL_STATS,_Fields.ACCESS_TYPE,_Fields.REQUIRED_READ_CAPABILITIES,_Fields.REQUIRED_WRITE_CAPABILITIES,_Fields.ID,_Fields.FILE_METADATA,_Fields.DICTIONARY,_Fields.TXN_ID};
   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);
@@ -417,6 +419,7 @@ public Table(Table other) {
     this.txnId = other.txnId;
   }
 
+  @Override
   public Table deepCopy() {
     return new Table(this);
   }
@@ -1183,6 +1186,7 @@ public void setTxnIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE_NAME:
@@ -1413,6 +1417,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE_NAME:
@@ -1504,6 +1509,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -2243,14 +2249,17 @@ public int compareTo(Table other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -2521,6 +2530,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TableStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableStandardScheme getScheme() {
       return new TableStandardScheme();
     }
@@ -2528,298 +2538,305 @@ public TableStandardScheme getScheme() {
 
   private static class TableStandardScheme extends org.apache.thrift.scheme.StandardScheme<Table> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Table 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 1: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            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 3: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.owner = iprot.readString();
-              struct.setOwnerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // LAST_ACCESS_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.lastAccessTime = iprot.readI32();
-              struct.setLastAccessTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // RETENTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.retention = iprot.readI32();
-              struct.setRetentionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // SD
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.sd = new StorageDescriptor();
-              struct.sd.read(iprot);
-              struct.setSdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // PARTITION_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list370 = iprot.readListBegin();
-                struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list370.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem371;
-                for (int _i372 = 0; _i372 < _list370.size; ++_i372)
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              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 3: // OWNER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.owner = iprot.readString();
+                struct.setOwnerIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // CREATE_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.createTime = iprot.readI32();
+                struct.setCreateTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // LAST_ACCESS_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.lastAccessTime = iprot.readI32();
+                struct.setLastAccessTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // RETENTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.retention = iprot.readI32();
+                struct.setRetentionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // SD
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.sd = new StorageDescriptor();
+                struct.sd.read(iprot);
+                struct.setSdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // PARTITION_KEYS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem371 = new FieldSchema();
-                  _elem371.read(iprot);
-                  struct.partitionKeys.add(_elem371);
+                  org.apache.thrift.protocol.TList _list370 = iprot.readListBegin();
+                  struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list370.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem371;
+                  for (int _i372 = 0; _i372 < _list370.size; ++_i372)
+                  {
+                    _elem371 = new FieldSchema();
+                    _elem371.read(iprot);
+                    struct.partitionKeys.add(_elem371);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionKeysIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PARAMETERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map373 = iprot.readMapBegin();
-                struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map373.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key374;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val375;
-                for (int _i376 = 0; _i376 < _map373.size; ++_i376)
+              break;
+            case 9: // PARAMETERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key374 = iprot.readString();
-                  _val375 = iprot.readString();
-                  struct.parameters.put(_key374, _val375);
+                  org.apache.thrift.protocol.TMap _map373 = iprot.readMapBegin();
+                  struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map373.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key374;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val375;
+                  for (int _i376 = 0; _i376 < _map373.size; ++_i376)
+                  {
+                    _key374 = iprot.readString();
+                    _val375 = iprot.readString();
+                    struct.parameters.put(_key374, _val375);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParametersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParametersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // VIEW_ORIGINAL_TEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.viewOriginalText = iprot.readString();
-              struct.setViewOriginalTextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // VIEW_EXPANDED_TEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.viewExpandedText = iprot.readString();
-              struct.setViewExpandedTextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // TABLE_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableType = iprot.readString();
-              struct.setTableTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.privileges = new PrincipalPrivilegeSet();
-              struct.privileges.read(iprot);
-              struct.setPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // TEMPORARY
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.temporary = iprot.readBool();
-              struct.setTemporaryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // REWRITE_ENABLED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.rewriteEnabled = iprot.readBool();
-              struct.setRewriteEnabledIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 16: // CREATION_METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.creationMetadata = new CreationMetadata();
-              struct.creationMetadata.read(iprot);
-              struct.setCreationMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 17: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 18: // OWNER_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setOwnerTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 19: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 20: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 21: // COL_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.colStats = new ColumnStatistics();
-              struct.colStats.read(iprot);
-              struct.setColStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 22: // ACCESS_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
-              struct.accessType = iprot.readByte();
-              struct.setAccessTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 23: // REQUIRED_READ_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list377 = iprot.readListBegin();
-                struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list377.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem378;
-                for (int _i379 = 0; _i379 < _list377.size; ++_i379)
+              break;
+            case 10: // VIEW_ORIGINAL_TEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.viewOriginalText = iprot.readString();
+                struct.setViewOriginalTextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 11: // VIEW_EXPANDED_TEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.viewExpandedText = iprot.readString();
+                struct.setViewExpandedTextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 12: // TABLE_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableType = iprot.readString();
+                struct.setTableTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 13: // PRIVILEGES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.privileges = new PrincipalPrivilegeSet();
+                struct.privileges.read(iprot);
+                struct.setPrivilegesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 14: // TEMPORARY
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.temporary = iprot.readBool();
+                struct.setTemporaryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 15: // REWRITE_ENABLED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.rewriteEnabled = iprot.readBool();
+                struct.setRewriteEnabledIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 16: // CREATION_METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.creationMetadata = new CreationMetadata();
+                struct.creationMetadata.read(iprot);
+                struct.setCreationMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 17: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 18: // OWNER_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setOwnerTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 19: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 20: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 21: // COL_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.colStats = new ColumnStatistics();
+                struct.colStats.read(iprot);
+                struct.setColStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 22: // ACCESS_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
+                struct.accessType = iprot.readByte();
+                struct.setAccessTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 23: // REQUIRED_READ_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem378 = iprot.readString();
-                  struct.requiredReadCapabilities.add(_elem378);
+                  org.apache.thrift.protocol.TList _list377 = iprot.readListBegin();
+                  struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list377.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem378;
+                  for (int _i379 = 0; _i379 < _list377.size; ++_i379)
+                  {
+                    _elem378 = iprot.readString();
+                    struct.requiredReadCapabilities.add(_elem378);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRequiredReadCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRequiredReadCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 24: // REQUIRED_WRITE_CAPABILITIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list380 = iprot.readListBegin();
-                struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list380.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem381;
-                for (int _i382 = 0; _i382 < _list380.size; ++_i382)
+              break;
+            case 24: // REQUIRED_WRITE_CAPABILITIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem381 = iprot.readString();
-                  struct.requiredWriteCapabilities.add(_elem381);
+                  org.apache.thrift.protocol.TList _list380 = iprot.readListBegin();
+                  struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list380.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem381;
+                  for (int _i382 = 0; _i382 < _list380.size; ++_i382)
+                  {
+                    _elem381 = iprot.readString();
+                    struct.requiredWriteCapabilities.add(_elem381);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRequiredWriteCapabilitiesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRequiredWriteCapabilitiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 25: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 26: // FILE_METADATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.fileMetadata = new FileMetadata();
-              struct.fileMetadata.read(iprot);
-              struct.setFileMetadataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 27: // DICTIONARY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.dictionary = new ObjectDictionary();
-              struct.dictionary.read(iprot);
-              struct.setDictionaryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 28: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
+              break;
+            case 25: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 26: // FILE_METADATA
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.fileMetadata = new FileMetadata();
+                struct.fileMetadata.read(iprot);
+                struct.setFileMetadataIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 27: // DICTIONARY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.dictionary = new ObjectDictionary();
+                struct.dictionary.read(iprot);
+                struct.setDictionaryIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 28: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Table struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -3012,6 +3029,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Table struct) thro
   }
 
   private static class TableTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableTupleScheme getScheme() {
       return new TableTupleScheme();
     }
@@ -3221,164 +3239,169 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Table struct) throw
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Table struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(28);
-      if (incoming.get(0)) {
-        struct.tableName = iprot.readString();
-        struct.setTableNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.dbName = iprot.readString();
-        struct.setDbNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.owner = iprot.readString();
-        struct.setOwnerIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.lastAccessTime = iprot.readI32();
-        struct.setLastAccessTimeIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.retention = iprot.readI32();
-        struct.setRetentionIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.sd = new StorageDescriptor();
-        struct.sd.read(iprot);
-        struct.setSdIsSet(true);
-      }
-      if (incoming.get(7)) {
-        {
-          org.apache.thrift.protocol.TList _list391 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list391.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem392;
-          for (int _i393 = 0; _i393 < _list391.size; ++_i393)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(28);
+        if (incoming.get(0)) {
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.dbName = iprot.readString();
+          struct.setDbNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.owner = iprot.readString();
+          struct.setOwnerIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.createTime = iprot.readI32();
+          struct.setCreateTimeIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.lastAccessTime = iprot.readI32();
+          struct.setLastAccessTimeIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.retention = iprot.readI32();
+          struct.setRetentionIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.sd = new StorageDescriptor();
+          struct.sd.read(iprot);
+          struct.setSdIsSet(true);
+        }
+        if (incoming.get(7)) {
           {
-            _elem392 = new FieldSchema();
-            _elem392.read(iprot);
-            struct.partitionKeys.add(_elem392);
+            org.apache.thrift.protocol.TList _list391 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.partitionKeys = new java.util.ArrayList<FieldSchema>(_list391.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem392;
+            for (int _i393 = 0; _i393 < _list391.size; ++_i393)
+            {
+              _elem392 = new FieldSchema();
+              _elem392.read(iprot);
+              struct.partitionKeys.add(_elem392);
+            }
           }
+          struct.setPartitionKeysIsSet(true);
         }
-        struct.setPartitionKeysIsSet(true);
-      }
-      if (incoming.get(8)) {
-        {
-          org.apache.thrift.protocol.TMap _map394 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-          struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map394.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _key395;
-          @org.apache.thrift.annotation.Nullable java.lang.String _val396;
-          for (int _i397 = 0; _i397 < _map394.size; ++_i397)
+        if (incoming.get(8)) {
           {
-            _key395 = iprot.readString();
-            _val396 = iprot.readString();
-            struct.parameters.put(_key395, _val396);
+            org.apache.thrift.protocol.TMap _map394 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.parameters = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map394.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key395;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val396;
+            for (int _i397 = 0; _i397 < _map394.size; ++_i397)
+            {
+              _key395 = iprot.readString();
+              _val396 = iprot.readString();
+              struct.parameters.put(_key395, _val396);
+            }
           }
+          struct.setParametersIsSet(true);
         }
-        struct.setParametersIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.viewOriginalText = iprot.readString();
-        struct.setViewOriginalTextIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.viewExpandedText = iprot.readString();
-        struct.setViewExpandedTextIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.tableType = iprot.readString();
-        struct.setTableTypeIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.privileges = new PrincipalPrivilegeSet();
-        struct.privileges.read(iprot);
-        struct.setPrivilegesIsSet(true);
-      }
-      if (incoming.get(13)) {
-        struct.temporary = iprot.readBool();
-        struct.setTemporaryIsSet(true);
-      }
-      if (incoming.get(14)) {
-        struct.rewriteEnabled = iprot.readBool();
-        struct.setRewriteEnabledIsSet(true);
-      }
-      if (incoming.get(15)) {
-        struct.creationMetadata = new CreationMetadata();
-        struct.creationMetadata.read(iprot);
-        struct.setCreationMetadataIsSet(true);
-      }
-      if (incoming.get(16)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(17)) {
-        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setOwnerTypeIsSet(true);
-      }
-      if (incoming.get(18)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(19)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
-      }
-      if (incoming.get(20)) {
-        struct.colStats = new ColumnStatistics();
-        struct.colStats.read(iprot);
-        struct.setColStatsIsSet(true);
-      }
-      if (incoming.get(21)) {
-        struct.accessType = iprot.readByte();
-        struct.setAccessTypeIsSet(true);
-      }
-      if (incoming.get(22)) {
-        {
-          org.apache.thrift.protocol.TList _list398 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list398.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem399;
-          for (int _i400 = 0; _i400 < _list398.size; ++_i400)
+        if (incoming.get(9)) {
+          struct.viewOriginalText = iprot.readString();
+          struct.setViewOriginalTextIsSet(true);
+        }
+        if (incoming.get(10)) {
+          struct.viewExpandedText = iprot.readString();
+          struct.setViewExpandedTextIsSet(true);
+        }
+        if (incoming.get(11)) {
+          struct.tableType = iprot.readString();
+          struct.setTableTypeIsSet(true);
+        }
+        if (incoming.get(12)) {
+          struct.privileges = new PrincipalPrivilegeSet();
+          struct.privileges.read(iprot);
+          struct.setPrivilegesIsSet(true);
+        }
+        if (incoming.get(13)) {
+          struct.temporary = iprot.readBool();
+          struct.setTemporaryIsSet(true);
+        }
+        if (incoming.get(14)) {
+          struct.rewriteEnabled = iprot.readBool();
+          struct.setRewriteEnabledIsSet(true);
+        }
+        if (incoming.get(15)) {
+          struct.creationMetadata = new CreationMetadata();
+          struct.creationMetadata.read(iprot);
+          struct.setCreationMetadataIsSet(true);
+        }
+        if (incoming.get(16)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(17)) {
+          struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setOwnerTypeIsSet(true);
+        }
+        if (incoming.get(18)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(19)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+        if (incoming.get(20)) {
+          struct.colStats = new ColumnStatistics();
+          struct.colStats.read(iprot);
+          struct.setColStatsIsSet(true);
+        }
+        if (incoming.get(21)) {
+          struct.accessType = iprot.readByte();
+          struct.setAccessTypeIsSet(true);
+        }
+        if (incoming.get(22)) {
           {
-            _elem399 = iprot.readString();
-            struct.requiredReadCapabilities.add(_elem399);
+            org.apache.thrift.protocol.TList _list398 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list398.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem399;
+            for (int _i400 = 0; _i400 < _list398.size; ++_i400)
+            {
+              _elem399 = iprot.readString();
+              struct.requiredReadCapabilities.add(_elem399);
+            }
           }
+          struct.setRequiredReadCapabilitiesIsSet(true);
         }
-        struct.setRequiredReadCapabilitiesIsSet(true);
-      }
-      if (incoming.get(23)) {
-        {
-          org.apache.thrift.protocol.TList _list401 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list401.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem402;
-          for (int _i403 = 0; _i403 < _list401.size; ++_i403)
+        if (incoming.get(23)) {
           {
-            _elem402 = iprot.readString();
-            struct.requiredWriteCapabilities.add(_elem402);
+            org.apache.thrift.protocol.TList _list401 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list401.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem402;
+            for (int _i403 = 0; _i403 < _list401.size; ++_i403)
+            {
+              _elem402 = iprot.readString();
+              struct.requiredWriteCapabilities.add(_elem402);
+            }
           }
+          struct.setRequiredWriteCapabilitiesIsSet(true);
         }
-        struct.setRequiredWriteCapabilitiesIsSet(true);
-      }
-      if (incoming.get(24)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(25)) {
-        struct.fileMetadata = new FileMetadata();
-        struct.fileMetadata.read(iprot);
-        struct.setFileMetadataIsSet(true);
-      }
-      if (incoming.get(26)) {
-        struct.dictionary = new ObjectDictionary();
-        struct.dictionary.read(iprot);
-        struct.setDictionaryIsSet(true);
-      }
-      if (incoming.get(27)) {
-        struct.txnId = iprot.readI64();
-        struct.setTxnIdIsSet(true);
+        if (incoming.get(24)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+        if (incoming.get(25)) {
+          struct.fileMetadata = new FileMetadata();
+          struct.fileMetadata.read(iprot);
+          struct.setFileMetadataIsSet(true);
+        }
+        if (incoming.get(26)) {
+          struct.dictionary = new ObjectDictionary();
+          struct.dictionary.read(iprot);
+          struct.setDictionaryIsSet(true);
+        }
+        if (incoming.get(27)) {
+          struct.txnId = iprot.readI64();
+          struct.setTxnIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java
index d85dff892139..c12824ff78e6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TableMeta implements org.apache.thrift.TBase<TableMeta, TableMeta._Fields>, java.io.Serializable, Cloneable, Comparable<TableMeta> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableMeta");
 
@@ -103,17 +103,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.COMMENTS,_Fields.CAT_NAME,_Fields.OWNER_NAME,_Fields.OWNER_TYPE};
+  private static final _Fields[] optionals = {_Fields.COMMENTS,_Fields.CAT_NAME,_Fields.OWNER_NAME,_Fields.OWNER_TYPE};
   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);
@@ -176,6 +178,7 @@ public TableMeta(TableMeta other) {
     }
   }
 
+  @Override
   public TableMeta deepCopy() {
     return new TableMeta(this);
   }
@@ -367,6 +370,7 @@ public void setOwnerTypeIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -429,6 +433,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -457,6 +462,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -677,14 +683,17 @@ public int compareTo(TableMeta other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -795,6 +804,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TableMetaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableMetaStandardScheme getScheme() {
       return new TableMetaStandardScheme();
     }
@@ -802,81 +812,88 @@ public TableMetaStandardScheme getScheme() {
 
   private static class TableMetaStandardScheme extends org.apache.thrift.scheme.StandardScheme<TableMeta> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TableMeta 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 1: // DB_NAME
-            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: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TABLE_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableType = iprot.readString();
-              struct.setTableTypeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableType = iprot.readString();
+                struct.setTableTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // COMMENTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.comments = iprot.readString();
+                struct.setCommentsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // OWNER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ownerName = iprot.readString();
+                struct.setOwnerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // OWNER_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                struct.setOwnerTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COMMENTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.comments = iprot.readString();
-              struct.setCommentsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // OWNER_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setOwnerTypeIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TableMeta struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -931,6 +948,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TableMeta struct)
   }
 
   private static class TableMetaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableMetaTupleScheme getScheme() {
       return new TableMetaTupleScheme();
     }
@@ -974,29 +992,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TableMeta struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TableMeta struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      struct.tableType = iprot.readString();
-      struct.setTableTypeIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.comments = iprot.readString();
-        struct.setCommentsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setOwnerTypeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        struct.tableType = iprot.readString();
+        struct.setTableTypeIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.comments = iprot.readString();
+          struct.setCommentsIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.ownerName = iprot.readString();
+          struct.setOwnerNameIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+          struct.setOwnerTypeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableParamsUpdate.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableParamsUpdate.java
index d1fb3b779cb6..4f216e9396d8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableParamsUpdate.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableParamsUpdate.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TableParamsUpdate implements org.apache.thrift.TBase<TableParamsUpdate, TableParamsUpdate._Fields>, java.io.Serializable, Cloneable, Comparable<TableParamsUpdate> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableParamsUpdate");
 
@@ -94,17 +94,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.EXPECTED_PARAM_KEY,_Fields.EXPECTED_PARAM_VALUE};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.EXPECTED_PARAM_KEY,_Fields.EXPECTED_PARAM_VALUE};
   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);
@@ -165,6 +167,7 @@ public TableParamsUpdate(TableParamsUpdate other) {
     }
   }
 
+  @Override
   public TableParamsUpdate deepCopy() {
     return new TableParamsUpdate(this);
   }
@@ -334,6 +337,7 @@ public void setExpected_param_valueIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -388,6 +392,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -413,6 +418,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -608,14 +614,17 @@ public int compareTo(TableParamsUpdate other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -716,6 +725,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TableParamsUpdateStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableParamsUpdateStandardScheme getScheme() {
       return new TableParamsUpdateStandardScheme();
     }
@@ -723,85 +733,92 @@ public TableParamsUpdateStandardScheme getScheme() {
 
   private static class TableParamsUpdateStandardScheme extends org.apache.thrift.scheme.StandardScheme<TableParamsUpdate> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TableParamsUpdate 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.cat_name = iprot.readString();
-              struct.setCat_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table_name = iprot.readString();
-              struct.setTable_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // PARAMS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map1482 = iprot.readMapBegin();
-                struct.params = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1482.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _key1483;
-                @org.apache.thrift.annotation.Nullable java.lang.String _val1484;
-                for (int _i1485 = 0; _i1485 < _map1482.size; ++_i1485)
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.cat_name = iprot.readString();
+                struct.setCat_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table_name = iprot.readString();
+                struct.setTable_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // PARAMS
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  _key1483 = iprot.readString();
-                  _val1484 = iprot.readString();
-                  struct.params.put(_key1483, _val1484);
+                  org.apache.thrift.protocol.TMap _map1482 = iprot.readMapBegin();
+                  struct.params = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1482.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key1483;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val1484;
+                  for (int _i1485 = 0; _i1485 < _map1482.size; ++_i1485)
+                  {
+                    _key1483 = iprot.readString();
+                    _val1484 = iprot.readString();
+                    struct.params.put(_key1483, _val1484);
+                  }
+                  iprot.readMapEnd();
                 }
-                iprot.readMapEnd();
+                struct.setParamsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setParamsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // EXPECTED_PARAM_KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expected_param_key = iprot.readString();
-              struct.setExpected_param_keyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // EXPECTED_PARAM_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.expected_param_value = iprot.readString();
-              struct.setExpected_param_valueIsSet(true);
-            } else { 
+              break;
+            case 5: // EXPECTED_PARAM_KEY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expected_param_key = iprot.readString();
+                struct.setExpected_param_keyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // EXPECTED_PARAM_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.expected_param_value = iprot.readString();
+                struct.setExpected_param_valueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TableParamsUpdate struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -857,6 +874,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TableParamsUpdate
   }
 
   private static class TableParamsUpdateTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableParamsUpdateTupleScheme getScheme() {
       return new TableParamsUpdateTupleScheme();
     }
@@ -901,36 +919,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TableParamsUpdate s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TableParamsUpdate struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.table_name = iprot.readString();
-      struct.setTable_nameIsSet(true);
-      {
-        org.apache.thrift.protocol.TMap _map1488 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-        struct.params = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1488.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _key1489;
-        @org.apache.thrift.annotation.Nullable java.lang.String _val1490;
-        for (int _i1491 = 0; _i1491 < _map1488.size; ++_i1491)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.table_name = iprot.readString();
+        struct.setTable_nameIsSet(true);
         {
-          _key1489 = iprot.readString();
-          _val1490 = iprot.readString();
-          struct.params.put(_key1489, _val1490);
+          org.apache.thrift.protocol.TMap _map1488 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+          struct.params = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1488.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key1489;
+          @org.apache.thrift.annotation.Nullable java.lang.String _val1490;
+          for (int _i1491 = 0; _i1491 < _map1488.size; ++_i1491)
+          {
+            _key1489 = iprot.readString();
+            _val1490 = iprot.readString();
+            struct.params.put(_key1489, _val1490);
+          }
         }
-      }
-      struct.setParamsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.cat_name = iprot.readString();
-        struct.setCat_nameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.expected_param_key = iprot.readString();
-        struct.setExpected_param_keyIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.expected_param_value = iprot.readString();
-        struct.setExpected_param_valueIsSet(true);
+        struct.setParamsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.cat_name = iprot.readString();
+          struct.setCat_nameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.expected_param_key = iprot.readString();
+          struct.setExpected_param_keyIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.expected_param_value = iprot.readString();
+          struct.setExpected_param_valueIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
index d0aa9cd5c35d..3ff0a3a08fb5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TableStatsRequest implements org.apache.thrift.TBase<TableStatsRequest, TableStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<TableStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableStatsRequest");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -111,7 +113,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.ENGINE,_Fields.ID};
+  private static final _Fields[] optionals = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.ENGINE,_Fields.ID};
   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);
@@ -179,6 +181,7 @@ public TableStatsRequest(TableStatsRequest other) {
     this.id = other.id;
   }
 
+  @Override
   public TableStatsRequest deepCopy() {
     return new TableStatsRequest(this);
   }
@@ -378,6 +381,7 @@ public void setIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -440,6 +444,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -468,6 +473,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -688,14 +694,17 @@ public int compareTo(TableStatsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -804,6 +813,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TableStatsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableStatsRequestStandardScheme getScheme() {
       return new TableStatsRequestStandardScheme();
     }
@@ -811,91 +821,98 @@ public TableStatsRequestStandardScheme getScheme() {
 
   private static class TableStatsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<TableStatsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TableStatsRequest 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 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // COL_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list628 = iprot.readListBegin();
-                struct.colNames = new java.util.ArrayList<java.lang.String>(_list628.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem629;
-                for (int _i630 = 0; _i630 < _list628.size; ++_i630)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.dbName = iprot.readString();
+                struct.setDbNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tblName = iprot.readString();
+                struct.setTblNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // COL_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem629 = iprot.readString();
-                  struct.colNames.add(_elem629);
+                  org.apache.thrift.protocol.TList _list628 = iprot.readListBegin();
+                  struct.colNames = new java.util.ArrayList<java.lang.String>(_list628.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem629;
+                  for (int _i630 = 0; _i630 < _list628.size; ++_i630)
+                  {
+                    _elem629 = iprot.readString();
+                    struct.colNames.add(_elem629);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setColNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setColNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ENGINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.engine = iprot.readString();
-              struct.setEngineIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
+              break;
+            case 4: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ENGINE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.engine = iprot.readString();
+                struct.setEngineIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TableStatsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -955,6 +972,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TableStatsRequest
   }
 
   private static class TableStatsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableStatsRequestTupleScheme getScheme() {
       return new TableStatsRequestTupleScheme();
     }
@@ -1004,38 +1022,43 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TableStatsRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TableStatsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list633 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-        struct.colNames = new java.util.ArrayList<java.lang.String>(_list633.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem634;
-        for (int _i635 = 0; _i635 < _list633.size; ++_i635)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tblName = iprot.readString();
+        struct.setTblNameIsSet(true);
         {
-          _elem634 = iprot.readString();
-          struct.colNames.add(_elem634);
+          org.apache.thrift.protocol.TList _list633 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.colNames = new java.util.ArrayList<java.lang.String>(_list633.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem634;
+          for (int _i635 = 0; _i635 < _list633.size; ++_i635)
+          {
+            _elem634 = iprot.readString();
+            struct.colNames.add(_elem634);
+          }
         }
-      }
-      struct.setColNamesIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.catName = iprot.readString();
-        struct.setCatNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.engine = iprot.readString();
-        struct.setEngineIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.id = iprot.readI64();
-        struct.setIdIsSet(true);
+        struct.setColNamesIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.catName = iprot.readString();
+          struct.setCatNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.engine = iprot.readString();
+          struct.setEngineIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.id = iprot.readI64();
+          struct.setIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
index 8a49c67f2014..154a2acfde60 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TableStatsResult implements org.apache.thrift.TBase<TableStatsResult, TableStatsResult._Fields>, java.io.Serializable, Cloneable, Comparable<TableStatsResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableStatsResult");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
+  private static final _Fields[] optionals = {_Fields.IS_STATS_COMPLIANT};
   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);
@@ -124,6 +126,7 @@ public TableStatsResult(TableStatsResult other) {
     this.isStatsCompliant = other.isStatsCompliant;
   }
 
+  @Override
   public TableStatsResult deepCopy() {
     return new TableStatsResult(this);
   }
@@ -197,6 +200,7 @@ public void setIsStatsCompliantIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE_STATS:
@@ -219,6 +223,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE_STATS:
@@ -232,6 +237,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -327,14 +333,17 @@ public int compareTo(TableStatsResult other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -389,6 +398,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TableStatsResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableStatsResultStandardScheme getScheme() {
       return new TableStatsResultStandardScheme();
     }
@@ -396,52 +406,59 @@ public TableStatsResultStandardScheme getScheme() {
 
   private static class TableStatsResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<TableStatsResult> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TableStatsResult 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 1: // TABLE_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list602 = iprot.readListBegin();
-                struct.tableStats = new java.util.ArrayList<ColumnStatisticsObj>(_list602.size);
-                @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem603;
-                for (int _i604 = 0; _i604 < _list602.size; ++_i604)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TABLE_STATS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem603 = new ColumnStatisticsObj();
-                  _elem603.read(iprot);
-                  struct.tableStats.add(_elem603);
+                  org.apache.thrift.protocol.TList _list602 = iprot.readListBegin();
+                  struct.tableStats = new java.util.ArrayList<ColumnStatisticsObj>(_list602.size);
+                  @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem603;
+                  for (int _i604 = 0; _i604 < _list602.size; ++_i604)
+                  {
+                    _elem603 = new ColumnStatisticsObj();
+                    _elem603.read(iprot);
+                    struct.tableStats.add(_elem603);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTableStatsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTableStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IS_STATS_COMPLIANT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isStatsCompliant = iprot.readBool();
-              struct.setIsStatsCompliantIsSet(true);
-            } else { 
+              break;
+            case 2: // IS_STATS_COMPLIANT
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isStatsCompliant = iprot.readBool();
+                struct.setIsStatsCompliantIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TableStatsResult struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -470,6 +487,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TableStatsResult s
   }
 
   private static class TableStatsResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableStatsResultTupleScheme getScheme() {
       return new TableStatsResultTupleScheme();
     }
@@ -499,23 +517,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TableStatsResult st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TableStatsResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list607 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.tableStats = new java.util.ArrayList<ColumnStatisticsObj>(_list607.size);
-        @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem608;
-        for (int _i609 = 0; _i609 < _list607.size; ++_i609)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem608 = new ColumnStatisticsObj();
-          _elem608.read(iprot);
-          struct.tableStats.add(_elem608);
+          org.apache.thrift.protocol.TList _list607 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.tableStats = new java.util.ArrayList<ColumnStatisticsObj>(_list607.size);
+          @org.apache.thrift.annotation.Nullable ColumnStatisticsObj _elem608;
+          for (int _i609 = 0; _i609 < _list607.size; ++_i609)
+          {
+            _elem608 = new ColumnStatisticsObj();
+            _elem608.read(iprot);
+            struct.tableStats.add(_elem608);
+          }
         }
-      }
-      struct.setTableStatsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.isStatsCompliant = iprot.readBool();
-        struct.setIsStatsCompliantIsSet(true);
+        struct.setTableStatsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.isStatsCompliant = iprot.readBool();
+          struct.setIsStatsCompliantIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java
index ba684d83380f..cc6d7dda7ccf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TableValidWriteIds implements org.apache.thrift.TBase<TableValidWriteIds, TableValidWriteIds._Fields>, java.io.Serializable, Cloneable, Comparable<TableValidWriteIds> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableValidWriteIds");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -102,7 +104,7 @@ public java.lang.String getFieldName() {
   private static final int __WRITEIDHIGHWATERMARK_ISSET_ID = 0;
   private static final int __MINOPENWRITEID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MIN_OPEN_WRITE_ID};
+  private static final _Fields[] optionals = {_Fields.MIN_OPEN_WRITE_ID};
   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);
@@ -157,6 +159,7 @@ public TableValidWriteIds(TableValidWriteIds other) {
     }
   }
 
+  @Override
   public TableValidWriteIds deepCopy() {
     return new TableValidWriteIds(this);
   }
@@ -312,6 +315,7 @@ public void setAbortedBitsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FULL_TABLE_NAME:
@@ -362,6 +366,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FULL_TABLE_NAME:
@@ -384,6 +389,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -552,14 +558,17 @@ public int compareTo(TableValidWriteIds other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -646,6 +655,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TableValidWriteIdsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableValidWriteIdsStandardScheme getScheme() {
       return new TableValidWriteIdsStandardScheme();
     }
@@ -653,75 +663,82 @@ public TableValidWriteIdsStandardScheme getScheme() {
 
   private static class TableValidWriteIdsStandardScheme extends org.apache.thrift.scheme.StandardScheme<TableValidWriteIds> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TableValidWriteIds 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 1: // FULL_TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fullTableName = iprot.readString();
-              struct.setFullTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WRITE_ID_HIGH_WATER_MARK
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeIdHighWaterMark = iprot.readI64();
-              struct.setWriteIdHighWaterMarkIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // INVALID_WRITE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list862 = iprot.readListBegin();
-                struct.invalidWriteIds = new java.util.ArrayList<java.lang.Long>(_list862.size);
-                long _elem863;
-                for (int _i864 = 0; _i864 < _list862.size; ++_i864)
+          }
+          switch (schemeField.id) {
+            case 1: // FULL_TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.fullTableName = iprot.readString();
+                struct.setFullTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // WRITE_ID_HIGH_WATER_MARK
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeIdHighWaterMark = iprot.readI64();
+                struct.setWriteIdHighWaterMarkIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // INVALID_WRITE_IDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem863 = iprot.readI64();
-                  struct.invalidWriteIds.add(_elem863);
+                  org.apache.thrift.protocol.TList _list862 = iprot.readListBegin();
+                  struct.invalidWriteIds = new java.util.ArrayList<java.lang.Long>(_list862.size);
+                  long _elem863;
+                  for (int _i864 = 0; _i864 < _list862.size; ++_i864)
+                  {
+                    _elem863 = iprot.readI64();
+                    struct.invalidWriteIds.add(_elem863);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setInvalidWriteIdsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setInvalidWriteIdsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // MIN_OPEN_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.minOpenWriteId = iprot.readI64();
-              struct.setMinOpenWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ABORTED_BITS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.abortedBits = iprot.readBinary();
-              struct.setAbortedBitsIsSet(true);
-            } else { 
+              break;
+            case 4: // MIN_OPEN_WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.minOpenWriteId = iprot.readI64();
+                struct.setMinOpenWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ABORTED_BITS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.abortedBits = iprot.readBinary();
+                struct.setAbortedBitsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TableValidWriteIds struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -763,6 +780,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TableValidWriteIds
   }
 
   private static class TableValidWriteIdsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TableValidWriteIdsTupleScheme getScheme() {
       return new TableValidWriteIdsTupleScheme();
     }
@@ -795,28 +813,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TableValidWriteIds
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TableValidWriteIds struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.fullTableName = iprot.readString();
-      struct.setFullTableNameIsSet(true);
-      struct.writeIdHighWaterMark = iprot.readI64();
-      struct.setWriteIdHighWaterMarkIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list867 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
-        struct.invalidWriteIds = new java.util.ArrayList<java.lang.Long>(_list867.size);
-        long _elem868;
-        for (int _i869 = 0; _i869 < _list867.size; ++_i869)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.fullTableName = iprot.readString();
+        struct.setFullTableNameIsSet(true);
+        struct.writeIdHighWaterMark = iprot.readI64();
+        struct.setWriteIdHighWaterMarkIsSet(true);
         {
-          _elem868 = iprot.readI64();
-          struct.invalidWriteIds.add(_elem868);
+          org.apache.thrift.protocol.TList _list867 = iprot.readListBegin(org.apache.thrift.protocol.TType.I64);
+          struct.invalidWriteIds = new java.util.ArrayList<java.lang.Long>(_list867.size);
+          long _elem868;
+          for (int _i869 = 0; _i869 < _list867.size; ++_i869)
+          {
+            _elem868 = iprot.readI64();
+            struct.invalidWriteIds.add(_elem868);
+          }
         }
-      }
-      struct.setInvalidWriteIdsIsSet(true);
-      struct.abortedBits = iprot.readBinary();
-      struct.setAbortedBitsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.minOpenWriteId = iprot.readI64();
-        struct.setMinOpenWriteIdIsSet(true);
+        struct.setInvalidWriteIdsIsSet(true);
+        struct.abortedBits = iprot.readBinary();
+        struct.setAbortedBitsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.minOpenWriteId = iprot.readI64();
+          struct.setMinOpenWriteIdIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
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 a79131b16a6a..a0d4110ba938 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
@@ -1,13 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hive.metastore.api;
 
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ThriftHiveMetastore {
 
   /**
@@ -591,7 +591,7 @@
 
   }
 
-  @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public interface AsyncIface extends com.facebook.fb303.FacebookService .AsyncIface {
+  @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public interface AsyncIface extends com.facebook.fb303.FacebookService.AsyncIface {
 
     public void abort_Compactions(AbortCompactionRequest rqst, org.apache.thrift.async.AsyncMethodCallback<AbortCompactResponse> resultHandler) throws org.apache.thrift.TException;
 
@@ -1172,9 +1172,11 @@
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class Client extends com.facebook.fb303.FacebookService.Client implements Iface {
     @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
+      @Override
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
+      @Override
       public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
@@ -1189,6 +1191,7 @@ public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.prot
       super(iprot, oprot);
     }
 
+    @Override
     public AbortCompactResponse abort_Compactions(AbortCompactionRequest rqst) throws org.apache.thrift.TException
     {
       send_abort_Compactions(rqst);
@@ -1212,6 +1215,7 @@ public AbortCompactResponse recv_abort_Compactions() throws org.apache.thrift.TE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "abort_Compactions failed: unknown result");
     }
 
+    @Override
     public java.lang.String getMetaConf(java.lang.String key) throws MetaException, org.apache.thrift.TException
     {
       send_getMetaConf(key);
@@ -1238,6 +1242,7 @@ public java.lang.String recv_getMetaConf() throws MetaException, org.apache.thri
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getMetaConf failed: unknown result");
     }
 
+    @Override
     public void setMetaConf(java.lang.String key, java.lang.String value) throws MetaException, org.apache.thrift.TException
     {
       send_setMetaConf(key, value);
@@ -1262,6 +1267,7 @@ public void recv_setMetaConf() throws MetaException, org.apache.thrift.TExceptio
       return;
     }
 
+    @Override
     public void create_catalog(CreateCatalogRequest catalog) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_catalog(catalog);
@@ -1291,6 +1297,7 @@ public void recv_create_catalog() throws AlreadyExistsException, InvalidObjectEx
       return;
     }
 
+    @Override
     public void alter_catalog(AlterCatalogRequest rqst) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_catalog(rqst);
@@ -1320,6 +1327,7 @@ public void recv_alter_catalog() throws NoSuchObjectException, InvalidOperationE
       return;
     }
 
+    @Override
     public GetCatalogResponse get_catalog(GetCatalogRequest catName) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_catalog(catName);
@@ -1349,6 +1357,7 @@ public GetCatalogResponse recv_get_catalog() throws NoSuchObjectException, MetaE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_catalog failed: unknown result");
     }
 
+    @Override
     public GetCatalogsResponse get_catalogs() throws MetaException, org.apache.thrift.TException
     {
       send_get_catalogs();
@@ -1374,6 +1383,7 @@ public GetCatalogsResponse recv_get_catalogs() throws MetaException, org.apache.
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_catalogs failed: unknown result");
     }
 
+    @Override
     public void drop_catalog(DropCatalogRequest catName) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_catalog(catName);
@@ -1403,6 +1413,7 @@ public void recv_drop_catalog() throws NoSuchObjectException, InvalidOperationEx
       return;
     }
 
+    @Override
     public void create_database(Database database) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_database(database);
@@ -1432,6 +1443,7 @@ public void recv_create_database() throws AlreadyExistsException, InvalidObjectE
       return;
     }
 
+    @Override
     public void create_database_req(CreateDatabaseRequest createDatabaseRequest) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_database_req(createDatabaseRequest);
@@ -1461,6 +1473,7 @@ public void recv_create_database_req() throws AlreadyExistsException, InvalidObj
       return;
     }
 
+    @Override
     public Database get_database(java.lang.String name) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_database(name);
@@ -1490,6 +1503,7 @@ public Database recv_get_database() throws NoSuchObjectException, MetaException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_database failed: unknown result");
     }
 
+    @Override
     public Database get_database_req(GetDatabaseRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_database_req(request);
@@ -1519,6 +1533,7 @@ public Database recv_get_database_req() throws NoSuchObjectException, MetaExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_database_req failed: unknown result");
     }
 
+    @Override
     public void drop_database(java.lang.String name, boolean deleteData, boolean cascade) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_database(name, deleteData, cascade);
@@ -1550,6 +1565,7 @@ public void recv_drop_database() throws NoSuchObjectException, InvalidOperationE
       return;
     }
 
+    @Override
     public AsyncOperationResp drop_database_req(DropDatabaseRequest req) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_database_req(req);
@@ -1582,6 +1598,7 @@ public AsyncOperationResp recv_drop_database_req() throws NoSuchObjectException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_database_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_databases(java.lang.String pattern) throws MetaException, org.apache.thrift.TException
     {
       send_get_databases(pattern);
@@ -1608,6 +1625,7 @@ public java.util.List<java.lang.String> recv_get_databases() throws MetaExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_databases failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_all_databases() throws MetaException, org.apache.thrift.TException
     {
       send_get_all_databases();
@@ -1633,6 +1651,7 @@ public java.util.List<java.lang.String> recv_get_all_databases() throws MetaExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_databases failed: unknown result");
     }
 
+    @Override
     public GetDatabaseObjectsResponse get_databases_req(GetDatabaseObjectsRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_databases_req(request);
@@ -1659,6 +1678,7 @@ public GetDatabaseObjectsResponse recv_get_databases_req() throws MetaException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_databases_req failed: unknown result");
     }
 
+    @Override
     public void alter_database(java.lang.String dbname, Database db) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_alter_database(dbname, db);
@@ -1686,6 +1706,7 @@ public void recv_alter_database() throws MetaException, NoSuchObjectException, o
       return;
     }
 
+    @Override
     public void alter_database_req(AlterDatabaseRequest alterDbReq) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_alter_database_req(alterDbReq);
@@ -1712,6 +1733,7 @@ public void recv_alter_database_req() throws MetaException, NoSuchObjectExceptio
       return;
     }
 
+    @Override
     public void create_dataconnector_req(CreateDataConnectorRequest connectorReq) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_dataconnector_req(connectorReq);
@@ -1741,6 +1763,7 @@ public void recv_create_dataconnector_req() throws AlreadyExistsException, Inval
       return;
     }
 
+    @Override
     public DataConnector get_dataconnector_req(GetDataConnectorRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_dataconnector_req(request);
@@ -1770,6 +1793,7 @@ public DataConnector recv_get_dataconnector_req() throws NoSuchObjectException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_dataconnector_req failed: unknown result");
     }
 
+    @Override
     public void drop_dataconnector_req(DropDataConnectorRequest dropDcReq) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_dataconnector_req(dropDcReq);
@@ -1799,6 +1823,7 @@ public void recv_drop_dataconnector_req() throws NoSuchObjectException, InvalidO
       return;
     }
 
+    @Override
     public java.util.List<java.lang.String> get_dataconnectors() throws MetaException, org.apache.thrift.TException
     {
       send_get_dataconnectors();
@@ -1824,6 +1849,7 @@ public java.util.List<java.lang.String> recv_get_dataconnectors() throws MetaExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_dataconnectors failed: unknown result");
     }
 
+    @Override
     public void alter_dataconnector_req(AlterDataConnectorRequest alterReq) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_alter_dataconnector_req(alterReq);
@@ -1850,6 +1876,7 @@ public void recv_alter_dataconnector_req() throws MetaException, NoSuchObjectExc
       return;
     }
 
+    @Override
     public Type get_type(java.lang.String name) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_type(name);
@@ -1879,6 +1906,7 @@ public Type recv_get_type() throws MetaException, NoSuchObjectException, org.apa
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_type failed: unknown result");
     }
 
+    @Override
     public boolean create_type(Type type) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_type(type);
@@ -1911,6 +1939,7 @@ public boolean recv_create_type() throws AlreadyExistsException, InvalidObjectEx
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_type failed: unknown result");
     }
 
+    @Override
     public boolean drop_type(java.lang.String type) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_drop_type(type);
@@ -1940,6 +1969,7 @@ public boolean recv_drop_type() throws MetaException, NoSuchObjectException, org
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_type failed: unknown result");
     }
 
+    @Override
     public java.util.Map<java.lang.String,Type> get_type_all(java.lang.String name) throws MetaException, org.apache.thrift.TException
     {
       send_get_type_all(name);
@@ -1966,6 +1996,7 @@ public java.util.Map<java.lang.String,Type> recv_get_type_all() throws MetaExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_type_all failed: unknown result");
     }
 
+    @Override
     public java.util.List<FieldSchema> get_fields(java.lang.String db_name, java.lang.String table_name) throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_fields(db_name, table_name);
@@ -1999,6 +2030,7 @@ public java.util.List<FieldSchema> recv_get_fields() throws MetaException, Unkno
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_fields failed: unknown result");
     }
 
+    @Override
     public java.util.List<FieldSchema> get_fields_with_environment_context(java.lang.String db_name, java.lang.String table_name, EnvironmentContext environment_context) throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_fields_with_environment_context(db_name, table_name, environment_context);
@@ -2033,6 +2065,7 @@ public java.util.List<FieldSchema> recv_get_fields_with_environment_context() th
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_fields_with_environment_context failed: unknown result");
     }
 
+    @Override
     public GetFieldsResponse get_fields_req(GetFieldsRequest req) throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_fields_req(req);
@@ -2065,6 +2098,7 @@ public GetFieldsResponse recv_get_fields_req() throws MetaException, UnknownTabl
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_fields_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<FieldSchema> get_schema(java.lang.String db_name, java.lang.String table_name) throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_schema(db_name, table_name);
@@ -2098,6 +2132,7 @@ public java.util.List<FieldSchema> recv_get_schema() throws MetaException, Unkno
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schema failed: unknown result");
     }
 
+    @Override
     public java.util.List<FieldSchema> get_schema_with_environment_context(java.lang.String db_name, java.lang.String table_name, EnvironmentContext environment_context) throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_schema_with_environment_context(db_name, table_name, environment_context);
@@ -2132,6 +2167,7 @@ public java.util.List<FieldSchema> recv_get_schema_with_environment_context() th
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schema_with_environment_context failed: unknown result");
     }
 
+    @Override
     public GetSchemaResponse get_schema_req(GetSchemaRequest req) throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_schema_req(req);
@@ -2164,6 +2200,7 @@ public GetSchemaResponse recv_get_schema_req() throws MetaException, UnknownTabl
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schema_req failed: unknown result");
     }
 
+    @Override
     public void create_table(Table tbl) throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_create_table(tbl);
@@ -2196,6 +2233,7 @@ public void recv_create_table() throws AlreadyExistsException, InvalidObjectExce
       return;
     }
 
+    @Override
     public void create_table_with_environment_context(Table tbl, EnvironmentContext environment_context) throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_create_table_with_environment_context(tbl, environment_context);
@@ -2229,6 +2267,7 @@ public void recv_create_table_with_environment_context() throws AlreadyExistsExc
       return;
     }
 
+    @Override
     public void create_table_with_constraints(Table tbl, java.util.List<SQLPrimaryKey> primaryKeys, java.util.List<SQLForeignKey> foreignKeys, java.util.List<SQLUniqueConstraint> uniqueConstraints, java.util.List<SQLNotNullConstraint> notNullConstraints, java.util.List<SQLDefaultConstraint> defaultConstraints, java.util.List<SQLCheckConstraint> checkConstraints) throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_create_table_with_constraints(tbl, primaryKeys, foreignKeys, uniqueConstraints, notNullConstraints, defaultConstraints, checkConstraints);
@@ -2267,6 +2306,7 @@ public void recv_create_table_with_constraints() throws AlreadyExistsException,
       return;
     }
 
+    @Override
     public void create_table_req(CreateTableRequest request) throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_create_table_req(request);
@@ -2299,6 +2339,7 @@ public void recv_create_table_req() throws AlreadyExistsException, InvalidObject
       return;
     }
 
+    @Override
     public void drop_constraint(DropConstraintRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_constraint(req);
@@ -2325,6 +2366,7 @@ public void recv_drop_constraint() throws NoSuchObjectException, MetaException,
       return;
     }
 
+    @Override
     public void add_primary_key(AddPrimaryKeyRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_primary_key(req);
@@ -2351,6 +2393,7 @@ public void recv_add_primary_key() throws NoSuchObjectException, MetaException,
       return;
     }
 
+    @Override
     public void add_foreign_key(AddForeignKeyRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_foreign_key(req);
@@ -2377,6 +2420,7 @@ public void recv_add_foreign_key() throws NoSuchObjectException, MetaException,
       return;
     }
 
+    @Override
     public void add_unique_constraint(AddUniqueConstraintRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_unique_constraint(req);
@@ -2403,6 +2447,7 @@ public void recv_add_unique_constraint() throws NoSuchObjectException, MetaExcep
       return;
     }
 
+    @Override
     public void add_not_null_constraint(AddNotNullConstraintRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_not_null_constraint(req);
@@ -2429,6 +2474,7 @@ public void recv_add_not_null_constraint() throws NoSuchObjectException, MetaExc
       return;
     }
 
+    @Override
     public void add_default_constraint(AddDefaultConstraintRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_default_constraint(req);
@@ -2455,6 +2501,7 @@ public void recv_add_default_constraint() throws NoSuchObjectException, MetaExce
       return;
     }
 
+    @Override
     public void add_check_constraint(AddCheckConstraintRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_check_constraint(req);
@@ -2481,6 +2528,7 @@ public void recv_add_check_constraint() throws NoSuchObjectException, MetaExcept
       return;
     }
 
+    @Override
     public Table translate_table_dryrun(CreateTableRequest request) throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_translate_table_dryrun(request);
@@ -2516,6 +2564,7 @@ public Table recv_translate_table_dryrun() throws AlreadyExistsException, Invali
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "translate_table_dryrun failed: unknown result");
     }
 
+    @Override
     public void drop_table(java.lang.String dbname, java.lang.String name, boolean deleteData) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_table(dbname, name, deleteData);
@@ -2544,6 +2593,7 @@ public void recv_drop_table() throws NoSuchObjectException, MetaException, org.a
       return;
     }
 
+    @Override
     public void drop_table_with_environment_context(java.lang.String dbname, java.lang.String name, boolean deleteData, EnvironmentContext environment_context) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_table_with_environment_context(dbname, name, deleteData, environment_context);
@@ -2573,6 +2623,7 @@ public void recv_drop_table_with_environment_context() throws NoSuchObjectExcept
       return;
     }
 
+    @Override
     public AsyncOperationResp drop_table_req(DropTableRequest dropTableReq) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_table_req(dropTableReq);
@@ -2602,6 +2653,7 @@ public AsyncOperationResp recv_drop_table_req() throws NoSuchObjectException, Me
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_table_req failed: unknown result");
     }
 
+    @Override
     public void truncate_table(java.lang.String dbName, java.lang.String tableName, java.util.List<java.lang.String> partNames) throws MetaException, org.apache.thrift.TException
     {
       send_truncate_table(dbName, tableName, partNames);
@@ -2627,6 +2679,7 @@ public void recv_truncate_table() throws MetaException, org.apache.thrift.TExcep
       return;
     }
 
+    @Override
     public TruncateTableResponse truncate_table_req(TruncateTableRequest req) throws MetaException, org.apache.thrift.TException
     {
       send_truncate_table_req(req);
@@ -2653,6 +2706,7 @@ public TruncateTableResponse recv_truncate_table_req() throws MetaException, org
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "truncate_table_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_tables(java.lang.String db_name, java.lang.String pattern) throws MetaException, org.apache.thrift.TException
     {
       send_get_tables(db_name, pattern);
@@ -2680,6 +2734,7 @@ public java.util.List<java.lang.String> recv_get_tables() throws MetaException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_tables failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_tables_by_type(java.lang.String db_name, java.lang.String pattern, java.lang.String tableType) throws MetaException, org.apache.thrift.TException
     {
       send_get_tables_by_type(db_name, pattern, tableType);
@@ -2708,6 +2763,7 @@ public java.util.List<java.lang.String> recv_get_tables_by_type() throws MetaExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_tables_by_type failed: unknown result");
     }
 
+    @Override
     public java.util.List<Table> get_all_materialized_view_objects_for_rewriting() throws MetaException, org.apache.thrift.TException
     {
       send_get_all_materialized_view_objects_for_rewriting();
@@ -2733,6 +2789,7 @@ public java.util.List<Table> recv_get_all_materialized_view_objects_for_rewritin
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_materialized_view_objects_for_rewriting failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_materialized_views_for_rewriting(java.lang.String db_name) throws MetaException, org.apache.thrift.TException
     {
       send_get_materialized_views_for_rewriting(db_name);
@@ -2759,6 +2816,7 @@ public java.util.List<java.lang.String> recv_get_materialized_views_for_rewritin
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_materialized_views_for_rewriting failed: unknown result");
     }
 
+    @Override
     public java.util.List<TableMeta> get_table_meta(java.lang.String db_patterns, java.lang.String tbl_patterns, java.util.List<java.lang.String> tbl_types) throws MetaException, org.apache.thrift.TException
     {
       send_get_table_meta(db_patterns, tbl_patterns, tbl_types);
@@ -2787,6 +2845,7 @@ public java.util.List<TableMeta> recv_get_table_meta() throws MetaException, org
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_table_meta failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_all_tables(java.lang.String db_name) throws MetaException, org.apache.thrift.TException
     {
       send_get_all_tables(db_name);
@@ -2813,6 +2872,7 @@ public java.util.List<java.lang.String> recv_get_all_tables() throws MetaExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_tables failed: unknown result");
     }
 
+    @Override
     public java.util.List<ExtendedTableInfo> get_tables_ext(GetTablesExtRequest req) throws MetaException, org.apache.thrift.TException
     {
       send_get_tables_ext(req);
@@ -2839,6 +2899,7 @@ public java.util.List<ExtendedTableInfo> recv_get_tables_ext() throws MetaExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_tables_ext failed: unknown result");
     }
 
+    @Override
     public GetTableResult get_table_req(GetTableRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_table_req(req);
@@ -2868,6 +2929,7 @@ public GetTableResult recv_get_table_req() throws MetaException, NoSuchObjectExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_table_req failed: unknown result");
     }
 
+    @Override
     public GetTablesResult get_table_objects_by_name_req(GetTablesRequest req) throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_table_objects_by_name_req(req);
@@ -2900,6 +2962,7 @@ public GetTablesResult recv_get_table_objects_by_name_req() throws MetaException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_table_objects_by_name_req failed: unknown result");
     }
 
+    @Override
     public Materialization get_materialization_invalidation_info(CreationMetadata creation_metadata, java.lang.String validTxnList) throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_materialization_invalidation_info(creation_metadata, validTxnList);
@@ -2933,6 +2996,7 @@ public Materialization recv_get_materialization_invalidation_info() throws MetaE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_materialization_invalidation_info failed: unknown result");
     }
 
+    @Override
     public void update_creation_metadata(java.lang.String catName, java.lang.String dbname, java.lang.String tbl_name, CreationMetadata creation_metadata) throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException
     {
       send_update_creation_metadata(catName, dbname, tbl_name, creation_metadata);
@@ -2965,6 +3029,7 @@ public void recv_update_creation_metadata() throws MetaException, InvalidOperati
       return;
     }
 
+    @Override
     public java.util.List<java.lang.String> get_table_names_by_filter(java.lang.String dbname, java.lang.String filter, short max_tables) throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException
     {
       send_get_table_names_by_filter(dbname, filter, max_tables);
@@ -2999,6 +3064,7 @@ public java.util.List<java.lang.String> recv_get_table_names_by_filter() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_table_names_by_filter failed: unknown result");
     }
 
+    @Override
     public void alter_table(java.lang.String dbname, java.lang.String tbl_name, Table new_tbl) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_table(dbname, tbl_name, new_tbl);
@@ -3027,6 +3093,7 @@ public void recv_alter_table() throws InvalidOperationException, MetaException,
       return;
     }
 
+    @Override
     public void alter_table_with_environment_context(java.lang.String dbname, java.lang.String tbl_name, Table new_tbl, EnvironmentContext environment_context) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_table_with_environment_context(dbname, tbl_name, new_tbl, environment_context);
@@ -3056,6 +3123,7 @@ public void recv_alter_table_with_environment_context() throws InvalidOperationE
       return;
     }
 
+    @Override
     public void alter_table_with_cascade(java.lang.String dbname, java.lang.String tbl_name, Table new_tbl, boolean cascade) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_table_with_cascade(dbname, tbl_name, new_tbl, cascade);
@@ -3085,6 +3153,7 @@ public void recv_alter_table_with_cascade() throws InvalidOperationException, Me
       return;
     }
 
+    @Override
     public AlterTableResponse alter_table_req(AlterTableRequest req) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_table_req(req);
@@ -3114,6 +3183,7 @@ public AlterTableResponse recv_alter_table_req() throws InvalidOperationExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "alter_table_req failed: unknown result");
     }
 
+    @Override
     public void update_table_params(java.util.List<TableParamsUpdate> updates) throws MetaException, org.apache.thrift.TException
     {
       send_update_table_params(updates);
@@ -3137,6 +3207,7 @@ public void recv_update_table_params() throws MetaException, org.apache.thrift.T
       return;
     }
 
+    @Override
     public Partition add_partition(Partition new_part) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_add_partition(new_part);
@@ -3169,6 +3240,7 @@ public Partition recv_add_partition() throws InvalidObjectException, AlreadyExis
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_partition failed: unknown result");
     }
 
+    @Override
     public Partition add_partition_with_environment_context(Partition new_part, EnvironmentContext environment_context) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_add_partition_with_environment_context(new_part, environment_context);
@@ -3202,6 +3274,7 @@ public Partition recv_add_partition_with_environment_context() throws InvalidObj
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_partition_with_environment_context failed: unknown result");
     }
 
+    @Override
     public int add_partitions(java.util.List<Partition> new_parts) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_add_partitions(new_parts);
@@ -3234,6 +3307,7 @@ public int recv_add_partitions() throws InvalidObjectException, AlreadyExistsExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_partitions failed: unknown result");
     }
 
+    @Override
     public int add_partitions_pspec(java.util.List<PartitionSpec> new_parts) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_add_partitions_pspec(new_parts);
@@ -3266,6 +3340,7 @@ public int recv_add_partitions_pspec() throws InvalidObjectException, AlreadyExi
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_partitions_pspec failed: unknown result");
     }
 
+    @Override
     public Partition append_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_append_partition(db_name, tbl_name, part_vals);
@@ -3300,6 +3375,7 @@ public Partition recv_append_partition() throws InvalidObjectException, AlreadyE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append_partition failed: unknown result");
     }
 
+    @Override
     public AddPartitionsResult add_partitions_req(AddPartitionsRequest request) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_add_partitions_req(request);
@@ -3332,6 +3408,7 @@ public AddPartitionsResult recv_add_partitions_req() throws InvalidObjectExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_partitions_req failed: unknown result");
     }
 
+    @Override
     public Partition append_partition_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, EnvironmentContext environment_context) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_append_partition_with_environment_context(db_name, tbl_name, part_vals, environment_context);
@@ -3367,6 +3444,7 @@ public Partition recv_append_partition_with_environment_context() throws Invalid
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append_partition_with_environment_context failed: unknown result");
     }
 
+    @Override
     public Partition append_partition_req(AppendPartitionsRequest appendPartitionsReq) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_append_partition_req(appendPartitionsReq);
@@ -3399,6 +3477,7 @@ public Partition recv_append_partition_req() throws InvalidObjectException, Alre
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append_partition_req failed: unknown result");
     }
 
+    @Override
     public Partition append_partition_by_name(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_append_partition_by_name(db_name, tbl_name, part_name);
@@ -3433,6 +3512,7 @@ public Partition recv_append_partition_by_name() throws InvalidObjectException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append_partition_by_name failed: unknown result");
     }
 
+    @Override
     public Partition append_partition_by_name_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, EnvironmentContext environment_context) throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_append_partition_by_name_with_environment_context(db_name, tbl_name, part_name, environment_context);
@@ -3468,6 +3548,7 @@ public Partition recv_append_partition_by_name_with_environment_context() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append_partition_by_name_with_environment_context failed: unknown result");
     }
 
+    @Override
     public boolean drop_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, boolean deleteData) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_partition(db_name, tbl_name, part_vals, deleteData);
@@ -3500,6 +3581,7 @@ public boolean recv_drop_partition() throws NoSuchObjectException, MetaException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_partition failed: unknown result");
     }
 
+    @Override
     public boolean drop_partition_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, boolean deleteData, EnvironmentContext environment_context) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_partition_with_environment_context(db_name, tbl_name, part_vals, deleteData, environment_context);
@@ -3533,6 +3615,7 @@ public boolean recv_drop_partition_with_environment_context() throws NoSuchObjec
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_partition_with_environment_context failed: unknown result");
     }
 
+    @Override
     public boolean drop_partition_req(DropPartitionRequest dropPartitionReq) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_partition_req(dropPartitionReq);
@@ -3562,6 +3645,7 @@ public boolean recv_drop_partition_req() throws NoSuchObjectException, MetaExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_partition_req failed: unknown result");
     }
 
+    @Override
     public boolean drop_partition_by_name(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, boolean deleteData) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_partition_by_name(db_name, tbl_name, part_name, deleteData);
@@ -3594,6 +3678,7 @@ public boolean recv_drop_partition_by_name() throws NoSuchObjectException, MetaE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_partition_by_name failed: unknown result");
     }
 
+    @Override
     public boolean drop_partition_by_name_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, boolean deleteData, EnvironmentContext environment_context) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_partition_by_name_with_environment_context(db_name, tbl_name, part_name, deleteData, environment_context);
@@ -3627,6 +3712,7 @@ public boolean recv_drop_partition_by_name_with_environment_context() throws NoS
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_partition_by_name_with_environment_context failed: unknown result");
     }
 
+    @Override
     public DropPartitionsResult drop_partitions_req(DropPartitionsRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_partitions_req(req);
@@ -3656,6 +3742,7 @@ public DropPartitionsResult recv_drop_partitions_req() throws NoSuchObjectExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_partitions_req failed: unknown result");
     }
 
+    @Override
     public Partition get_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition(db_name, tbl_name, part_vals);
@@ -3687,6 +3774,7 @@ public Partition recv_get_partition() throws MetaException, NoSuchObjectExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition failed: unknown result");
     }
 
+    @Override
     public GetPartitionResponse get_partition_req(GetPartitionRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_req(req);
@@ -3716,6 +3804,7 @@ public GetPartitionResponse recv_get_partition_req() throws MetaException, NoSuc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_req failed: unknown result");
     }
 
+    @Override
     public Partition exchange_partition(java.util.Map<java.lang.String,java.lang.String> partitionSpecs, java.lang.String source_db, java.lang.String source_table_name, java.lang.String dest_db, java.lang.String dest_table_name) throws MetaException, NoSuchObjectException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException
     {
       send_exchange_partition(partitionSpecs, source_db, source_table_name, dest_db, dest_table_name);
@@ -3755,6 +3844,7 @@ public Partition recv_exchange_partition() throws MetaException, NoSuchObjectExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "exchange_partition failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> exchange_partitions(java.util.Map<java.lang.String,java.lang.String> partitionSpecs, java.lang.String source_db, java.lang.String source_table_name, java.lang.String dest_db, java.lang.String dest_table_name) throws MetaException, NoSuchObjectException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException
     {
       send_exchange_partitions(partitionSpecs, source_db, source_table_name, dest_db, dest_table_name);
@@ -3794,6 +3884,7 @@ public java.util.List<Partition> recv_exchange_partitions() throws MetaException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "exchange_partitions failed: unknown result");
     }
 
+    @Override
     public Partition get_partition_with_auth(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, java.lang.String user_name, java.util.List<java.lang.String> group_names) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_with_auth(db_name, tbl_name, part_vals, user_name, group_names);
@@ -3827,6 +3918,7 @@ public Partition recv_get_partition_with_auth() throws MetaException, NoSuchObje
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_with_auth failed: unknown result");
     }
 
+    @Override
     public Partition get_partition_by_name(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_by_name(db_name, tbl_name, part_name);
@@ -3858,6 +3950,7 @@ public Partition recv_get_partition_by_name() throws MetaException, NoSuchObject
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_by_name failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions(java.lang.String db_name, java.lang.String tbl_name, short max_parts) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partitions(db_name, tbl_name, max_parts);
@@ -3889,6 +3982,7 @@ public java.util.List<Partition> recv_get_partitions() throws NoSuchObjectExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions failed: unknown result");
     }
 
+    @Override
     public PartitionsResponse get_partitions_req(PartitionsRequest req) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partitions_req(req);
@@ -3918,6 +4012,7 @@ public PartitionsResponse recv_get_partitions_req() throws NoSuchObjectException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions_with_auth(java.lang.String db_name, java.lang.String tbl_name, short max_parts, java.lang.String user_name, java.util.List<java.lang.String> group_names) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partitions_with_auth(db_name, tbl_name, max_parts, user_name, group_names);
@@ -3951,6 +4046,7 @@ public java.util.List<Partition> recv_get_partitions_with_auth() throws NoSuchOb
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_with_auth failed: unknown result");
     }
 
+    @Override
     public java.util.List<PartitionSpec> get_partitions_pspec(java.lang.String db_name, java.lang.String tbl_name, int max_parts) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partitions_pspec(db_name, tbl_name, max_parts);
@@ -3982,6 +4078,7 @@ public java.util.List<PartitionSpec> recv_get_partitions_pspec() throws NoSuchOb
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_pspec failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_partition_names(java.lang.String db_name, java.lang.String tbl_name, short max_parts) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partition_names(db_name, tbl_name, max_parts);
@@ -4013,6 +4110,7 @@ public java.util.List<java.lang.String> recv_get_partition_names() throws NoSuch
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_names failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> fetch_partition_names_req(PartitionsRequest partitionReq) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_fetch_partition_names_req(partitionReq);
@@ -4042,6 +4140,7 @@ public java.util.List<java.lang.String> recv_fetch_partition_names_req() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fetch_partition_names_req failed: unknown result");
     }
 
+    @Override
     public PartitionValuesResponse get_partition_values(PartitionValuesRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_values(request);
@@ -4071,6 +4170,7 @@ public PartitionValuesResponse recv_get_partition_values() throws MetaException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_values failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions_ps(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, short max_parts) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partitions_ps(db_name, tbl_name, part_vals, max_parts);
@@ -4103,6 +4203,7 @@ public java.util.List<Partition> recv_get_partitions_ps() throws MetaException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_ps failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions_ps_with_auth(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, short max_parts, java.lang.String user_name, java.util.List<java.lang.String> group_names) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partitions_ps_with_auth(db_name, tbl_name, part_vals, max_parts, user_name, group_names);
@@ -4137,6 +4238,7 @@ public java.util.List<Partition> recv_get_partitions_ps_with_auth() throws NoSuc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_ps_with_auth failed: unknown result");
     }
 
+    @Override
     public GetPartitionsPsWithAuthResponse get_partitions_ps_with_auth_req(GetPartitionsPsWithAuthRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partitions_ps_with_auth_req(req);
@@ -4166,6 +4268,7 @@ public GetPartitionsPsWithAuthResponse recv_get_partitions_ps_with_auth_req() th
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_ps_with_auth_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_partition_names_ps(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, short max_parts) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_names_ps(db_name, tbl_name, part_vals, max_parts);
@@ -4198,6 +4301,7 @@ public java.util.List<java.lang.String> recv_get_partition_names_ps() throws Met
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_names_ps failed: unknown result");
     }
 
+    @Override
     public GetPartitionNamesPsResponse get_partition_names_ps_req(GetPartitionNamesPsRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_names_ps_req(req);
@@ -4227,6 +4331,7 @@ public GetPartitionNamesPsResponse recv_get_partition_names_ps_req() throws Meta
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_names_ps_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_partition_names_req(PartitionsByExprRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partition_names_req(req);
@@ -4256,6 +4361,7 @@ public java.util.List<java.lang.String> recv_get_partition_names_req() throws Me
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_names_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions_by_filter(java.lang.String db_name, java.lang.String tbl_name, java.lang.String filter, short max_parts) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partitions_by_filter(db_name, tbl_name, filter, max_parts);
@@ -4288,6 +4394,7 @@ public java.util.List<Partition> recv_get_partitions_by_filter() throws MetaExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_by_filter failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions_by_filter_req(GetPartitionsByFilterRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partitions_by_filter_req(req);
@@ -4317,6 +4424,7 @@ public java.util.List<Partition> recv_get_partitions_by_filter_req() throws Meta
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_by_filter_req failed: unknown result");
     }
 
+    @Override
     public java.util.List<PartitionSpec> get_part_specs_by_filter(java.lang.String db_name, java.lang.String tbl_name, java.lang.String filter, int max_parts) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_part_specs_by_filter(db_name, tbl_name, filter, max_parts);
@@ -4349,6 +4457,7 @@ public java.util.List<PartitionSpec> recv_get_part_specs_by_filter() throws Meta
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_part_specs_by_filter failed: unknown result");
     }
 
+    @Override
     public PartitionsByExprResult get_partitions_by_expr(PartitionsByExprRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partitions_by_expr(req);
@@ -4378,6 +4487,7 @@ public PartitionsByExprResult recv_get_partitions_by_expr() throws MetaException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_by_expr failed: unknown result");
     }
 
+    @Override
     public PartitionsSpecByExprResult get_partitions_spec_by_expr(PartitionsByExprRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_partitions_spec_by_expr(req);
@@ -4407,6 +4517,7 @@ public PartitionsSpecByExprResult recv_get_partitions_spec_by_expr() throws Meta
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_spec_by_expr failed: unknown result");
     }
 
+    @Override
     public int get_num_partitions_by_filter(java.lang.String db_name, java.lang.String tbl_name, java.lang.String filter) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_num_partitions_by_filter(db_name, tbl_name, filter);
@@ -4438,6 +4549,7 @@ public int recv_get_num_partitions_by_filter() throws MetaException, NoSuchObjec
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_num_partitions_by_filter failed: unknown result");
     }
 
+    @Override
     public java.util.List<Partition> get_partitions_by_names(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> names) throws MetaException, NoSuchObjectException, InvalidObjectException, org.apache.thrift.TException
     {
       send_get_partitions_by_names(db_name, tbl_name, names);
@@ -4472,6 +4584,7 @@ public java.util.List<Partition> recv_get_partitions_by_names() throws MetaExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_by_names failed: unknown result");
     }
 
+    @Override
     public GetPartitionsByNamesResult get_partitions_by_names_req(GetPartitionsByNamesRequest req) throws MetaException, NoSuchObjectException, InvalidObjectException, org.apache.thrift.TException
     {
       send_get_partitions_by_names_req(req);
@@ -4504,6 +4617,7 @@ public GetPartitionsByNamesResult recv_get_partitions_by_names_req() throws Meta
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_by_names_req failed: unknown result");
     }
 
+    @Override
     public PropertyGetResponse get_properties(PropertyGetRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_properties(req);
@@ -4533,6 +4647,7 @@ public PropertyGetResponse recv_get_properties() throws MetaException, NoSuchObj
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_properties failed: unknown result");
     }
 
+    @Override
     public boolean set_properties(PropertySetRequest req) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_set_properties(req);
@@ -4562,6 +4677,7 @@ public boolean recv_set_properties() throws MetaException, NoSuchObjectException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "set_properties failed: unknown result");
     }
 
+    @Override
     public void alter_partition(java.lang.String db_name, java.lang.String tbl_name, Partition new_part) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_partition(db_name, tbl_name, new_part);
@@ -4590,6 +4706,7 @@ public void recv_alter_partition() throws InvalidOperationException, MetaExcepti
       return;
     }
 
+    @Override
     public void alter_partitions(java.lang.String db_name, java.lang.String tbl_name, java.util.List<Partition> new_parts) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_partitions(db_name, tbl_name, new_parts);
@@ -4618,6 +4735,7 @@ public void recv_alter_partitions() throws InvalidOperationException, MetaExcept
       return;
     }
 
+    @Override
     public void alter_partitions_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.util.List<Partition> new_parts, EnvironmentContext environment_context) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_partitions_with_environment_context(db_name, tbl_name, new_parts, environment_context);
@@ -4647,6 +4765,7 @@ public void recv_alter_partitions_with_environment_context() throws InvalidOpera
       return;
     }
 
+    @Override
     public AlterPartitionsResponse alter_partitions_req(AlterPartitionsRequest req) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_partitions_req(req);
@@ -4676,6 +4795,7 @@ public AlterPartitionsResponse recv_alter_partitions_req() throws InvalidOperati
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "alter_partitions_req failed: unknown result");
     }
 
+    @Override
     public void alter_partition_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, Partition new_part, EnvironmentContext environment_context) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_partition_with_environment_context(db_name, tbl_name, new_part, environment_context);
@@ -4705,6 +4825,7 @@ public void recv_alter_partition_with_environment_context() throws InvalidOperat
       return;
     }
 
+    @Override
     public void rename_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, Partition new_part) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_rename_partition(db_name, tbl_name, part_vals, new_part);
@@ -4734,6 +4855,7 @@ public void recv_rename_partition() throws InvalidOperationException, MetaExcept
       return;
     }
 
+    @Override
     public RenamePartitionResponse rename_partition_req(RenamePartitionRequest req) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_rename_partition_req(req);
@@ -4763,6 +4885,7 @@ public RenamePartitionResponse recv_rename_partition_req() throws InvalidOperati
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "rename_partition_req failed: unknown result");
     }
 
+    @Override
     public boolean partition_name_has_valid_characters(java.util.List<java.lang.String> part_vals, boolean throw_exception) throws MetaException, org.apache.thrift.TException
     {
       send_partition_name_has_valid_characters(part_vals, throw_exception);
@@ -4790,6 +4913,7 @@ public boolean recv_partition_name_has_valid_characters() throws MetaException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "partition_name_has_valid_characters failed: unknown result");
     }
 
+    @Override
     public java.lang.String get_config_value(java.lang.String name, java.lang.String defaultValue) throws ConfigValSecurityException, org.apache.thrift.TException
     {
       send_get_config_value(name, defaultValue);
@@ -4817,6 +4941,7 @@ public java.lang.String recv_get_config_value() throws ConfigValSecurityExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_config_value failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> partition_name_to_vals(java.lang.String part_name) throws MetaException, org.apache.thrift.TException
     {
       send_partition_name_to_vals(part_name);
@@ -4843,6 +4968,7 @@ public java.util.List<java.lang.String> recv_partition_name_to_vals() throws Met
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "partition_name_to_vals failed: unknown result");
     }
 
+    @Override
     public java.util.Map<java.lang.String,java.lang.String> partition_name_to_spec(java.lang.String part_name) throws MetaException, org.apache.thrift.TException
     {
       send_partition_name_to_spec(part_name);
@@ -4869,6 +4995,7 @@ public java.util.Map<java.lang.String,java.lang.String> recv_partition_name_to_s
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "partition_name_to_spec failed: unknown result");
     }
 
+    @Override
     public void markPartitionForEvent(java.lang.String db_name, java.lang.String tbl_name, java.util.Map<java.lang.String,java.lang.String> part_vals, PartitionEventType eventType) throws MetaException, NoSuchObjectException, UnknownDBException, UnknownTableException, UnknownPartitionException, InvalidPartitionException, org.apache.thrift.TException
     {
       send_markPartitionForEvent(db_name, tbl_name, part_vals, eventType);
@@ -4910,6 +5037,7 @@ public void recv_markPartitionForEvent() throws MetaException, NoSuchObjectExcep
       return;
     }
 
+    @Override
     public boolean isPartitionMarkedForEvent(java.lang.String db_name, java.lang.String tbl_name, java.util.Map<java.lang.String,java.lang.String> part_vals, PartitionEventType eventType) throws MetaException, NoSuchObjectException, UnknownDBException, UnknownTableException, UnknownPartitionException, InvalidPartitionException, org.apache.thrift.TException
     {
       send_isPartitionMarkedForEvent(db_name, tbl_name, part_vals, eventType);
@@ -4954,6 +5082,7 @@ public boolean recv_isPartitionMarkedForEvent() throws MetaException, NoSuchObje
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isPartitionMarkedForEvent failed: unknown result");
     }
 
+    @Override
     public PrimaryKeysResponse get_primary_keys(PrimaryKeysRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_primary_keys(request);
@@ -4983,6 +5112,7 @@ public PrimaryKeysResponse recv_get_primary_keys() throws MetaException, NoSuchO
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_primary_keys failed: unknown result");
     }
 
+    @Override
     public ForeignKeysResponse get_foreign_keys(ForeignKeysRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_foreign_keys(request);
@@ -5012,6 +5142,7 @@ public ForeignKeysResponse recv_get_foreign_keys() throws MetaException, NoSuchO
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_foreign_keys failed: unknown result");
     }
 
+    @Override
     public UniqueConstraintsResponse get_unique_constraints(UniqueConstraintsRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_unique_constraints(request);
@@ -5041,6 +5172,7 @@ public UniqueConstraintsResponse recv_get_unique_constraints() throws MetaExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_unique_constraints failed: unknown result");
     }
 
+    @Override
     public NotNullConstraintsResponse get_not_null_constraints(NotNullConstraintsRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_not_null_constraints(request);
@@ -5070,6 +5202,7 @@ public NotNullConstraintsResponse recv_get_not_null_constraints() throws MetaExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_not_null_constraints failed: unknown result");
     }
 
+    @Override
     public DefaultConstraintsResponse get_default_constraints(DefaultConstraintsRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_default_constraints(request);
@@ -5099,6 +5232,7 @@ public DefaultConstraintsResponse recv_get_default_constraints() throws MetaExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_default_constraints failed: unknown result");
     }
 
+    @Override
     public CheckConstraintsResponse get_check_constraints(CheckConstraintsRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_check_constraints(request);
@@ -5128,6 +5262,7 @@ public CheckConstraintsResponse recv_get_check_constraints() throws MetaExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_check_constraints failed: unknown result");
     }
 
+    @Override
     public AllTableConstraintsResponse get_all_table_constraints(AllTableConstraintsRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_all_table_constraints(request);
@@ -5157,6 +5292,7 @@ public AllTableConstraintsResponse recv_get_all_table_constraints() throws MetaE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_table_constraints failed: unknown result");
     }
 
+    @Override
     public boolean update_table_column_statistics(ColumnStatistics stats_obj) throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException
     {
       send_update_table_column_statistics(stats_obj);
@@ -5192,6 +5328,7 @@ public boolean recv_update_table_column_statistics() throws NoSuchObjectExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "update_table_column_statistics failed: unknown result");
     }
 
+    @Override
     public boolean update_partition_column_statistics(ColumnStatistics stats_obj) throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException
     {
       send_update_partition_column_statistics(stats_obj);
@@ -5227,6 +5364,7 @@ public boolean recv_update_partition_column_statistics() throws NoSuchObjectExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "update_partition_column_statistics failed: unknown result");
     }
 
+    @Override
     public SetPartitionsStatsResponse update_table_column_statistics_req(SetPartitionsStatsRequest req) throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException
     {
       send_update_table_column_statistics_req(req);
@@ -5262,6 +5400,7 @@ public SetPartitionsStatsResponse recv_update_table_column_statistics_req() thro
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "update_table_column_statistics_req failed: unknown result");
     }
 
+    @Override
     public SetPartitionsStatsResponse update_partition_column_statistics_req(SetPartitionsStatsRequest req) throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException
     {
       send_update_partition_column_statistics_req(req);
@@ -5297,6 +5436,7 @@ public SetPartitionsStatsResponse recv_update_partition_column_statistics_req()
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "update_partition_column_statistics_req failed: unknown result");
     }
 
+    @Override
     public void update_transaction_statistics(UpdateTransactionalStatsRequest req) throws MetaException, org.apache.thrift.TException
     {
       send_update_transaction_statistics(req);
@@ -5320,6 +5460,7 @@ public void recv_update_transaction_statistics() throws MetaException, org.apach
       return;
     }
 
+    @Override
     public ColumnStatistics get_table_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String col_name) throws NoSuchObjectException, MetaException, InvalidInputException, InvalidObjectException, org.apache.thrift.TException
     {
       send_get_table_column_statistics(db_name, tbl_name, col_name);
@@ -5357,6 +5498,7 @@ public ColumnStatistics recv_get_table_column_statistics() throws NoSuchObjectEx
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_table_column_statistics failed: unknown result");
     }
 
+    @Override
     public ColumnStatistics get_partition_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, java.lang.String col_name) throws NoSuchObjectException, MetaException, InvalidInputException, InvalidObjectException, org.apache.thrift.TException
     {
       send_get_partition_column_statistics(db_name, tbl_name, part_name, col_name);
@@ -5395,6 +5537,7 @@ public ColumnStatistics recv_get_partition_column_statistics() throws NoSuchObje
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partition_column_statistics failed: unknown result");
     }
 
+    @Override
     public TableStatsResult get_table_statistics_req(TableStatsRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_table_statistics_req(request);
@@ -5424,6 +5567,7 @@ public TableStatsResult recv_get_table_statistics_req() throws NoSuchObjectExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_table_statistics_req failed: unknown result");
     }
 
+    @Override
     public PartitionsStatsResult get_partitions_statistics_req(PartitionsStatsRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_partitions_statistics_req(request);
@@ -5453,6 +5597,7 @@ public PartitionsStatsResult recv_get_partitions_statistics_req() throws NoSuchO
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_statistics_req failed: unknown result");
     }
 
+    @Override
     public AggrStats get_aggr_stats_for(PartitionsStatsRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_aggr_stats_for(request);
@@ -5482,6 +5627,7 @@ public AggrStats recv_get_aggr_stats_for() throws NoSuchObjectException, MetaExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_aggr_stats_for failed: unknown result");
     }
 
+    @Override
     public boolean set_aggr_stats_for(SetPartitionsStatsRequest request) throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException
     {
       send_set_aggr_stats_for(request);
@@ -5517,6 +5663,7 @@ public boolean recv_set_aggr_stats_for() throws NoSuchObjectException, InvalidOb
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "set_aggr_stats_for failed: unknown result");
     }
 
+    @Override
     public boolean delete_partition_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, java.lang.String col_name, java.lang.String engine) throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException
     {
       send_delete_partition_column_statistics(db_name, tbl_name, part_name, col_name, engine);
@@ -5556,6 +5703,7 @@ public boolean recv_delete_partition_column_statistics() throws NoSuchObjectExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "delete_partition_column_statistics failed: unknown result");
     }
 
+    @Override
     public boolean delete_table_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String col_name, java.lang.String engine) throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException
     {
       send_delete_table_column_statistics(db_name, tbl_name, col_name, engine);
@@ -5594,6 +5742,7 @@ public boolean recv_delete_table_column_statistics() throws NoSuchObjectExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "delete_table_column_statistics failed: unknown result");
     }
 
+    @Override
     public boolean delete_column_statistics_req(DeleteColumnStatisticsRequest req) throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException
     {
       send_delete_column_statistics_req(req);
@@ -5629,6 +5778,7 @@ public boolean recv_delete_column_statistics_req() throws NoSuchObjectException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "delete_column_statistics_req failed: unknown result");
     }
 
+    @Override
     public void create_function(Function func) throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_create_function(func);
@@ -5661,6 +5811,7 @@ public void recv_create_function() throws AlreadyExistsException, InvalidObjectE
       return;
     }
 
+    @Override
     public void drop_function(java.lang.String dbName, java.lang.String funcName) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_function(dbName, funcName);
@@ -5688,6 +5839,7 @@ public void recv_drop_function() throws NoSuchObjectException, MetaException, or
       return;
     }
 
+    @Override
     public void alter_function(java.lang.String dbName, java.lang.String funcName, Function newFunc) throws InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_function(dbName, funcName, newFunc);
@@ -5716,6 +5868,7 @@ public void recv_alter_function() throws InvalidOperationException, MetaExceptio
       return;
     }
 
+    @Override
     public java.util.List<java.lang.String> get_functions(java.lang.String dbName, java.lang.String pattern) throws MetaException, org.apache.thrift.TException
     {
       send_get_functions(dbName, pattern);
@@ -5743,6 +5896,7 @@ public java.util.List<java.lang.String> recv_get_functions() throws MetaExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_functions failed: unknown result");
     }
 
+    @Override
     public GetFunctionsResponse get_functions_req(GetFunctionsRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_functions_req(request);
@@ -5769,6 +5923,7 @@ public GetFunctionsResponse recv_get_functions_req() throws MetaException, org.a
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_functions_req failed: unknown result");
     }
 
+    @Override
     public Function get_function(java.lang.String dbName, java.lang.String funcName) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_function(dbName, funcName);
@@ -5799,6 +5954,7 @@ public Function recv_get_function() throws MetaException, NoSuchObjectException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_function failed: unknown result");
     }
 
+    @Override
     public GetAllFunctionsResponse get_all_functions() throws MetaException, org.apache.thrift.TException
     {
       send_get_all_functions();
@@ -5824,6 +5980,7 @@ public GetAllFunctionsResponse recv_get_all_functions() throws MetaException, or
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_functions failed: unknown result");
     }
 
+    @Override
     public boolean create_role(Role role) throws MetaException, org.apache.thrift.TException
     {
       send_create_role(role);
@@ -5850,6 +6007,7 @@ public boolean recv_create_role() throws MetaException, org.apache.thrift.TExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_role failed: unknown result");
     }
 
+    @Override
     public boolean drop_role(java.lang.String role_name) throws MetaException, org.apache.thrift.TException
     {
       send_drop_role(role_name);
@@ -5876,6 +6034,7 @@ public boolean recv_drop_role() throws MetaException, org.apache.thrift.TExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_role failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_role_names() throws MetaException, org.apache.thrift.TException
     {
       send_get_role_names();
@@ -5901,6 +6060,7 @@ public java.util.List<java.lang.String> recv_get_role_names() throws MetaExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_role_names failed: unknown result");
     }
 
+    @Override
     public boolean grant_role(java.lang.String role_name, java.lang.String principal_name, PrincipalType principal_type, java.lang.String grantor, PrincipalType grantorType, boolean grant_option) throws MetaException, org.apache.thrift.TException
     {
       send_grant_role(role_name, principal_name, principal_type, grantor, grantorType, grant_option);
@@ -5932,6 +6092,7 @@ public boolean recv_grant_role() throws MetaException, org.apache.thrift.TExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "grant_role failed: unknown result");
     }
 
+    @Override
     public boolean revoke_role(java.lang.String role_name, java.lang.String principal_name, PrincipalType principal_type) throws MetaException, org.apache.thrift.TException
     {
       send_revoke_role(role_name, principal_name, principal_type);
@@ -5960,6 +6121,7 @@ public boolean recv_revoke_role() throws MetaException, org.apache.thrift.TExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "revoke_role failed: unknown result");
     }
 
+    @Override
     public java.util.List<Role> list_roles(java.lang.String principal_name, PrincipalType principal_type) throws MetaException, org.apache.thrift.TException
     {
       send_list_roles(principal_name, principal_type);
@@ -5987,6 +6149,7 @@ public java.util.List<Role> recv_list_roles() throws MetaException, org.apache.t
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "list_roles failed: unknown result");
     }
 
+    @Override
     public GrantRevokeRoleResponse grant_revoke_role(GrantRevokeRoleRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_grant_revoke_role(request);
@@ -6013,6 +6176,7 @@ public GrantRevokeRoleResponse recv_grant_revoke_role() throws MetaException, or
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "grant_revoke_role failed: unknown result");
     }
 
+    @Override
     public GetPrincipalsInRoleResponse get_principals_in_role(GetPrincipalsInRoleRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_principals_in_role(request);
@@ -6039,6 +6203,7 @@ public GetPrincipalsInRoleResponse recv_get_principals_in_role() throws MetaExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_principals_in_role failed: unknown result");
     }
 
+    @Override
     public GetRoleGrantsForPrincipalResponse get_role_grants_for_principal(GetRoleGrantsForPrincipalRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_role_grants_for_principal(request);
@@ -6065,6 +6230,7 @@ public GetRoleGrantsForPrincipalResponse recv_get_role_grants_for_principal() th
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_role_grants_for_principal failed: unknown result");
     }
 
+    @Override
     public PrincipalPrivilegeSet get_privilege_set(HiveObjectRef hiveObject, java.lang.String user_name, java.util.List<java.lang.String> group_names) throws MetaException, org.apache.thrift.TException
     {
       send_get_privilege_set(hiveObject, user_name, group_names);
@@ -6093,6 +6259,7 @@ public PrincipalPrivilegeSet recv_get_privilege_set() throws MetaException, org.
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_privilege_set failed: unknown result");
     }
 
+    @Override
     public java.util.List<HiveObjectPrivilege> list_privileges(java.lang.String principal_name, PrincipalType principal_type, HiveObjectRef hiveObject) throws MetaException, org.apache.thrift.TException
     {
       send_list_privileges(principal_name, principal_type, hiveObject);
@@ -6121,6 +6288,7 @@ public java.util.List<HiveObjectPrivilege> recv_list_privileges() throws MetaExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "list_privileges failed: unknown result");
     }
 
+    @Override
     public boolean grant_privileges(PrivilegeBag privileges) throws MetaException, org.apache.thrift.TException
     {
       send_grant_privileges(privileges);
@@ -6147,6 +6315,7 @@ public boolean recv_grant_privileges() throws MetaException, org.apache.thrift.T
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "grant_privileges failed: unknown result");
     }
 
+    @Override
     public boolean revoke_privileges(PrivilegeBag privileges) throws MetaException, org.apache.thrift.TException
     {
       send_revoke_privileges(privileges);
@@ -6173,6 +6342,7 @@ public boolean recv_revoke_privileges() throws MetaException, org.apache.thrift.
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "revoke_privileges failed: unknown result");
     }
 
+    @Override
     public GrantRevokePrivilegeResponse grant_revoke_privileges(GrantRevokePrivilegeRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_grant_revoke_privileges(request);
@@ -6199,6 +6369,7 @@ public GrantRevokePrivilegeResponse recv_grant_revoke_privileges() throws MetaEx
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "grant_revoke_privileges failed: unknown result");
     }
 
+    @Override
     public GrantRevokePrivilegeResponse refresh_privileges(HiveObjectRef objToRefresh, java.lang.String authorizer, GrantRevokePrivilegeRequest grantRequest) throws MetaException, org.apache.thrift.TException
     {
       send_refresh_privileges(objToRefresh, authorizer, grantRequest);
@@ -6227,6 +6398,7 @@ public GrantRevokePrivilegeResponse recv_refresh_privileges() throws MetaExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "refresh_privileges failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> set_ugi(java.lang.String user_name, java.util.List<java.lang.String> group_names) throws MetaException, org.apache.thrift.TException
     {
       send_set_ugi(user_name, group_names);
@@ -6254,6 +6426,7 @@ public java.util.List<java.lang.String> recv_set_ugi() throws MetaException, org
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "set_ugi failed: unknown result");
     }
 
+    @Override
     public java.lang.String get_delegation_token(java.lang.String token_owner, java.lang.String renewer_kerberos_principal_name) throws MetaException, org.apache.thrift.TException
     {
       send_get_delegation_token(token_owner, renewer_kerberos_principal_name);
@@ -6281,6 +6454,7 @@ public java.lang.String recv_get_delegation_token() throws MetaException, org.ap
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_delegation_token failed: unknown result");
     }
 
+    @Override
     public long renew_delegation_token(java.lang.String token_str_form) throws MetaException, org.apache.thrift.TException
     {
       send_renew_delegation_token(token_str_form);
@@ -6307,6 +6481,7 @@ public long recv_renew_delegation_token() throws MetaException, org.apache.thrif
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "renew_delegation_token failed: unknown result");
     }
 
+    @Override
     public void cancel_delegation_token(java.lang.String token_str_form) throws MetaException, org.apache.thrift.TException
     {
       send_cancel_delegation_token(token_str_form);
@@ -6330,6 +6505,7 @@ public void recv_cancel_delegation_token() throws MetaException, org.apache.thri
       return;
     }
 
+    @Override
     public boolean add_token(java.lang.String token_identifier, java.lang.String delegation_token) throws org.apache.thrift.TException
     {
       send_add_token(token_identifier, delegation_token);
@@ -6354,6 +6530,7 @@ public boolean recv_add_token() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_token failed: unknown result");
     }
 
+    @Override
     public boolean remove_token(java.lang.String token_identifier) throws org.apache.thrift.TException
     {
       send_remove_token(token_identifier);
@@ -6377,6 +6554,7 @@ public boolean recv_remove_token() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "remove_token failed: unknown result");
     }
 
+    @Override
     public java.lang.String get_token(java.lang.String token_identifier) throws org.apache.thrift.TException
     {
       send_get_token(token_identifier);
@@ -6400,6 +6578,7 @@ public java.lang.String recv_get_token() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_token failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_all_token_identifiers() throws org.apache.thrift.TException
     {
       send_get_all_token_identifiers();
@@ -6422,6 +6601,7 @@ public java.util.List<java.lang.String> recv_get_all_token_identifiers() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_token_identifiers failed: unknown result");
     }
 
+    @Override
     public int add_master_key(java.lang.String key) throws MetaException, org.apache.thrift.TException
     {
       send_add_master_key(key);
@@ -6448,6 +6628,7 @@ public int recv_add_master_key() throws MetaException, org.apache.thrift.TExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_master_key failed: unknown result");
     }
 
+    @Override
     public void update_master_key(int seq_number, java.lang.String key) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_update_master_key(seq_number, key);
@@ -6475,6 +6656,7 @@ public void recv_update_master_key() throws NoSuchObjectException, MetaException
       return;
     }
 
+    @Override
     public boolean remove_master_key(int key_seq) throws org.apache.thrift.TException
     {
       send_remove_master_key(key_seq);
@@ -6498,6 +6680,7 @@ public boolean recv_remove_master_key() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "remove_master_key failed: unknown result");
     }
 
+    @Override
     public java.util.List<java.lang.String> get_master_keys() throws org.apache.thrift.TException
     {
       send_get_master_keys();
@@ -6520,6 +6703,7 @@ public java.util.List<java.lang.String> recv_get_master_keys() throws org.apache
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_master_keys failed: unknown result");
     }
 
+    @Override
     public GetOpenTxnsResponse get_open_txns() throws org.apache.thrift.TException
     {
       send_get_open_txns();
@@ -6542,6 +6726,7 @@ public GetOpenTxnsResponse recv_get_open_txns() throws org.apache.thrift.TExcept
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_open_txns failed: unknown result");
     }
 
+    @Override
     public GetOpenTxnsInfoResponse get_open_txns_info() throws org.apache.thrift.TException
     {
       send_get_open_txns_info();
@@ -6564,6 +6749,7 @@ public GetOpenTxnsInfoResponse recv_get_open_txns_info() throws org.apache.thrif
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_open_txns_info failed: unknown result");
     }
 
+    @Override
     public OpenTxnsResponse open_txns(OpenTxnRequest rqst) throws org.apache.thrift.TException
     {
       send_open_txns(rqst);
@@ -6587,6 +6773,7 @@ public OpenTxnsResponse recv_open_txns() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "open_txns failed: unknown result");
     }
 
+    @Override
     public void abort_txn(AbortTxnRequest rqst) throws NoSuchTxnException, org.apache.thrift.TException
     {
       send_abort_txn(rqst);
@@ -6610,6 +6797,7 @@ public void recv_abort_txn() throws NoSuchTxnException, org.apache.thrift.TExcep
       return;
     }
 
+    @Override
     public void abort_txns(AbortTxnsRequest rqst) throws NoSuchTxnException, org.apache.thrift.TException
     {
       send_abort_txns(rqst);
@@ -6633,6 +6821,7 @@ public void recv_abort_txns() throws NoSuchTxnException, org.apache.thrift.TExce
       return;
     }
 
+    @Override
     public void commit_txn(CommitTxnRequest rqst) throws NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException
     {
       send_commit_txn(rqst);
@@ -6659,6 +6848,7 @@ public void recv_commit_txn() throws NoSuchTxnException, TxnAbortedException, or
       return;
     }
 
+    @Override
     public long get_latest_txnid_in_conflict(long txnId) throws MetaException, org.apache.thrift.TException
     {
       send_get_latest_txnid_in_conflict(txnId);
@@ -6685,6 +6875,7 @@ public long recv_get_latest_txnid_in_conflict() throws MetaException, org.apache
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_latest_txnid_in_conflict failed: unknown result");
     }
 
+    @Override
     public void repl_tbl_writeid_state(ReplTblWriteIdStateRequest rqst) throws org.apache.thrift.TException
     {
       send_repl_tbl_writeid_state(rqst);
@@ -6705,6 +6896,7 @@ public void recv_repl_tbl_writeid_state() throws org.apache.thrift.TException
       return;
     }
 
+    @Override
     public GetValidWriteIdsResponse get_valid_write_ids(GetValidWriteIdsRequest rqst) throws NoSuchTxnException, MetaException, org.apache.thrift.TException
     {
       send_get_valid_write_ids(rqst);
@@ -6734,6 +6926,7 @@ public GetValidWriteIdsResponse recv_get_valid_write_ids() throws NoSuchTxnExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_valid_write_ids failed: unknown result");
     }
 
+    @Override
     public void add_write_ids_to_min_history(long txnId, java.util.Map<java.lang.String,java.lang.Long> writeIds) throws MetaException, org.apache.thrift.TException
     {
       send_add_write_ids_to_min_history(txnId, writeIds);
@@ -6758,6 +6951,7 @@ public void recv_add_write_ids_to_min_history() throws MetaException, org.apache
       return;
     }
 
+    @Override
     public AllocateTableWriteIdsResponse allocate_table_write_ids(AllocateTableWriteIdsRequest rqst) throws NoSuchTxnException, TxnAbortedException, MetaException, org.apache.thrift.TException
     {
       send_allocate_table_write_ids(rqst);
@@ -6790,6 +6984,7 @@ public AllocateTableWriteIdsResponse recv_allocate_table_write_ids() throws NoSu
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "allocate_table_write_ids failed: unknown result");
     }
 
+    @Override
     public MaxAllocatedTableWriteIdResponse get_max_allocated_table_write_id(MaxAllocatedTableWriteIdRequest rqst) throws MetaException, org.apache.thrift.TException
     {
       send_get_max_allocated_table_write_id(rqst);
@@ -6816,6 +7011,7 @@ public MaxAllocatedTableWriteIdResponse recv_get_max_allocated_table_write_id()
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_max_allocated_table_write_id failed: unknown result");
     }
 
+    @Override
     public void seed_write_id(SeedTableWriteIdsRequest rqst) throws MetaException, org.apache.thrift.TException
     {
       send_seed_write_id(rqst);
@@ -6839,6 +7035,7 @@ public void recv_seed_write_id() throws MetaException, org.apache.thrift.TExcept
       return;
     }
 
+    @Override
     public void seed_txn_id(SeedTxnIdRequest rqst) throws MetaException, org.apache.thrift.TException
     {
       send_seed_txn_id(rqst);
@@ -6862,6 +7059,7 @@ public void recv_seed_txn_id() throws MetaException, org.apache.thrift.TExceptio
       return;
     }
 
+    @Override
     public LockResponse lock(LockRequest rqst) throws NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException
     {
       send_lock(rqst);
@@ -6891,6 +7089,7 @@ public LockResponse recv_lock() throws NoSuchTxnException, TxnAbortedException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "lock failed: unknown result");
     }
 
+    @Override
     public LockResponse check_lock(CheckLockRequest rqst) throws NoSuchTxnException, TxnAbortedException, NoSuchLockException, org.apache.thrift.TException
     {
       send_check_lock(rqst);
@@ -6923,6 +7122,7 @@ public LockResponse recv_check_lock() throws NoSuchTxnException, TxnAbortedExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "check_lock failed: unknown result");
     }
 
+    @Override
     public void unlock(UnlockRequest rqst) throws NoSuchLockException, TxnOpenException, org.apache.thrift.TException
     {
       send_unlock(rqst);
@@ -6949,6 +7149,7 @@ public void recv_unlock() throws NoSuchLockException, TxnOpenException, org.apac
       return;
     }
 
+    @Override
     public ShowLocksResponse show_locks(ShowLocksRequest rqst) throws org.apache.thrift.TException
     {
       send_show_locks(rqst);
@@ -6972,6 +7173,7 @@ public ShowLocksResponse recv_show_locks() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "show_locks failed: unknown result");
     }
 
+    @Override
     public void heartbeat(HeartbeatRequest ids) throws NoSuchLockException, NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException
     {
       send_heartbeat(ids);
@@ -7001,6 +7203,7 @@ public void recv_heartbeat() throws NoSuchLockException, NoSuchTxnException, Txn
       return;
     }
 
+    @Override
     public HeartbeatTxnRangeResponse heartbeat_txn_range(HeartbeatTxnRangeRequest txns) throws org.apache.thrift.TException
     {
       send_heartbeat_txn_range(txns);
@@ -7024,6 +7227,7 @@ public HeartbeatTxnRangeResponse recv_heartbeat_txn_range() throws org.apache.th
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "heartbeat_txn_range failed: unknown result");
     }
 
+    @Override
     public void compact(CompactionRequest rqst) throws org.apache.thrift.TException
     {
       send_compact(rqst);
@@ -7044,6 +7248,7 @@ public void recv_compact() throws org.apache.thrift.TException
       return;
     }
 
+    @Override
     public CompactionResponse compact2(CompactionRequest rqst) throws org.apache.thrift.TException
     {
       send_compact2(rqst);
@@ -7067,6 +7272,7 @@ public CompactionResponse recv_compact2() throws org.apache.thrift.TException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "compact2 failed: unknown result");
     }
 
+    @Override
     public ShowCompactResponse show_compact(ShowCompactRequest rqst) throws org.apache.thrift.TException
     {
       send_show_compact(rqst);
@@ -7090,6 +7296,7 @@ public ShowCompactResponse recv_show_compact() throws org.apache.thrift.TExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "show_compact failed: unknown result");
     }
 
+    @Override
     public boolean submit_for_cleanup(CompactionRequest o1, long o2, long o3) throws MetaException, org.apache.thrift.TException
     {
       send_submit_for_cleanup(o1, o2, o3);
@@ -7118,6 +7325,7 @@ public boolean recv_submit_for_cleanup() throws MetaException, org.apache.thrift
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submit_for_cleanup failed: unknown result");
     }
 
+    @Override
     public void add_dynamic_partitions(AddDynamicPartitions rqst) throws NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException
     {
       send_add_dynamic_partitions(rqst);
@@ -7144,6 +7352,7 @@ public void recv_add_dynamic_partitions() throws NoSuchTxnException, TxnAbortedE
       return;
     }
 
+    @Override
     public OptionalCompactionInfoStruct find_next_compact(java.lang.String workerId) throws MetaException, org.apache.thrift.TException
     {
       send_find_next_compact(workerId);
@@ -7170,6 +7379,7 @@ public OptionalCompactionInfoStruct recv_find_next_compact() throws MetaExceptio
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "find_next_compact failed: unknown result");
     }
 
+    @Override
     public OptionalCompactionInfoStruct find_next_compact2(FindNextCompactRequest rqst) throws MetaException, org.apache.thrift.TException
     {
       send_find_next_compact2(rqst);
@@ -7196,6 +7406,7 @@ public OptionalCompactionInfoStruct recv_find_next_compact2() throws MetaExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "find_next_compact2 failed: unknown result");
     }
 
+    @Override
     public void update_compactor_state(CompactionInfoStruct cr, long txn_id) throws org.apache.thrift.TException
     {
       send_update_compactor_state(cr, txn_id);
@@ -7217,6 +7428,7 @@ public void recv_update_compactor_state() throws org.apache.thrift.TException
       return;
     }
 
+    @Override
     public java.util.List<java.lang.String> find_columns_with_stats(CompactionInfoStruct cr) throws org.apache.thrift.TException
     {
       send_find_columns_with_stats(cr);
@@ -7240,6 +7452,7 @@ public java.util.List<java.lang.String> recv_find_columns_with_stats() throws or
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "find_columns_with_stats failed: unknown result");
     }
 
+    @Override
     public void mark_cleaned(CompactionInfoStruct cr) throws MetaException, org.apache.thrift.TException
     {
       send_mark_cleaned(cr);
@@ -7263,6 +7476,7 @@ public void recv_mark_cleaned() throws MetaException, org.apache.thrift.TExcepti
       return;
     }
 
+    @Override
     public void mark_compacted(CompactionInfoStruct cr) throws MetaException, org.apache.thrift.TException
     {
       send_mark_compacted(cr);
@@ -7286,6 +7500,7 @@ public void recv_mark_compacted() throws MetaException, org.apache.thrift.TExcep
       return;
     }
 
+    @Override
     public void mark_failed(CompactionInfoStruct cr) throws MetaException, org.apache.thrift.TException
     {
       send_mark_failed(cr);
@@ -7309,6 +7524,7 @@ public void recv_mark_failed() throws MetaException, org.apache.thrift.TExceptio
       return;
     }
 
+    @Override
     public void mark_refused(CompactionInfoStruct cr) throws MetaException, org.apache.thrift.TException
     {
       send_mark_refused(cr);
@@ -7332,6 +7548,7 @@ public void recv_mark_refused() throws MetaException, org.apache.thrift.TExcepti
       return;
     }
 
+    @Override
     public boolean update_compaction_metrics_data(CompactionMetricsDataStruct data) throws MetaException, org.apache.thrift.TException
     {
       send_update_compaction_metrics_data(data);
@@ -7358,6 +7575,7 @@ public boolean recv_update_compaction_metrics_data() throws MetaException, org.a
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "update_compaction_metrics_data failed: unknown result");
     }
 
+    @Override
     public void remove_compaction_metrics_data(CompactionMetricsDataRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_remove_compaction_metrics_data(request);
@@ -7381,6 +7599,7 @@ public void recv_remove_compaction_metrics_data() throws MetaException, org.apac
       return;
     }
 
+    @Override
     public void set_hadoop_jobid(java.lang.String jobId, long cq_id) throws org.apache.thrift.TException
     {
       send_set_hadoop_jobid(jobId, cq_id);
@@ -7402,6 +7621,7 @@ public void recv_set_hadoop_jobid() throws org.apache.thrift.TException
       return;
     }
 
+    @Override
     public GetLatestCommittedCompactionInfoResponse get_latest_committed_compaction_info(GetLatestCommittedCompactionInfoRequest rqst) throws org.apache.thrift.TException
     {
       send_get_latest_committed_compaction_info(rqst);
@@ -7425,6 +7645,7 @@ public GetLatestCommittedCompactionInfoResponse recv_get_latest_committed_compac
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_latest_committed_compaction_info failed: unknown result");
     }
 
+    @Override
     public NotificationEventResponse get_next_notification(NotificationEventRequest rqst) throws org.apache.thrift.TException
     {
       send_get_next_notification(rqst);
@@ -7448,6 +7669,7 @@ public NotificationEventResponse recv_get_next_notification() throws org.apache.
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_next_notification failed: unknown result");
     }
 
+    @Override
     public CurrentNotificationEventId get_current_notificationEventId() throws org.apache.thrift.TException
     {
       send_get_current_notificationEventId();
@@ -7470,6 +7692,7 @@ public CurrentNotificationEventId recv_get_current_notificationEventId() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_current_notificationEventId failed: unknown result");
     }
 
+    @Override
     public NotificationEventsCountResponse get_notification_events_count(NotificationEventsCountRequest rqst) throws org.apache.thrift.TException
     {
       send_get_notification_events_count(rqst);
@@ -7493,6 +7716,7 @@ public NotificationEventsCountResponse recv_get_notification_events_count() thro
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_notification_events_count failed: unknown result");
     }
 
+    @Override
     public FireEventResponse fire_listener_event(FireEventRequest rqst) throws org.apache.thrift.TException
     {
       send_fire_listener_event(rqst);
@@ -7516,6 +7740,7 @@ public FireEventResponse recv_fire_listener_event() throws org.apache.thrift.TEx
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fire_listener_event failed: unknown result");
     }
 
+    @Override
     public void flushCache() throws org.apache.thrift.TException
     {
       send_flushCache();
@@ -7535,6 +7760,7 @@ public void recv_flushCache() throws org.apache.thrift.TException
       return;
     }
 
+    @Override
     public WriteNotificationLogResponse add_write_notification_log(WriteNotificationLogRequest rqst) throws org.apache.thrift.TException
     {
       send_add_write_notification_log(rqst);
@@ -7558,6 +7784,7 @@ public WriteNotificationLogResponse recv_add_write_notification_log() throws org
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_write_notification_log failed: unknown result");
     }
 
+    @Override
     public WriteNotificationLogBatchResponse add_write_notification_log_in_batch(WriteNotificationLogBatchRequest rqst) throws org.apache.thrift.TException
     {
       send_add_write_notification_log_in_batch(rqst);
@@ -7581,6 +7808,7 @@ public WriteNotificationLogBatchResponse recv_add_write_notification_log_in_batc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "add_write_notification_log_in_batch failed: unknown result");
     }
 
+    @Override
     public CmRecycleResponse cm_recycle(CmRecycleRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_cm_recycle(request);
@@ -7607,6 +7835,7 @@ public CmRecycleResponse recv_cm_recycle() throws MetaException, org.apache.thri
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "cm_recycle failed: unknown result");
     }
 
+    @Override
     public GetFileMetadataByExprResult get_file_metadata_by_expr(GetFileMetadataByExprRequest req) throws org.apache.thrift.TException
     {
       send_get_file_metadata_by_expr(req);
@@ -7630,6 +7859,7 @@ public GetFileMetadataByExprResult recv_get_file_metadata_by_expr() throws org.a
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_file_metadata_by_expr failed: unknown result");
     }
 
+    @Override
     public GetFileMetadataResult get_file_metadata(GetFileMetadataRequest req) throws org.apache.thrift.TException
     {
       send_get_file_metadata(req);
@@ -7653,6 +7883,7 @@ public GetFileMetadataResult recv_get_file_metadata() throws org.apache.thrift.T
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_file_metadata failed: unknown result");
     }
 
+    @Override
     public PutFileMetadataResult put_file_metadata(PutFileMetadataRequest req) throws org.apache.thrift.TException
     {
       send_put_file_metadata(req);
@@ -7676,6 +7907,7 @@ public PutFileMetadataResult recv_put_file_metadata() throws org.apache.thrift.T
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "put_file_metadata failed: unknown result");
     }
 
+    @Override
     public ClearFileMetadataResult clear_file_metadata(ClearFileMetadataRequest req) throws org.apache.thrift.TException
     {
       send_clear_file_metadata(req);
@@ -7699,6 +7931,7 @@ public ClearFileMetadataResult recv_clear_file_metadata() throws org.apache.thri
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "clear_file_metadata failed: unknown result");
     }
 
+    @Override
     public CacheFileMetadataResult cache_file_metadata(CacheFileMetadataRequest req) throws org.apache.thrift.TException
     {
       send_cache_file_metadata(req);
@@ -7722,6 +7955,7 @@ public CacheFileMetadataResult recv_cache_file_metadata() throws org.apache.thri
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "cache_file_metadata failed: unknown result");
     }
 
+    @Override
     public java.lang.String get_metastore_db_uuid() throws MetaException, org.apache.thrift.TException
     {
       send_get_metastore_db_uuid();
@@ -7747,6 +7981,7 @@ public java.lang.String recv_get_metastore_db_uuid() throws MetaException, org.a
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_metastore_db_uuid failed: unknown result");
     }
 
+    @Override
     public WMCreateResourcePlanResponse create_resource_plan(WMCreateResourcePlanRequest request) throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_resource_plan(request);
@@ -7779,6 +8014,7 @@ public WMCreateResourcePlanResponse recv_create_resource_plan() throws AlreadyEx
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_resource_plan failed: unknown result");
     }
 
+    @Override
     public WMGetResourcePlanResponse get_resource_plan(WMGetResourcePlanRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_resource_plan(request);
@@ -7808,6 +8044,7 @@ public WMGetResourcePlanResponse recv_get_resource_plan() throws NoSuchObjectExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_resource_plan failed: unknown result");
     }
 
+    @Override
     public WMGetActiveResourcePlanResponse get_active_resource_plan(WMGetActiveResourcePlanRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_active_resource_plan(request);
@@ -7834,6 +8071,7 @@ public WMGetActiveResourcePlanResponse recv_get_active_resource_plan() throws Me
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_active_resource_plan failed: unknown result");
     }
 
+    @Override
     public WMGetAllResourcePlanResponse get_all_resource_plans(WMGetAllResourcePlanRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_all_resource_plans(request);
@@ -7860,6 +8098,7 @@ public WMGetAllResourcePlanResponse recv_get_all_resource_plans() throws MetaExc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_resource_plans failed: unknown result");
     }
 
+    @Override
     public WMAlterResourcePlanResponse alter_resource_plan(WMAlterResourcePlanRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_alter_resource_plan(request);
@@ -7892,6 +8131,7 @@ public WMAlterResourcePlanResponse recv_alter_resource_plan() throws NoSuchObjec
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "alter_resource_plan failed: unknown result");
     }
 
+    @Override
     public WMValidateResourcePlanResponse validate_resource_plan(WMValidateResourcePlanRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_validate_resource_plan(request);
@@ -7921,6 +8161,7 @@ public WMValidateResourcePlanResponse recv_validate_resource_plan() throws NoSuc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "validate_resource_plan failed: unknown result");
     }
 
+    @Override
     public WMDropResourcePlanResponse drop_resource_plan(WMDropResourcePlanRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_resource_plan(request);
@@ -7953,6 +8194,7 @@ public WMDropResourcePlanResponse recv_drop_resource_plan() throws NoSuchObjectE
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_resource_plan failed: unknown result");
     }
 
+    @Override
     public WMCreateTriggerResponse create_wm_trigger(WMCreateTriggerRequest request) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_wm_trigger(request);
@@ -7988,6 +8230,7 @@ public WMCreateTriggerResponse recv_create_wm_trigger() throws AlreadyExistsExce
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_wm_trigger failed: unknown result");
     }
 
+    @Override
     public WMAlterTriggerResponse alter_wm_trigger(WMAlterTriggerRequest request) throws NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_alter_wm_trigger(request);
@@ -8020,6 +8263,7 @@ public WMAlterTriggerResponse recv_alter_wm_trigger() throws NoSuchObjectExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "alter_wm_trigger failed: unknown result");
     }
 
+    @Override
     public WMDropTriggerResponse drop_wm_trigger(WMDropTriggerRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_wm_trigger(request);
@@ -8052,6 +8296,7 @@ public WMDropTriggerResponse recv_drop_wm_trigger() throws NoSuchObjectException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_wm_trigger failed: unknown result");
     }
 
+    @Override
     public WMGetTriggersForResourePlanResponse get_triggers_for_resourceplan(WMGetTriggersForResourePlanRequest request) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_triggers_for_resourceplan(request);
@@ -8081,6 +8326,7 @@ public WMGetTriggersForResourePlanResponse recv_get_triggers_for_resourceplan()
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_triggers_for_resourceplan failed: unknown result");
     }
 
+    @Override
     public WMCreatePoolResponse create_wm_pool(WMCreatePoolRequest request) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_wm_pool(request);
@@ -8116,6 +8362,7 @@ public WMCreatePoolResponse recv_create_wm_pool() throws AlreadyExistsException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_wm_pool failed: unknown result");
     }
 
+    @Override
     public WMAlterPoolResponse alter_wm_pool(WMAlterPoolRequest request) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_alter_wm_pool(request);
@@ -8151,6 +8398,7 @@ public WMAlterPoolResponse recv_alter_wm_pool() throws AlreadyExistsException, N
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "alter_wm_pool failed: unknown result");
     }
 
+    @Override
     public WMDropPoolResponse drop_wm_pool(WMDropPoolRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_wm_pool(request);
@@ -8183,6 +8431,7 @@ public WMDropPoolResponse recv_drop_wm_pool() throws NoSuchObjectException, Inva
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_wm_pool failed: unknown result");
     }
 
+    @Override
     public WMCreateOrUpdateMappingResponse create_or_update_wm_mapping(WMCreateOrUpdateMappingRequest request) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_or_update_wm_mapping(request);
@@ -8218,6 +8467,7 @@ public WMCreateOrUpdateMappingResponse recv_create_or_update_wm_mapping() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_or_update_wm_mapping failed: unknown result");
     }
 
+    @Override
     public WMDropMappingResponse drop_wm_mapping(WMDropMappingRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_wm_mapping(request);
@@ -8250,6 +8500,7 @@ public WMDropMappingResponse recv_drop_wm_mapping() throws NoSuchObjectException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "drop_wm_mapping failed: unknown result");
     }
 
+    @Override
     public WMCreateOrDropTriggerToPoolMappingResponse create_or_drop_wm_trigger_to_pool_mapping(WMCreateOrDropTriggerToPoolMappingRequest request) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_or_drop_wm_trigger_to_pool_mapping(request);
@@ -8285,6 +8536,7 @@ public WMCreateOrDropTriggerToPoolMappingResponse recv_create_or_drop_wm_trigger
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "create_or_drop_wm_trigger_to_pool_mapping failed: unknown result");
     }
 
+    @Override
     public void create_ischema(ISchema schema) throws AlreadyExistsException, NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_ischema(schema);
@@ -8314,6 +8566,7 @@ public void recv_create_ischema() throws AlreadyExistsException, NoSuchObjectExc
       return;
     }
 
+    @Override
     public void alter_ischema(AlterISchemaRequest rqst) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_alter_ischema(rqst);
@@ -8340,6 +8593,7 @@ public void recv_alter_ischema() throws NoSuchObjectException, MetaException, or
       return;
     }
 
+    @Override
     public ISchema get_ischema(ISchemaName name) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_ischema(name);
@@ -8369,6 +8623,7 @@ public ISchema recv_get_ischema() throws NoSuchObjectException, MetaException, o
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_ischema failed: unknown result");
     }
 
+    @Override
     public void drop_ischema(ISchemaName name) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_drop_ischema(name);
@@ -8398,6 +8653,7 @@ public void recv_drop_ischema() throws NoSuchObjectException, InvalidOperationEx
       return;
     }
 
+    @Override
     public void add_schema_version(SchemaVersion schemaVersion) throws AlreadyExistsException, NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_add_schema_version(schemaVersion);
@@ -8427,6 +8683,7 @@ public void recv_add_schema_version() throws AlreadyExistsException, NoSuchObjec
       return;
     }
 
+    @Override
     public SchemaVersion get_schema_version(SchemaVersionDescriptor schemaVersion) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_schema_version(schemaVersion);
@@ -8456,6 +8713,7 @@ public SchemaVersion recv_get_schema_version() throws NoSuchObjectException, Met
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schema_version failed: unknown result");
     }
 
+    @Override
     public SchemaVersion get_schema_latest_version(ISchemaName schemaName) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_schema_latest_version(schemaName);
@@ -8485,6 +8743,7 @@ public SchemaVersion recv_get_schema_latest_version() throws NoSuchObjectExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schema_latest_version failed: unknown result");
     }
 
+    @Override
     public java.util.List<SchemaVersion> get_schema_all_versions(ISchemaName schemaName) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_schema_all_versions(schemaName);
@@ -8514,6 +8773,7 @@ public java.util.List<SchemaVersion> recv_get_schema_all_versions() throws NoSuc
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schema_all_versions failed: unknown result");
     }
 
+    @Override
     public void drop_schema_version(SchemaVersionDescriptor schemaVersion) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_drop_schema_version(schemaVersion);
@@ -8540,6 +8800,7 @@ public void recv_drop_schema_version() throws NoSuchObjectException, MetaExcepti
       return;
     }
 
+    @Override
     public FindSchemasByColsResp get_schemas_by_cols(FindSchemasByColsRqst rqst) throws MetaException, org.apache.thrift.TException
     {
       send_get_schemas_by_cols(rqst);
@@ -8566,6 +8827,7 @@ public FindSchemasByColsResp recv_get_schemas_by_cols() throws MetaException, or
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_schemas_by_cols failed: unknown result");
     }
 
+    @Override
     public void map_schema_version_to_serde(MapSchemaVersionToSerdeRequest rqst) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_map_schema_version_to_serde(rqst);
@@ -8592,6 +8854,7 @@ public void recv_map_schema_version_to_serde() throws NoSuchObjectException, Met
       return;
     }
 
+    @Override
     public void set_schema_version_state(SetSchemaVersionStateRequest rqst) throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException
     {
       send_set_schema_version_state(rqst);
@@ -8621,6 +8884,7 @@ public void recv_set_schema_version_state() throws NoSuchObjectException, Invali
       return;
     }
 
+    @Override
     public void add_serde(SerDeInfo serde) throws AlreadyExistsException, MetaException, org.apache.thrift.TException
     {
       send_add_serde(serde);
@@ -8647,6 +8911,7 @@ public void recv_add_serde() throws AlreadyExistsException, MetaException, org.a
       return;
     }
 
+    @Override
     public SerDeInfo get_serde(GetSerdeRequest rqst) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_get_serde(rqst);
@@ -8676,6 +8941,7 @@ public SerDeInfo recv_get_serde() throws NoSuchObjectException, MetaException, o
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_serde failed: unknown result");
     }
 
+    @Override
     public LockResponse get_lock_materialization_rebuild(java.lang.String dbName, java.lang.String tableName, long txnId) throws org.apache.thrift.TException
     {
       send_get_lock_materialization_rebuild(dbName, tableName, txnId);
@@ -8701,6 +8967,7 @@ public LockResponse recv_get_lock_materialization_rebuild() throws org.apache.th
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_lock_materialization_rebuild failed: unknown result");
     }
 
+    @Override
     public boolean heartbeat_lock_materialization_rebuild(java.lang.String dbName, java.lang.String tableName, long txnId) throws org.apache.thrift.TException
     {
       send_heartbeat_lock_materialization_rebuild(dbName, tableName, txnId);
@@ -8726,6 +8993,7 @@ public boolean recv_heartbeat_lock_materialization_rebuild() throws org.apache.t
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "heartbeat_lock_materialization_rebuild failed: unknown result");
     }
 
+    @Override
     public LockResponse get_lock_materialization_rebuild_req(LockMaterializationRebuildRequest req) throws org.apache.thrift.TException
     {
       send_get_lock_materialization_rebuild_req(req);
@@ -8749,6 +9017,7 @@ public LockResponse recv_get_lock_materialization_rebuild_req() throws org.apach
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_lock_materialization_rebuild_req failed: unknown result");
     }
 
+    @Override
     public boolean heartbeat_lock_materialization_rebuild_req(LockMaterializationRebuildRequest req) throws org.apache.thrift.TException
     {
       send_heartbeat_lock_materialization_rebuild_req(req);
@@ -8772,6 +9041,7 @@ public boolean recv_heartbeat_lock_materialization_rebuild_req() throws org.apac
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "heartbeat_lock_materialization_rebuild_req failed: unknown result");
     }
 
+    @Override
     public void add_runtime_stats(RuntimeStat stat) throws MetaException, org.apache.thrift.TException
     {
       send_add_runtime_stats(stat);
@@ -8795,6 +9065,7 @@ public void recv_add_runtime_stats() throws MetaException, org.apache.thrift.TEx
       return;
     }
 
+    @Override
     public java.util.List<RuntimeStat> get_runtime_stats(GetRuntimeStatsRequest rqst) throws MetaException, org.apache.thrift.TException
     {
       send_get_runtime_stats(rqst);
@@ -8821,6 +9092,7 @@ public java.util.List<RuntimeStat> recv_get_runtime_stats() throws MetaException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_runtime_stats failed: unknown result");
     }
 
+    @Override
     public GetPartitionsResponse get_partitions_with_specs(GetPartitionsRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_partitions_with_specs(request);
@@ -8847,6 +9119,7 @@ public GetPartitionsResponse recv_get_partitions_with_specs() throws MetaExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_partitions_with_specs failed: unknown result");
     }
 
+    @Override
     public ScheduledQueryPollResponse scheduled_query_poll(ScheduledQueryPollRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_scheduled_query_poll(request);
@@ -8873,6 +9146,7 @@ public ScheduledQueryPollResponse recv_scheduled_query_poll() throws MetaExcepti
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scheduled_query_poll failed: unknown result");
     }
 
+    @Override
     public void scheduled_query_maintenance(ScheduledQueryMaintenanceRequest request) throws MetaException, NoSuchObjectException, AlreadyExistsException, InvalidInputException, org.apache.thrift.TException
     {
       send_scheduled_query_maintenance(request);
@@ -8905,6 +9179,7 @@ public void recv_scheduled_query_maintenance() throws MetaException, NoSuchObjec
       return;
     }
 
+    @Override
     public void scheduled_query_progress(ScheduledQueryProgressInfo info) throws MetaException, InvalidOperationException, org.apache.thrift.TException
     {
       send_scheduled_query_progress(info);
@@ -8931,6 +9206,7 @@ public void recv_scheduled_query_progress() throws MetaException, InvalidOperati
       return;
     }
 
+    @Override
     public ScheduledQuery get_scheduled_query(ScheduledQueryKey scheduleKey) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_scheduled_query(scheduleKey);
@@ -8960,6 +9236,7 @@ public ScheduledQuery recv_get_scheduled_query() throws MetaException, NoSuchObj
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_scheduled_query failed: unknown result");
     }
 
+    @Override
     public void add_replication_metrics(ReplicationMetricList replicationMetricList) throws MetaException, org.apache.thrift.TException
     {
       send_add_replication_metrics(replicationMetricList);
@@ -8983,6 +9260,7 @@ public void recv_add_replication_metrics() throws MetaException, org.apache.thri
       return;
     }
 
+    @Override
     public ReplicationMetricList get_replication_metrics(GetReplicationMetricsRequest rqst) throws MetaException, org.apache.thrift.TException
     {
       send_get_replication_metrics(rqst);
@@ -9009,6 +9287,7 @@ public ReplicationMetricList recv_get_replication_metrics() throws MetaException
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_replication_metrics failed: unknown result");
     }
 
+    @Override
     public GetOpenTxnsResponse get_open_txns_req(GetOpenTxnsRequest getOpenTxnsRequest) throws org.apache.thrift.TException
     {
       send_get_open_txns_req(getOpenTxnsRequest);
@@ -9032,6 +9311,7 @@ public GetOpenTxnsResponse recv_get_open_txns_req() throws org.apache.thrift.TEx
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_open_txns_req failed: unknown result");
     }
 
+    @Override
     public void create_stored_procedure(StoredProcedure proc) throws NoSuchObjectException, MetaException, org.apache.thrift.TException
     {
       send_create_stored_procedure(proc);
@@ -9058,6 +9338,7 @@ public void recv_create_stored_procedure() throws NoSuchObjectException, MetaExc
       return;
     }
 
+    @Override
     public StoredProcedure get_stored_procedure(StoredProcedureRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_get_stored_procedure(request);
@@ -9087,6 +9368,7 @@ public StoredProcedure recv_get_stored_procedure() throws MetaException, NoSuchO
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_stored_procedure failed: unknown result");
     }
 
+    @Override
     public void drop_stored_procedure(StoredProcedureRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_drop_stored_procedure(request);
@@ -9110,6 +9392,7 @@ public void recv_drop_stored_procedure() throws MetaException, org.apache.thrift
       return;
     }
 
+    @Override
     public java.util.List<java.lang.String> get_all_stored_procedures(ListStoredProcedureRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_all_stored_procedures(request);
@@ -9136,6 +9419,7 @@ public java.util.List<java.lang.String> recv_get_all_stored_procedures() throws
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_stored_procedures failed: unknown result");
     }
 
+    @Override
     public Package find_package(GetPackageRequest request) throws MetaException, NoSuchObjectException, org.apache.thrift.TException
     {
       send_find_package(request);
@@ -9165,6 +9449,7 @@ public Package recv_find_package() throws MetaException, NoSuchObjectException,
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "find_package failed: unknown result");
     }
 
+    @Override
     public void add_package(AddPackageRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_add_package(request);
@@ -9188,6 +9473,7 @@ public void recv_add_package() throws MetaException, org.apache.thrift.TExceptio
       return;
     }
 
+    @Override
     public java.util.List<java.lang.String> get_all_packages(ListPackageRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_all_packages(request);
@@ -9214,6 +9500,7 @@ public java.util.List<java.lang.String> recv_get_all_packages() throws MetaExcep
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_packages failed: unknown result");
     }
 
+    @Override
     public void drop_package(DropPackageRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_drop_package(request);
@@ -9237,6 +9524,7 @@ public void recv_drop_package() throws MetaException, org.apache.thrift.TExcepti
       return;
     }
 
+    @Override
     public java.util.List<WriteEventInfo> get_all_write_event_info(GetAllWriteEventInfoRequest request) throws MetaException, org.apache.thrift.TException
     {
       send_get_all_write_event_info(request);
@@ -9263,6 +9551,7 @@ public java.util.List<WriteEventInfo> recv_get_all_write_event_info() throws Met
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_all_write_event_info failed: unknown result");
     }
 
+    @Override
     public ReplayedTxnsForPolicyResult get_replayed_txns_for_policy(java.lang.String policyName) throws MetaException, org.apache.thrift.TException
     {
       send_get_replayed_txns_for_policy(policyName);
@@ -9298,6 +9587,7 @@ public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.ap
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
+    @Override
       public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
@@ -9307,6 +9597,7 @@ public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory,
       super(protocolFactory, clientManager, transport);
     }
 
+    @Override
     public void abort_Compactions(AbortCompactionRequest rqst, org.apache.thrift.async.AsyncMethodCallback<AbortCompactResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       abort_Compactions_call method_call = new abort_Compactions_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -9321,6 +9612,7 @@ public abort_Compactions_call(AbortCompactionRequest rqst, org.apache.thrift.asy
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("abort_Compactions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         abort_Compactions_args args = new abort_Compactions_args();
@@ -9329,6 +9621,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AbortCompactResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9339,6 +9632,7 @@ public AbortCompactResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void getMetaConf(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getMetaConf_call method_call = new getMetaConf_call(key, resultHandler, this, ___protocolFactory, ___transport);
@@ -9353,6 +9647,7 @@ public getMetaConf_call(java.lang.String key, org.apache.thrift.async.AsyncMetho
         this.key = key;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getMetaConf", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getMetaConf_args args = new getMetaConf_args();
@@ -9361,6 +9656,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.String getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9371,6 +9667,7 @@ public java.lang.String getResult() throws MetaException, org.apache.thrift.TExc
       }
     }
 
+    @Override
     public void setMetaConf(java.lang.String key, java.lang.String value, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setMetaConf_call method_call = new setMetaConf_call(key, value, resultHandler, this, ___protocolFactory, ___transport);
@@ -9387,6 +9684,7 @@ public setMetaConf_call(java.lang.String key, java.lang.String value, org.apache
         this.value = value;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setMetaConf", org.apache.thrift.protocol.TMessageType.CALL, 0));
         setMetaConf_args args = new setMetaConf_args();
@@ -9396,16 +9694,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_setMetaConf();
         return null;
       }
     }
 
+    @Override
     public void create_catalog(CreateCatalogRequest catalog, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_catalog_call method_call = new create_catalog_call(catalog, resultHandler, this, ___protocolFactory, ___transport);
@@ -9420,6 +9721,7 @@ public create_catalog_call(CreateCatalogRequest catalog, org.apache.thrift.async
         this.catalog = catalog;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_catalog", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_catalog_args args = new create_catalog_args();
@@ -9428,16 +9730,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_catalog();
         return null;
       }
     }
 
+    @Override
     public void alter_catalog(AlterCatalogRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_catalog_call method_call = new alter_catalog_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -9452,6 +9757,7 @@ public alter_catalog_call(AlterCatalogRequest rqst, org.apache.thrift.async.Asyn
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_catalog", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_catalog_args args = new alter_catalog_args();
@@ -9460,16 +9766,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_catalog();
         return null;
       }
     }
 
+    @Override
     public void get_catalog(GetCatalogRequest catName, org.apache.thrift.async.AsyncMethodCallback<GetCatalogResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_catalog_call method_call = new get_catalog_call(catName, resultHandler, this, ___protocolFactory, ___transport);
@@ -9484,6 +9793,7 @@ public get_catalog_call(GetCatalogRequest catName, org.apache.thrift.async.Async
         this.catName = catName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_catalog", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_catalog_args args = new get_catalog_args();
@@ -9492,6 +9802,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetCatalogResponse getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9502,6 +9813,7 @@ public GetCatalogResponse getResult() throws NoSuchObjectException, MetaExceptio
       }
     }
 
+    @Override
     public void get_catalogs(org.apache.thrift.async.AsyncMethodCallback<GetCatalogsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_catalogs_call method_call = new get_catalogs_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -9514,6 +9826,7 @@ public get_catalogs_call(org.apache.thrift.async.AsyncMethodCallback<GetCatalogs
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_catalogs", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_catalogs_args args = new get_catalogs_args();
@@ -9521,6 +9834,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetCatalogsResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9531,6 +9845,7 @@ public GetCatalogsResponse getResult() throws MetaException, org.apache.thrift.T
       }
     }
 
+    @Override
     public void drop_catalog(DropCatalogRequest catName, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_catalog_call method_call = new drop_catalog_call(catName, resultHandler, this, ___protocolFactory, ___transport);
@@ -9545,6 +9860,7 @@ public drop_catalog_call(DropCatalogRequest catName, org.apache.thrift.async.Asy
         this.catName = catName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_catalog", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_catalog_args args = new drop_catalog_args();
@@ -9553,16 +9869,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_catalog();
         return null;
       }
     }
 
+    @Override
     public void create_database(Database database, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_database_call method_call = new create_database_call(database, resultHandler, this, ___protocolFactory, ___transport);
@@ -9577,6 +9896,7 @@ public create_database_call(Database database, org.apache.thrift.async.AsyncMeth
         this.database = database;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_database", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_database_args args = new create_database_args();
@@ -9585,16 +9905,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_database();
         return null;
       }
     }
 
+    @Override
     public void create_database_req(CreateDatabaseRequest createDatabaseRequest, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_database_req_call method_call = new create_database_req_call(createDatabaseRequest, resultHandler, this, ___protocolFactory, ___transport);
@@ -9609,6 +9932,7 @@ public create_database_req_call(CreateDatabaseRequest createDatabaseRequest, org
         this.createDatabaseRequest = createDatabaseRequest;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_database_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_database_req_args args = new create_database_req_args();
@@ -9617,16 +9941,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_database_req();
         return null;
       }
     }
 
+    @Override
     public void get_database(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<Database> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_database_call method_call = new get_database_call(name, resultHandler, this, ___protocolFactory, ___transport);
@@ -9641,6 +9968,7 @@ public get_database_call(java.lang.String name, org.apache.thrift.async.AsyncMet
         this.name = name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_database", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_database_args args = new get_database_args();
@@ -9649,6 +9977,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Database getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9659,6 +9988,7 @@ public Database getResult() throws NoSuchObjectException, MetaException, org.apa
       }
     }
 
+    @Override
     public void get_database_req(GetDatabaseRequest request, org.apache.thrift.async.AsyncMethodCallback<Database> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_database_req_call method_call = new get_database_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -9673,6 +10003,7 @@ public get_database_req_call(GetDatabaseRequest request, org.apache.thrift.async
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_database_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_database_req_args args = new get_database_req_args();
@@ -9681,6 +10012,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Database getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9691,6 +10023,7 @@ public Database getResult() throws NoSuchObjectException, MetaException, org.apa
       }
     }
 
+    @Override
     public void drop_database(java.lang.String name, boolean deleteData, boolean cascade, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_database_call method_call = new drop_database_call(name, deleteData, cascade, resultHandler, this, ___protocolFactory, ___transport);
@@ -9709,6 +10042,7 @@ public drop_database_call(java.lang.String name, boolean deleteData, boolean cas
         this.cascade = cascade;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_database", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_database_args args = new drop_database_args();
@@ -9719,16 +10053,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_database();
         return null;
       }
     }
 
+    @Override
     public void drop_database_req(DropDatabaseRequest req, org.apache.thrift.async.AsyncMethodCallback<AsyncOperationResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_database_req_call method_call = new drop_database_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -9743,6 +10080,7 @@ public drop_database_req_call(DropDatabaseRequest req, org.apache.thrift.async.A
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_database_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_database_req_args args = new drop_database_req_args();
@@ -9751,6 +10089,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AsyncOperationResp getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9761,6 +10100,7 @@ public AsyncOperationResp getResult() throws NoSuchObjectException, InvalidOpera
       }
     }
 
+    @Override
     public void get_databases(java.lang.String pattern, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_databases_call method_call = new get_databases_call(pattern, resultHandler, this, ___protocolFactory, ___transport);
@@ -9775,6 +10115,7 @@ public get_databases_call(java.lang.String pattern, org.apache.thrift.async.Asyn
         this.pattern = pattern;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_databases", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_databases_args args = new get_databases_args();
@@ -9783,6 +10124,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9793,6 +10135,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_all_databases(org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_databases_call method_call = new get_all_databases_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -9805,6 +10148,7 @@ public get_all_databases_call(org.apache.thrift.async.AsyncMethodCallback<java.u
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_databases", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_databases_args args = new get_all_databases_args();
@@ -9812,6 +10156,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9822,6 +10167,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_databases_req(GetDatabaseObjectsRequest request, org.apache.thrift.async.AsyncMethodCallback<GetDatabaseObjectsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_databases_req_call method_call = new get_databases_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -9836,6 +10182,7 @@ public get_databases_req_call(GetDatabaseObjectsRequest request, org.apache.thri
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_databases_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_databases_req_args args = new get_databases_req_args();
@@ -9844,6 +10191,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetDatabaseObjectsResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9854,6 +10202,7 @@ public GetDatabaseObjectsResponse getResult() throws MetaException, org.apache.t
       }
     }
 
+    @Override
     public void alter_database(java.lang.String dbname, Database db, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_database_call method_call = new alter_database_call(dbname, db, resultHandler, this, ___protocolFactory, ___transport);
@@ -9870,6 +10219,7 @@ public alter_database_call(java.lang.String dbname, Database db, org.apache.thri
         this.db = db;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_database", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_database_args args = new alter_database_args();
@@ -9879,16 +10229,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_database();
         return null;
       }
     }
 
+    @Override
     public void alter_database_req(AlterDatabaseRequest alterDbReq, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_database_req_call method_call = new alter_database_req_call(alterDbReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -9903,6 +10256,7 @@ public alter_database_req_call(AlterDatabaseRequest alterDbReq, org.apache.thrif
         this.alterDbReq = alterDbReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_database_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_database_req_args args = new alter_database_req_args();
@@ -9911,16 +10265,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_database_req();
         return null;
       }
     }
 
+    @Override
     public void create_dataconnector_req(CreateDataConnectorRequest connectorReq, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_dataconnector_req_call method_call = new create_dataconnector_req_call(connectorReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -9935,6 +10292,7 @@ public create_dataconnector_req_call(CreateDataConnectorRequest connectorReq, or
         this.connectorReq = connectorReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_dataconnector_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_dataconnector_req_args args = new create_dataconnector_req_args();
@@ -9943,16 +10301,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_dataconnector_req();
         return null;
       }
     }
 
+    @Override
     public void get_dataconnector_req(GetDataConnectorRequest request, org.apache.thrift.async.AsyncMethodCallback<DataConnector> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_dataconnector_req_call method_call = new get_dataconnector_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -9967,6 +10328,7 @@ public get_dataconnector_req_call(GetDataConnectorRequest request, org.apache.th
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_dataconnector_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_dataconnector_req_args args = new get_dataconnector_req_args();
@@ -9975,6 +10337,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public DataConnector getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -9985,6 +10348,7 @@ public DataConnector getResult() throws NoSuchObjectException, MetaException, or
       }
     }
 
+    @Override
     public void drop_dataconnector_req(DropDataConnectorRequest dropDcReq, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_dataconnector_req_call method_call = new drop_dataconnector_req_call(dropDcReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -9999,6 +10363,7 @@ public drop_dataconnector_req_call(DropDataConnectorRequest dropDcReq, org.apach
         this.dropDcReq = dropDcReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_dataconnector_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_dataconnector_req_args args = new drop_dataconnector_req_args();
@@ -10007,16 +10372,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_dataconnector_req();
         return null;
       }
     }
 
+    @Override
     public void get_dataconnectors(org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_dataconnectors_call method_call = new get_dataconnectors_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -10029,6 +10397,7 @@ public get_dataconnectors_call(org.apache.thrift.async.AsyncMethodCallback<java.
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_dataconnectors", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_dataconnectors_args args = new get_dataconnectors_args();
@@ -10036,6 +10405,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10046,6 +10416,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void alter_dataconnector_req(AlterDataConnectorRequest alterReq, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_dataconnector_req_call method_call = new alter_dataconnector_req_call(alterReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -10060,6 +10431,7 @@ public alter_dataconnector_req_call(AlterDataConnectorRequest alterReq, org.apac
         this.alterReq = alterReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_dataconnector_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_dataconnector_req_args args = new alter_dataconnector_req_args();
@@ -10068,16 +10440,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_dataconnector_req();
         return null;
       }
     }
 
+    @Override
     public void get_type(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<Type> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_type_call method_call = new get_type_call(name, resultHandler, this, ___protocolFactory, ___transport);
@@ -10092,6 +10467,7 @@ public get_type_call(java.lang.String name, org.apache.thrift.async.AsyncMethodC
         this.name = name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_type", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_type_args args = new get_type_args();
@@ -10100,6 +10476,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Type getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10110,6 +10487,7 @@ public Type getResult() throws MetaException, NoSuchObjectException, org.apache.
       }
     }
 
+    @Override
     public void create_type(Type type, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_type_call method_call = new create_type_call(type, resultHandler, this, ___protocolFactory, ___transport);
@@ -10124,6 +10502,7 @@ public create_type_call(Type type, org.apache.thrift.async.AsyncMethodCallback<j
         this.type = type;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_type", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_type_args args = new create_type_args();
@@ -10132,6 +10511,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10142,6 +10522,7 @@ public java.lang.Boolean getResult() throws AlreadyExistsException, InvalidObjec
       }
     }
 
+    @Override
     public void drop_type(java.lang.String type, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_type_call method_call = new drop_type_call(type, resultHandler, this, ___protocolFactory, ___transport);
@@ -10156,6 +10537,7 @@ public drop_type_call(java.lang.String type, org.apache.thrift.async.AsyncMethod
         this.type = type;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_type", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_type_args args = new drop_type_args();
@@ -10164,6 +10546,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10174,6 +10557,7 @@ public java.lang.Boolean getResult() throws MetaException, NoSuchObjectException
       }
     }
 
+    @Override
     public void get_type_all(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,Type>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_type_all_call method_call = new get_type_all_call(name, resultHandler, this, ___protocolFactory, ___transport);
@@ -10188,6 +10572,7 @@ public get_type_all_call(java.lang.String name, org.apache.thrift.async.AsyncMet
         this.name = name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_type_all", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_type_all_args args = new get_type_all_args();
@@ -10196,6 +10581,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.Map<java.lang.String,Type> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10206,6 +10592,7 @@ public java.util.Map<java.lang.String,Type> getResult() throws MetaException, or
       }
     }
 
+    @Override
     public void get_fields(java.lang.String db_name, java.lang.String table_name, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_fields_call method_call = new get_fields_call(db_name, table_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -10222,6 +10609,7 @@ public get_fields_call(java.lang.String db_name, java.lang.String table_name, or
         this.table_name = table_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_fields", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_fields_args args = new get_fields_args();
@@ -10231,6 +10619,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10241,6 +10630,7 @@ public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTabl
       }
     }
 
+    @Override
     public void get_fields_with_environment_context(java.lang.String db_name, java.lang.String table_name, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_fields_with_environment_context_call method_call = new get_fields_with_environment_context_call(db_name, table_name, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -10259,6 +10649,7 @@ public get_fields_with_environment_context_call(java.lang.String db_name, java.l
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_fields_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_fields_with_environment_context_args args = new get_fields_with_environment_context_args();
@@ -10269,6 +10660,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10279,6 +10671,7 @@ public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTabl
       }
     }
 
+    @Override
     public void get_fields_req(GetFieldsRequest req, org.apache.thrift.async.AsyncMethodCallback<GetFieldsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_fields_req_call method_call = new get_fields_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10293,6 +10686,7 @@ public get_fields_req_call(GetFieldsRequest req, org.apache.thrift.async.AsyncMe
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_fields_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_fields_req_args args = new get_fields_req_args();
@@ -10301,6 +10695,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetFieldsResponse getResult() throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10311,6 +10706,7 @@ public GetFieldsResponse getResult() throws MetaException, UnknownTableException
       }
     }
 
+    @Override
     public void get_schema(java.lang.String db_name, java.lang.String table_name, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schema_call method_call = new get_schema_call(db_name, table_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -10327,6 +10723,7 @@ public get_schema_call(java.lang.String db_name, java.lang.String table_name, or
         this.table_name = table_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schema", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schema_args args = new get_schema_args();
@@ -10336,6 +10733,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10346,6 +10744,7 @@ public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTabl
       }
     }
 
+    @Override
     public void get_schema_with_environment_context(java.lang.String db_name, java.lang.String table_name, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schema_with_environment_context_call method_call = new get_schema_with_environment_context_call(db_name, table_name, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -10364,6 +10763,7 @@ public get_schema_with_environment_context_call(java.lang.String db_name, java.l
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schema_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schema_with_environment_context_args args = new get_schema_with_environment_context_args();
@@ -10374,6 +10774,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10384,6 +10785,7 @@ public java.util.List<FieldSchema> getResult() throws MetaException, UnknownTabl
       }
     }
 
+    @Override
     public void get_schema_req(GetSchemaRequest req, org.apache.thrift.async.AsyncMethodCallback<GetSchemaResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schema_req_call method_call = new get_schema_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10398,6 +10800,7 @@ public get_schema_req_call(GetSchemaRequest req, org.apache.thrift.async.AsyncMe
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schema_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schema_req_args args = new get_schema_req_args();
@@ -10406,6 +10809,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetSchemaResponse getResult() throws MetaException, UnknownTableException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10416,6 +10820,7 @@ public GetSchemaResponse getResult() throws MetaException, UnknownTableException
       }
     }
 
+    @Override
     public void create_table(Table tbl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_table_call method_call = new create_table_call(tbl, resultHandler, this, ___protocolFactory, ___transport);
@@ -10430,6 +10835,7 @@ public create_table_call(Table tbl, org.apache.thrift.async.AsyncMethodCallback<
         this.tbl = tbl;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_table", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_table_args args = new create_table_args();
@@ -10438,16 +10844,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_table();
         return null;
       }
     }
 
+    @Override
     public void create_table_with_environment_context(Table tbl, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_table_with_environment_context_call method_call = new create_table_with_environment_context_call(tbl, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -10464,6 +10873,7 @@ public create_table_with_environment_context_call(Table tbl, EnvironmentContext
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_table_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_table_with_environment_context_args args = new create_table_with_environment_context_args();
@@ -10473,16 +10883,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_table_with_environment_context();
         return null;
       }
     }
 
+    @Override
     public void create_table_with_constraints(Table tbl, java.util.List<SQLPrimaryKey> primaryKeys, java.util.List<SQLForeignKey> foreignKeys, java.util.List<SQLUniqueConstraint> uniqueConstraints, java.util.List<SQLNotNullConstraint> notNullConstraints, java.util.List<SQLDefaultConstraint> defaultConstraints, java.util.List<SQLCheckConstraint> checkConstraints, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_table_with_constraints_call method_call = new create_table_with_constraints_call(tbl, primaryKeys, foreignKeys, uniqueConstraints, notNullConstraints, defaultConstraints, checkConstraints, resultHandler, this, ___protocolFactory, ___transport);
@@ -10509,6 +10922,7 @@ public create_table_with_constraints_call(Table tbl, java.util.List<SQLPrimaryKe
         this.checkConstraints = checkConstraints;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_table_with_constraints", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_table_with_constraints_args args = new create_table_with_constraints_args();
@@ -10523,16 +10937,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_table_with_constraints();
         return null;
       }
     }
 
+    @Override
     public void create_table_req(CreateTableRequest request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_table_req_call method_call = new create_table_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -10547,6 +10964,7 @@ public create_table_req_call(CreateTableRequest request, org.apache.thrift.async
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_table_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_table_req_args args = new create_table_req_args();
@@ -10555,16 +10973,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_table_req();
         return null;
       }
     }
 
+    @Override
     public void drop_constraint(DropConstraintRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_constraint_call method_call = new drop_constraint_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10579,6 +11000,7 @@ public drop_constraint_call(DropConstraintRequest req, org.apache.thrift.async.A
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_constraint", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_constraint_args args = new drop_constraint_args();
@@ -10587,16 +11009,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_constraint();
         return null;
       }
     }
 
+    @Override
     public void add_primary_key(AddPrimaryKeyRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_primary_key_call method_call = new add_primary_key_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10611,6 +11036,7 @@ public add_primary_key_call(AddPrimaryKeyRequest req, org.apache.thrift.async.As
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_primary_key", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_primary_key_args args = new add_primary_key_args();
@@ -10619,16 +11045,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_primary_key();
         return null;
       }
     }
 
+    @Override
     public void add_foreign_key(AddForeignKeyRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_foreign_key_call method_call = new add_foreign_key_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10643,6 +11072,7 @@ public add_foreign_key_call(AddForeignKeyRequest req, org.apache.thrift.async.As
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_foreign_key", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_foreign_key_args args = new add_foreign_key_args();
@@ -10651,16 +11081,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_foreign_key();
         return null;
       }
     }
 
+    @Override
     public void add_unique_constraint(AddUniqueConstraintRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_unique_constraint_call method_call = new add_unique_constraint_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10675,6 +11108,7 @@ public add_unique_constraint_call(AddUniqueConstraintRequest req, org.apache.thr
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_unique_constraint", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_unique_constraint_args args = new add_unique_constraint_args();
@@ -10683,16 +11117,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_unique_constraint();
         return null;
       }
     }
 
+    @Override
     public void add_not_null_constraint(AddNotNullConstraintRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_not_null_constraint_call method_call = new add_not_null_constraint_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10707,6 +11144,7 @@ public add_not_null_constraint_call(AddNotNullConstraintRequest req, org.apache.
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_not_null_constraint", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_not_null_constraint_args args = new add_not_null_constraint_args();
@@ -10715,16 +11153,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_not_null_constraint();
         return null;
       }
     }
 
+    @Override
     public void add_default_constraint(AddDefaultConstraintRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_default_constraint_call method_call = new add_default_constraint_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10739,6 +11180,7 @@ public add_default_constraint_call(AddDefaultConstraintRequest req, org.apache.t
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_default_constraint", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_default_constraint_args args = new add_default_constraint_args();
@@ -10747,16 +11189,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_default_constraint();
         return null;
       }
     }
 
+    @Override
     public void add_check_constraint(AddCheckConstraintRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_check_constraint_call method_call = new add_check_constraint_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10771,6 +11216,7 @@ public add_check_constraint_call(AddCheckConstraintRequest req, org.apache.thrif
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_check_constraint", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_check_constraint_args args = new add_check_constraint_args();
@@ -10779,16 +11225,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_check_constraint();
         return null;
       }
     }
 
+    @Override
     public void translate_table_dryrun(CreateTableRequest request, org.apache.thrift.async.AsyncMethodCallback<Table> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       translate_table_dryrun_call method_call = new translate_table_dryrun_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -10803,6 +11252,7 @@ public translate_table_dryrun_call(CreateTableRequest request, org.apache.thrift
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("translate_table_dryrun", org.apache.thrift.protocol.TMessageType.CALL, 0));
         translate_table_dryrun_args args = new translate_table_dryrun_args();
@@ -10811,6 +11261,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Table getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10821,6 +11272,7 @@ public Table getResult() throws AlreadyExistsException, InvalidObjectException,
       }
     }
 
+    @Override
     public void drop_table(java.lang.String dbname, java.lang.String name, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_table_call method_call = new drop_table_call(dbname, name, deleteData, resultHandler, this, ___protocolFactory, ___transport);
@@ -10839,6 +11291,7 @@ public drop_table_call(java.lang.String dbname, java.lang.String name, boolean d
         this.deleteData = deleteData;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_table", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_table_args args = new drop_table_args();
@@ -10849,16 +11302,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_table();
         return null;
       }
     }
 
+    @Override
     public void drop_table_with_environment_context(java.lang.String dbname, java.lang.String name, boolean deleteData, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_table_with_environment_context_call method_call = new drop_table_with_environment_context_call(dbname, name, deleteData, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -10879,6 +11335,7 @@ public drop_table_with_environment_context_call(java.lang.String dbname, java.la
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_table_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_table_with_environment_context_args args = new drop_table_with_environment_context_args();
@@ -10890,16 +11347,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_table_with_environment_context();
         return null;
       }
     }
 
+    @Override
     public void drop_table_req(DropTableRequest dropTableReq, org.apache.thrift.async.AsyncMethodCallback<AsyncOperationResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_table_req_call method_call = new drop_table_req_call(dropTableReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -10914,6 +11374,7 @@ public drop_table_req_call(DropTableRequest dropTableReq, org.apache.thrift.asyn
         this.dropTableReq = dropTableReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_table_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_table_req_args args = new drop_table_req_args();
@@ -10922,6 +11383,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AsyncOperationResp getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -10932,6 +11394,7 @@ public AsyncOperationResp getResult() throws NoSuchObjectException, MetaExceptio
       }
     }
 
+    @Override
     public void truncate_table(java.lang.String dbName, java.lang.String tableName, java.util.List<java.lang.String> partNames, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       truncate_table_call method_call = new truncate_table_call(dbName, tableName, partNames, resultHandler, this, ___protocolFactory, ___transport);
@@ -10950,6 +11413,7 @@ public truncate_table_call(java.lang.String dbName, java.lang.String tableName,
         this.partNames = partNames;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("truncate_table", org.apache.thrift.protocol.TMessageType.CALL, 0));
         truncate_table_args args = new truncate_table_args();
@@ -10960,16 +11424,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_truncate_table();
         return null;
       }
     }
 
+    @Override
     public void truncate_table_req(TruncateTableRequest req, org.apache.thrift.async.AsyncMethodCallback<TruncateTableResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       truncate_table_req_call method_call = new truncate_table_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -10984,6 +11451,7 @@ public truncate_table_req_call(TruncateTableRequest req, org.apache.thrift.async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("truncate_table_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         truncate_table_req_args args = new truncate_table_req_args();
@@ -10992,6 +11460,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TruncateTableResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11002,6 +11471,7 @@ public TruncateTableResponse getResult() throws MetaException, org.apache.thrift
       }
     }
 
+    @Override
     public void get_tables(java.lang.String db_name, java.lang.String pattern, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_tables_call method_call = new get_tables_call(db_name, pattern, resultHandler, this, ___protocolFactory, ___transport);
@@ -11018,6 +11488,7 @@ public get_tables_call(java.lang.String db_name, java.lang.String pattern, org.a
         this.pattern = pattern;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_tables", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_tables_args args = new get_tables_args();
@@ -11027,6 +11498,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11037,6 +11509,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_tables_by_type(java.lang.String db_name, java.lang.String pattern, java.lang.String tableType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_tables_by_type_call method_call = new get_tables_by_type_call(db_name, pattern, tableType, resultHandler, this, ___protocolFactory, ___transport);
@@ -11055,6 +11528,7 @@ public get_tables_by_type_call(java.lang.String db_name, java.lang.String patter
         this.tableType = tableType;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_tables_by_type", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_tables_by_type_args args = new get_tables_by_type_args();
@@ -11065,6 +11539,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11075,6 +11550,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_all_materialized_view_objects_for_rewriting(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Table>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_materialized_view_objects_for_rewriting_call method_call = new get_all_materialized_view_objects_for_rewriting_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -11087,6 +11563,7 @@ public get_all_materialized_view_objects_for_rewriting_call(org.apache.thrift.as
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_materialized_view_objects_for_rewriting", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_materialized_view_objects_for_rewriting_args args = new get_all_materialized_view_objects_for_rewriting_args();
@@ -11094,6 +11571,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Table> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11104,6 +11582,7 @@ public java.util.List<Table> getResult() throws MetaException, org.apache.thrift
       }
     }
 
+    @Override
     public void get_materialized_views_for_rewriting(java.lang.String db_name, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_materialized_views_for_rewriting_call method_call = new get_materialized_views_for_rewriting_call(db_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -11118,6 +11597,7 @@ public get_materialized_views_for_rewriting_call(java.lang.String db_name, org.a
         this.db_name = db_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_materialized_views_for_rewriting", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_materialized_views_for_rewriting_args args = new get_materialized_views_for_rewriting_args();
@@ -11126,6 +11606,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11136,6 +11617,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_table_meta(java.lang.String db_patterns, java.lang.String tbl_patterns, java.util.List<java.lang.String> tbl_types, org.apache.thrift.async.AsyncMethodCallback<java.util.List<TableMeta>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_table_meta_call method_call = new get_table_meta_call(db_patterns, tbl_patterns, tbl_types, resultHandler, this, ___protocolFactory, ___transport);
@@ -11154,6 +11636,7 @@ public get_table_meta_call(java.lang.String db_patterns, java.lang.String tbl_pa
         this.tbl_types = tbl_types;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_table_meta", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_table_meta_args args = new get_table_meta_args();
@@ -11164,6 +11647,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<TableMeta> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11174,6 +11658,7 @@ public java.util.List<TableMeta> getResult() throws MetaException, org.apache.th
       }
     }
 
+    @Override
     public void get_all_tables(java.lang.String db_name, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_tables_call method_call = new get_all_tables_call(db_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -11188,6 +11673,7 @@ public get_all_tables_call(java.lang.String db_name, org.apache.thrift.async.Asy
         this.db_name = db_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_tables", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_tables_args args = new get_all_tables_args();
@@ -11196,6 +11682,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11206,6 +11693,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_tables_ext(GetTablesExtRequest req, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ExtendedTableInfo>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_tables_ext_call method_call = new get_tables_ext_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -11220,6 +11708,7 @@ public get_tables_ext_call(GetTablesExtRequest req, org.apache.thrift.async.Asyn
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_tables_ext", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_tables_ext_args args = new get_tables_ext_args();
@@ -11228,6 +11717,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<ExtendedTableInfo> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11238,6 +11728,7 @@ public java.util.List<ExtendedTableInfo> getResult() throws MetaException, org.a
       }
     }
 
+    @Override
     public void get_table_req(GetTableRequest req, org.apache.thrift.async.AsyncMethodCallback<GetTableResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_table_req_call method_call = new get_table_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -11252,6 +11743,7 @@ public get_table_req_call(GetTableRequest req, org.apache.thrift.async.AsyncMeth
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_table_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_table_req_args args = new get_table_req_args();
@@ -11260,6 +11752,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetTableResult getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11270,6 +11763,7 @@ public GetTableResult getResult() throws MetaException, NoSuchObjectException, o
       }
     }
 
+    @Override
     public void get_table_objects_by_name_req(GetTablesRequest req, org.apache.thrift.async.AsyncMethodCallback<GetTablesResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_table_objects_by_name_req_call method_call = new get_table_objects_by_name_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -11284,6 +11778,7 @@ public get_table_objects_by_name_req_call(GetTablesRequest req, org.apache.thrif
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_table_objects_by_name_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_table_objects_by_name_req_args args = new get_table_objects_by_name_req_args();
@@ -11292,6 +11787,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetTablesResult getResult() throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11302,6 +11798,7 @@ public GetTablesResult getResult() throws MetaException, InvalidOperationExcepti
       }
     }
 
+    @Override
     public void get_materialization_invalidation_info(CreationMetadata creation_metadata, java.lang.String validTxnList, org.apache.thrift.async.AsyncMethodCallback<Materialization> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_materialization_invalidation_info_call method_call = new get_materialization_invalidation_info_call(creation_metadata, validTxnList, resultHandler, this, ___protocolFactory, ___transport);
@@ -11318,6 +11815,7 @@ public get_materialization_invalidation_info_call(CreationMetadata creation_meta
         this.validTxnList = validTxnList;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_materialization_invalidation_info", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_materialization_invalidation_info_args args = new get_materialization_invalidation_info_args();
@@ -11327,6 +11825,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Materialization getResult() throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11337,6 +11836,7 @@ public Materialization getResult() throws MetaException, InvalidOperationExcepti
       }
     }
 
+    @Override
     public void update_creation_metadata(java.lang.String catName, java.lang.String dbname, java.lang.String tbl_name, CreationMetadata creation_metadata, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_creation_metadata_call method_call = new update_creation_metadata_call(catName, dbname, tbl_name, creation_metadata, resultHandler, this, ___protocolFactory, ___transport);
@@ -11357,6 +11857,7 @@ public update_creation_metadata_call(java.lang.String catName, java.lang.String
         this.creation_metadata = creation_metadata;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_creation_metadata", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_creation_metadata_args args = new update_creation_metadata_args();
@@ -11368,16 +11869,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_update_creation_metadata();
         return null;
       }
     }
 
+    @Override
     public void get_table_names_by_filter(java.lang.String dbname, java.lang.String filter, short max_tables, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_table_names_by_filter_call method_call = new get_table_names_by_filter_call(dbname, filter, max_tables, resultHandler, this, ___protocolFactory, ___transport);
@@ -11396,6 +11900,7 @@ public get_table_names_by_filter_call(java.lang.String dbname, java.lang.String
         this.max_tables = max_tables;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_table_names_by_filter", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_table_names_by_filter_args args = new get_table_names_by_filter_args();
@@ -11406,6 +11911,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, InvalidOperationException, UnknownDBException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11416,6 +11922,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, Invali
       }
     }
 
+    @Override
     public void alter_table(java.lang.String dbname, java.lang.String tbl_name, Table new_tbl, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_table_call method_call = new alter_table_call(dbname, tbl_name, new_tbl, resultHandler, this, ___protocolFactory, ___transport);
@@ -11434,6 +11941,7 @@ public alter_table_call(java.lang.String dbname, java.lang.String tbl_name, Tabl
         this.new_tbl = new_tbl;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_table", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_table_args args = new alter_table_args();
@@ -11444,16 +11952,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_table();
         return null;
       }
     }
 
+    @Override
     public void alter_table_with_environment_context(java.lang.String dbname, java.lang.String tbl_name, Table new_tbl, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_table_with_environment_context_call method_call = new alter_table_with_environment_context_call(dbname, tbl_name, new_tbl, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -11474,6 +11985,7 @@ public alter_table_with_environment_context_call(java.lang.String dbname, java.l
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_table_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_table_with_environment_context_args args = new alter_table_with_environment_context_args();
@@ -11485,16 +11997,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_table_with_environment_context();
         return null;
       }
     }
 
+    @Override
     public void alter_table_with_cascade(java.lang.String dbname, java.lang.String tbl_name, Table new_tbl, boolean cascade, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_table_with_cascade_call method_call = new alter_table_with_cascade_call(dbname, tbl_name, new_tbl, cascade, resultHandler, this, ___protocolFactory, ___transport);
@@ -11515,6 +12030,7 @@ public alter_table_with_cascade_call(java.lang.String dbname, java.lang.String t
         this.cascade = cascade;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_table_with_cascade", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_table_with_cascade_args args = new alter_table_with_cascade_args();
@@ -11526,16 +12042,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_table_with_cascade();
         return null;
       }
     }
 
+    @Override
     public void alter_table_req(AlterTableRequest req, org.apache.thrift.async.AsyncMethodCallback<AlterTableResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_table_req_call method_call = new alter_table_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -11550,6 +12069,7 @@ public alter_table_req_call(AlterTableRequest req, org.apache.thrift.async.Async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_table_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_table_req_args args = new alter_table_req_args();
@@ -11558,6 +12078,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AlterTableResponse getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11568,6 +12089,7 @@ public AlterTableResponse getResult() throws InvalidOperationException, MetaExce
       }
     }
 
+    @Override
     public void update_table_params(java.util.List<TableParamsUpdate> updates, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_table_params_call method_call = new update_table_params_call(updates, resultHandler, this, ___protocolFactory, ___transport);
@@ -11582,6 +12104,7 @@ public update_table_params_call(java.util.List<TableParamsUpdate> updates, org.a
         this.updates = updates;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_table_params", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_table_params_args args = new update_table_params_args();
@@ -11590,16 +12113,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_update_table_params();
         return null;
       }
     }
 
+    @Override
     public void add_partition(Partition new_part, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_partition_call method_call = new add_partition_call(new_part, resultHandler, this, ___protocolFactory, ___transport);
@@ -11614,6 +12140,7 @@ public add_partition_call(Partition new_part, org.apache.thrift.async.AsyncMetho
         this.new_part = new_part;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_partition_args args = new add_partition_args();
@@ -11622,6 +12149,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11632,6 +12160,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void add_partition_with_environment_context(Partition new_part, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_partition_with_environment_context_call method_call = new add_partition_with_environment_context_call(new_part, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -11648,6 +12177,7 @@ public add_partition_with_environment_context_call(Partition new_part, Environme
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_partition_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_partition_with_environment_context_args args = new add_partition_with_environment_context_args();
@@ -11657,6 +12187,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11667,6 +12198,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void add_partitions(java.util.List<Partition> new_parts, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_partitions_call method_call = new add_partitions_call(new_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -11681,6 +12213,7 @@ public add_partitions_call(java.util.List<Partition> new_parts, org.apache.thrif
         this.new_parts = new_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_partitions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_partitions_args args = new add_partitions_args();
@@ -11689,6 +12222,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Integer getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11699,6 +12233,7 @@ public java.lang.Integer getResult() throws InvalidObjectException, AlreadyExist
       }
     }
 
+    @Override
     public void add_partitions_pspec(java.util.List<PartitionSpec> new_parts, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_partitions_pspec_call method_call = new add_partitions_pspec_call(new_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -11713,6 +12248,7 @@ public add_partitions_pspec_call(java.util.List<PartitionSpec> new_parts, org.ap
         this.new_parts = new_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_partitions_pspec", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_partitions_pspec_args args = new add_partitions_pspec_args();
@@ -11721,6 +12257,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Integer getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11731,6 +12268,7 @@ public java.lang.Integer getResult() throws InvalidObjectException, AlreadyExist
       }
     }
 
+    @Override
     public void append_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       append_partition_call method_call = new append_partition_call(db_name, tbl_name, part_vals, resultHandler, this, ___protocolFactory, ___transport);
@@ -11749,6 +12287,7 @@ public append_partition_call(java.lang.String db_name, java.lang.String tbl_name
         this.part_vals = part_vals;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         append_partition_args args = new append_partition_args();
@@ -11759,6 +12298,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11769,6 +12309,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void add_partitions_req(AddPartitionsRequest request, org.apache.thrift.async.AsyncMethodCallback<AddPartitionsResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_partitions_req_call method_call = new add_partitions_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -11783,6 +12324,7 @@ public add_partitions_req_call(AddPartitionsRequest request, org.apache.thrift.a
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_partitions_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_partitions_req_args args = new add_partitions_req_args();
@@ -11791,6 +12333,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AddPartitionsResult getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11801,6 +12344,7 @@ public AddPartitionsResult getResult() throws InvalidObjectException, AlreadyExi
       }
     }
 
+    @Override
     public void append_partition_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       append_partition_with_environment_context_call method_call = new append_partition_with_environment_context_call(db_name, tbl_name, part_vals, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -11821,6 +12365,7 @@ public append_partition_with_environment_context_call(java.lang.String db_name,
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append_partition_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         append_partition_with_environment_context_args args = new append_partition_with_environment_context_args();
@@ -11832,6 +12377,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11842,6 +12388,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void append_partition_req(AppendPartitionsRequest appendPartitionsReq, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       append_partition_req_call method_call = new append_partition_req_call(appendPartitionsReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -11856,6 +12403,7 @@ public append_partition_req_call(AppendPartitionsRequest appendPartitionsReq, or
         this.appendPartitionsReq = appendPartitionsReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append_partition_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         append_partition_req_args args = new append_partition_req_args();
@@ -11864,6 +12412,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11874,6 +12423,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void append_partition_by_name(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       append_partition_by_name_call method_call = new append_partition_by_name_call(db_name, tbl_name, part_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -11892,6 +12442,7 @@ public append_partition_by_name_call(java.lang.String db_name, java.lang.String
         this.part_name = part_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append_partition_by_name", org.apache.thrift.protocol.TMessageType.CALL, 0));
         append_partition_by_name_args args = new append_partition_by_name_args();
@@ -11902,6 +12453,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11912,6 +12464,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void append_partition_by_name_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       append_partition_by_name_with_environment_context_call method_call = new append_partition_by_name_with_environment_context_call(db_name, tbl_name, part_name, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -11932,6 +12485,7 @@ public append_partition_by_name_with_environment_context_call(java.lang.String d
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append_partition_by_name_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         append_partition_by_name_with_environment_context_args args = new append_partition_by_name_with_environment_context_args();
@@ -11943,6 +12497,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws InvalidObjectException, AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11953,6 +12508,7 @@ public Partition getResult() throws InvalidObjectException, AlreadyExistsExcepti
       }
     }
 
+    @Override
     public void drop_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_partition_call method_call = new drop_partition_call(db_name, tbl_name, part_vals, deleteData, resultHandler, this, ___protocolFactory, ___transport);
@@ -11973,6 +12529,7 @@ public drop_partition_call(java.lang.String db_name, java.lang.String tbl_name,
         this.deleteData = deleteData;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_partition_args args = new drop_partition_args();
@@ -11984,6 +12541,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -11994,6 +12552,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void drop_partition_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, boolean deleteData, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_partition_with_environment_context_call method_call = new drop_partition_with_environment_context_call(db_name, tbl_name, part_vals, deleteData, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -12016,6 +12575,7 @@ public drop_partition_with_environment_context_call(java.lang.String db_name, ja
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_partition_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_partition_with_environment_context_args args = new drop_partition_with_environment_context_args();
@@ -12028,6 +12588,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12038,6 +12599,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void drop_partition_req(DropPartitionRequest dropPartitionReq, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_partition_req_call method_call = new drop_partition_req_call(dropPartitionReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -12052,6 +12614,7 @@ public drop_partition_req_call(DropPartitionRequest dropPartitionReq, org.apache
         this.dropPartitionReq = dropPartitionReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_partition_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_partition_req_args args = new drop_partition_req_args();
@@ -12060,6 +12623,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12070,6 +12634,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void drop_partition_by_name(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, boolean deleteData, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_partition_by_name_call method_call = new drop_partition_by_name_call(db_name, tbl_name, part_name, deleteData, resultHandler, this, ___protocolFactory, ___transport);
@@ -12090,6 +12655,7 @@ public drop_partition_by_name_call(java.lang.String db_name, java.lang.String tb
         this.deleteData = deleteData;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_partition_by_name", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_partition_by_name_args args = new drop_partition_by_name_args();
@@ -12101,6 +12667,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12111,6 +12678,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void drop_partition_by_name_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, boolean deleteData, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_partition_by_name_with_environment_context_call method_call = new drop_partition_by_name_with_environment_context_call(db_name, tbl_name, part_name, deleteData, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -12133,6 +12701,7 @@ public drop_partition_by_name_with_environment_context_call(java.lang.String db_
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_partition_by_name_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_partition_by_name_with_environment_context_args args = new drop_partition_by_name_with_environment_context_args();
@@ -12145,6 +12714,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12155,6 +12725,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void drop_partitions_req(DropPartitionsRequest req, org.apache.thrift.async.AsyncMethodCallback<DropPartitionsResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_partitions_req_call method_call = new drop_partitions_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12169,6 +12740,7 @@ public drop_partitions_req_call(DropPartitionsRequest req, org.apache.thrift.asy
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_partitions_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_partitions_req_args args = new drop_partitions_req_args();
@@ -12177,6 +12749,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public DropPartitionsResult getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12187,6 +12760,7 @@ public DropPartitionsResult getResult() throws NoSuchObjectException, MetaExcept
       }
     }
 
+    @Override
     public void get_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_call method_call = new get_partition_call(db_name, tbl_name, part_vals, resultHandler, this, ___protocolFactory, ___transport);
@@ -12205,6 +12779,7 @@ public get_partition_call(java.lang.String db_name, java.lang.String tbl_name, j
         this.part_vals = part_vals;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_args args = new get_partition_args();
@@ -12215,6 +12790,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12225,6 +12801,7 @@ public Partition getResult() throws MetaException, NoSuchObjectException, org.ap
       }
     }
 
+    @Override
     public void get_partition_req(GetPartitionRequest req, org.apache.thrift.async.AsyncMethodCallback<GetPartitionResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_req_call method_call = new get_partition_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12239,6 +12816,7 @@ public get_partition_req_call(GetPartitionRequest req, org.apache.thrift.async.A
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_req_args args = new get_partition_req_args();
@@ -12247,6 +12825,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetPartitionResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12257,6 +12836,7 @@ public GetPartitionResponse getResult() throws MetaException, NoSuchObjectExcept
       }
     }
 
+    @Override
     public void exchange_partition(java.util.Map<java.lang.String,java.lang.String> partitionSpecs, java.lang.String source_db, java.lang.String source_table_name, java.lang.String dest_db, java.lang.String dest_table_name, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       exchange_partition_call method_call = new exchange_partition_call(partitionSpecs, source_db, source_table_name, dest_db, dest_table_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -12279,6 +12859,7 @@ public exchange_partition_call(java.util.Map<java.lang.String,java.lang.String>
         this.dest_table_name = dest_table_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("exchange_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         exchange_partition_args args = new exchange_partition_args();
@@ -12291,6 +12872,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws MetaException, NoSuchObjectException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12301,6 +12883,7 @@ public Partition getResult() throws MetaException, NoSuchObjectException, Invali
       }
     }
 
+    @Override
     public void exchange_partitions(java.util.Map<java.lang.String,java.lang.String> partitionSpecs, java.lang.String source_db, java.lang.String source_table_name, java.lang.String dest_db, java.lang.String dest_table_name, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       exchange_partitions_call method_call = new exchange_partitions_call(partitionSpecs, source_db, source_table_name, dest_db, dest_table_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -12323,6 +12906,7 @@ public exchange_partitions_call(java.util.Map<java.lang.String,java.lang.String>
         this.dest_table_name = dest_table_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("exchange_partitions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         exchange_partitions_args args = new exchange_partitions_args();
@@ -12335,6 +12919,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12345,6 +12930,7 @@ public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectE
       }
     }
 
+    @Override
     public void get_partition_with_auth(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, java.lang.String user_name, java.util.List<java.lang.String> group_names, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_with_auth_call method_call = new get_partition_with_auth_call(db_name, tbl_name, part_vals, user_name, group_names, resultHandler, this, ___protocolFactory, ___transport);
@@ -12367,6 +12953,7 @@ public get_partition_with_auth_call(java.lang.String db_name, java.lang.String t
         this.group_names = group_names;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_with_auth", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_with_auth_args args = new get_partition_with_auth_args();
@@ -12379,6 +12966,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12389,6 +12977,7 @@ public Partition getResult() throws MetaException, NoSuchObjectException, org.ap
       }
     }
 
+    @Override
     public void get_partition_by_name(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_by_name_call method_call = new get_partition_by_name_call(db_name, tbl_name, part_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -12407,6 +12996,7 @@ public get_partition_by_name_call(java.lang.String db_name, java.lang.String tbl
         this.part_name = part_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_by_name", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_by_name_args args = new get_partition_by_name_args();
@@ -12417,6 +13007,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Partition getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12427,6 +13018,7 @@ public Partition getResult() throws MetaException, NoSuchObjectException, org.ap
       }
     }
 
+    @Override
     public void get_partitions(java.lang.String db_name, java.lang.String tbl_name, short max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_call method_call = new get_partitions_call(db_name, tbl_name, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12445,6 +13037,7 @@ public get_partitions_call(java.lang.String db_name, java.lang.String tbl_name,
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_args args = new get_partitions_args();
@@ -12455,6 +13048,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12465,6 +13059,7 @@ public java.util.List<Partition> getResult() throws NoSuchObjectException, MetaE
       }
     }
 
+    @Override
     public void get_partitions_req(PartitionsRequest req, org.apache.thrift.async.AsyncMethodCallback<PartitionsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_req_call method_call = new get_partitions_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12479,6 +13074,7 @@ public get_partitions_req_call(PartitionsRequest req, org.apache.thrift.async.As
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_req_args args = new get_partitions_req_args();
@@ -12487,6 +13083,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PartitionsResponse getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12497,6 +13094,7 @@ public PartitionsResponse getResult() throws NoSuchObjectException, MetaExceptio
       }
     }
 
+    @Override
     public void get_partitions_with_auth(java.lang.String db_name, java.lang.String tbl_name, short max_parts, java.lang.String user_name, java.util.List<java.lang.String> group_names, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_with_auth_call method_call = new get_partitions_with_auth_call(db_name, tbl_name, max_parts, user_name, group_names, resultHandler, this, ___protocolFactory, ___transport);
@@ -12519,6 +13117,7 @@ public get_partitions_with_auth_call(java.lang.String db_name, java.lang.String
         this.group_names = group_names;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_with_auth", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_with_auth_args args = new get_partitions_with_auth_args();
@@ -12531,6 +13130,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12541,6 +13141,7 @@ public java.util.List<Partition> getResult() throws NoSuchObjectException, MetaE
       }
     }
 
+    @Override
     public void get_partitions_pspec(java.lang.String db_name, java.lang.String tbl_name, int max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<PartitionSpec>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_pspec_call method_call = new get_partitions_pspec_call(db_name, tbl_name, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12559,6 +13160,7 @@ public get_partitions_pspec_call(java.lang.String db_name, java.lang.String tbl_
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_pspec", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_pspec_args args = new get_partitions_pspec_args();
@@ -12569,6 +13171,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<PartitionSpec> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12579,6 +13182,7 @@ public java.util.List<PartitionSpec> getResult() throws NoSuchObjectException, M
       }
     }
 
+    @Override
     public void get_partition_names(java.lang.String db_name, java.lang.String tbl_name, short max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_names_call method_call = new get_partition_names_call(db_name, tbl_name, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12597,6 +13201,7 @@ public get_partition_names_call(java.lang.String db_name, java.lang.String tbl_n
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_names", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_names_args args = new get_partition_names_args();
@@ -12607,6 +13212,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12617,6 +13223,7 @@ public java.util.List<java.lang.String> getResult() throws NoSuchObjectException
       }
     }
 
+    @Override
     public void fetch_partition_names_req(PartitionsRequest partitionReq, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       fetch_partition_names_req_call method_call = new fetch_partition_names_req_call(partitionReq, resultHandler, this, ___protocolFactory, ___transport);
@@ -12631,6 +13238,7 @@ public fetch_partition_names_req_call(PartitionsRequest partitionReq, org.apache
         this.partitionReq = partitionReq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("fetch_partition_names_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         fetch_partition_names_req_args args = new fetch_partition_names_req_args();
@@ -12639,6 +13247,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12649,6 +13258,7 @@ public java.util.List<java.lang.String> getResult() throws NoSuchObjectException
       }
     }
 
+    @Override
     public void get_partition_values(PartitionValuesRequest request, org.apache.thrift.async.AsyncMethodCallback<PartitionValuesResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_values_call method_call = new get_partition_values_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -12663,6 +13273,7 @@ public get_partition_values_call(PartitionValuesRequest request, org.apache.thri
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_values", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_values_args args = new get_partition_values_args();
@@ -12671,6 +13282,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PartitionValuesResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12681,6 +13293,7 @@ public PartitionValuesResponse getResult() throws MetaException, NoSuchObjectExc
       }
     }
 
+    @Override
     public void get_partitions_ps(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, short max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_ps_call method_call = new get_partitions_ps_call(db_name, tbl_name, part_vals, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12701,6 +13314,7 @@ public get_partitions_ps_call(java.lang.String db_name, java.lang.String tbl_nam
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_ps", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_ps_args args = new get_partitions_ps_args();
@@ -12712,6 +13326,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12722,6 +13337,7 @@ public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectE
       }
     }
 
+    @Override
     public void get_partitions_ps_with_auth(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, short max_parts, java.lang.String user_name, java.util.List<java.lang.String> group_names, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_ps_with_auth_call method_call = new get_partitions_ps_with_auth_call(db_name, tbl_name, part_vals, max_parts, user_name, group_names, resultHandler, this, ___protocolFactory, ___transport);
@@ -12746,6 +13362,7 @@ public get_partitions_ps_with_auth_call(java.lang.String db_name, java.lang.Stri
         this.group_names = group_names;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_ps_with_auth", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_ps_with_auth_args args = new get_partitions_ps_with_auth_args();
@@ -12759,6 +13376,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12769,6 +13387,7 @@ public java.util.List<Partition> getResult() throws NoSuchObjectException, MetaE
       }
     }
 
+    @Override
     public void get_partitions_ps_with_auth_req(GetPartitionsPsWithAuthRequest req, org.apache.thrift.async.AsyncMethodCallback<GetPartitionsPsWithAuthResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_ps_with_auth_req_call method_call = new get_partitions_ps_with_auth_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12783,6 +13402,7 @@ public get_partitions_ps_with_auth_req_call(GetPartitionsPsWithAuthRequest req,
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_ps_with_auth_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_ps_with_auth_req_args args = new get_partitions_ps_with_auth_req_args();
@@ -12791,6 +13411,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetPartitionsPsWithAuthResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12801,6 +13422,7 @@ public GetPartitionsPsWithAuthResponse getResult() throws MetaException, NoSuchO
       }
     }
 
+    @Override
     public void get_partition_names_ps(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, short max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_names_ps_call method_call = new get_partition_names_ps_call(db_name, tbl_name, part_vals, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12821,6 +13443,7 @@ public get_partition_names_ps_call(java.lang.String db_name, java.lang.String tb
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_names_ps", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_names_ps_args args = new get_partition_names_ps_args();
@@ -12832,6 +13455,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12842,6 +13466,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, NoSuch
       }
     }
 
+    @Override
     public void get_partition_names_ps_req(GetPartitionNamesPsRequest req, org.apache.thrift.async.AsyncMethodCallback<GetPartitionNamesPsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_names_ps_req_call method_call = new get_partition_names_ps_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12856,6 +13481,7 @@ public get_partition_names_ps_req_call(GetPartitionNamesPsRequest req, org.apach
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_names_ps_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_names_ps_req_args args = new get_partition_names_ps_req_args();
@@ -12864,6 +13490,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetPartitionNamesPsResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12874,6 +13501,7 @@ public GetPartitionNamesPsResponse getResult() throws MetaException, NoSuchObjec
       }
     }
 
+    @Override
     public void get_partition_names_req(PartitionsByExprRequest req, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_names_req_call method_call = new get_partition_names_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12888,6 +13516,7 @@ public get_partition_names_req_call(PartitionsByExprRequest req, org.apache.thri
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_names_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_names_req_args args = new get_partition_names_req_args();
@@ -12896,6 +13525,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12906,6 +13536,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, NoSuch
       }
     }
 
+    @Override
     public void get_partitions_by_filter(java.lang.String db_name, java.lang.String tbl_name, java.lang.String filter, short max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_by_filter_call method_call = new get_partitions_by_filter_call(db_name, tbl_name, filter, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12926,6 +13557,7 @@ public get_partitions_by_filter_call(java.lang.String db_name, java.lang.String
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_by_filter", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_by_filter_args args = new get_partitions_by_filter_args();
@@ -12937,6 +13569,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12947,6 +13580,7 @@ public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectE
       }
     }
 
+    @Override
     public void get_partitions_by_filter_req(GetPartitionsByFilterRequest req, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_by_filter_req_call method_call = new get_partitions_by_filter_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -12961,6 +13595,7 @@ public get_partitions_by_filter_req_call(GetPartitionsByFilterRequest req, org.a
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_by_filter_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_by_filter_req_args args = new get_partitions_by_filter_req_args();
@@ -12969,6 +13604,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -12979,6 +13615,7 @@ public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectE
       }
     }
 
+    @Override
     public void get_part_specs_by_filter(java.lang.String db_name, java.lang.String tbl_name, java.lang.String filter, int max_parts, org.apache.thrift.async.AsyncMethodCallback<java.util.List<PartitionSpec>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_part_specs_by_filter_call method_call = new get_part_specs_by_filter_call(db_name, tbl_name, filter, max_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -12999,6 +13636,7 @@ public get_part_specs_by_filter_call(java.lang.String db_name, java.lang.String
         this.max_parts = max_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_part_specs_by_filter", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_part_specs_by_filter_args args = new get_part_specs_by_filter_args();
@@ -13010,6 +13648,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<PartitionSpec> getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13020,6 +13659,7 @@ public java.util.List<PartitionSpec> getResult() throws MetaException, NoSuchObj
       }
     }
 
+    @Override
     public void get_partitions_by_expr(PartitionsByExprRequest req, org.apache.thrift.async.AsyncMethodCallback<PartitionsByExprResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_by_expr_call method_call = new get_partitions_by_expr_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13034,6 +13674,7 @@ public get_partitions_by_expr_call(PartitionsByExprRequest req, org.apache.thrif
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_by_expr", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_by_expr_args args = new get_partitions_by_expr_args();
@@ -13042,6 +13683,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PartitionsByExprResult getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13052,6 +13694,7 @@ public PartitionsByExprResult getResult() throws MetaException, NoSuchObjectExce
       }
     }
 
+    @Override
     public void get_partitions_spec_by_expr(PartitionsByExprRequest req, org.apache.thrift.async.AsyncMethodCallback<PartitionsSpecByExprResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_spec_by_expr_call method_call = new get_partitions_spec_by_expr_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13066,6 +13709,7 @@ public get_partitions_spec_by_expr_call(PartitionsByExprRequest req, org.apache.
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_spec_by_expr", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_spec_by_expr_args args = new get_partitions_spec_by_expr_args();
@@ -13074,6 +13718,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PartitionsSpecByExprResult getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13084,6 +13729,7 @@ public PartitionsSpecByExprResult getResult() throws MetaException, NoSuchObject
       }
     }
 
+    @Override
     public void get_num_partitions_by_filter(java.lang.String db_name, java.lang.String tbl_name, java.lang.String filter, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_num_partitions_by_filter_call method_call = new get_num_partitions_by_filter_call(db_name, tbl_name, filter, resultHandler, this, ___protocolFactory, ___transport);
@@ -13102,6 +13748,7 @@ public get_num_partitions_by_filter_call(java.lang.String db_name, java.lang.Str
         this.filter = filter;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_num_partitions_by_filter", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_num_partitions_by_filter_args args = new get_num_partitions_by_filter_args();
@@ -13112,6 +13759,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Integer getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13122,6 +13770,7 @@ public java.lang.Integer getResult() throws MetaException, NoSuchObjectException
       }
     }
 
+    @Override
     public void get_partitions_by_names(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> names, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_by_names_call method_call = new get_partitions_by_names_call(db_name, tbl_name, names, resultHandler, this, ___protocolFactory, ___transport);
@@ -13140,6 +13789,7 @@ public get_partitions_by_names_call(java.lang.String db_name, java.lang.String t
         this.names = names;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_by_names", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_by_names_args args = new get_partitions_by_names_args();
@@ -13150,6 +13800,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectException, InvalidObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13160,6 +13811,7 @@ public java.util.List<Partition> getResult() throws MetaException, NoSuchObjectE
       }
     }
 
+    @Override
     public void get_partitions_by_names_req(GetPartitionsByNamesRequest req, org.apache.thrift.async.AsyncMethodCallback<GetPartitionsByNamesResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_by_names_req_call method_call = new get_partitions_by_names_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13174,6 +13826,7 @@ public get_partitions_by_names_req_call(GetPartitionsByNamesRequest req, org.apa
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_by_names_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_by_names_req_args args = new get_partitions_by_names_req_args();
@@ -13182,6 +13835,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetPartitionsByNamesResult getResult() throws MetaException, NoSuchObjectException, InvalidObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13192,6 +13846,7 @@ public GetPartitionsByNamesResult getResult() throws MetaException, NoSuchObject
       }
     }
 
+    @Override
     public void get_properties(PropertyGetRequest req, org.apache.thrift.async.AsyncMethodCallback<PropertyGetResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_properties_call method_call = new get_properties_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13206,6 +13861,7 @@ public get_properties_call(PropertyGetRequest req, org.apache.thrift.async.Async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_properties", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_properties_args args = new get_properties_args();
@@ -13214,6 +13870,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PropertyGetResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13224,6 +13881,7 @@ public PropertyGetResponse getResult() throws MetaException, NoSuchObjectExcepti
       }
     }
 
+    @Override
     public void set_properties(PropertySetRequest req, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       set_properties_call method_call = new set_properties_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13238,6 +13896,7 @@ public set_properties_call(PropertySetRequest req, org.apache.thrift.async.Async
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_properties", org.apache.thrift.protocol.TMessageType.CALL, 0));
         set_properties_args args = new set_properties_args();
@@ -13246,6 +13905,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13256,6 +13916,7 @@ public java.lang.Boolean getResult() throws MetaException, NoSuchObjectException
       }
     }
 
+    @Override
     public void alter_partition(java.lang.String db_name, java.lang.String tbl_name, Partition new_part, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_partition_call method_call = new alter_partition_call(db_name, tbl_name, new_part, resultHandler, this, ___protocolFactory, ___transport);
@@ -13274,6 +13935,7 @@ public alter_partition_call(java.lang.String db_name, java.lang.String tbl_name,
         this.new_part = new_part;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_partition_args args = new alter_partition_args();
@@ -13284,16 +13946,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_partition();
         return null;
       }
     }
 
+    @Override
     public void alter_partitions(java.lang.String db_name, java.lang.String tbl_name, java.util.List<Partition> new_parts, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_partitions_call method_call = new alter_partitions_call(db_name, tbl_name, new_parts, resultHandler, this, ___protocolFactory, ___transport);
@@ -13312,6 +13977,7 @@ public alter_partitions_call(java.lang.String db_name, java.lang.String tbl_name
         this.new_parts = new_parts;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_partitions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_partitions_args args = new alter_partitions_args();
@@ -13322,16 +13988,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_partitions();
         return null;
       }
     }
 
+    @Override
     public void alter_partitions_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, java.util.List<Partition> new_parts, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_partitions_with_environment_context_call method_call = new alter_partitions_with_environment_context_call(db_name, tbl_name, new_parts, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -13352,6 +14021,7 @@ public alter_partitions_with_environment_context_call(java.lang.String db_name,
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_partitions_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_partitions_with_environment_context_args args = new alter_partitions_with_environment_context_args();
@@ -13363,16 +14033,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_partitions_with_environment_context();
         return null;
       }
     }
 
+    @Override
     public void alter_partitions_req(AlterPartitionsRequest req, org.apache.thrift.async.AsyncMethodCallback<AlterPartitionsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_partitions_req_call method_call = new alter_partitions_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13387,6 +14060,7 @@ public alter_partitions_req_call(AlterPartitionsRequest req, org.apache.thrift.a
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_partitions_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_partitions_req_args args = new alter_partitions_req_args();
@@ -13395,6 +14069,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AlterPartitionsResponse getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13405,6 +14080,7 @@ public AlterPartitionsResponse getResult() throws InvalidOperationException, Met
       }
     }
 
+    @Override
     public void alter_partition_with_environment_context(java.lang.String db_name, java.lang.String tbl_name, Partition new_part, EnvironmentContext environment_context, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_partition_with_environment_context_call method_call = new alter_partition_with_environment_context_call(db_name, tbl_name, new_part, environment_context, resultHandler, this, ___protocolFactory, ___transport);
@@ -13425,6 +14101,7 @@ public alter_partition_with_environment_context_call(java.lang.String db_name, j
         this.environment_context = environment_context;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_partition_with_environment_context", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_partition_with_environment_context_args args = new alter_partition_with_environment_context_args();
@@ -13436,16 +14113,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_partition_with_environment_context();
         return null;
       }
     }
 
+    @Override
     public void rename_partition(java.lang.String db_name, java.lang.String tbl_name, java.util.List<java.lang.String> part_vals, Partition new_part, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       rename_partition_call method_call = new rename_partition_call(db_name, tbl_name, part_vals, new_part, resultHandler, this, ___protocolFactory, ___transport);
@@ -13466,6 +14146,7 @@ public rename_partition_call(java.lang.String db_name, java.lang.String tbl_name
         this.new_part = new_part;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("rename_partition", org.apache.thrift.protocol.TMessageType.CALL, 0));
         rename_partition_args args = new rename_partition_args();
@@ -13477,16 +14158,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_rename_partition();
         return null;
       }
     }
 
+    @Override
     public void rename_partition_req(RenamePartitionRequest req, org.apache.thrift.async.AsyncMethodCallback<RenamePartitionResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       rename_partition_req_call method_call = new rename_partition_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -13501,6 +14185,7 @@ public rename_partition_req_call(RenamePartitionRequest req, org.apache.thrift.a
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("rename_partition_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         rename_partition_req_args args = new rename_partition_req_args();
@@ -13509,6 +14194,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public RenamePartitionResponse getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13519,6 +14205,7 @@ public RenamePartitionResponse getResult() throws InvalidOperationException, Met
       }
     }
 
+    @Override
     public void partition_name_has_valid_characters(java.util.List<java.lang.String> part_vals, boolean throw_exception, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       partition_name_has_valid_characters_call method_call = new partition_name_has_valid_characters_call(part_vals, throw_exception, resultHandler, this, ___protocolFactory, ___transport);
@@ -13535,6 +14222,7 @@ public partition_name_has_valid_characters_call(java.util.List<java.lang.String>
         this.throw_exception = throw_exception;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("partition_name_has_valid_characters", org.apache.thrift.protocol.TMessageType.CALL, 0));
         partition_name_has_valid_characters_args args = new partition_name_has_valid_characters_args();
@@ -13544,6 +14232,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13554,6 +14243,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void get_config_value(java.lang.String name, java.lang.String defaultValue, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_config_value_call method_call = new get_config_value_call(name, defaultValue, resultHandler, this, ___protocolFactory, ___transport);
@@ -13570,6 +14260,7 @@ public get_config_value_call(java.lang.String name, java.lang.String defaultValu
         this.defaultValue = defaultValue;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_config_value", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_config_value_args args = new get_config_value_args();
@@ -13579,6 +14270,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.String getResult() throws ConfigValSecurityException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13589,6 +14281,7 @@ public java.lang.String getResult() throws ConfigValSecurityException, org.apach
       }
     }
 
+    @Override
     public void partition_name_to_vals(java.lang.String part_name, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       partition_name_to_vals_call method_call = new partition_name_to_vals_call(part_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -13603,6 +14296,7 @@ public partition_name_to_vals_call(java.lang.String part_name, org.apache.thrift
         this.part_name = part_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("partition_name_to_vals", org.apache.thrift.protocol.TMessageType.CALL, 0));
         partition_name_to_vals_args args = new partition_name_to_vals_args();
@@ -13611,6 +14305,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13621,6 +14316,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void partition_name_to_spec(java.lang.String part_name, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       partition_name_to_spec_call method_call = new partition_name_to_spec_call(part_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -13635,6 +14331,7 @@ public partition_name_to_spec_call(java.lang.String part_name, org.apache.thrift
         this.part_name = part_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("partition_name_to_spec", org.apache.thrift.protocol.TMessageType.CALL, 0));
         partition_name_to_spec_args args = new partition_name_to_spec_args();
@@ -13643,6 +14340,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.Map<java.lang.String,java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13653,6 +14351,7 @@ public java.util.Map<java.lang.String,java.lang.String> getResult() throws MetaE
       }
     }
 
+    @Override
     public void markPartitionForEvent(java.lang.String db_name, java.lang.String tbl_name, java.util.Map<java.lang.String,java.lang.String> part_vals, PartitionEventType eventType, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       markPartitionForEvent_call method_call = new markPartitionForEvent_call(db_name, tbl_name, part_vals, eventType, resultHandler, this, ___protocolFactory, ___transport);
@@ -13673,6 +14372,7 @@ public markPartitionForEvent_call(java.lang.String db_name, java.lang.String tbl
         this.eventType = eventType;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("markPartitionForEvent", org.apache.thrift.protocol.TMessageType.CALL, 0));
         markPartitionForEvent_args args = new markPartitionForEvent_args();
@@ -13684,16 +14384,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, NoSuchObjectException, UnknownDBException, UnknownTableException, UnknownPartitionException, InvalidPartitionException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_markPartitionForEvent();
         return null;
       }
     }
 
+    @Override
     public void isPartitionMarkedForEvent(java.lang.String db_name, java.lang.String tbl_name, java.util.Map<java.lang.String,java.lang.String> part_vals, PartitionEventType eventType, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isPartitionMarkedForEvent_call method_call = new isPartitionMarkedForEvent_call(db_name, tbl_name, part_vals, eventType, resultHandler, this, ___protocolFactory, ___transport);
@@ -13714,6 +14417,7 @@ public isPartitionMarkedForEvent_call(java.lang.String db_name, java.lang.String
         this.eventType = eventType;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("isPartitionMarkedForEvent", org.apache.thrift.protocol.TMessageType.CALL, 0));
         isPartitionMarkedForEvent_args args = new isPartitionMarkedForEvent_args();
@@ -13725,6 +14429,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, NoSuchObjectException, UnknownDBException, UnknownTableException, UnknownPartitionException, InvalidPartitionException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13735,6 +14440,7 @@ public java.lang.Boolean getResult() throws MetaException, NoSuchObjectException
       }
     }
 
+    @Override
     public void get_primary_keys(PrimaryKeysRequest request, org.apache.thrift.async.AsyncMethodCallback<PrimaryKeysResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_primary_keys_call method_call = new get_primary_keys_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13749,6 +14455,7 @@ public get_primary_keys_call(PrimaryKeysRequest request, org.apache.thrift.async
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_primary_keys", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_primary_keys_args args = new get_primary_keys_args();
@@ -13757,6 +14464,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PrimaryKeysResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13767,6 +14475,7 @@ public PrimaryKeysResponse getResult() throws MetaException, NoSuchObjectExcepti
       }
     }
 
+    @Override
     public void get_foreign_keys(ForeignKeysRequest request, org.apache.thrift.async.AsyncMethodCallback<ForeignKeysResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_foreign_keys_call method_call = new get_foreign_keys_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13781,6 +14490,7 @@ public get_foreign_keys_call(ForeignKeysRequest request, org.apache.thrift.async
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_foreign_keys", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_foreign_keys_args args = new get_foreign_keys_args();
@@ -13789,6 +14499,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ForeignKeysResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13799,6 +14510,7 @@ public ForeignKeysResponse getResult() throws MetaException, NoSuchObjectExcepti
       }
     }
 
+    @Override
     public void get_unique_constraints(UniqueConstraintsRequest request, org.apache.thrift.async.AsyncMethodCallback<UniqueConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_unique_constraints_call method_call = new get_unique_constraints_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13813,6 +14525,7 @@ public get_unique_constraints_call(UniqueConstraintsRequest request, org.apache.
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_unique_constraints", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_unique_constraints_args args = new get_unique_constraints_args();
@@ -13821,6 +14534,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public UniqueConstraintsResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13831,6 +14545,7 @@ public UniqueConstraintsResponse getResult() throws MetaException, NoSuchObjectE
       }
     }
 
+    @Override
     public void get_not_null_constraints(NotNullConstraintsRequest request, org.apache.thrift.async.AsyncMethodCallback<NotNullConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_not_null_constraints_call method_call = new get_not_null_constraints_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13845,6 +14560,7 @@ public get_not_null_constraints_call(NotNullConstraintsRequest request, org.apac
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_not_null_constraints", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_not_null_constraints_args args = new get_not_null_constraints_args();
@@ -13853,6 +14569,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public NotNullConstraintsResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13863,6 +14580,7 @@ public NotNullConstraintsResponse getResult() throws MetaException, NoSuchObject
       }
     }
 
+    @Override
     public void get_default_constraints(DefaultConstraintsRequest request, org.apache.thrift.async.AsyncMethodCallback<DefaultConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_default_constraints_call method_call = new get_default_constraints_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13877,6 +14595,7 @@ public get_default_constraints_call(DefaultConstraintsRequest request, org.apach
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_default_constraints", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_default_constraints_args args = new get_default_constraints_args();
@@ -13885,6 +14604,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public DefaultConstraintsResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13895,6 +14615,7 @@ public DefaultConstraintsResponse getResult() throws MetaException, NoSuchObject
       }
     }
 
+    @Override
     public void get_check_constraints(CheckConstraintsRequest request, org.apache.thrift.async.AsyncMethodCallback<CheckConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_check_constraints_call method_call = new get_check_constraints_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13909,6 +14630,7 @@ public get_check_constraints_call(CheckConstraintsRequest request, org.apache.th
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_check_constraints", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_check_constraints_args args = new get_check_constraints_args();
@@ -13917,6 +14639,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public CheckConstraintsResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13927,6 +14650,7 @@ public CheckConstraintsResponse getResult() throws MetaException, NoSuchObjectEx
       }
     }
 
+    @Override
     public void get_all_table_constraints(AllTableConstraintsRequest request, org.apache.thrift.async.AsyncMethodCallback<AllTableConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_table_constraints_call method_call = new get_all_table_constraints_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -13941,6 +14665,7 @@ public get_all_table_constraints_call(AllTableConstraintsRequest request, org.ap
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_table_constraints", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_table_constraints_args args = new get_all_table_constraints_args();
@@ -13949,6 +14674,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AllTableConstraintsResponse getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13959,6 +14685,7 @@ public AllTableConstraintsResponse getResult() throws MetaException, NoSuchObjec
       }
     }
 
+    @Override
     public void update_table_column_statistics(ColumnStatistics stats_obj, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_table_column_statistics_call method_call = new update_table_column_statistics_call(stats_obj, resultHandler, this, ___protocolFactory, ___transport);
@@ -13973,6 +14700,7 @@ public update_table_column_statistics_call(ColumnStatistics stats_obj, org.apach
         this.stats_obj = stats_obj;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_table_column_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_table_column_statistics_args args = new update_table_column_statistics_args();
@@ -13981,6 +14709,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -13991,6 +14720,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, InvalidObject
       }
     }
 
+    @Override
     public void update_partition_column_statistics(ColumnStatistics stats_obj, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_partition_column_statistics_call method_call = new update_partition_column_statistics_call(stats_obj, resultHandler, this, ___protocolFactory, ___transport);
@@ -14005,6 +14735,7 @@ public update_partition_column_statistics_call(ColumnStatistics stats_obj, org.a
         this.stats_obj = stats_obj;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_partition_column_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_partition_column_statistics_args args = new update_partition_column_statistics_args();
@@ -14013,6 +14744,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14023,6 +14755,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, InvalidObject
       }
     }
 
+    @Override
     public void update_table_column_statistics_req(SetPartitionsStatsRequest req, org.apache.thrift.async.AsyncMethodCallback<SetPartitionsStatsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_table_column_statistics_req_call method_call = new update_table_column_statistics_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -14037,6 +14770,7 @@ public update_table_column_statistics_req_call(SetPartitionsStatsRequest req, or
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_table_column_statistics_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_table_column_statistics_req_args args = new update_table_column_statistics_req_args();
@@ -14045,6 +14779,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public SetPartitionsStatsResponse getResult() throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14055,6 +14790,7 @@ public SetPartitionsStatsResponse getResult() throws NoSuchObjectException, Inva
       }
     }
 
+    @Override
     public void update_partition_column_statistics_req(SetPartitionsStatsRequest req, org.apache.thrift.async.AsyncMethodCallback<SetPartitionsStatsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_partition_column_statistics_req_call method_call = new update_partition_column_statistics_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -14069,6 +14805,7 @@ public update_partition_column_statistics_req_call(SetPartitionsStatsRequest req
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_partition_column_statistics_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_partition_column_statistics_req_args args = new update_partition_column_statistics_req_args();
@@ -14077,6 +14814,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public SetPartitionsStatsResponse getResult() throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14087,6 +14825,7 @@ public SetPartitionsStatsResponse getResult() throws NoSuchObjectException, Inva
       }
     }
 
+    @Override
     public void update_transaction_statistics(UpdateTransactionalStatsRequest req, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_transaction_statistics_call method_call = new update_transaction_statistics_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -14101,6 +14840,7 @@ public update_transaction_statistics_call(UpdateTransactionalStatsRequest req, o
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_transaction_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_transaction_statistics_args args = new update_transaction_statistics_args();
@@ -14109,16 +14849,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_update_transaction_statistics();
         return null;
       }
     }
 
+    @Override
     public void get_table_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String col_name, org.apache.thrift.async.AsyncMethodCallback<ColumnStatistics> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_table_column_statistics_call method_call = new get_table_column_statistics_call(db_name, tbl_name, col_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -14137,6 +14880,7 @@ public get_table_column_statistics_call(java.lang.String db_name, java.lang.Stri
         this.col_name = col_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_table_column_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_table_column_statistics_args args = new get_table_column_statistics_args();
@@ -14147,6 +14891,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ColumnStatistics getResult() throws NoSuchObjectException, MetaException, InvalidInputException, InvalidObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14157,6 +14902,7 @@ public ColumnStatistics getResult() throws NoSuchObjectException, MetaException,
       }
     }
 
+    @Override
     public void get_partition_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, java.lang.String col_name, org.apache.thrift.async.AsyncMethodCallback<ColumnStatistics> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partition_column_statistics_call method_call = new get_partition_column_statistics_call(db_name, tbl_name, part_name, col_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -14177,6 +14923,7 @@ public get_partition_column_statistics_call(java.lang.String db_name, java.lang.
         this.col_name = col_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partition_column_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partition_column_statistics_args args = new get_partition_column_statistics_args();
@@ -14188,6 +14935,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ColumnStatistics getResult() throws NoSuchObjectException, MetaException, InvalidInputException, InvalidObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14198,6 +14946,7 @@ public ColumnStatistics getResult() throws NoSuchObjectException, MetaException,
       }
     }
 
+    @Override
     public void get_table_statistics_req(TableStatsRequest request, org.apache.thrift.async.AsyncMethodCallback<TableStatsResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_table_statistics_req_call method_call = new get_table_statistics_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14212,6 +14961,7 @@ public get_table_statistics_req_call(TableStatsRequest request, org.apache.thrif
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_table_statistics_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_table_statistics_req_args args = new get_table_statistics_req_args();
@@ -14220,6 +14970,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public TableStatsResult getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14230,6 +14981,7 @@ public TableStatsResult getResult() throws NoSuchObjectException, MetaException,
       }
     }
 
+    @Override
     public void get_partitions_statistics_req(PartitionsStatsRequest request, org.apache.thrift.async.AsyncMethodCallback<PartitionsStatsResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_statistics_req_call method_call = new get_partitions_statistics_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14244,6 +14996,7 @@ public get_partitions_statistics_req_call(PartitionsStatsRequest request, org.ap
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_statistics_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_statistics_req_args args = new get_partitions_statistics_req_args();
@@ -14252,6 +15005,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PartitionsStatsResult getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14262,6 +15016,7 @@ public PartitionsStatsResult getResult() throws NoSuchObjectException, MetaExcep
       }
     }
 
+    @Override
     public void get_aggr_stats_for(PartitionsStatsRequest request, org.apache.thrift.async.AsyncMethodCallback<AggrStats> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_aggr_stats_for_call method_call = new get_aggr_stats_for_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14276,6 +15031,7 @@ public get_aggr_stats_for_call(PartitionsStatsRequest request, org.apache.thrift
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_aggr_stats_for", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_aggr_stats_for_args args = new get_aggr_stats_for_args();
@@ -14284,6 +15040,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AggrStats getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14294,6 +15051,7 @@ public AggrStats getResult() throws NoSuchObjectException, MetaException, org.ap
       }
     }
 
+    @Override
     public void set_aggr_stats_for(SetPartitionsStatsRequest request, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       set_aggr_stats_for_call method_call = new set_aggr_stats_for_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14308,6 +15066,7 @@ public set_aggr_stats_for_call(SetPartitionsStatsRequest request, org.apache.thr
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_aggr_stats_for", org.apache.thrift.protocol.TMessageType.CALL, 0));
         set_aggr_stats_for_args args = new set_aggr_stats_for_args();
@@ -14316,6 +15075,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14326,6 +15086,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, InvalidObject
       }
     }
 
+    @Override
     public void delete_partition_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String part_name, java.lang.String col_name, java.lang.String engine, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       delete_partition_column_statistics_call method_call = new delete_partition_column_statistics_call(db_name, tbl_name, part_name, col_name, engine, resultHandler, this, ___protocolFactory, ___transport);
@@ -14348,6 +15109,7 @@ public delete_partition_column_statistics_call(java.lang.String db_name, java.la
         this.engine = engine;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("delete_partition_column_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         delete_partition_column_statistics_args args = new delete_partition_column_statistics_args();
@@ -14360,6 +15122,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14370,6 +15133,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void delete_table_column_statistics(java.lang.String db_name, java.lang.String tbl_name, java.lang.String col_name, java.lang.String engine, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       delete_table_column_statistics_call method_call = new delete_table_column_statistics_call(db_name, tbl_name, col_name, engine, resultHandler, this, ___protocolFactory, ___transport);
@@ -14390,6 +15154,7 @@ public delete_table_column_statistics_call(java.lang.String db_name, java.lang.S
         this.engine = engine;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("delete_table_column_statistics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         delete_table_column_statistics_args args = new delete_table_column_statistics_args();
@@ -14401,6 +15166,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14411,6 +15177,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void delete_column_statistics_req(DeleteColumnStatisticsRequest req, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       delete_column_statistics_req_call method_call = new delete_column_statistics_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -14425,6 +15192,7 @@ public delete_column_statistics_req_call(DeleteColumnStatisticsRequest req, org.
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("delete_column_statistics_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         delete_column_statistics_req_args args = new delete_column_statistics_req_args();
@@ -14433,6 +15201,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14443,6 +15212,7 @@ public java.lang.Boolean getResult() throws NoSuchObjectException, MetaException
       }
     }
 
+    @Override
     public void create_function(Function func, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_function_call method_call = new create_function_call(func, resultHandler, this, ___protocolFactory, ___transport);
@@ -14457,6 +15227,7 @@ public create_function_call(Function func, org.apache.thrift.async.AsyncMethodCa
         this.func = func;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_function", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_function_args args = new create_function_args();
@@ -14465,16 +15236,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_function();
         return null;
       }
     }
 
+    @Override
     public void drop_function(java.lang.String dbName, java.lang.String funcName, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_function_call method_call = new drop_function_call(dbName, funcName, resultHandler, this, ___protocolFactory, ___transport);
@@ -14491,6 +15265,7 @@ public drop_function_call(java.lang.String dbName, java.lang.String funcName, or
         this.funcName = funcName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_function", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_function_args args = new drop_function_args();
@@ -14500,16 +15275,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_function();
         return null;
       }
     }
 
+    @Override
     public void alter_function(java.lang.String dbName, java.lang.String funcName, Function newFunc, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_function_call method_call = new alter_function_call(dbName, funcName, newFunc, resultHandler, this, ___protocolFactory, ___transport);
@@ -14528,6 +15306,7 @@ public alter_function_call(java.lang.String dbName, java.lang.String funcName, F
         this.newFunc = newFunc;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_function", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_function_args args = new alter_function_args();
@@ -14538,16 +15317,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_function();
         return null;
       }
     }
 
+    @Override
     public void get_functions(java.lang.String dbName, java.lang.String pattern, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_functions_call method_call = new get_functions_call(dbName, pattern, resultHandler, this, ___protocolFactory, ___transport);
@@ -14564,6 +15346,7 @@ public get_functions_call(java.lang.String dbName, java.lang.String pattern, org
         this.pattern = pattern;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_functions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_functions_args args = new get_functions_args();
@@ -14573,6 +15356,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14583,6 +15367,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_functions_req(GetFunctionsRequest request, org.apache.thrift.async.AsyncMethodCallback<GetFunctionsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_functions_req_call method_call = new get_functions_req_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14597,6 +15382,7 @@ public get_functions_req_call(GetFunctionsRequest request, org.apache.thrift.asy
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_functions_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_functions_req_args args = new get_functions_req_args();
@@ -14605,6 +15391,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetFunctionsResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14615,6 +15402,7 @@ public GetFunctionsResponse getResult() throws MetaException, org.apache.thrift.
       }
     }
 
+    @Override
     public void get_function(java.lang.String dbName, java.lang.String funcName, org.apache.thrift.async.AsyncMethodCallback<Function> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_function_call method_call = new get_function_call(dbName, funcName, resultHandler, this, ___protocolFactory, ___transport);
@@ -14631,6 +15419,7 @@ public get_function_call(java.lang.String dbName, java.lang.String funcName, org
         this.funcName = funcName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_function", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_function_args args = new get_function_args();
@@ -14640,6 +15429,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Function getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14650,6 +15440,7 @@ public Function getResult() throws MetaException, NoSuchObjectException, org.apa
       }
     }
 
+    @Override
     public void get_all_functions(org.apache.thrift.async.AsyncMethodCallback<GetAllFunctionsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_functions_call method_call = new get_all_functions_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -14662,6 +15453,7 @@ public get_all_functions_call(org.apache.thrift.async.AsyncMethodCallback<GetAll
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_functions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_functions_args args = new get_all_functions_args();
@@ -14669,6 +15461,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetAllFunctionsResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14679,6 +15472,7 @@ public GetAllFunctionsResponse getResult() throws MetaException, org.apache.thri
       }
     }
 
+    @Override
     public void create_role(Role role, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_role_call method_call = new create_role_call(role, resultHandler, this, ___protocolFactory, ___transport);
@@ -14693,6 +15487,7 @@ public create_role_call(Role role, org.apache.thrift.async.AsyncMethodCallback<j
         this.role = role;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_role", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_role_args args = new create_role_args();
@@ -14701,6 +15496,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14711,6 +15507,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void drop_role(java.lang.String role_name, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_role_call method_call = new drop_role_call(role_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -14725,6 +15522,7 @@ public drop_role_call(java.lang.String role_name, org.apache.thrift.async.AsyncM
         this.role_name = role_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_role", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_role_args args = new drop_role_args();
@@ -14733,6 +15531,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14743,6 +15542,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void get_role_names(org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_role_names_call method_call = new get_role_names_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -14755,6 +15555,7 @@ public get_role_names_call(org.apache.thrift.async.AsyncMethodCallback<java.util
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_role_names", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_role_names_args args = new get_role_names_args();
@@ -14762,6 +15563,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14772,6 +15574,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void grant_role(java.lang.String role_name, java.lang.String principal_name, PrincipalType principal_type, java.lang.String grantor, PrincipalType grantorType, boolean grant_option, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       grant_role_call method_call = new grant_role_call(role_name, principal_name, principal_type, grantor, grantorType, grant_option, resultHandler, this, ___protocolFactory, ___transport);
@@ -14796,6 +15599,7 @@ public grant_role_call(java.lang.String role_name, java.lang.String principal_na
         this.grant_option = grant_option;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("grant_role", org.apache.thrift.protocol.TMessageType.CALL, 0));
         grant_role_args args = new grant_role_args();
@@ -14809,6 +15613,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14819,6 +15624,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void revoke_role(java.lang.String role_name, java.lang.String principal_name, PrincipalType principal_type, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       revoke_role_call method_call = new revoke_role_call(role_name, principal_name, principal_type, resultHandler, this, ___protocolFactory, ___transport);
@@ -14837,6 +15643,7 @@ public revoke_role_call(java.lang.String role_name, java.lang.String principal_n
         this.principal_type = principal_type;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("revoke_role", org.apache.thrift.protocol.TMessageType.CALL, 0));
         revoke_role_args args = new revoke_role_args();
@@ -14847,6 +15654,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14857,6 +15665,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void list_roles(java.lang.String principal_name, PrincipalType principal_type, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Role>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       list_roles_call method_call = new list_roles_call(principal_name, principal_type, resultHandler, this, ___protocolFactory, ___transport);
@@ -14873,6 +15682,7 @@ public list_roles_call(java.lang.String principal_name, PrincipalType principal_
         this.principal_type = principal_type;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("list_roles", org.apache.thrift.protocol.TMessageType.CALL, 0));
         list_roles_args args = new list_roles_args();
@@ -14882,6 +15692,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<Role> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14892,6 +15703,7 @@ public java.util.List<Role> getResult() throws MetaException, org.apache.thrift.
       }
     }
 
+    @Override
     public void grant_revoke_role(GrantRevokeRoleRequest request, org.apache.thrift.async.AsyncMethodCallback<GrantRevokeRoleResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       grant_revoke_role_call method_call = new grant_revoke_role_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14906,6 +15718,7 @@ public grant_revoke_role_call(GrantRevokeRoleRequest request, org.apache.thrift.
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("grant_revoke_role", org.apache.thrift.protocol.TMessageType.CALL, 0));
         grant_revoke_role_args args = new grant_revoke_role_args();
@@ -14914,6 +15727,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GrantRevokeRoleResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14924,6 +15738,7 @@ public GrantRevokeRoleResponse getResult() throws MetaException, org.apache.thri
       }
     }
 
+    @Override
     public void get_principals_in_role(GetPrincipalsInRoleRequest request, org.apache.thrift.async.AsyncMethodCallback<GetPrincipalsInRoleResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_principals_in_role_call method_call = new get_principals_in_role_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14938,6 +15753,7 @@ public get_principals_in_role_call(GetPrincipalsInRoleRequest request, org.apach
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_principals_in_role", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_principals_in_role_args args = new get_principals_in_role_args();
@@ -14946,6 +15762,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetPrincipalsInRoleResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14956,6 +15773,7 @@ public GetPrincipalsInRoleResponse getResult() throws MetaException, org.apache.
       }
     }
 
+    @Override
     public void get_role_grants_for_principal(GetRoleGrantsForPrincipalRequest request, org.apache.thrift.async.AsyncMethodCallback<GetRoleGrantsForPrincipalResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_role_grants_for_principal_call method_call = new get_role_grants_for_principal_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -14970,6 +15788,7 @@ public get_role_grants_for_principal_call(GetRoleGrantsForPrincipalRequest reque
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_role_grants_for_principal", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_role_grants_for_principal_args args = new get_role_grants_for_principal_args();
@@ -14978,6 +15797,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetRoleGrantsForPrincipalResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -14988,6 +15808,7 @@ public GetRoleGrantsForPrincipalResponse getResult() throws MetaException, org.a
       }
     }
 
+    @Override
     public void get_privilege_set(HiveObjectRef hiveObject, java.lang.String user_name, java.util.List<java.lang.String> group_names, org.apache.thrift.async.AsyncMethodCallback<PrincipalPrivilegeSet> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_privilege_set_call method_call = new get_privilege_set_call(hiveObject, user_name, group_names, resultHandler, this, ___protocolFactory, ___transport);
@@ -15006,6 +15827,7 @@ public get_privilege_set_call(HiveObjectRef hiveObject, java.lang.String user_na
         this.group_names = group_names;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_privilege_set", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_privilege_set_args args = new get_privilege_set_args();
@@ -15016,6 +15838,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PrincipalPrivilegeSet getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15026,6 +15849,7 @@ public PrincipalPrivilegeSet getResult() throws MetaException, org.apache.thrift
       }
     }
 
+    @Override
     public void list_privileges(java.lang.String principal_name, PrincipalType principal_type, HiveObjectRef hiveObject, org.apache.thrift.async.AsyncMethodCallback<java.util.List<HiveObjectPrivilege>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       list_privileges_call method_call = new list_privileges_call(principal_name, principal_type, hiveObject, resultHandler, this, ___protocolFactory, ___transport);
@@ -15044,6 +15868,7 @@ public list_privileges_call(java.lang.String principal_name, PrincipalType princ
         this.hiveObject = hiveObject;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("list_privileges", org.apache.thrift.protocol.TMessageType.CALL, 0));
         list_privileges_args args = new list_privileges_args();
@@ -15054,6 +15879,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<HiveObjectPrivilege> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15064,6 +15890,7 @@ public java.util.List<HiveObjectPrivilege> getResult() throws MetaException, org
       }
     }
 
+    @Override
     public void grant_privileges(PrivilegeBag privileges, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       grant_privileges_call method_call = new grant_privileges_call(privileges, resultHandler, this, ___protocolFactory, ___transport);
@@ -15078,6 +15905,7 @@ public grant_privileges_call(PrivilegeBag privileges, org.apache.thrift.async.As
         this.privileges = privileges;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("grant_privileges", org.apache.thrift.protocol.TMessageType.CALL, 0));
         grant_privileges_args args = new grant_privileges_args();
@@ -15086,6 +15914,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15096,6 +15925,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void revoke_privileges(PrivilegeBag privileges, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       revoke_privileges_call method_call = new revoke_privileges_call(privileges, resultHandler, this, ___protocolFactory, ___transport);
@@ -15110,6 +15940,7 @@ public revoke_privileges_call(PrivilegeBag privileges, org.apache.thrift.async.A
         this.privileges = privileges;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("revoke_privileges", org.apache.thrift.protocol.TMessageType.CALL, 0));
         revoke_privileges_args args = new revoke_privileges_args();
@@ -15118,6 +15949,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15128,6 +15960,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void grant_revoke_privileges(GrantRevokePrivilegeRequest request, org.apache.thrift.async.AsyncMethodCallback<GrantRevokePrivilegeResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       grant_revoke_privileges_call method_call = new grant_revoke_privileges_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -15142,6 +15975,7 @@ public grant_revoke_privileges_call(GrantRevokePrivilegeRequest request, org.apa
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("grant_revoke_privileges", org.apache.thrift.protocol.TMessageType.CALL, 0));
         grant_revoke_privileges_args args = new grant_revoke_privileges_args();
@@ -15150,6 +15984,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GrantRevokePrivilegeResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15160,6 +15995,7 @@ public GrantRevokePrivilegeResponse getResult() throws MetaException, org.apache
       }
     }
 
+    @Override
     public void refresh_privileges(HiveObjectRef objToRefresh, java.lang.String authorizer, GrantRevokePrivilegeRequest grantRequest, org.apache.thrift.async.AsyncMethodCallback<GrantRevokePrivilegeResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       refresh_privileges_call method_call = new refresh_privileges_call(objToRefresh, authorizer, grantRequest, resultHandler, this, ___protocolFactory, ___transport);
@@ -15178,6 +16014,7 @@ public refresh_privileges_call(HiveObjectRef objToRefresh, java.lang.String auth
         this.grantRequest = grantRequest;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("refresh_privileges", org.apache.thrift.protocol.TMessageType.CALL, 0));
         refresh_privileges_args args = new refresh_privileges_args();
@@ -15188,6 +16025,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GrantRevokePrivilegeResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15198,6 +16036,7 @@ public GrantRevokePrivilegeResponse getResult() throws MetaException, org.apache
       }
     }
 
+    @Override
     public void set_ugi(java.lang.String user_name, java.util.List<java.lang.String> group_names, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       set_ugi_call method_call = new set_ugi_call(user_name, group_names, resultHandler, this, ___protocolFactory, ___transport);
@@ -15214,6 +16053,7 @@ public set_ugi_call(java.lang.String user_name, java.util.List<java.lang.String>
         this.group_names = group_names;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_ugi", org.apache.thrift.protocol.TMessageType.CALL, 0));
         set_ugi_args args = new set_ugi_args();
@@ -15223,6 +16063,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15233,6 +16074,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void get_delegation_token(java.lang.String token_owner, java.lang.String renewer_kerberos_principal_name, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_delegation_token_call method_call = new get_delegation_token_call(token_owner, renewer_kerberos_principal_name, resultHandler, this, ___protocolFactory, ___transport);
@@ -15249,6 +16091,7 @@ public get_delegation_token_call(java.lang.String token_owner, java.lang.String
         this.renewer_kerberos_principal_name = renewer_kerberos_principal_name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_delegation_token", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_delegation_token_args args = new get_delegation_token_args();
@@ -15258,6 +16101,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.String getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15268,6 +16112,7 @@ public java.lang.String getResult() throws MetaException, org.apache.thrift.TExc
       }
     }
 
+    @Override
     public void renew_delegation_token(java.lang.String token_str_form, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       renew_delegation_token_call method_call = new renew_delegation_token_call(token_str_form, resultHandler, this, ___protocolFactory, ___transport);
@@ -15282,6 +16127,7 @@ public renew_delegation_token_call(java.lang.String token_str_form, org.apache.t
         this.token_str_form = token_str_form;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("renew_delegation_token", org.apache.thrift.protocol.TMessageType.CALL, 0));
         renew_delegation_token_args args = new renew_delegation_token_args();
@@ -15290,6 +16136,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Long getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15300,6 +16147,7 @@ public java.lang.Long getResult() throws MetaException, org.apache.thrift.TExcep
       }
     }
 
+    @Override
     public void cancel_delegation_token(java.lang.String token_str_form, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       cancel_delegation_token_call method_call = new cancel_delegation_token_call(token_str_form, resultHandler, this, ___protocolFactory, ___transport);
@@ -15314,6 +16162,7 @@ public cancel_delegation_token_call(java.lang.String token_str_form, org.apache.
         this.token_str_form = token_str_form;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("cancel_delegation_token", org.apache.thrift.protocol.TMessageType.CALL, 0));
         cancel_delegation_token_args args = new cancel_delegation_token_args();
@@ -15322,16 +16171,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_cancel_delegation_token();
         return null;
       }
     }
 
+    @Override
     public void add_token(java.lang.String token_identifier, java.lang.String delegation_token, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_token_call method_call = new add_token_call(token_identifier, delegation_token, resultHandler, this, ___protocolFactory, ___transport);
@@ -15348,6 +16200,7 @@ public add_token_call(java.lang.String token_identifier, java.lang.String delega
         this.delegation_token = delegation_token;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_token", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_token_args args = new add_token_args();
@@ -15357,6 +16210,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15367,6 +16221,7 @@ public java.lang.Boolean getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void remove_token(java.lang.String token_identifier, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       remove_token_call method_call = new remove_token_call(token_identifier, resultHandler, this, ___protocolFactory, ___transport);
@@ -15381,6 +16236,7 @@ public remove_token_call(java.lang.String token_identifier, org.apache.thrift.as
         this.token_identifier = token_identifier;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_token", org.apache.thrift.protocol.TMessageType.CALL, 0));
         remove_token_args args = new remove_token_args();
@@ -15389,6 +16245,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15399,6 +16256,7 @@ public java.lang.Boolean getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void get_token(java.lang.String token_identifier, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_token_call method_call = new get_token_call(token_identifier, resultHandler, this, ___protocolFactory, ___transport);
@@ -15413,6 +16271,7 @@ public get_token_call(java.lang.String token_identifier, org.apache.thrift.async
         this.token_identifier = token_identifier;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_token", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_token_args args = new get_token_args();
@@ -15421,6 +16280,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.String getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15431,6 +16291,7 @@ public java.lang.String getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void get_all_token_identifiers(org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_token_identifiers_call method_call = new get_all_token_identifiers_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -15443,6 +16304,7 @@ public get_all_token_identifiers_call(org.apache.thrift.async.AsyncMethodCallbac
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_token_identifiers", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_token_identifiers_args args = new get_all_token_identifiers_args();
@@ -15450,6 +16312,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15460,6 +16323,7 @@ public java.util.List<java.lang.String> getResult() throws org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void add_master_key(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_master_key_call method_call = new add_master_key_call(key, resultHandler, this, ___protocolFactory, ___transport);
@@ -15474,6 +16338,7 @@ public add_master_key_call(java.lang.String key, org.apache.thrift.async.AsyncMe
         this.key = key;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_master_key", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_master_key_args args = new add_master_key_args();
@@ -15482,6 +16347,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Integer getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15492,6 +16358,7 @@ public java.lang.Integer getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void update_master_key(int seq_number, java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_master_key_call method_call = new update_master_key_call(seq_number, key, resultHandler, this, ___protocolFactory, ___transport);
@@ -15508,6 +16375,7 @@ public update_master_key_call(int seq_number, java.lang.String key, org.apache.t
         this.key = key;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_master_key", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_master_key_args args = new update_master_key_args();
@@ -15517,16 +16385,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_update_master_key();
         return null;
       }
     }
 
+    @Override
     public void remove_master_key(int key_seq, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       remove_master_key_call method_call = new remove_master_key_call(key_seq, resultHandler, this, ___protocolFactory, ___transport);
@@ -15541,6 +16412,7 @@ public remove_master_key_call(int key_seq, org.apache.thrift.async.AsyncMethodCa
         this.key_seq = key_seq;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_master_key", org.apache.thrift.protocol.TMessageType.CALL, 0));
         remove_master_key_args args = new remove_master_key_args();
@@ -15549,6 +16421,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15559,6 +16432,7 @@ public java.lang.Boolean getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void get_master_keys(org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_master_keys_call method_call = new get_master_keys_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -15571,6 +16445,7 @@ public get_master_keys_call(org.apache.thrift.async.AsyncMethodCallback<java.uti
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_master_keys", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_master_keys_args args = new get_master_keys_args();
@@ -15578,6 +16453,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15588,6 +16464,7 @@ public java.util.List<java.lang.String> getResult() throws org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void get_open_txns(org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_open_txns_call method_call = new get_open_txns_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -15600,6 +16477,7 @@ public get_open_txns_call(org.apache.thrift.async.AsyncMethodCallback<GetOpenTxn
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_open_txns", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_open_txns_args args = new get_open_txns_args();
@@ -15607,6 +16485,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetOpenTxnsResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15617,6 +16496,7 @@ public GetOpenTxnsResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void get_open_txns_info(org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsInfoResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_open_txns_info_call method_call = new get_open_txns_info_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -15629,6 +16509,7 @@ public get_open_txns_info_call(org.apache.thrift.async.AsyncMethodCallback<GetOp
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_open_txns_info", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_open_txns_info_args args = new get_open_txns_info_args();
@@ -15636,6 +16517,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetOpenTxnsInfoResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15646,6 +16528,7 @@ public GetOpenTxnsInfoResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void open_txns(OpenTxnRequest rqst, org.apache.thrift.async.AsyncMethodCallback<OpenTxnsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       open_txns_call method_call = new open_txns_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15660,6 +16543,7 @@ public open_txns_call(OpenTxnRequest rqst, org.apache.thrift.async.AsyncMethodCa
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("open_txns", org.apache.thrift.protocol.TMessageType.CALL, 0));
         open_txns_args args = new open_txns_args();
@@ -15668,6 +16552,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public OpenTxnsResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15678,6 +16563,7 @@ public OpenTxnsResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void abort_txn(AbortTxnRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       abort_txn_call method_call = new abort_txn_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15692,6 +16578,7 @@ public abort_txn_call(AbortTxnRequest rqst, org.apache.thrift.async.AsyncMethodC
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("abort_txn", org.apache.thrift.protocol.TMessageType.CALL, 0));
         abort_txn_args args = new abort_txn_args();
@@ -15700,16 +16587,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchTxnException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_abort_txn();
         return null;
       }
     }
 
+    @Override
     public void abort_txns(AbortTxnsRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       abort_txns_call method_call = new abort_txns_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15724,6 +16614,7 @@ public abort_txns_call(AbortTxnsRequest rqst, org.apache.thrift.async.AsyncMetho
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("abort_txns", org.apache.thrift.protocol.TMessageType.CALL, 0));
         abort_txns_args args = new abort_txns_args();
@@ -15732,16 +16623,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchTxnException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_abort_txns();
         return null;
       }
     }
 
+    @Override
     public void commit_txn(CommitTxnRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       commit_txn_call method_call = new commit_txn_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15756,6 +16650,7 @@ public commit_txn_call(CommitTxnRequest rqst, org.apache.thrift.async.AsyncMetho
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("commit_txn", org.apache.thrift.protocol.TMessageType.CALL, 0));
         commit_txn_args args = new commit_txn_args();
@@ -15764,16 +16659,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_commit_txn();
         return null;
       }
     }
 
+    @Override
     public void get_latest_txnid_in_conflict(long txnId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_latest_txnid_in_conflict_call method_call = new get_latest_txnid_in_conflict_call(txnId, resultHandler, this, ___protocolFactory, ___transport);
@@ -15788,6 +16686,7 @@ public get_latest_txnid_in_conflict_call(long txnId, org.apache.thrift.async.Asy
         this.txnId = txnId;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_latest_txnid_in_conflict", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_latest_txnid_in_conflict_args args = new get_latest_txnid_in_conflict_args();
@@ -15796,6 +16695,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Long getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15806,6 +16706,7 @@ public java.lang.Long getResult() throws MetaException, org.apache.thrift.TExcep
       }
     }
 
+    @Override
     public void repl_tbl_writeid_state(ReplTblWriteIdStateRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       repl_tbl_writeid_state_call method_call = new repl_tbl_writeid_state_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15820,6 +16721,7 @@ public repl_tbl_writeid_state_call(ReplTblWriteIdStateRequest rqst, org.apache.t
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("repl_tbl_writeid_state", org.apache.thrift.protocol.TMessageType.CALL, 0));
         repl_tbl_writeid_state_args args = new repl_tbl_writeid_state_args();
@@ -15828,16 +16730,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_repl_tbl_writeid_state();
         return null;
       }
     }
 
+    @Override
     public void get_valid_write_ids(GetValidWriteIdsRequest rqst, org.apache.thrift.async.AsyncMethodCallback<GetValidWriteIdsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_valid_write_ids_call method_call = new get_valid_write_ids_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15852,6 +16757,7 @@ public get_valid_write_ids_call(GetValidWriteIdsRequest rqst, org.apache.thrift.
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_valid_write_ids", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_valid_write_ids_args args = new get_valid_write_ids_args();
@@ -15860,6 +16766,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetValidWriteIdsResponse getResult() throws NoSuchTxnException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15870,6 +16777,7 @@ public GetValidWriteIdsResponse getResult() throws NoSuchTxnException, MetaExcep
       }
     }
 
+    @Override
     public void add_write_ids_to_min_history(long txnId, java.util.Map<java.lang.String,java.lang.Long> writeIds, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_write_ids_to_min_history_call method_call = new add_write_ids_to_min_history_call(txnId, writeIds, resultHandler, this, ___protocolFactory, ___transport);
@@ -15886,6 +16794,7 @@ public add_write_ids_to_min_history_call(long txnId, java.util.Map<java.lang.Str
         this.writeIds = writeIds;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_write_ids_to_min_history", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_write_ids_to_min_history_args args = new add_write_ids_to_min_history_args();
@@ -15895,16 +16804,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_write_ids_to_min_history();
         return null;
       }
     }
 
+    @Override
     public void allocate_table_write_ids(AllocateTableWriteIdsRequest rqst, org.apache.thrift.async.AsyncMethodCallback<AllocateTableWriteIdsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       allocate_table_write_ids_call method_call = new allocate_table_write_ids_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15919,6 +16831,7 @@ public allocate_table_write_ids_call(AllocateTableWriteIdsRequest rqst, org.apac
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("allocate_table_write_ids", org.apache.thrift.protocol.TMessageType.CALL, 0));
         allocate_table_write_ids_args args = new allocate_table_write_ids_args();
@@ -15927,6 +16840,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public AllocateTableWriteIdsResponse getResult() throws NoSuchTxnException, TxnAbortedException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15937,6 +16851,7 @@ public AllocateTableWriteIdsResponse getResult() throws NoSuchTxnException, TxnA
       }
     }
 
+    @Override
     public void get_max_allocated_table_write_id(MaxAllocatedTableWriteIdRequest rqst, org.apache.thrift.async.AsyncMethodCallback<MaxAllocatedTableWriteIdResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_max_allocated_table_write_id_call method_call = new get_max_allocated_table_write_id_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15951,6 +16866,7 @@ public get_max_allocated_table_write_id_call(MaxAllocatedTableWriteIdRequest rqs
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_max_allocated_table_write_id", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_max_allocated_table_write_id_args args = new get_max_allocated_table_write_id_args();
@@ -15959,6 +16875,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public MaxAllocatedTableWriteIdResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -15969,6 +16886,7 @@ public MaxAllocatedTableWriteIdResponse getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void seed_write_id(SeedTableWriteIdsRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       seed_write_id_call method_call = new seed_write_id_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -15983,6 +16901,7 @@ public seed_write_id_call(SeedTableWriteIdsRequest rqst, org.apache.thrift.async
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("seed_write_id", org.apache.thrift.protocol.TMessageType.CALL, 0));
         seed_write_id_args args = new seed_write_id_args();
@@ -15991,16 +16910,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_seed_write_id();
         return null;
       }
     }
 
+    @Override
     public void seed_txn_id(SeedTxnIdRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       seed_txn_id_call method_call = new seed_txn_id_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16015,6 +16937,7 @@ public seed_txn_id_call(SeedTxnIdRequest rqst, org.apache.thrift.async.AsyncMeth
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("seed_txn_id", org.apache.thrift.protocol.TMessageType.CALL, 0));
         seed_txn_id_args args = new seed_txn_id_args();
@@ -16023,16 +16946,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_seed_txn_id();
         return null;
       }
     }
 
+    @Override
     public void lock(LockRequest rqst, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       lock_call method_call = new lock_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16047,6 +16973,7 @@ public lock_call(LockRequest rqst, org.apache.thrift.async.AsyncMethodCallback<L
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("lock", org.apache.thrift.protocol.TMessageType.CALL, 0));
         lock_args args = new lock_args();
@@ -16055,6 +16982,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public LockResponse getResult() throws NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16065,6 +16993,7 @@ public LockResponse getResult() throws NoSuchTxnException, TxnAbortedException,
       }
     }
 
+    @Override
     public void check_lock(CheckLockRequest rqst, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       check_lock_call method_call = new check_lock_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16079,6 +17008,7 @@ public check_lock_call(CheckLockRequest rqst, org.apache.thrift.async.AsyncMetho
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("check_lock", org.apache.thrift.protocol.TMessageType.CALL, 0));
         check_lock_args args = new check_lock_args();
@@ -16087,6 +17017,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public LockResponse getResult() throws NoSuchTxnException, TxnAbortedException, NoSuchLockException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16097,6 +17028,7 @@ public LockResponse getResult() throws NoSuchTxnException, TxnAbortedException,
       }
     }
 
+    @Override
     public void unlock(UnlockRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       unlock_call method_call = new unlock_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16111,6 +17043,7 @@ public unlock_call(UnlockRequest rqst, org.apache.thrift.async.AsyncMethodCallba
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("unlock", org.apache.thrift.protocol.TMessageType.CALL, 0));
         unlock_args args = new unlock_args();
@@ -16119,16 +17052,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchLockException, TxnOpenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_unlock();
         return null;
       }
     }
 
+    @Override
     public void show_locks(ShowLocksRequest rqst, org.apache.thrift.async.AsyncMethodCallback<ShowLocksResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       show_locks_call method_call = new show_locks_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16143,6 +17079,7 @@ public show_locks_call(ShowLocksRequest rqst, org.apache.thrift.async.AsyncMetho
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("show_locks", org.apache.thrift.protocol.TMessageType.CALL, 0));
         show_locks_args args = new show_locks_args();
@@ -16151,6 +17088,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ShowLocksResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16161,6 +17099,7 @@ public ShowLocksResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void heartbeat(HeartbeatRequest ids, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       heartbeat_call method_call = new heartbeat_call(ids, resultHandler, this, ___protocolFactory, ___transport);
@@ -16175,6 +17114,7 @@ public heartbeat_call(HeartbeatRequest ids, org.apache.thrift.async.AsyncMethodC
         this.ids = ids;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("heartbeat", org.apache.thrift.protocol.TMessageType.CALL, 0));
         heartbeat_args args = new heartbeat_args();
@@ -16183,16 +17123,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchLockException, NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_heartbeat();
         return null;
       }
     }
 
+    @Override
     public void heartbeat_txn_range(HeartbeatTxnRangeRequest txns, org.apache.thrift.async.AsyncMethodCallback<HeartbeatTxnRangeResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       heartbeat_txn_range_call method_call = new heartbeat_txn_range_call(txns, resultHandler, this, ___protocolFactory, ___transport);
@@ -16207,6 +17150,7 @@ public heartbeat_txn_range_call(HeartbeatTxnRangeRequest txns, org.apache.thrift
         this.txns = txns;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("heartbeat_txn_range", org.apache.thrift.protocol.TMessageType.CALL, 0));
         heartbeat_txn_range_args args = new heartbeat_txn_range_args();
@@ -16215,6 +17159,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public HeartbeatTxnRangeResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16225,6 +17170,7 @@ public HeartbeatTxnRangeResponse getResult() throws org.apache.thrift.TException
       }
     }
 
+    @Override
     public void compact(CompactionRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       compact_call method_call = new compact_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16239,6 +17185,7 @@ public compact_call(CompactionRequest rqst, org.apache.thrift.async.AsyncMethodC
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("compact", org.apache.thrift.protocol.TMessageType.CALL, 0));
         compact_args args = new compact_args();
@@ -16247,16 +17194,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_compact();
         return null;
       }
     }
 
+    @Override
     public void compact2(CompactionRequest rqst, org.apache.thrift.async.AsyncMethodCallback<CompactionResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       compact2_call method_call = new compact2_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16271,6 +17221,7 @@ public compact2_call(CompactionRequest rqst, org.apache.thrift.async.AsyncMethod
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("compact2", org.apache.thrift.protocol.TMessageType.CALL, 0));
         compact2_args args = new compact2_args();
@@ -16279,6 +17230,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public CompactionResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16289,6 +17241,7 @@ public CompactionResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void show_compact(ShowCompactRequest rqst, org.apache.thrift.async.AsyncMethodCallback<ShowCompactResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       show_compact_call method_call = new show_compact_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16303,6 +17256,7 @@ public show_compact_call(ShowCompactRequest rqst, org.apache.thrift.async.AsyncM
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("show_compact", org.apache.thrift.protocol.TMessageType.CALL, 0));
         show_compact_args args = new show_compact_args();
@@ -16311,6 +17265,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ShowCompactResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16321,6 +17276,7 @@ public ShowCompactResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void submit_for_cleanup(CompactionRequest o1, long o2, long o3, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       submit_for_cleanup_call method_call = new submit_for_cleanup_call(o1, o2, o3, resultHandler, this, ___protocolFactory, ___transport);
@@ -16339,6 +17295,7 @@ public submit_for_cleanup_call(CompactionRequest o1, long o2, long o3, org.apach
         this.o3 = o3;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("submit_for_cleanup", org.apache.thrift.protocol.TMessageType.CALL, 0));
         submit_for_cleanup_args args = new submit_for_cleanup_args();
@@ -16349,6 +17306,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16359,6 +17317,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void add_dynamic_partitions(AddDynamicPartitions rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_dynamic_partitions_call method_call = new add_dynamic_partitions_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16373,6 +17332,7 @@ public add_dynamic_partitions_call(AddDynamicPartitions rqst, org.apache.thrift.
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_dynamic_partitions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_dynamic_partitions_args args = new add_dynamic_partitions_args();
@@ -16381,16 +17341,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchTxnException, TxnAbortedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_dynamic_partitions();
         return null;
       }
     }
 
+    @Override
     public void find_next_compact(java.lang.String workerId, org.apache.thrift.async.AsyncMethodCallback<OptionalCompactionInfoStruct> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       find_next_compact_call method_call = new find_next_compact_call(workerId, resultHandler, this, ___protocolFactory, ___transport);
@@ -16405,6 +17368,7 @@ public find_next_compact_call(java.lang.String workerId, org.apache.thrift.async
         this.workerId = workerId;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("find_next_compact", org.apache.thrift.protocol.TMessageType.CALL, 0));
         find_next_compact_args args = new find_next_compact_args();
@@ -16413,6 +17377,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public OptionalCompactionInfoStruct getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16423,6 +17388,7 @@ public OptionalCompactionInfoStruct getResult() throws MetaException, org.apache
       }
     }
 
+    @Override
     public void find_next_compact2(FindNextCompactRequest rqst, org.apache.thrift.async.AsyncMethodCallback<OptionalCompactionInfoStruct> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       find_next_compact2_call method_call = new find_next_compact2_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16437,6 +17403,7 @@ public find_next_compact2_call(FindNextCompactRequest rqst, org.apache.thrift.as
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("find_next_compact2", org.apache.thrift.protocol.TMessageType.CALL, 0));
         find_next_compact2_args args = new find_next_compact2_args();
@@ -16445,6 +17412,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public OptionalCompactionInfoStruct getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16455,6 +17423,7 @@ public OptionalCompactionInfoStruct getResult() throws MetaException, org.apache
       }
     }
 
+    @Override
     public void update_compactor_state(CompactionInfoStruct cr, long txn_id, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_compactor_state_call method_call = new update_compactor_state_call(cr, txn_id, resultHandler, this, ___protocolFactory, ___transport);
@@ -16471,6 +17440,7 @@ public update_compactor_state_call(CompactionInfoStruct cr, long txn_id, org.apa
         this.txn_id = txn_id;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_compactor_state", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_compactor_state_args args = new update_compactor_state_args();
@@ -16480,16 +17450,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_update_compactor_state();
         return null;
       }
     }
 
+    @Override
     public void find_columns_with_stats(CompactionInfoStruct cr, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       find_columns_with_stats_call method_call = new find_columns_with_stats_call(cr, resultHandler, this, ___protocolFactory, ___transport);
@@ -16504,6 +17477,7 @@ public find_columns_with_stats_call(CompactionInfoStruct cr, org.apache.thrift.a
         this.cr = cr;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("find_columns_with_stats", org.apache.thrift.protocol.TMessageType.CALL, 0));
         find_columns_with_stats_args args = new find_columns_with_stats_args();
@@ -16512,6 +17486,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16522,6 +17497,7 @@ public java.util.List<java.lang.String> getResult() throws org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void mark_cleaned(CompactionInfoStruct cr, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       mark_cleaned_call method_call = new mark_cleaned_call(cr, resultHandler, this, ___protocolFactory, ___transport);
@@ -16536,6 +17512,7 @@ public mark_cleaned_call(CompactionInfoStruct cr, org.apache.thrift.async.AsyncM
         this.cr = cr;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mark_cleaned", org.apache.thrift.protocol.TMessageType.CALL, 0));
         mark_cleaned_args args = new mark_cleaned_args();
@@ -16544,16 +17521,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_mark_cleaned();
         return null;
       }
     }
 
+    @Override
     public void mark_compacted(CompactionInfoStruct cr, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       mark_compacted_call method_call = new mark_compacted_call(cr, resultHandler, this, ___protocolFactory, ___transport);
@@ -16568,6 +17548,7 @@ public mark_compacted_call(CompactionInfoStruct cr, org.apache.thrift.async.Asyn
         this.cr = cr;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mark_compacted", org.apache.thrift.protocol.TMessageType.CALL, 0));
         mark_compacted_args args = new mark_compacted_args();
@@ -16576,16 +17557,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_mark_compacted();
         return null;
       }
     }
 
+    @Override
     public void mark_failed(CompactionInfoStruct cr, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       mark_failed_call method_call = new mark_failed_call(cr, resultHandler, this, ___protocolFactory, ___transport);
@@ -16600,6 +17584,7 @@ public mark_failed_call(CompactionInfoStruct cr, org.apache.thrift.async.AsyncMe
         this.cr = cr;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mark_failed", org.apache.thrift.protocol.TMessageType.CALL, 0));
         mark_failed_args args = new mark_failed_args();
@@ -16608,16 +17593,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_mark_failed();
         return null;
       }
     }
 
+    @Override
     public void mark_refused(CompactionInfoStruct cr, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       mark_refused_call method_call = new mark_refused_call(cr, resultHandler, this, ___protocolFactory, ___transport);
@@ -16632,6 +17620,7 @@ public mark_refused_call(CompactionInfoStruct cr, org.apache.thrift.async.AsyncM
         this.cr = cr;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mark_refused", org.apache.thrift.protocol.TMessageType.CALL, 0));
         mark_refused_args args = new mark_refused_args();
@@ -16640,16 +17629,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_mark_refused();
         return null;
       }
     }
 
+    @Override
     public void update_compaction_metrics_data(CompactionMetricsDataStruct data, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       update_compaction_metrics_data_call method_call = new update_compaction_metrics_data_call(data, resultHandler, this, ___protocolFactory, ___transport);
@@ -16664,6 +17656,7 @@ public update_compaction_metrics_data_call(CompactionMetricsDataStruct data, org
         this.data = data;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update_compaction_metrics_data", org.apache.thrift.protocol.TMessageType.CALL, 0));
         update_compaction_metrics_data_args args = new update_compaction_metrics_data_args();
@@ -16672,6 +17665,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16682,6 +17676,7 @@ public java.lang.Boolean getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void remove_compaction_metrics_data(CompactionMetricsDataRequest request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       remove_compaction_metrics_data_call method_call = new remove_compaction_metrics_data_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -16696,6 +17691,7 @@ public remove_compaction_metrics_data_call(CompactionMetricsDataRequest request,
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_compaction_metrics_data", org.apache.thrift.protocol.TMessageType.CALL, 0));
         remove_compaction_metrics_data_args args = new remove_compaction_metrics_data_args();
@@ -16704,16 +17700,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_remove_compaction_metrics_data();
         return null;
       }
     }
 
+    @Override
     public void set_hadoop_jobid(java.lang.String jobId, long cq_id, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       set_hadoop_jobid_call method_call = new set_hadoop_jobid_call(jobId, cq_id, resultHandler, this, ___protocolFactory, ___transport);
@@ -16730,6 +17729,7 @@ public set_hadoop_jobid_call(java.lang.String jobId, long cq_id, org.apache.thri
         this.cq_id = cq_id;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_hadoop_jobid", org.apache.thrift.protocol.TMessageType.CALL, 0));
         set_hadoop_jobid_args args = new set_hadoop_jobid_args();
@@ -16739,16 +17739,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_set_hadoop_jobid();
         return null;
       }
     }
 
+    @Override
     public void get_latest_committed_compaction_info(GetLatestCommittedCompactionInfoRequest rqst, org.apache.thrift.async.AsyncMethodCallback<GetLatestCommittedCompactionInfoResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_latest_committed_compaction_info_call method_call = new get_latest_committed_compaction_info_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16763,6 +17766,7 @@ public get_latest_committed_compaction_info_call(GetLatestCommittedCompactionInf
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_latest_committed_compaction_info", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_latest_committed_compaction_info_args args = new get_latest_committed_compaction_info_args();
@@ -16771,6 +17775,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetLatestCommittedCompactionInfoResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16781,6 +17786,7 @@ public GetLatestCommittedCompactionInfoResponse getResult() throws org.apache.th
       }
     }
 
+    @Override
     public void get_next_notification(NotificationEventRequest rqst, org.apache.thrift.async.AsyncMethodCallback<NotificationEventResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_next_notification_call method_call = new get_next_notification_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16795,6 +17801,7 @@ public get_next_notification_call(NotificationEventRequest rqst, org.apache.thri
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_next_notification", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_next_notification_args args = new get_next_notification_args();
@@ -16803,6 +17810,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public NotificationEventResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16813,6 +17821,7 @@ public NotificationEventResponse getResult() throws org.apache.thrift.TException
       }
     }
 
+    @Override
     public void get_current_notificationEventId(org.apache.thrift.async.AsyncMethodCallback<CurrentNotificationEventId> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_current_notificationEventId_call method_call = new get_current_notificationEventId_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -16825,6 +17834,7 @@ public get_current_notificationEventId_call(org.apache.thrift.async.AsyncMethodC
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_current_notificationEventId", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_current_notificationEventId_args args = new get_current_notificationEventId_args();
@@ -16832,6 +17842,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public CurrentNotificationEventId getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16842,6 +17853,7 @@ public CurrentNotificationEventId getResult() throws org.apache.thrift.TExceptio
       }
     }
 
+    @Override
     public void get_notification_events_count(NotificationEventsCountRequest rqst, org.apache.thrift.async.AsyncMethodCallback<NotificationEventsCountResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_notification_events_count_call method_call = new get_notification_events_count_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16856,6 +17868,7 @@ public get_notification_events_count_call(NotificationEventsCountRequest rqst, o
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_notification_events_count", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_notification_events_count_args args = new get_notification_events_count_args();
@@ -16864,6 +17877,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public NotificationEventsCountResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16874,6 +17888,7 @@ public NotificationEventsCountResponse getResult() throws org.apache.thrift.TExc
       }
     }
 
+    @Override
     public void fire_listener_event(FireEventRequest rqst, org.apache.thrift.async.AsyncMethodCallback<FireEventResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       fire_listener_event_call method_call = new fire_listener_event_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16888,6 +17903,7 @@ public fire_listener_event_call(FireEventRequest rqst, org.apache.thrift.async.A
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("fire_listener_event", org.apache.thrift.protocol.TMessageType.CALL, 0));
         fire_listener_event_args args = new fire_listener_event_args();
@@ -16896,6 +17912,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public FireEventResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16906,6 +17923,7 @@ public FireEventResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void flushCache(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       flushCache_call method_call = new flushCache_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -16918,6 +17936,7 @@ public flushCache_call(org.apache.thrift.async.AsyncMethodCallback<Void> resultH
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("flushCache", org.apache.thrift.protocol.TMessageType.CALL, 0));
         flushCache_args args = new flushCache_args();
@@ -16925,16 +17944,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_flushCache();
         return null;
       }
     }
 
+    @Override
     public void add_write_notification_log(WriteNotificationLogRequest rqst, org.apache.thrift.async.AsyncMethodCallback<WriteNotificationLogResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_write_notification_log_call method_call = new add_write_notification_log_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16949,6 +17971,7 @@ public add_write_notification_log_call(WriteNotificationLogRequest rqst, org.apa
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_write_notification_log", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_write_notification_log_args args = new add_write_notification_log_args();
@@ -16957,6 +17980,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WriteNotificationLogResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16967,6 +17991,7 @@ public WriteNotificationLogResponse getResult() throws org.apache.thrift.TExcept
       }
     }
 
+    @Override
     public void add_write_notification_log_in_batch(WriteNotificationLogBatchRequest rqst, org.apache.thrift.async.AsyncMethodCallback<WriteNotificationLogBatchResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_write_notification_log_in_batch_call method_call = new add_write_notification_log_in_batch_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -16981,6 +18006,7 @@ public add_write_notification_log_in_batch_call(WriteNotificationLogBatchRequest
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_write_notification_log_in_batch", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_write_notification_log_in_batch_args args = new add_write_notification_log_in_batch_args();
@@ -16989,6 +18015,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WriteNotificationLogBatchResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -16999,6 +18026,7 @@ public WriteNotificationLogBatchResponse getResult() throws org.apache.thrift.TE
       }
     }
 
+    @Override
     public void cm_recycle(CmRecycleRequest request, org.apache.thrift.async.AsyncMethodCallback<CmRecycleResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       cm_recycle_call method_call = new cm_recycle_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17013,6 +18041,7 @@ public cm_recycle_call(CmRecycleRequest request, org.apache.thrift.async.AsyncMe
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("cm_recycle", org.apache.thrift.protocol.TMessageType.CALL, 0));
         cm_recycle_args args = new cm_recycle_args();
@@ -17021,6 +18050,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public CmRecycleResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17031,6 +18061,7 @@ public CmRecycleResponse getResult() throws MetaException, org.apache.thrift.TEx
       }
     }
 
+    @Override
     public void get_file_metadata_by_expr(GetFileMetadataByExprRequest req, org.apache.thrift.async.AsyncMethodCallback<GetFileMetadataByExprResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_file_metadata_by_expr_call method_call = new get_file_metadata_by_expr_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -17045,6 +18076,7 @@ public get_file_metadata_by_expr_call(GetFileMetadataByExprRequest req, org.apac
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_file_metadata_by_expr", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_file_metadata_by_expr_args args = new get_file_metadata_by_expr_args();
@@ -17053,6 +18085,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetFileMetadataByExprResult getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17063,6 +18096,7 @@ public GetFileMetadataByExprResult getResult() throws org.apache.thrift.TExcepti
       }
     }
 
+    @Override
     public void get_file_metadata(GetFileMetadataRequest req, org.apache.thrift.async.AsyncMethodCallback<GetFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_file_metadata_call method_call = new get_file_metadata_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -17077,6 +18111,7 @@ public get_file_metadata_call(GetFileMetadataRequest req, org.apache.thrift.asyn
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_file_metadata", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_file_metadata_args args = new get_file_metadata_args();
@@ -17085,6 +18120,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetFileMetadataResult getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17095,6 +18131,7 @@ public GetFileMetadataResult getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void put_file_metadata(PutFileMetadataRequest req, org.apache.thrift.async.AsyncMethodCallback<PutFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       put_file_metadata_call method_call = new put_file_metadata_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -17109,6 +18146,7 @@ public put_file_metadata_call(PutFileMetadataRequest req, org.apache.thrift.asyn
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("put_file_metadata", org.apache.thrift.protocol.TMessageType.CALL, 0));
         put_file_metadata_args args = new put_file_metadata_args();
@@ -17117,6 +18155,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public PutFileMetadataResult getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17127,6 +18166,7 @@ public PutFileMetadataResult getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void clear_file_metadata(ClearFileMetadataRequest req, org.apache.thrift.async.AsyncMethodCallback<ClearFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       clear_file_metadata_call method_call = new clear_file_metadata_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -17141,6 +18181,7 @@ public clear_file_metadata_call(ClearFileMetadataRequest req, org.apache.thrift.
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("clear_file_metadata", org.apache.thrift.protocol.TMessageType.CALL, 0));
         clear_file_metadata_args args = new clear_file_metadata_args();
@@ -17149,6 +18190,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ClearFileMetadataResult getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17159,6 +18201,7 @@ public ClearFileMetadataResult getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void cache_file_metadata(CacheFileMetadataRequest req, org.apache.thrift.async.AsyncMethodCallback<CacheFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       cache_file_metadata_call method_call = new cache_file_metadata_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -17173,6 +18216,7 @@ public cache_file_metadata_call(CacheFileMetadataRequest req, org.apache.thrift.
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("cache_file_metadata", org.apache.thrift.protocol.TMessageType.CALL, 0));
         cache_file_metadata_args args = new cache_file_metadata_args();
@@ -17181,6 +18225,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public CacheFileMetadataResult getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17191,6 +18236,7 @@ public CacheFileMetadataResult getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void get_metastore_db_uuid(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_metastore_db_uuid_call method_call = new get_metastore_db_uuid_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -17203,6 +18249,7 @@ public get_metastore_db_uuid_call(org.apache.thrift.async.AsyncMethodCallback<ja
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_metastore_db_uuid", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_metastore_db_uuid_args args = new get_metastore_db_uuid_args();
@@ -17210,6 +18257,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.String getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17220,6 +18268,7 @@ public java.lang.String getResult() throws MetaException, org.apache.thrift.TExc
       }
     }
 
+    @Override
     public void create_resource_plan(WMCreateResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMCreateResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_resource_plan_call method_call = new create_resource_plan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17234,6 +18283,7 @@ public create_resource_plan_call(WMCreateResourcePlanRequest request, org.apache
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_resource_plan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_resource_plan_args args = new create_resource_plan_args();
@@ -17242,6 +18292,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMCreateResourcePlanResponse getResult() throws AlreadyExistsException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17252,6 +18303,7 @@ public WMCreateResourcePlanResponse getResult() throws AlreadyExistsException, I
       }
     }
 
+    @Override
     public void get_resource_plan(WMGetResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMGetResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_resource_plan_call method_call = new get_resource_plan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17266,6 +18318,7 @@ public get_resource_plan_call(WMGetResourcePlanRequest request, org.apache.thrif
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_resource_plan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_resource_plan_args args = new get_resource_plan_args();
@@ -17274,6 +18327,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMGetResourcePlanResponse getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17284,6 +18338,7 @@ public WMGetResourcePlanResponse getResult() throws NoSuchObjectException, MetaE
       }
     }
 
+    @Override
     public void get_active_resource_plan(WMGetActiveResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMGetActiveResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_active_resource_plan_call method_call = new get_active_resource_plan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17298,6 +18353,7 @@ public get_active_resource_plan_call(WMGetActiveResourcePlanRequest request, org
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_active_resource_plan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_active_resource_plan_args args = new get_active_resource_plan_args();
@@ -17306,6 +18362,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMGetActiveResourcePlanResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17316,6 +18373,7 @@ public WMGetActiveResourcePlanResponse getResult() throws MetaException, org.apa
       }
     }
 
+    @Override
     public void get_all_resource_plans(WMGetAllResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMGetAllResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_resource_plans_call method_call = new get_all_resource_plans_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17330,6 +18388,7 @@ public get_all_resource_plans_call(WMGetAllResourcePlanRequest request, org.apac
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_resource_plans", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_resource_plans_args args = new get_all_resource_plans_args();
@@ -17338,6 +18397,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMGetAllResourcePlanResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17348,6 +18408,7 @@ public WMGetAllResourcePlanResponse getResult() throws MetaException, org.apache
       }
     }
 
+    @Override
     public void alter_resource_plan(WMAlterResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMAlterResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_resource_plan_call method_call = new alter_resource_plan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17362,6 +18423,7 @@ public alter_resource_plan_call(WMAlterResourcePlanRequest request, org.apache.t
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_resource_plan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_resource_plan_args args = new alter_resource_plan_args();
@@ -17370,6 +18432,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMAlterResourcePlanResponse getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17380,6 +18443,7 @@ public WMAlterResourcePlanResponse getResult() throws NoSuchObjectException, Inv
       }
     }
 
+    @Override
     public void validate_resource_plan(WMValidateResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMValidateResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       validate_resource_plan_call method_call = new validate_resource_plan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17394,6 +18458,7 @@ public validate_resource_plan_call(WMValidateResourcePlanRequest request, org.ap
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("validate_resource_plan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         validate_resource_plan_args args = new validate_resource_plan_args();
@@ -17402,6 +18467,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMValidateResourcePlanResponse getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17412,6 +18478,7 @@ public WMValidateResourcePlanResponse getResult() throws NoSuchObjectException,
       }
     }
 
+    @Override
     public void drop_resource_plan(WMDropResourcePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMDropResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_resource_plan_call method_call = new drop_resource_plan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17426,6 +18493,7 @@ public drop_resource_plan_call(WMDropResourcePlanRequest request, org.apache.thr
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_resource_plan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_resource_plan_args args = new drop_resource_plan_args();
@@ -17434,6 +18502,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMDropResourcePlanResponse getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17444,6 +18513,7 @@ public WMDropResourcePlanResponse getResult() throws NoSuchObjectException, Inva
       }
     }
 
+    @Override
     public void create_wm_trigger(WMCreateTriggerRequest request, org.apache.thrift.async.AsyncMethodCallback<WMCreateTriggerResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_wm_trigger_call method_call = new create_wm_trigger_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17458,6 +18528,7 @@ public create_wm_trigger_call(WMCreateTriggerRequest request, org.apache.thrift.
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_wm_trigger", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_wm_trigger_args args = new create_wm_trigger_args();
@@ -17466,6 +18537,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMCreateTriggerResponse getResult() throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17476,6 +18548,7 @@ public WMCreateTriggerResponse getResult() throws AlreadyExistsException, NoSuch
       }
     }
 
+    @Override
     public void alter_wm_trigger(WMAlterTriggerRequest request, org.apache.thrift.async.AsyncMethodCallback<WMAlterTriggerResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_wm_trigger_call method_call = new alter_wm_trigger_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17490,6 +18563,7 @@ public alter_wm_trigger_call(WMAlterTriggerRequest request, org.apache.thrift.as
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_wm_trigger", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_wm_trigger_args args = new alter_wm_trigger_args();
@@ -17498,6 +18572,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMAlterTriggerResponse getResult() throws NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17508,6 +18583,7 @@ public WMAlterTriggerResponse getResult() throws NoSuchObjectException, InvalidO
       }
     }
 
+    @Override
     public void drop_wm_trigger(WMDropTriggerRequest request, org.apache.thrift.async.AsyncMethodCallback<WMDropTriggerResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_wm_trigger_call method_call = new drop_wm_trigger_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17522,6 +18598,7 @@ public drop_wm_trigger_call(WMDropTriggerRequest request, org.apache.thrift.asyn
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_wm_trigger", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_wm_trigger_args args = new drop_wm_trigger_args();
@@ -17530,6 +18607,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMDropTriggerResponse getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17540,6 +18618,7 @@ public WMDropTriggerResponse getResult() throws NoSuchObjectException, InvalidOp
       }
     }
 
+    @Override
     public void get_triggers_for_resourceplan(WMGetTriggersForResourePlanRequest request, org.apache.thrift.async.AsyncMethodCallback<WMGetTriggersForResourePlanResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_triggers_for_resourceplan_call method_call = new get_triggers_for_resourceplan_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17554,6 +18633,7 @@ public get_triggers_for_resourceplan_call(WMGetTriggersForResourePlanRequest req
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_triggers_for_resourceplan", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_triggers_for_resourceplan_args args = new get_triggers_for_resourceplan_args();
@@ -17562,6 +18642,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMGetTriggersForResourePlanResponse getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17572,6 +18653,7 @@ public WMGetTriggersForResourePlanResponse getResult() throws NoSuchObjectExcept
       }
     }
 
+    @Override
     public void create_wm_pool(WMCreatePoolRequest request, org.apache.thrift.async.AsyncMethodCallback<WMCreatePoolResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_wm_pool_call method_call = new create_wm_pool_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17586,6 +18668,7 @@ public create_wm_pool_call(WMCreatePoolRequest request, org.apache.thrift.async.
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_wm_pool", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_wm_pool_args args = new create_wm_pool_args();
@@ -17594,6 +18677,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMCreatePoolResponse getResult() throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17604,6 +18688,7 @@ public WMCreatePoolResponse getResult() throws AlreadyExistsException, NoSuchObj
       }
     }
 
+    @Override
     public void alter_wm_pool(WMAlterPoolRequest request, org.apache.thrift.async.AsyncMethodCallback<WMAlterPoolResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_wm_pool_call method_call = new alter_wm_pool_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17618,6 +18703,7 @@ public alter_wm_pool_call(WMAlterPoolRequest request, org.apache.thrift.async.As
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_wm_pool", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_wm_pool_args args = new alter_wm_pool_args();
@@ -17626,6 +18712,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMAlterPoolResponse getResult() throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17636,6 +18723,7 @@ public WMAlterPoolResponse getResult() throws AlreadyExistsException, NoSuchObje
       }
     }
 
+    @Override
     public void drop_wm_pool(WMDropPoolRequest request, org.apache.thrift.async.AsyncMethodCallback<WMDropPoolResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_wm_pool_call method_call = new drop_wm_pool_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17650,6 +18738,7 @@ public drop_wm_pool_call(WMDropPoolRequest request, org.apache.thrift.async.Asyn
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_wm_pool", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_wm_pool_args args = new drop_wm_pool_args();
@@ -17658,6 +18747,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMDropPoolResponse getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17668,6 +18758,7 @@ public WMDropPoolResponse getResult() throws NoSuchObjectException, InvalidOpera
       }
     }
 
+    @Override
     public void create_or_update_wm_mapping(WMCreateOrUpdateMappingRequest request, org.apache.thrift.async.AsyncMethodCallback<WMCreateOrUpdateMappingResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_or_update_wm_mapping_call method_call = new create_or_update_wm_mapping_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17682,6 +18773,7 @@ public create_or_update_wm_mapping_call(WMCreateOrUpdateMappingRequest request,
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_or_update_wm_mapping", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_or_update_wm_mapping_args args = new create_or_update_wm_mapping_args();
@@ -17690,6 +18782,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMCreateOrUpdateMappingResponse getResult() throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17700,6 +18793,7 @@ public WMCreateOrUpdateMappingResponse getResult() throws AlreadyExistsException
       }
     }
 
+    @Override
     public void drop_wm_mapping(WMDropMappingRequest request, org.apache.thrift.async.AsyncMethodCallback<WMDropMappingResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_wm_mapping_call method_call = new drop_wm_mapping_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17714,6 +18808,7 @@ public drop_wm_mapping_call(WMDropMappingRequest request, org.apache.thrift.asyn
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_wm_mapping", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_wm_mapping_args args = new drop_wm_mapping_args();
@@ -17722,6 +18817,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMDropMappingResponse getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17732,6 +18828,7 @@ public WMDropMappingResponse getResult() throws NoSuchObjectException, InvalidOp
       }
     }
 
+    @Override
     public void create_or_drop_wm_trigger_to_pool_mapping(WMCreateOrDropTriggerToPoolMappingRequest request, org.apache.thrift.async.AsyncMethodCallback<WMCreateOrDropTriggerToPoolMappingResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_or_drop_wm_trigger_to_pool_mapping_call method_call = new create_or_drop_wm_trigger_to_pool_mapping_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -17746,6 +18843,7 @@ public create_or_drop_wm_trigger_to_pool_mapping_call(WMCreateOrDropTriggerToPoo
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_or_drop_wm_trigger_to_pool_mapping", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_or_drop_wm_trigger_to_pool_mapping_args args = new create_or_drop_wm_trigger_to_pool_mapping_args();
@@ -17754,6 +18852,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public WMCreateOrDropTriggerToPoolMappingResponse getResult() throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17764,6 +18863,7 @@ public WMCreateOrDropTriggerToPoolMappingResponse getResult() throws AlreadyExis
       }
     }
 
+    @Override
     public void create_ischema(ISchema schema, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_ischema_call method_call = new create_ischema_call(schema, resultHandler, this, ___protocolFactory, ___transport);
@@ -17778,6 +18878,7 @@ public create_ischema_call(ISchema schema, org.apache.thrift.async.AsyncMethodCa
         this.schema = schema;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_ischema", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_ischema_args args = new create_ischema_args();
@@ -17786,16 +18887,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_ischema();
         return null;
       }
     }
 
+    @Override
     public void alter_ischema(AlterISchemaRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       alter_ischema_call method_call = new alter_ischema_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -17810,6 +18914,7 @@ public alter_ischema_call(AlterISchemaRequest rqst, org.apache.thrift.async.Asyn
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("alter_ischema", org.apache.thrift.protocol.TMessageType.CALL, 0));
         alter_ischema_args args = new alter_ischema_args();
@@ -17818,16 +18923,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_alter_ischema();
         return null;
       }
     }
 
+    @Override
     public void get_ischema(ISchemaName name, org.apache.thrift.async.AsyncMethodCallback<ISchema> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_ischema_call method_call = new get_ischema_call(name, resultHandler, this, ___protocolFactory, ___transport);
@@ -17842,6 +18950,7 @@ public get_ischema_call(ISchemaName name, org.apache.thrift.async.AsyncMethodCal
         this.name = name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_ischema", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_ischema_args args = new get_ischema_args();
@@ -17850,6 +18959,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ISchema getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17860,6 +18970,7 @@ public ISchema getResult() throws NoSuchObjectException, MetaException, org.apac
       }
     }
 
+    @Override
     public void drop_ischema(ISchemaName name, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_ischema_call method_call = new drop_ischema_call(name, resultHandler, this, ___protocolFactory, ___transport);
@@ -17874,6 +18985,7 @@ public drop_ischema_call(ISchemaName name, org.apache.thrift.async.AsyncMethodCa
         this.name = name;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_ischema", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_ischema_args args = new drop_ischema_args();
@@ -17882,16 +18994,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_ischema();
         return null;
       }
     }
 
+    @Override
     public void add_schema_version(SchemaVersion schemaVersion, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_schema_version_call method_call = new add_schema_version_call(schemaVersion, resultHandler, this, ___protocolFactory, ___transport);
@@ -17906,6 +19021,7 @@ public add_schema_version_call(SchemaVersion schemaVersion, org.apache.thrift.as
         this.schemaVersion = schemaVersion;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_schema_version", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_schema_version_args args = new add_schema_version_args();
@@ -17914,16 +19030,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_schema_version();
         return null;
       }
     }
 
+    @Override
     public void get_schema_version(SchemaVersionDescriptor schemaVersion, org.apache.thrift.async.AsyncMethodCallback<SchemaVersion> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schema_version_call method_call = new get_schema_version_call(schemaVersion, resultHandler, this, ___protocolFactory, ___transport);
@@ -17938,6 +19057,7 @@ public get_schema_version_call(SchemaVersionDescriptor schemaVersion, org.apache
         this.schemaVersion = schemaVersion;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schema_version", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schema_version_args args = new get_schema_version_args();
@@ -17946,6 +19066,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public SchemaVersion getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17956,6 +19077,7 @@ public SchemaVersion getResult() throws NoSuchObjectException, MetaException, or
       }
     }
 
+    @Override
     public void get_schema_latest_version(ISchemaName schemaName, org.apache.thrift.async.AsyncMethodCallback<SchemaVersion> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schema_latest_version_call method_call = new get_schema_latest_version_call(schemaName, resultHandler, this, ___protocolFactory, ___transport);
@@ -17970,6 +19092,7 @@ public get_schema_latest_version_call(ISchemaName schemaName, org.apache.thrift.
         this.schemaName = schemaName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schema_latest_version", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schema_latest_version_args args = new get_schema_latest_version_args();
@@ -17978,6 +19101,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public SchemaVersion getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -17988,6 +19112,7 @@ public SchemaVersion getResult() throws NoSuchObjectException, MetaException, or
       }
     }
 
+    @Override
     public void get_schema_all_versions(ISchemaName schemaName, org.apache.thrift.async.AsyncMethodCallback<java.util.List<SchemaVersion>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schema_all_versions_call method_call = new get_schema_all_versions_call(schemaName, resultHandler, this, ___protocolFactory, ___transport);
@@ -18002,6 +19127,7 @@ public get_schema_all_versions_call(ISchemaName schemaName, org.apache.thrift.as
         this.schemaName = schemaName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schema_all_versions", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schema_all_versions_args args = new get_schema_all_versions_args();
@@ -18010,6 +19136,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<SchemaVersion> getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18020,6 +19147,7 @@ public java.util.List<SchemaVersion> getResult() throws NoSuchObjectException, M
       }
     }
 
+    @Override
     public void drop_schema_version(SchemaVersionDescriptor schemaVersion, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_schema_version_call method_call = new drop_schema_version_call(schemaVersion, resultHandler, this, ___protocolFactory, ___transport);
@@ -18034,6 +19162,7 @@ public drop_schema_version_call(SchemaVersionDescriptor schemaVersion, org.apach
         this.schemaVersion = schemaVersion;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_schema_version", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_schema_version_args args = new drop_schema_version_args();
@@ -18042,16 +19171,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_schema_version();
         return null;
       }
     }
 
+    @Override
     public void get_schemas_by_cols(FindSchemasByColsRqst rqst, org.apache.thrift.async.AsyncMethodCallback<FindSchemasByColsResp> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_schemas_by_cols_call method_call = new get_schemas_by_cols_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -18066,6 +19198,7 @@ public get_schemas_by_cols_call(FindSchemasByColsRqst rqst, org.apache.thrift.as
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_schemas_by_cols", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_schemas_by_cols_args args = new get_schemas_by_cols_args();
@@ -18074,6 +19207,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public FindSchemasByColsResp getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18084,6 +19218,7 @@ public FindSchemasByColsResp getResult() throws MetaException, org.apache.thrift
       }
     }
 
+    @Override
     public void map_schema_version_to_serde(MapSchemaVersionToSerdeRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       map_schema_version_to_serde_call method_call = new map_schema_version_to_serde_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -18098,6 +19233,7 @@ public map_schema_version_to_serde_call(MapSchemaVersionToSerdeRequest rqst, org
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("map_schema_version_to_serde", org.apache.thrift.protocol.TMessageType.CALL, 0));
         map_schema_version_to_serde_args args = new map_schema_version_to_serde_args();
@@ -18106,16 +19242,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_map_schema_version_to_serde();
         return null;
       }
     }
 
+    @Override
     public void set_schema_version_state(SetSchemaVersionStateRequest rqst, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       set_schema_version_state_call method_call = new set_schema_version_state_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -18130,6 +19269,7 @@ public set_schema_version_state_call(SetSchemaVersionStateRequest rqst, org.apac
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_schema_version_state", org.apache.thrift.protocol.TMessageType.CALL, 0));
         set_schema_version_state_args args = new set_schema_version_state_args();
@@ -18138,16 +19278,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, InvalidOperationException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_set_schema_version_state();
         return null;
       }
     }
 
+    @Override
     public void add_serde(SerDeInfo serde, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_serde_call method_call = new add_serde_call(serde, resultHandler, this, ___protocolFactory, ___transport);
@@ -18162,6 +19305,7 @@ public add_serde_call(SerDeInfo serde, org.apache.thrift.async.AsyncMethodCallba
         this.serde = serde;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_serde", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_serde_args args = new add_serde_args();
@@ -18170,16 +19314,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws AlreadyExistsException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_serde();
         return null;
       }
     }
 
+    @Override
     public void get_serde(GetSerdeRequest rqst, org.apache.thrift.async.AsyncMethodCallback<SerDeInfo> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_serde_call method_call = new get_serde_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -18194,6 +19341,7 @@ public get_serde_call(GetSerdeRequest rqst, org.apache.thrift.async.AsyncMethodC
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_serde", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_serde_args args = new get_serde_args();
@@ -18202,6 +19350,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public SerDeInfo getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18212,6 +19361,7 @@ public SerDeInfo getResult() throws NoSuchObjectException, MetaException, org.ap
       }
     }
 
+    @Override
     public void get_lock_materialization_rebuild(java.lang.String dbName, java.lang.String tableName, long txnId, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_lock_materialization_rebuild_call method_call = new get_lock_materialization_rebuild_call(dbName, tableName, txnId, resultHandler, this, ___protocolFactory, ___transport);
@@ -18230,6 +19380,7 @@ public get_lock_materialization_rebuild_call(java.lang.String dbName, java.lang.
         this.txnId = txnId;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_lock_materialization_rebuild", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_lock_materialization_rebuild_args args = new get_lock_materialization_rebuild_args();
@@ -18240,6 +19391,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public LockResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18250,6 +19402,7 @@ public LockResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void heartbeat_lock_materialization_rebuild(java.lang.String dbName, java.lang.String tableName, long txnId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       heartbeat_lock_materialization_rebuild_call method_call = new heartbeat_lock_materialization_rebuild_call(dbName, tableName, txnId, resultHandler, this, ___protocolFactory, ___transport);
@@ -18268,6 +19421,7 @@ public heartbeat_lock_materialization_rebuild_call(java.lang.String dbName, java
         this.txnId = txnId;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("heartbeat_lock_materialization_rebuild", org.apache.thrift.protocol.TMessageType.CALL, 0));
         heartbeat_lock_materialization_rebuild_args args = new heartbeat_lock_materialization_rebuild_args();
@@ -18278,6 +19432,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18288,6 +19443,7 @@ public java.lang.Boolean getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void get_lock_materialization_rebuild_req(LockMaterializationRebuildRequest req, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_lock_materialization_rebuild_req_call method_call = new get_lock_materialization_rebuild_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -18302,6 +19458,7 @@ public get_lock_materialization_rebuild_req_call(LockMaterializationRebuildReque
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_lock_materialization_rebuild_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_lock_materialization_rebuild_req_args args = new get_lock_materialization_rebuild_req_args();
@@ -18310,6 +19467,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public LockResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18320,6 +19478,7 @@ public LockResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void heartbeat_lock_materialization_rebuild_req(LockMaterializationRebuildRequest req, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       heartbeat_lock_materialization_rebuild_req_call method_call = new heartbeat_lock_materialization_rebuild_req_call(req, resultHandler, this, ___protocolFactory, ___transport);
@@ -18334,6 +19493,7 @@ public heartbeat_lock_materialization_rebuild_req_call(LockMaterializationRebuil
         this.req = req;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("heartbeat_lock_materialization_rebuild_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         heartbeat_lock_materialization_rebuild_req_args args = new heartbeat_lock_materialization_rebuild_req_args();
@@ -18342,6 +19502,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18352,6 +19513,7 @@ public java.lang.Boolean getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void add_runtime_stats(RuntimeStat stat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_runtime_stats_call method_call = new add_runtime_stats_call(stat, resultHandler, this, ___protocolFactory, ___transport);
@@ -18366,6 +19528,7 @@ public add_runtime_stats_call(RuntimeStat stat, org.apache.thrift.async.AsyncMet
         this.stat = stat;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_runtime_stats", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_runtime_stats_args args = new add_runtime_stats_args();
@@ -18374,16 +19537,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_runtime_stats();
         return null;
       }
     }
 
+    @Override
     public void get_runtime_stats(GetRuntimeStatsRequest rqst, org.apache.thrift.async.AsyncMethodCallback<java.util.List<RuntimeStat>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_runtime_stats_call method_call = new get_runtime_stats_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -18398,6 +19564,7 @@ public get_runtime_stats_call(GetRuntimeStatsRequest rqst, org.apache.thrift.asy
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_runtime_stats", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_runtime_stats_args args = new get_runtime_stats_args();
@@ -18406,6 +19573,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<RuntimeStat> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18416,6 +19584,7 @@ public java.util.List<RuntimeStat> getResult() throws MetaException, org.apache.
       }
     }
 
+    @Override
     public void get_partitions_with_specs(GetPartitionsRequest request, org.apache.thrift.async.AsyncMethodCallback<GetPartitionsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_partitions_with_specs_call method_call = new get_partitions_with_specs_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18430,6 +19599,7 @@ public get_partitions_with_specs_call(GetPartitionsRequest request, org.apache.t
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_partitions_with_specs", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_partitions_with_specs_args args = new get_partitions_with_specs_args();
@@ -18438,6 +19608,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetPartitionsResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18448,6 +19619,7 @@ public GetPartitionsResponse getResult() throws MetaException, org.apache.thrift
       }
     }
 
+    @Override
     public void scheduled_query_poll(ScheduledQueryPollRequest request, org.apache.thrift.async.AsyncMethodCallback<ScheduledQueryPollResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       scheduled_query_poll_call method_call = new scheduled_query_poll_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18462,6 +19634,7 @@ public scheduled_query_poll_call(ScheduledQueryPollRequest request, org.apache.t
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scheduled_query_poll", org.apache.thrift.protocol.TMessageType.CALL, 0));
         scheduled_query_poll_args args = new scheduled_query_poll_args();
@@ -18470,6 +19643,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ScheduledQueryPollResponse getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18480,6 +19654,7 @@ public ScheduledQueryPollResponse getResult() throws MetaException, org.apache.t
       }
     }
 
+    @Override
     public void scheduled_query_maintenance(ScheduledQueryMaintenanceRequest request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       scheduled_query_maintenance_call method_call = new scheduled_query_maintenance_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18494,6 +19669,7 @@ public scheduled_query_maintenance_call(ScheduledQueryMaintenanceRequest request
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scheduled_query_maintenance", org.apache.thrift.protocol.TMessageType.CALL, 0));
         scheduled_query_maintenance_args args = new scheduled_query_maintenance_args();
@@ -18502,16 +19678,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, NoSuchObjectException, AlreadyExistsException, InvalidInputException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_scheduled_query_maintenance();
         return null;
       }
     }
 
+    @Override
     public void scheduled_query_progress(ScheduledQueryProgressInfo info, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       scheduled_query_progress_call method_call = new scheduled_query_progress_call(info, resultHandler, this, ___protocolFactory, ___transport);
@@ -18526,6 +19705,7 @@ public scheduled_query_progress_call(ScheduledQueryProgressInfo info, org.apache
         this.info = info;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scheduled_query_progress", org.apache.thrift.protocol.TMessageType.CALL, 0));
         scheduled_query_progress_args args = new scheduled_query_progress_args();
@@ -18534,16 +19714,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, InvalidOperationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_scheduled_query_progress();
         return null;
       }
     }
 
+    @Override
     public void get_scheduled_query(ScheduledQueryKey scheduleKey, org.apache.thrift.async.AsyncMethodCallback<ScheduledQuery> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_scheduled_query_call method_call = new get_scheduled_query_call(scheduleKey, resultHandler, this, ___protocolFactory, ___transport);
@@ -18558,6 +19741,7 @@ public get_scheduled_query_call(ScheduledQueryKey scheduleKey, org.apache.thrift
         this.scheduleKey = scheduleKey;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_scheduled_query", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_scheduled_query_args args = new get_scheduled_query_args();
@@ -18566,6 +19750,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ScheduledQuery getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18576,6 +19761,7 @@ public ScheduledQuery getResult() throws MetaException, NoSuchObjectException, o
       }
     }
 
+    @Override
     public void add_replication_metrics(ReplicationMetricList replicationMetricList, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_replication_metrics_call method_call = new add_replication_metrics_call(replicationMetricList, resultHandler, this, ___protocolFactory, ___transport);
@@ -18590,6 +19776,7 @@ public add_replication_metrics_call(ReplicationMetricList replicationMetricList,
         this.replicationMetricList = replicationMetricList;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_replication_metrics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_replication_metrics_args args = new add_replication_metrics_args();
@@ -18598,16 +19785,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_replication_metrics();
         return null;
       }
     }
 
+    @Override
     public void get_replication_metrics(GetReplicationMetricsRequest rqst, org.apache.thrift.async.AsyncMethodCallback<ReplicationMetricList> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_replication_metrics_call method_call = new get_replication_metrics_call(rqst, resultHandler, this, ___protocolFactory, ___transport);
@@ -18622,6 +19812,7 @@ public get_replication_metrics_call(GetReplicationMetricsRequest rqst, org.apach
         this.rqst = rqst;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_replication_metrics", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_replication_metrics_args args = new get_replication_metrics_args();
@@ -18630,6 +19821,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ReplicationMetricList getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18640,6 +19832,7 @@ public ReplicationMetricList getResult() throws MetaException, org.apache.thrift
       }
     }
 
+    @Override
     public void get_open_txns_req(GetOpenTxnsRequest getOpenTxnsRequest, org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsResponse> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_open_txns_req_call method_call = new get_open_txns_req_call(getOpenTxnsRequest, resultHandler, this, ___protocolFactory, ___transport);
@@ -18654,6 +19847,7 @@ public get_open_txns_req_call(GetOpenTxnsRequest getOpenTxnsRequest, org.apache.
         this.getOpenTxnsRequest = getOpenTxnsRequest;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_open_txns_req", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_open_txns_req_args args = new get_open_txns_req_args();
@@ -18662,6 +19856,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public GetOpenTxnsResponse getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18672,6 +19867,7 @@ public GetOpenTxnsResponse getResult() throws org.apache.thrift.TException {
       }
     }
 
+    @Override
     public void create_stored_procedure(StoredProcedure proc, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       create_stored_procedure_call method_call = new create_stored_procedure_call(proc, resultHandler, this, ___protocolFactory, ___transport);
@@ -18686,6 +19882,7 @@ public create_stored_procedure_call(StoredProcedure proc, org.apache.thrift.asyn
         this.proc = proc;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("create_stored_procedure", org.apache.thrift.protocol.TMessageType.CALL, 0));
         create_stored_procedure_args args = new create_stored_procedure_args();
@@ -18694,16 +19891,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws NoSuchObjectException, MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_create_stored_procedure();
         return null;
       }
     }
 
+    @Override
     public void get_stored_procedure(StoredProcedureRequest request, org.apache.thrift.async.AsyncMethodCallback<StoredProcedure> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_stored_procedure_call method_call = new get_stored_procedure_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18718,6 +19918,7 @@ public get_stored_procedure_call(StoredProcedureRequest request, org.apache.thri
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_stored_procedure", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_stored_procedure_args args = new get_stored_procedure_args();
@@ -18726,6 +19927,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public StoredProcedure getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18736,6 +19938,7 @@ public StoredProcedure getResult() throws MetaException, NoSuchObjectException,
       }
     }
 
+    @Override
     public void drop_stored_procedure(StoredProcedureRequest request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_stored_procedure_call method_call = new drop_stored_procedure_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18750,6 +19953,7 @@ public drop_stored_procedure_call(StoredProcedureRequest request, org.apache.thr
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_stored_procedure", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_stored_procedure_args args = new drop_stored_procedure_args();
@@ -18758,16 +19962,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_stored_procedure();
         return null;
       }
     }
 
+    @Override
     public void get_all_stored_procedures(ListStoredProcedureRequest request, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_stored_procedures_call method_call = new get_all_stored_procedures_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18782,6 +19989,7 @@ public get_all_stored_procedures_call(ListStoredProcedureRequest request, org.ap
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_stored_procedures", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_stored_procedures_args args = new get_all_stored_procedures_args();
@@ -18790,6 +19998,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18800,6 +20009,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void find_package(GetPackageRequest request, org.apache.thrift.async.AsyncMethodCallback<Package> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       find_package_call method_call = new find_package_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18814,6 +20024,7 @@ public find_package_call(GetPackageRequest request, org.apache.thrift.async.Asyn
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("find_package", org.apache.thrift.protocol.TMessageType.CALL, 0));
         find_package_args args = new find_package_args();
@@ -18822,6 +20033,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Package getResult() throws MetaException, NoSuchObjectException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18832,6 +20044,7 @@ public Package getResult() throws MetaException, NoSuchObjectException, org.apac
       }
     }
 
+    @Override
     public void add_package(AddPackageRequest request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       add_package_call method_call = new add_package_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18846,6 +20059,7 @@ public add_package_call(AddPackageRequest request, org.apache.thrift.async.Async
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add_package", org.apache.thrift.protocol.TMessageType.CALL, 0));
         add_package_args args = new add_package_args();
@@ -18854,16 +20068,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_add_package();
         return null;
       }
     }
 
+    @Override
     public void get_all_packages(ListPackageRequest request, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_packages_call method_call = new get_all_packages_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18878,6 +20095,7 @@ public get_all_packages_call(ListPackageRequest request, org.apache.thrift.async
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_packages", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_packages_args args = new get_all_packages_args();
@@ -18886,6 +20104,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<java.lang.String> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18896,6 +20115,7 @@ public java.util.List<java.lang.String> getResult() throws MetaException, org.ap
       }
     }
 
+    @Override
     public void drop_package(DropPackageRequest request, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       drop_package_call method_call = new drop_package_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18910,6 +20130,7 @@ public drop_package_call(DropPackageRequest request, org.apache.thrift.async.Asy
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("drop_package", org.apache.thrift.protocol.TMessageType.CALL, 0));
         drop_package_args args = new drop_package_args();
@@ -18918,16 +20139,19 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public Void getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_drop_package();
         return null;
       }
     }
 
+    @Override
     public void get_all_write_event_info(GetAllWriteEventInfoRequest request, org.apache.thrift.async.AsyncMethodCallback<java.util.List<WriteEventInfo>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_all_write_event_info_call method_call = new get_all_write_event_info_call(request, resultHandler, this, ___protocolFactory, ___transport);
@@ -18942,6 +20166,7 @@ public get_all_write_event_info_call(GetAllWriteEventInfoRequest request, org.ap
         this.request = request;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_all_write_event_info", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_all_write_event_info_args args = new get_all_write_event_info_args();
@@ -18950,6 +20175,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public java.util.List<WriteEventInfo> getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18960,6 +20186,7 @@ public java.util.List<WriteEventInfo> getResult() throws MetaException, org.apac
       }
     }
 
+    @Override
     public void get_replayed_txns_for_policy(java.lang.String policyName, org.apache.thrift.async.AsyncMethodCallback<ReplayedTxnsForPolicyResult> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       get_replayed_txns_for_policy_call method_call = new get_replayed_txns_for_policy_call(policyName, resultHandler, this, ___protocolFactory, ___transport);
@@ -18974,6 +20201,7 @@ public get_replayed_txns_for_policy_call(java.lang.String policyName, org.apache
         this.policyName = policyName;
       }
 
+      @Override
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_replayed_txns_for_policy", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_replayed_txns_for_policy_args args = new get_replayed_txns_for_policy_args();
@@ -18982,6 +20210,7 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa
         prot.writeMessageEnd();
       }
 
+      @Override
       public ReplayedTxnsForPolicyResult getResult() throws MetaException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
@@ -18997,14 +20226,14 @@ public ReplayedTxnsForPolicyResult getResult() throws MetaException, org.apache.
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class Processor<I extends Iface> extends com.facebook.fb303.FacebookService.Processor<I> implements org.apache.thrift.TProcessor {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
       processMap.put("abort_Compactions", new abort_Compactions());
       processMap.put("getMetaConf", new getMetaConf());
       processMap.put("setMetaConf", new setMetaConf());
@@ -19295,16 +20524,18 @@ protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.P
       return processMap;
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abort_Compactions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abort_Compactions_args, abort_Compactions_result> {
       public abort_Compactions() {
         super("abort_Compactions");
       }
 
+      @Override
       public abort_Compactions_args getEmptyArgsInstance() {
         return new abort_Compactions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19313,23 +20544,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public abort_Compactions_result getEmptyResultInstance() {
+        return new abort_Compactions_result();
+      }
+
+      @Override
       public abort_Compactions_result getResult(I iface, abort_Compactions_args args) throws org.apache.thrift.TException {
-        abort_Compactions_result result = new abort_Compactions_result();
+        abort_Compactions_result result = getEmptyResultInstance();
         result.success = iface.abort_Compactions(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getMetaConf_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getMetaConf_args, getMetaConf_result> {
       public getMetaConf() {
         super("getMetaConf");
       }
 
+      @Override
       public getMetaConf_args getEmptyArgsInstance() {
         return new getMetaConf_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19338,8 +20577,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public getMetaConf_result getEmptyResultInstance() {
+        return new getMetaConf_result();
+      }
+
+      @Override
       public getMetaConf_result getResult(I iface, getMetaConf_args args) throws org.apache.thrift.TException {
-        getMetaConf_result result = new getMetaConf_result();
+        getMetaConf_result result = getEmptyResultInstance();
         try {
           result.success = iface.getMetaConf(args.key);
         } catch (MetaException o1) {
@@ -19349,16 +20594,18 @@ public getMetaConf_result getResult(I iface, getMetaConf_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class setMetaConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setMetaConf_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class setMetaConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setMetaConf_args, setMetaConf_result> {
       public setMetaConf() {
         super("setMetaConf");
       }
 
+      @Override
       public setMetaConf_args getEmptyArgsInstance() {
         return new setMetaConf_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19367,8 +20614,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public setMetaConf_result getEmptyResultInstance() {
+        return new setMetaConf_result();
+      }
+
+      @Override
       public setMetaConf_result getResult(I iface, setMetaConf_args args) throws org.apache.thrift.TException {
-        setMetaConf_result result = new setMetaConf_result();
+        setMetaConf_result result = getEmptyResultInstance();
         try {
           iface.setMetaConf(args.key, args.value);
         } catch (MetaException o1) {
@@ -19378,16 +20631,18 @@ public setMetaConf_result getResult(I iface, setMetaConf_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_catalog_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_catalog_args, create_catalog_result> {
       public create_catalog() {
         super("create_catalog");
       }
 
+      @Override
       public create_catalog_args getEmptyArgsInstance() {
         return new create_catalog_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19396,8 +20651,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_catalog_result getEmptyResultInstance() {
+        return new create_catalog_result();
+      }
+
+      @Override
       public create_catalog_result getResult(I iface, create_catalog_args args) throws org.apache.thrift.TException {
-        create_catalog_result result = new create_catalog_result();
+        create_catalog_result result = getEmptyResultInstance();
         try {
           iface.create_catalog(args.catalog);
         } catch (AlreadyExistsException o1) {
@@ -19411,16 +20672,18 @@ public create_catalog_result getResult(I iface, create_catalog_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_catalog_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_catalog_args, alter_catalog_result> {
       public alter_catalog() {
         super("alter_catalog");
       }
 
+      @Override
       public alter_catalog_args getEmptyArgsInstance() {
         return new alter_catalog_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19429,8 +20692,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_catalog_result getEmptyResultInstance() {
+        return new alter_catalog_result();
+      }
+
+      @Override
       public alter_catalog_result getResult(I iface, alter_catalog_args args) throws org.apache.thrift.TException {
-        alter_catalog_result result = new alter_catalog_result();
+        alter_catalog_result result = getEmptyResultInstance();
         try {
           iface.alter_catalog(args.rqst);
         } catch (NoSuchObjectException o1) {
@@ -19444,16 +20713,18 @@ public alter_catalog_result getResult(I iface, alter_catalog_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_catalog_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_catalog_args, get_catalog_result> {
       public get_catalog() {
         super("get_catalog");
       }
 
+      @Override
       public get_catalog_args getEmptyArgsInstance() {
         return new get_catalog_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19462,8 +20733,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_catalog_result getEmptyResultInstance() {
+        return new get_catalog_result();
+      }
+
+      @Override
       public get_catalog_result getResult(I iface, get_catalog_args args) throws org.apache.thrift.TException {
-        get_catalog_result result = new get_catalog_result();
+        get_catalog_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_catalog(args.catName);
         } catch (NoSuchObjectException o1) {
@@ -19475,16 +20752,18 @@ public get_catalog_result getResult(I iface, get_catalog_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalogs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_catalogs_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalogs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_catalogs_args, get_catalogs_result> {
       public get_catalogs() {
         super("get_catalogs");
       }
 
+      @Override
       public get_catalogs_args getEmptyArgsInstance() {
         return new get_catalogs_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19493,8 +20772,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_catalogs_result getEmptyResultInstance() {
+        return new get_catalogs_result();
+      }
+
+      @Override
       public get_catalogs_result getResult(I iface, get_catalogs_args args) throws org.apache.thrift.TException {
-        get_catalogs_result result = new get_catalogs_result();
+        get_catalogs_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_catalogs();
         } catch (MetaException o1) {
@@ -19504,16 +20789,18 @@ public get_catalogs_result getResult(I iface, get_catalogs_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_catalog_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_catalog<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_catalog_args, drop_catalog_result> {
       public drop_catalog() {
         super("drop_catalog");
       }
 
+      @Override
       public drop_catalog_args getEmptyArgsInstance() {
         return new drop_catalog_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19522,8 +20809,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_catalog_result getEmptyResultInstance() {
+        return new drop_catalog_result();
+      }
+
+      @Override
       public drop_catalog_result getResult(I iface, drop_catalog_args args) throws org.apache.thrift.TException {
-        drop_catalog_result result = new drop_catalog_result();
+        drop_catalog_result result = getEmptyResultInstance();
         try {
           iface.drop_catalog(args.catName);
         } catch (NoSuchObjectException o1) {
@@ -19537,16 +20830,18 @@ public drop_catalog_result getResult(I iface, drop_catalog_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_database_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_database_args, create_database_result> {
       public create_database() {
         super("create_database");
       }
 
+      @Override
       public create_database_args getEmptyArgsInstance() {
         return new create_database_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19555,8 +20850,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_database_result getEmptyResultInstance() {
+        return new create_database_result();
+      }
+
+      @Override
       public create_database_result getResult(I iface, create_database_args args) throws org.apache.thrift.TException {
-        create_database_result result = new create_database_result();
+        create_database_result result = getEmptyResultInstance();
         try {
           iface.create_database(args.database);
         } catch (AlreadyExistsException o1) {
@@ -19570,16 +20871,18 @@ public create_database_result getResult(I iface, create_database_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_database_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_database_req_args, create_database_req_result> {
       public create_database_req() {
         super("create_database_req");
       }
 
+      @Override
       public create_database_req_args getEmptyArgsInstance() {
         return new create_database_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19588,8 +20891,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_database_req_result getEmptyResultInstance() {
+        return new create_database_req_result();
+      }
+
+      @Override
       public create_database_req_result getResult(I iface, create_database_req_args args) throws org.apache.thrift.TException {
-        create_database_req_result result = new create_database_req_result();
+        create_database_req_result result = getEmptyResultInstance();
         try {
           iface.create_database_req(args.createDatabaseRequest);
         } catch (AlreadyExistsException o1) {
@@ -19603,16 +20912,18 @@ public create_database_req_result getResult(I iface, create_database_req_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_database_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_database_args, get_database_result> {
       public get_database() {
         super("get_database");
       }
 
+      @Override
       public get_database_args getEmptyArgsInstance() {
         return new get_database_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19621,8 +20932,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_database_result getEmptyResultInstance() {
+        return new get_database_result();
+      }
+
+      @Override
       public get_database_result getResult(I iface, get_database_args args) throws org.apache.thrift.TException {
-        get_database_result result = new get_database_result();
+        get_database_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_database(args.name);
         } catch (NoSuchObjectException o1) {
@@ -19634,16 +20951,18 @@ public get_database_result getResult(I iface, get_database_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_database_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_database_req_args, get_database_req_result> {
       public get_database_req() {
         super("get_database_req");
       }
 
+      @Override
       public get_database_req_args getEmptyArgsInstance() {
         return new get_database_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19652,8 +20971,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_database_req_result getEmptyResultInstance() {
+        return new get_database_req_result();
+      }
+
+      @Override
       public get_database_req_result getResult(I iface, get_database_req_args args) throws org.apache.thrift.TException {
-        get_database_req_result result = new get_database_req_result();
+        get_database_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_database_req(args.request);
         } catch (NoSuchObjectException o1) {
@@ -19665,16 +20990,18 @@ public get_database_req_result getResult(I iface, get_database_req_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_database_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_database_args, drop_database_result> {
       public drop_database() {
         super("drop_database");
       }
 
+      @Override
       public drop_database_args getEmptyArgsInstance() {
         return new drop_database_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19683,8 +21010,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_database_result getEmptyResultInstance() {
+        return new drop_database_result();
+      }
+
+      @Override
       public drop_database_result getResult(I iface, drop_database_args args) throws org.apache.thrift.TException {
-        drop_database_result result = new drop_database_result();
+        drop_database_result result = getEmptyResultInstance();
         try {
           iface.drop_database(args.name, args.deleteData, args.cascade);
         } catch (NoSuchObjectException o1) {
@@ -19698,16 +21031,18 @@ public drop_database_result getResult(I iface, drop_database_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_database_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_database_req_args, drop_database_req_result> {
       public drop_database_req() {
         super("drop_database_req");
       }
 
+      @Override
       public drop_database_req_args getEmptyArgsInstance() {
         return new drop_database_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19716,8 +21051,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_database_req_result getEmptyResultInstance() {
+        return new drop_database_req_result();
+      }
+
+      @Override
       public drop_database_req_result getResult(I iface, drop_database_req_args args) throws org.apache.thrift.TException {
-        drop_database_req_result result = new drop_database_req_result();
+        drop_database_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_database_req(args.req);
         } catch (NoSuchObjectException o1) {
@@ -19731,16 +21072,18 @@ public drop_database_req_result getResult(I iface, drop_database_req_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_databases_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_databases_args, get_databases_result> {
       public get_databases() {
         super("get_databases");
       }
 
+      @Override
       public get_databases_args getEmptyArgsInstance() {
         return new get_databases_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19749,8 +21092,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_databases_result getEmptyResultInstance() {
+        return new get_databases_result();
+      }
+
+      @Override
       public get_databases_result getResult(I iface, get_databases_args args) throws org.apache.thrift.TException {
-        get_databases_result result = new get_databases_result();
+        get_databases_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_databases(args.pattern);
         } catch (MetaException o1) {
@@ -19760,16 +21109,18 @@ public get_databases_result getResult(I iface, get_databases_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_databases<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_databases_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_databases<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_databases_args, get_all_databases_result> {
       public get_all_databases() {
         super("get_all_databases");
       }
 
+      @Override
       public get_all_databases_args getEmptyArgsInstance() {
         return new get_all_databases_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19778,8 +21129,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_databases_result getEmptyResultInstance() {
+        return new get_all_databases_result();
+      }
+
+      @Override
       public get_all_databases_result getResult(I iface, get_all_databases_args args) throws org.apache.thrift.TException {
-        get_all_databases_result result = new get_all_databases_result();
+        get_all_databases_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_databases();
         } catch (MetaException o1) {
@@ -19789,16 +21146,18 @@ public get_all_databases_result getResult(I iface, get_all_databases_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_databases_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_databases_req_args, get_databases_req_result> {
       public get_databases_req() {
         super("get_databases_req");
       }
 
+      @Override
       public get_databases_req_args getEmptyArgsInstance() {
         return new get_databases_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19807,8 +21166,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_databases_req_result getEmptyResultInstance() {
+        return new get_databases_req_result();
+      }
+
+      @Override
       public get_databases_req_result getResult(I iface, get_databases_req_args args) throws org.apache.thrift.TException {
-        get_databases_req_result result = new get_databases_req_result();
+        get_databases_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_databases_req(args.request);
         } catch (MetaException o1) {
@@ -19818,16 +21183,18 @@ public get_databases_req_result getResult(I iface, get_databases_req_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_database_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_database_args, alter_database_result> {
       public alter_database() {
         super("alter_database");
       }
 
+      @Override
       public alter_database_args getEmptyArgsInstance() {
         return new alter_database_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19836,8 +21203,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_database_result getEmptyResultInstance() {
+        return new alter_database_result();
+      }
+
+      @Override
       public alter_database_result getResult(I iface, alter_database_args args) throws org.apache.thrift.TException {
-        alter_database_result result = new alter_database_result();
+        alter_database_result result = getEmptyResultInstance();
         try {
           iface.alter_database(args.dbname, args.db);
         } catch (MetaException o1) {
@@ -19849,16 +21222,18 @@ public alter_database_result getResult(I iface, alter_database_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_database_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_database_req_args, alter_database_req_result> {
       public alter_database_req() {
         super("alter_database_req");
       }
 
+      @Override
       public alter_database_req_args getEmptyArgsInstance() {
         return new alter_database_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19867,8 +21242,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_database_req_result getEmptyResultInstance() {
+        return new alter_database_req_result();
+      }
+
+      @Override
       public alter_database_req_result getResult(I iface, alter_database_req_args args) throws org.apache.thrift.TException {
-        alter_database_req_result result = new alter_database_req_result();
+        alter_database_req_result result = getEmptyResultInstance();
         try {
           iface.alter_database_req(args.alterDbReq);
         } catch (MetaException o1) {
@@ -19880,16 +21261,18 @@ public alter_database_req_result getResult(I iface, alter_database_req_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_dataconnector_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_dataconnector_req_args, create_dataconnector_req_result> {
       public create_dataconnector_req() {
         super("create_dataconnector_req");
       }
 
+      @Override
       public create_dataconnector_req_args getEmptyArgsInstance() {
         return new create_dataconnector_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19898,8 +21281,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_dataconnector_req_result getEmptyResultInstance() {
+        return new create_dataconnector_req_result();
+      }
+
+      @Override
       public create_dataconnector_req_result getResult(I iface, create_dataconnector_req_args args) throws org.apache.thrift.TException {
-        create_dataconnector_req_result result = new create_dataconnector_req_result();
+        create_dataconnector_req_result result = getEmptyResultInstance();
         try {
           iface.create_dataconnector_req(args.connectorReq);
         } catch (AlreadyExistsException o1) {
@@ -19913,16 +21302,18 @@ public create_dataconnector_req_result getResult(I iface, create_dataconnector_r
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_dataconnector_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_dataconnector_req_args, get_dataconnector_req_result> {
       public get_dataconnector_req() {
         super("get_dataconnector_req");
       }
 
+      @Override
       public get_dataconnector_req_args getEmptyArgsInstance() {
         return new get_dataconnector_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19931,8 +21322,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_dataconnector_req_result getEmptyResultInstance() {
+        return new get_dataconnector_req_result();
+      }
+
+      @Override
       public get_dataconnector_req_result getResult(I iface, get_dataconnector_req_args args) throws org.apache.thrift.TException {
-        get_dataconnector_req_result result = new get_dataconnector_req_result();
+        get_dataconnector_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_dataconnector_req(args.request);
         } catch (NoSuchObjectException o1) {
@@ -19944,16 +21341,18 @@ public get_dataconnector_req_result getResult(I iface, get_dataconnector_req_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_dataconnector_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_dataconnector_req_args, drop_dataconnector_req_result> {
       public drop_dataconnector_req() {
         super("drop_dataconnector_req");
       }
 
+      @Override
       public drop_dataconnector_req_args getEmptyArgsInstance() {
         return new drop_dataconnector_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19962,8 +21361,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_dataconnector_req_result getEmptyResultInstance() {
+        return new drop_dataconnector_req_result();
+      }
+
+      @Override
       public drop_dataconnector_req_result getResult(I iface, drop_dataconnector_req_args args) throws org.apache.thrift.TException {
-        drop_dataconnector_req_result result = new drop_dataconnector_req_result();
+        drop_dataconnector_req_result result = getEmptyResultInstance();
         try {
           iface.drop_dataconnector_req(args.dropDcReq);
         } catch (NoSuchObjectException o1) {
@@ -19977,16 +21382,18 @@ public drop_dataconnector_req_result getResult(I iface, drop_dataconnector_req_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnectors<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_dataconnectors_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnectors<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_dataconnectors_args, get_dataconnectors_result> {
       public get_dataconnectors() {
         super("get_dataconnectors");
       }
 
+      @Override
       public get_dataconnectors_args getEmptyArgsInstance() {
         return new get_dataconnectors_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -19995,8 +21402,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_dataconnectors_result getEmptyResultInstance() {
+        return new get_dataconnectors_result();
+      }
+
+      @Override
       public get_dataconnectors_result getResult(I iface, get_dataconnectors_args args) throws org.apache.thrift.TException {
-        get_dataconnectors_result result = new get_dataconnectors_result();
+        get_dataconnectors_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_dataconnectors();
         } catch (MetaException o1) {
@@ -20006,16 +21419,18 @@ public get_dataconnectors_result getResult(I iface, get_dataconnectors_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_dataconnector_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_dataconnector_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_dataconnector_req_args, alter_dataconnector_req_result> {
       public alter_dataconnector_req() {
         super("alter_dataconnector_req");
       }
 
+      @Override
       public alter_dataconnector_req_args getEmptyArgsInstance() {
         return new alter_dataconnector_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20024,8 +21439,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_dataconnector_req_result getEmptyResultInstance() {
+        return new alter_dataconnector_req_result();
+      }
+
+      @Override
       public alter_dataconnector_req_result getResult(I iface, alter_dataconnector_req_args args) throws org.apache.thrift.TException {
-        alter_dataconnector_req_result result = new alter_dataconnector_req_result();
+        alter_dataconnector_req_result result = getEmptyResultInstance();
         try {
           iface.alter_dataconnector_req(args.alterReq);
         } catch (MetaException o1) {
@@ -20037,16 +21458,18 @@ public alter_dataconnector_req_result getResult(I iface, alter_dataconnector_req
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_type_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_type_args, get_type_result> {
       public get_type() {
         super("get_type");
       }
 
+      @Override
       public get_type_args getEmptyArgsInstance() {
         return new get_type_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20055,8 +21478,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_type_result getEmptyResultInstance() {
+        return new get_type_result();
+      }
+
+      @Override
       public get_type_result getResult(I iface, get_type_args args) throws org.apache.thrift.TException {
-        get_type_result result = new get_type_result();
+        get_type_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_type(args.name);
         } catch (MetaException o1) {
@@ -20068,16 +21497,18 @@ public get_type_result getResult(I iface, get_type_args args) throws org.apache.
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_type_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_type_args, create_type_result> {
       public create_type() {
         super("create_type");
       }
 
+      @Override
       public create_type_args getEmptyArgsInstance() {
         return new create_type_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20086,8 +21517,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_type_result getEmptyResultInstance() {
+        return new create_type_result();
+      }
+
+      @Override
       public create_type_result getResult(I iface, create_type_args args) throws org.apache.thrift.TException {
-        create_type_result result = new create_type_result();
+        create_type_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_type(args.type);
           result.setSuccessIsSet(true);
@@ -20102,16 +21539,18 @@ public create_type_result getResult(I iface, create_type_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_type_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_type_args, drop_type_result> {
       public drop_type() {
         super("drop_type");
       }
 
+      @Override
       public drop_type_args getEmptyArgsInstance() {
         return new drop_type_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20120,8 +21559,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_type_result getEmptyResultInstance() {
+        return new drop_type_result();
+      }
+
+      @Override
       public drop_type_result getResult(I iface, drop_type_args args) throws org.apache.thrift.TException {
-        drop_type_result result = new drop_type_result();
+        drop_type_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_type(args.type);
           result.setSuccessIsSet(true);
@@ -20134,16 +21579,18 @@ public drop_type_result getResult(I iface, drop_type_args args) throws org.apach
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_all<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_type_all_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_all<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_type_all_args, get_type_all_result> {
       public get_type_all() {
         super("get_type_all");
       }
 
+      @Override
       public get_type_all_args getEmptyArgsInstance() {
         return new get_type_all_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20152,8 +21599,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_type_all_result getEmptyResultInstance() {
+        return new get_type_all_result();
+      }
+
+      @Override
       public get_type_all_result getResult(I iface, get_type_all_args args) throws org.apache.thrift.TException {
-        get_type_all_result result = new get_type_all_result();
+        get_type_all_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_type_all(args.name);
         } catch (MetaException o2) {
@@ -20163,16 +21616,18 @@ public get_type_all_result getResult(I iface, get_type_all_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_fields_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_fields_args, get_fields_result> {
       public get_fields() {
         super("get_fields");
       }
 
+      @Override
       public get_fields_args getEmptyArgsInstance() {
         return new get_fields_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20181,8 +21636,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_fields_result getEmptyResultInstance() {
+        return new get_fields_result();
+      }
+
+      @Override
       public get_fields_result getResult(I iface, get_fields_args args) throws org.apache.thrift.TException {
-        get_fields_result result = new get_fields_result();
+        get_fields_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_fields(args.db_name, args.table_name);
         } catch (MetaException o1) {
@@ -20196,16 +21657,18 @@ public get_fields_result getResult(I iface, get_fields_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_fields_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_fields_with_environment_context_args, get_fields_with_environment_context_result> {
       public get_fields_with_environment_context() {
         super("get_fields_with_environment_context");
       }
 
+      @Override
       public get_fields_with_environment_context_args getEmptyArgsInstance() {
         return new get_fields_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20214,8 +21677,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_fields_with_environment_context_result getEmptyResultInstance() {
+        return new get_fields_with_environment_context_result();
+      }
+
+      @Override
       public get_fields_with_environment_context_result getResult(I iface, get_fields_with_environment_context_args args) throws org.apache.thrift.TException {
-        get_fields_with_environment_context_result result = new get_fields_with_environment_context_result();
+        get_fields_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_fields_with_environment_context(args.db_name, args.table_name, args.environment_context);
         } catch (MetaException o1) {
@@ -20229,16 +21698,18 @@ public get_fields_with_environment_context_result getResult(I iface, get_fields_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_fields_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_fields_req_args, get_fields_req_result> {
       public get_fields_req() {
         super("get_fields_req");
       }
 
+      @Override
       public get_fields_req_args getEmptyArgsInstance() {
         return new get_fields_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20247,8 +21718,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_fields_req_result getEmptyResultInstance() {
+        return new get_fields_req_result();
+      }
+
+      @Override
       public get_fields_req_result getResult(I iface, get_fields_req_args args) throws org.apache.thrift.TException {
-        get_fields_req_result result = new get_fields_req_result();
+        get_fields_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_fields_req(args.req);
         } catch (MetaException o1) {
@@ -20262,16 +21739,18 @@ public get_fields_req_result getResult(I iface, get_fields_req_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_args, get_schema_result> {
       public get_schema() {
         super("get_schema");
       }
 
+      @Override
       public get_schema_args getEmptyArgsInstance() {
         return new get_schema_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20280,8 +21759,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schema_result getEmptyResultInstance() {
+        return new get_schema_result();
+      }
+
+      @Override
       public get_schema_result getResult(I iface, get_schema_args args) throws org.apache.thrift.TException {
-        get_schema_result result = new get_schema_result();
+        get_schema_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schema(args.db_name, args.table_name);
         } catch (MetaException o1) {
@@ -20295,16 +21780,18 @@ public get_schema_result getResult(I iface, get_schema_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_with_environment_context_args, get_schema_with_environment_context_result> {
       public get_schema_with_environment_context() {
         super("get_schema_with_environment_context");
       }
 
+      @Override
       public get_schema_with_environment_context_args getEmptyArgsInstance() {
         return new get_schema_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20313,8 +21800,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schema_with_environment_context_result getEmptyResultInstance() {
+        return new get_schema_with_environment_context_result();
+      }
+
+      @Override
       public get_schema_with_environment_context_result getResult(I iface, get_schema_with_environment_context_args args) throws org.apache.thrift.TException {
-        get_schema_with_environment_context_result result = new get_schema_with_environment_context_result();
+        get_schema_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schema_with_environment_context(args.db_name, args.table_name, args.environment_context);
         } catch (MetaException o1) {
@@ -20328,16 +21821,18 @@ public get_schema_with_environment_context_result getResult(I iface, get_schema_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_req_args, get_schema_req_result> {
       public get_schema_req() {
         super("get_schema_req");
       }
 
+      @Override
       public get_schema_req_args getEmptyArgsInstance() {
         return new get_schema_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20346,8 +21841,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schema_req_result getEmptyResultInstance() {
+        return new get_schema_req_result();
+      }
+
+      @Override
       public get_schema_req_result getResult(I iface, get_schema_req_args args) throws org.apache.thrift.TException {
-        get_schema_req_result result = new get_schema_req_result();
+        get_schema_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schema_req(args.req);
         } catch (MetaException o1) {
@@ -20361,16 +21862,18 @@ public get_schema_req_result getResult(I iface, get_schema_req_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_args, create_table_result> {
       public create_table() {
         super("create_table");
       }
 
+      @Override
       public create_table_args getEmptyArgsInstance() {
         return new create_table_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20379,8 +21882,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_table_result getEmptyResultInstance() {
+        return new create_table_result();
+      }
+
+      @Override
       public create_table_result getResult(I iface, create_table_args args) throws org.apache.thrift.TException {
-        create_table_result result = new create_table_result();
+        create_table_result result = getEmptyResultInstance();
         try {
           iface.create_table(args.tbl);
         } catch (AlreadyExistsException o1) {
@@ -20396,16 +21905,18 @@ public create_table_result getResult(I iface, create_table_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_with_environment_context_args, create_table_with_environment_context_result> {
       public create_table_with_environment_context() {
         super("create_table_with_environment_context");
       }
 
+      @Override
       public create_table_with_environment_context_args getEmptyArgsInstance() {
         return new create_table_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20414,8 +21925,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_table_with_environment_context_result getEmptyResultInstance() {
+        return new create_table_with_environment_context_result();
+      }
+
+      @Override
       public create_table_with_environment_context_result getResult(I iface, create_table_with_environment_context_args args) throws org.apache.thrift.TException {
-        create_table_with_environment_context_result result = new create_table_with_environment_context_result();
+        create_table_with_environment_context_result result = getEmptyResultInstance();
         try {
           iface.create_table_with_environment_context(args.tbl, args.environment_context);
         } catch (AlreadyExistsException o1) {
@@ -20431,16 +21948,18 @@ public create_table_with_environment_context_result getResult(I iface, create_ta
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_with_constraints_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_with_constraints_args, create_table_with_constraints_result> {
       public create_table_with_constraints() {
         super("create_table_with_constraints");
       }
 
+      @Override
       public create_table_with_constraints_args getEmptyArgsInstance() {
         return new create_table_with_constraints_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20449,8 +21968,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_table_with_constraints_result getEmptyResultInstance() {
+        return new create_table_with_constraints_result();
+      }
+
+      @Override
       public create_table_with_constraints_result getResult(I iface, create_table_with_constraints_args args) throws org.apache.thrift.TException {
-        create_table_with_constraints_result result = new create_table_with_constraints_result();
+        create_table_with_constraints_result result = getEmptyResultInstance();
         try {
           iface.create_table_with_constraints(args.tbl, args.primaryKeys, args.foreignKeys, args.uniqueConstraints, args.notNullConstraints, args.defaultConstraints, args.checkConstraints);
         } catch (AlreadyExistsException o1) {
@@ -20466,16 +21991,18 @@ public create_table_with_constraints_result getResult(I iface, create_table_with
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_table_req_args, create_table_req_result> {
       public create_table_req() {
         super("create_table_req");
       }
 
+      @Override
       public create_table_req_args getEmptyArgsInstance() {
         return new create_table_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20484,8 +22011,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_table_req_result getEmptyResultInstance() {
+        return new create_table_req_result();
+      }
+
+      @Override
       public create_table_req_result getResult(I iface, create_table_req_args args) throws org.apache.thrift.TException {
-        create_table_req_result result = new create_table_req_result();
+        create_table_req_result result = getEmptyResultInstance();
         try {
           iface.create_table_req(args.request);
         } catch (AlreadyExistsException o1) {
@@ -20501,16 +22034,18 @@ public create_table_req_result getResult(I iface, create_table_req_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_constraint_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_constraint_args, drop_constraint_result> {
       public drop_constraint() {
         super("drop_constraint");
       }
 
+      @Override
       public drop_constraint_args getEmptyArgsInstance() {
         return new drop_constraint_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20519,8 +22054,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_constraint_result getEmptyResultInstance() {
+        return new drop_constraint_result();
+      }
+
+      @Override
       public drop_constraint_result getResult(I iface, drop_constraint_args args) throws org.apache.thrift.TException {
-        drop_constraint_result result = new drop_constraint_result();
+        drop_constraint_result result = getEmptyResultInstance();
         try {
           iface.drop_constraint(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20532,16 +22073,18 @@ public drop_constraint_result getResult(I iface, drop_constraint_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_primary_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_primary_key_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_primary_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_primary_key_args, add_primary_key_result> {
       public add_primary_key() {
         super("add_primary_key");
       }
 
+      @Override
       public add_primary_key_args getEmptyArgsInstance() {
         return new add_primary_key_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20550,8 +22093,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_primary_key_result getEmptyResultInstance() {
+        return new add_primary_key_result();
+      }
+
+      @Override
       public add_primary_key_result getResult(I iface, add_primary_key_args args) throws org.apache.thrift.TException {
-        add_primary_key_result result = new add_primary_key_result();
+        add_primary_key_result result = getEmptyResultInstance();
         try {
           iface.add_primary_key(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20563,16 +22112,18 @@ public add_primary_key_result getResult(I iface, add_primary_key_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_foreign_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_foreign_key_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_foreign_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_foreign_key_args, add_foreign_key_result> {
       public add_foreign_key() {
         super("add_foreign_key");
       }
 
+      @Override
       public add_foreign_key_args getEmptyArgsInstance() {
         return new add_foreign_key_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20581,8 +22132,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_foreign_key_result getEmptyResultInstance() {
+        return new add_foreign_key_result();
+      }
+
+      @Override
       public add_foreign_key_result getResult(I iface, add_foreign_key_args args) throws org.apache.thrift.TException {
-        add_foreign_key_result result = new add_foreign_key_result();
+        add_foreign_key_result result = getEmptyResultInstance();
         try {
           iface.add_foreign_key(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20594,16 +22151,18 @@ public add_foreign_key_result getResult(I iface, add_foreign_key_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_unique_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_unique_constraint_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_unique_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_unique_constraint_args, add_unique_constraint_result> {
       public add_unique_constraint() {
         super("add_unique_constraint");
       }
 
+      @Override
       public add_unique_constraint_args getEmptyArgsInstance() {
         return new add_unique_constraint_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20612,8 +22171,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_unique_constraint_result getEmptyResultInstance() {
+        return new add_unique_constraint_result();
+      }
+
+      @Override
       public add_unique_constraint_result getResult(I iface, add_unique_constraint_args args) throws org.apache.thrift.TException {
-        add_unique_constraint_result result = new add_unique_constraint_result();
+        add_unique_constraint_result result = getEmptyResultInstance();
         try {
           iface.add_unique_constraint(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20625,16 +22190,18 @@ public add_unique_constraint_result getResult(I iface, add_unique_constraint_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_not_null_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_not_null_constraint_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_not_null_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_not_null_constraint_args, add_not_null_constraint_result> {
       public add_not_null_constraint() {
         super("add_not_null_constraint");
       }
 
+      @Override
       public add_not_null_constraint_args getEmptyArgsInstance() {
         return new add_not_null_constraint_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20643,8 +22210,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_not_null_constraint_result getEmptyResultInstance() {
+        return new add_not_null_constraint_result();
+      }
+
+      @Override
       public add_not_null_constraint_result getResult(I iface, add_not_null_constraint_args args) throws org.apache.thrift.TException {
-        add_not_null_constraint_result result = new add_not_null_constraint_result();
+        add_not_null_constraint_result result = getEmptyResultInstance();
         try {
           iface.add_not_null_constraint(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20656,16 +22229,18 @@ public add_not_null_constraint_result getResult(I iface, add_not_null_constraint
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_default_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_default_constraint_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_default_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_default_constraint_args, add_default_constraint_result> {
       public add_default_constraint() {
         super("add_default_constraint");
       }
 
+      @Override
       public add_default_constraint_args getEmptyArgsInstance() {
         return new add_default_constraint_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20674,8 +22249,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_default_constraint_result getEmptyResultInstance() {
+        return new add_default_constraint_result();
+      }
+
+      @Override
       public add_default_constraint_result getResult(I iface, add_default_constraint_args args) throws org.apache.thrift.TException {
-        add_default_constraint_result result = new add_default_constraint_result();
+        add_default_constraint_result result = getEmptyResultInstance();
         try {
           iface.add_default_constraint(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20687,16 +22268,18 @@ public add_default_constraint_result getResult(I iface, add_default_constraint_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_check_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_check_constraint_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_check_constraint<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_check_constraint_args, add_check_constraint_result> {
       public add_check_constraint() {
         super("add_check_constraint");
       }
 
+      @Override
       public add_check_constraint_args getEmptyArgsInstance() {
         return new add_check_constraint_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20705,8 +22288,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_check_constraint_result getEmptyResultInstance() {
+        return new add_check_constraint_result();
+      }
+
+      @Override
       public add_check_constraint_result getResult(I iface, add_check_constraint_args args) throws org.apache.thrift.TException {
-        add_check_constraint_result result = new add_check_constraint_result();
+        add_check_constraint_result result = getEmptyResultInstance();
         try {
           iface.add_check_constraint(args.req);
         } catch (NoSuchObjectException o1) {
@@ -20718,16 +22307,18 @@ public add_check_constraint_result getResult(I iface, add_check_constraint_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class translate_table_dryrun<I extends Iface> extends org.apache.thrift.ProcessFunction<I, translate_table_dryrun_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class translate_table_dryrun<I extends Iface> extends org.apache.thrift.ProcessFunction<I, translate_table_dryrun_args, translate_table_dryrun_result> {
       public translate_table_dryrun() {
         super("translate_table_dryrun");
       }
 
+      @Override
       public translate_table_dryrun_args getEmptyArgsInstance() {
         return new translate_table_dryrun_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20736,8 +22327,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public translate_table_dryrun_result getEmptyResultInstance() {
+        return new translate_table_dryrun_result();
+      }
+
+      @Override
       public translate_table_dryrun_result getResult(I iface, translate_table_dryrun_args args) throws org.apache.thrift.TException {
-        translate_table_dryrun_result result = new translate_table_dryrun_result();
+        translate_table_dryrun_result result = getEmptyResultInstance();
         try {
           result.success = iface.translate_table_dryrun(args.request);
         } catch (AlreadyExistsException o1) {
@@ -20753,16 +22350,18 @@ public translate_table_dryrun_result getResult(I iface, translate_table_dryrun_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_table_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_table_args, drop_table_result> {
       public drop_table() {
         super("drop_table");
       }
 
+      @Override
       public drop_table_args getEmptyArgsInstance() {
         return new drop_table_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20771,8 +22370,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_table_result getEmptyResultInstance() {
+        return new drop_table_result();
+      }
+
+      @Override
       public drop_table_result getResult(I iface, drop_table_args args) throws org.apache.thrift.TException {
-        drop_table_result result = new drop_table_result();
+        drop_table_result result = getEmptyResultInstance();
         try {
           iface.drop_table(args.dbname, args.name, args.deleteData);
         } catch (NoSuchObjectException o1) {
@@ -20784,16 +22389,18 @@ public drop_table_result getResult(I iface, drop_table_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_table_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_table_with_environment_context_args, drop_table_with_environment_context_result> {
       public drop_table_with_environment_context() {
         super("drop_table_with_environment_context");
       }
 
+      @Override
       public drop_table_with_environment_context_args getEmptyArgsInstance() {
         return new drop_table_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20802,8 +22409,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_table_with_environment_context_result getEmptyResultInstance() {
+        return new drop_table_with_environment_context_result();
+      }
+
+      @Override
       public drop_table_with_environment_context_result getResult(I iface, drop_table_with_environment_context_args args) throws org.apache.thrift.TException {
-        drop_table_with_environment_context_result result = new drop_table_with_environment_context_result();
+        drop_table_with_environment_context_result result = getEmptyResultInstance();
         try {
           iface.drop_table_with_environment_context(args.dbname, args.name, args.deleteData, args.environment_context);
         } catch (NoSuchObjectException o1) {
@@ -20815,16 +22428,18 @@ public drop_table_with_environment_context_result getResult(I iface, drop_table_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_table_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_table_req_args, drop_table_req_result> {
       public drop_table_req() {
         super("drop_table_req");
       }
 
+      @Override
       public drop_table_req_args getEmptyArgsInstance() {
         return new drop_table_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20833,8 +22448,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_table_req_result getEmptyResultInstance() {
+        return new drop_table_req_result();
+      }
+
+      @Override
       public drop_table_req_result getResult(I iface, drop_table_req_args args) throws org.apache.thrift.TException {
-        drop_table_req_result result = new drop_table_req_result();
+        drop_table_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_table_req(args.dropTableReq);
         } catch (NoSuchObjectException o1) {
@@ -20846,16 +22467,18 @@ public drop_table_req_result getResult(I iface, drop_table_req_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, truncate_table_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, truncate_table_args, truncate_table_result> {
       public truncate_table() {
         super("truncate_table");
       }
 
+      @Override
       public truncate_table_args getEmptyArgsInstance() {
         return new truncate_table_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20864,8 +22487,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public truncate_table_result getEmptyResultInstance() {
+        return new truncate_table_result();
+      }
+
+      @Override
       public truncate_table_result getResult(I iface, truncate_table_args args) throws org.apache.thrift.TException {
-        truncate_table_result result = new truncate_table_result();
+        truncate_table_result result = getEmptyResultInstance();
         try {
           iface.truncate_table(args.dbName, args.tableName, args.partNames);
         } catch (MetaException o1) {
@@ -20875,16 +22504,18 @@ public truncate_table_result getResult(I iface, truncate_table_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, truncate_table_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, truncate_table_req_args, truncate_table_req_result> {
       public truncate_table_req() {
         super("truncate_table_req");
       }
 
+      @Override
       public truncate_table_req_args getEmptyArgsInstance() {
         return new truncate_table_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20893,8 +22524,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public truncate_table_req_result getEmptyResultInstance() {
+        return new truncate_table_req_result();
+      }
+
+      @Override
       public truncate_table_req_result getResult(I iface, truncate_table_req_args args) throws org.apache.thrift.TException {
-        truncate_table_req_result result = new truncate_table_req_result();
+        truncate_table_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.truncate_table_req(args.req);
         } catch (MetaException o1) {
@@ -20904,16 +22541,18 @@ public truncate_table_req_result getResult(I iface, truncate_table_req_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_tables_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_tables_args, get_tables_result> {
       public get_tables() {
         super("get_tables");
       }
 
+      @Override
       public get_tables_args getEmptyArgsInstance() {
         return new get_tables_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20922,8 +22561,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_tables_result getEmptyResultInstance() {
+        return new get_tables_result();
+      }
+
+      @Override
       public get_tables_result getResult(I iface, get_tables_args args) throws org.apache.thrift.TException {
-        get_tables_result result = new get_tables_result();
+        get_tables_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_tables(args.db_name, args.pattern);
         } catch (MetaException o1) {
@@ -20933,16 +22578,18 @@ public get_tables_result getResult(I iface, get_tables_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_by_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_tables_by_type_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_by_type<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_tables_by_type_args, get_tables_by_type_result> {
       public get_tables_by_type() {
         super("get_tables_by_type");
       }
 
+      @Override
       public get_tables_by_type_args getEmptyArgsInstance() {
         return new get_tables_by_type_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20951,8 +22598,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_tables_by_type_result getEmptyResultInstance() {
+        return new get_tables_by_type_result();
+      }
+
+      @Override
       public get_tables_by_type_result getResult(I iface, get_tables_by_type_args args) throws org.apache.thrift.TException {
-        get_tables_by_type_result result = new get_tables_by_type_result();
+        get_tables_by_type_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_tables_by_type(args.db_name, args.pattern, args.tableType);
         } catch (MetaException o1) {
@@ -20962,16 +22615,18 @@ public get_tables_by_type_result getResult(I iface, get_tables_by_type_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_materialized_view_objects_for_rewriting<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_materialized_view_objects_for_rewriting_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_materialized_view_objects_for_rewriting<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_materialized_view_objects_for_rewriting_args, get_all_materialized_view_objects_for_rewriting_result> {
       public get_all_materialized_view_objects_for_rewriting() {
         super("get_all_materialized_view_objects_for_rewriting");
       }
 
+      @Override
       public get_all_materialized_view_objects_for_rewriting_args getEmptyArgsInstance() {
         return new get_all_materialized_view_objects_for_rewriting_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -20980,8 +22635,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_materialized_view_objects_for_rewriting_result getEmptyResultInstance() {
+        return new get_all_materialized_view_objects_for_rewriting_result();
+      }
+
+      @Override
       public get_all_materialized_view_objects_for_rewriting_result getResult(I iface, get_all_materialized_view_objects_for_rewriting_args args) throws org.apache.thrift.TException {
-        get_all_materialized_view_objects_for_rewriting_result result = new get_all_materialized_view_objects_for_rewriting_result();
+        get_all_materialized_view_objects_for_rewriting_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_materialized_view_objects_for_rewriting();
         } catch (MetaException o1) {
@@ -20991,16 +22652,18 @@ public get_all_materialized_view_objects_for_rewriting_result getResult(I iface,
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialized_views_for_rewriting<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_materialized_views_for_rewriting_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialized_views_for_rewriting<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_materialized_views_for_rewriting_args, get_materialized_views_for_rewriting_result> {
       public get_materialized_views_for_rewriting() {
         super("get_materialized_views_for_rewriting");
       }
 
+      @Override
       public get_materialized_views_for_rewriting_args getEmptyArgsInstance() {
         return new get_materialized_views_for_rewriting_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21009,8 +22672,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_materialized_views_for_rewriting_result getEmptyResultInstance() {
+        return new get_materialized_views_for_rewriting_result();
+      }
+
+      @Override
       public get_materialized_views_for_rewriting_result getResult(I iface, get_materialized_views_for_rewriting_args args) throws org.apache.thrift.TException {
-        get_materialized_views_for_rewriting_result result = new get_materialized_views_for_rewriting_result();
+        get_materialized_views_for_rewriting_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_materialized_views_for_rewriting(args.db_name);
         } catch (MetaException o1) {
@@ -21020,16 +22689,18 @@ public get_materialized_views_for_rewriting_result getResult(I iface, get_materi
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_meta<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_meta_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_meta<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_meta_args, get_table_meta_result> {
       public get_table_meta() {
         super("get_table_meta");
       }
 
+      @Override
       public get_table_meta_args getEmptyArgsInstance() {
         return new get_table_meta_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21038,8 +22709,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_table_meta_result getEmptyResultInstance() {
+        return new get_table_meta_result();
+      }
+
+      @Override
       public get_table_meta_result getResult(I iface, get_table_meta_args args) throws org.apache.thrift.TException {
-        get_table_meta_result result = new get_table_meta_result();
+        get_table_meta_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_table_meta(args.db_patterns, args.tbl_patterns, args.tbl_types);
         } catch (MetaException o1) {
@@ -21049,16 +22726,18 @@ public get_table_meta_result getResult(I iface, get_table_meta_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_tables<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_tables_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_tables<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_tables_args, get_all_tables_result> {
       public get_all_tables() {
         super("get_all_tables");
       }
 
+      @Override
       public get_all_tables_args getEmptyArgsInstance() {
         return new get_all_tables_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21067,8 +22746,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_tables_result getEmptyResultInstance() {
+        return new get_all_tables_result();
+      }
+
+      @Override
       public get_all_tables_result getResult(I iface, get_all_tables_args args) throws org.apache.thrift.TException {
-        get_all_tables_result result = new get_all_tables_result();
+        get_all_tables_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_tables(args.db_name);
         } catch (MetaException o1) {
@@ -21078,16 +22763,18 @@ public get_all_tables_result getResult(I iface, get_all_tables_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_ext<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_tables_ext_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_ext<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_tables_ext_args, get_tables_ext_result> {
       public get_tables_ext() {
         super("get_tables_ext");
       }
 
+      @Override
       public get_tables_ext_args getEmptyArgsInstance() {
         return new get_tables_ext_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21096,8 +22783,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_tables_ext_result getEmptyResultInstance() {
+        return new get_tables_ext_result();
+      }
+
+      @Override
       public get_tables_ext_result getResult(I iface, get_tables_ext_args args) throws org.apache.thrift.TException {
-        get_tables_ext_result result = new get_tables_ext_result();
+        get_tables_ext_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_tables_ext(args.req);
         } catch (MetaException o1) {
@@ -21107,16 +22800,18 @@ public get_tables_ext_result getResult(I iface, get_tables_ext_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_req_args, get_table_req_result> {
       public get_table_req() {
         super("get_table_req");
       }
 
+      @Override
       public get_table_req_args getEmptyArgsInstance() {
         return new get_table_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21125,8 +22820,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_table_req_result getEmptyResultInstance() {
+        return new get_table_req_result();
+      }
+
+      @Override
       public get_table_req_result getResult(I iface, get_table_req_args args) throws org.apache.thrift.TException {
-        get_table_req_result result = new get_table_req_result();
+        get_table_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_table_req(args.req);
         } catch (MetaException o1) {
@@ -21138,16 +22839,18 @@ public get_table_req_result getResult(I iface, get_table_req_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_objects_by_name_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_objects_by_name_req_args, get_table_objects_by_name_req_result> {
       public get_table_objects_by_name_req() {
         super("get_table_objects_by_name_req");
       }
 
+      @Override
       public get_table_objects_by_name_req_args getEmptyArgsInstance() {
         return new get_table_objects_by_name_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21156,8 +22859,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_table_objects_by_name_req_result getEmptyResultInstance() {
+        return new get_table_objects_by_name_req_result();
+      }
+
+      @Override
       public get_table_objects_by_name_req_result getResult(I iface, get_table_objects_by_name_req_args args) throws org.apache.thrift.TException {
-        get_table_objects_by_name_req_result result = new get_table_objects_by_name_req_result();
+        get_table_objects_by_name_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_table_objects_by_name_req(args.req);
         } catch (MetaException o1) {
@@ -21171,16 +22880,18 @@ public get_table_objects_by_name_req_result getResult(I iface, get_table_objects
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialization_invalidation_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_materialization_invalidation_info_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialization_invalidation_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_materialization_invalidation_info_args, get_materialization_invalidation_info_result> {
       public get_materialization_invalidation_info() {
         super("get_materialization_invalidation_info");
       }
 
+      @Override
       public get_materialization_invalidation_info_args getEmptyArgsInstance() {
         return new get_materialization_invalidation_info_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21189,8 +22900,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_materialization_invalidation_info_result getEmptyResultInstance() {
+        return new get_materialization_invalidation_info_result();
+      }
+
+      @Override
       public get_materialization_invalidation_info_result getResult(I iface, get_materialization_invalidation_info_args args) throws org.apache.thrift.TException {
-        get_materialization_invalidation_info_result result = new get_materialization_invalidation_info_result();
+        get_materialization_invalidation_info_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_materialization_invalidation_info(args.creation_metadata, args.validTxnList);
         } catch (MetaException o1) {
@@ -21204,16 +22921,18 @@ public get_materialization_invalidation_info_result getResult(I iface, get_mater
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_creation_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_creation_metadata_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_creation_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_creation_metadata_args, update_creation_metadata_result> {
       public update_creation_metadata() {
         super("update_creation_metadata");
       }
 
+      @Override
       public update_creation_metadata_args getEmptyArgsInstance() {
         return new update_creation_metadata_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21222,8 +22941,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_creation_metadata_result getEmptyResultInstance() {
+        return new update_creation_metadata_result();
+      }
+
+      @Override
       public update_creation_metadata_result getResult(I iface, update_creation_metadata_args args) throws org.apache.thrift.TException {
-        update_creation_metadata_result result = new update_creation_metadata_result();
+        update_creation_metadata_result result = getEmptyResultInstance();
         try {
           iface.update_creation_metadata(args.catName, args.dbname, args.tbl_name, args.creation_metadata);
         } catch (MetaException o1) {
@@ -21237,16 +22962,18 @@ public update_creation_metadata_result getResult(I iface, update_creation_metada
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_names_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_names_by_filter_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_names_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_names_by_filter_args, get_table_names_by_filter_result> {
       public get_table_names_by_filter() {
         super("get_table_names_by_filter");
       }
 
+      @Override
       public get_table_names_by_filter_args getEmptyArgsInstance() {
         return new get_table_names_by_filter_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21255,8 +22982,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_table_names_by_filter_result getEmptyResultInstance() {
+        return new get_table_names_by_filter_result();
+      }
+
+      @Override
       public get_table_names_by_filter_result getResult(I iface, get_table_names_by_filter_args args) throws org.apache.thrift.TException {
-        get_table_names_by_filter_result result = new get_table_names_by_filter_result();
+        get_table_names_by_filter_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_table_names_by_filter(args.dbname, args.filter, args.max_tables);
         } catch (MetaException o1) {
@@ -21270,16 +23003,18 @@ public get_table_names_by_filter_result getResult(I iface, get_table_names_by_fi
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_args, alter_table_result> {
       public alter_table() {
         super("alter_table");
       }
 
+      @Override
       public alter_table_args getEmptyArgsInstance() {
         return new alter_table_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21288,8 +23023,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_table_result getEmptyResultInstance() {
+        return new alter_table_result();
+      }
+
+      @Override
       public alter_table_result getResult(I iface, alter_table_args args) throws org.apache.thrift.TException {
-        alter_table_result result = new alter_table_result();
+        alter_table_result result = getEmptyResultInstance();
         try {
           iface.alter_table(args.dbname, args.tbl_name, args.new_tbl);
         } catch (InvalidOperationException o1) {
@@ -21301,16 +23042,18 @@ public alter_table_result getResult(I iface, alter_table_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_with_environment_context_args, alter_table_with_environment_context_result> {
       public alter_table_with_environment_context() {
         super("alter_table_with_environment_context");
       }
 
+      @Override
       public alter_table_with_environment_context_args getEmptyArgsInstance() {
         return new alter_table_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21319,8 +23062,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_table_with_environment_context_result getEmptyResultInstance() {
+        return new alter_table_with_environment_context_result();
+      }
+
+      @Override
       public alter_table_with_environment_context_result getResult(I iface, alter_table_with_environment_context_args args) throws org.apache.thrift.TException {
-        alter_table_with_environment_context_result result = new alter_table_with_environment_context_result();
+        alter_table_with_environment_context_result result = getEmptyResultInstance();
         try {
           iface.alter_table_with_environment_context(args.dbname, args.tbl_name, args.new_tbl, args.environment_context);
         } catch (InvalidOperationException o1) {
@@ -21332,16 +23081,18 @@ public alter_table_with_environment_context_result getResult(I iface, alter_tabl
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_cascade<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_with_cascade_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_cascade<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_with_cascade_args, alter_table_with_cascade_result> {
       public alter_table_with_cascade() {
         super("alter_table_with_cascade");
       }
 
+      @Override
       public alter_table_with_cascade_args getEmptyArgsInstance() {
         return new alter_table_with_cascade_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21350,8 +23101,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_table_with_cascade_result getEmptyResultInstance() {
+        return new alter_table_with_cascade_result();
+      }
+
+      @Override
       public alter_table_with_cascade_result getResult(I iface, alter_table_with_cascade_args args) throws org.apache.thrift.TException {
-        alter_table_with_cascade_result result = new alter_table_with_cascade_result();
+        alter_table_with_cascade_result result = getEmptyResultInstance();
         try {
           iface.alter_table_with_cascade(args.dbname, args.tbl_name, args.new_tbl, args.cascade);
         } catch (InvalidOperationException o1) {
@@ -21363,16 +23120,18 @@ public alter_table_with_cascade_result getResult(I iface, alter_table_with_casca
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_table_req_args, alter_table_req_result> {
       public alter_table_req() {
         super("alter_table_req");
       }
 
+      @Override
       public alter_table_req_args getEmptyArgsInstance() {
         return new alter_table_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21381,8 +23140,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_table_req_result getEmptyResultInstance() {
+        return new alter_table_req_result();
+      }
+
+      @Override
       public alter_table_req_result getResult(I iface, alter_table_req_args args) throws org.apache.thrift.TException {
-        alter_table_req_result result = new alter_table_req_result();
+        alter_table_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.alter_table_req(args.req);
         } catch (InvalidOperationException o1) {
@@ -21394,16 +23159,18 @@ public alter_table_req_result getResult(I iface, alter_table_req_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_params<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_table_params_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_params<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_table_params_args, update_table_params_result> {
       public update_table_params() {
         super("update_table_params");
       }
 
+      @Override
       public update_table_params_args getEmptyArgsInstance() {
         return new update_table_params_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21412,8 +23179,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_table_params_result getEmptyResultInstance() {
+        return new update_table_params_result();
+      }
+
+      @Override
       public update_table_params_result getResult(I iface, update_table_params_args args) throws org.apache.thrift.TException {
-        update_table_params_result result = new update_table_params_result();
+        update_table_params_result result = getEmptyResultInstance();
         try {
           iface.update_table_params(args.updates);
         } catch (MetaException o1) {
@@ -21423,16 +23196,18 @@ public update_table_params_result getResult(I iface, update_table_params_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partition_args, add_partition_result> {
       public add_partition() {
         super("add_partition");
       }
 
+      @Override
       public add_partition_args getEmptyArgsInstance() {
         return new add_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21441,8 +23216,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_partition_result getEmptyResultInstance() {
+        return new add_partition_result();
+      }
+
+      @Override
       public add_partition_result getResult(I iface, add_partition_args args) throws org.apache.thrift.TException {
-        add_partition_result result = new add_partition_result();
+        add_partition_result result = getEmptyResultInstance();
         try {
           result.success = iface.add_partition(args.new_part);
         } catch (InvalidObjectException o1) {
@@ -21456,16 +23237,18 @@ public add_partition_result getResult(I iface, add_partition_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partition_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partition_with_environment_context_args, add_partition_with_environment_context_result> {
       public add_partition_with_environment_context() {
         super("add_partition_with_environment_context");
       }
 
+      @Override
       public add_partition_with_environment_context_args getEmptyArgsInstance() {
         return new add_partition_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21474,8 +23257,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_partition_with_environment_context_result getEmptyResultInstance() {
+        return new add_partition_with_environment_context_result();
+      }
+
+      @Override
       public add_partition_with_environment_context_result getResult(I iface, add_partition_with_environment_context_args args) throws org.apache.thrift.TException {
-        add_partition_with_environment_context_result result = new add_partition_with_environment_context_result();
+        add_partition_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.add_partition_with_environment_context(args.new_part, args.environment_context);
         } catch (InvalidObjectException o1) {
@@ -21489,16 +23278,18 @@ public add_partition_with_environment_context_result getResult(I iface, add_part
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partitions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partitions_args, add_partitions_result> {
       public add_partitions() {
         super("add_partitions");
       }
 
+      @Override
       public add_partitions_args getEmptyArgsInstance() {
         return new add_partitions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21507,8 +23298,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_partitions_result getEmptyResultInstance() {
+        return new add_partitions_result();
+      }
+
+      @Override
       public add_partitions_result getResult(I iface, add_partitions_args args) throws org.apache.thrift.TException {
-        add_partitions_result result = new add_partitions_result();
+        add_partitions_result result = getEmptyResultInstance();
         try {
           result.success = iface.add_partitions(args.new_parts);
           result.setSuccessIsSet(true);
@@ -21523,16 +23320,18 @@ public add_partitions_result getResult(I iface, add_partitions_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_pspec<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partitions_pspec_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_pspec<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partitions_pspec_args, add_partitions_pspec_result> {
       public add_partitions_pspec() {
         super("add_partitions_pspec");
       }
 
+      @Override
       public add_partitions_pspec_args getEmptyArgsInstance() {
         return new add_partitions_pspec_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21541,8 +23340,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_partitions_pspec_result getEmptyResultInstance() {
+        return new add_partitions_pspec_result();
+      }
+
+      @Override
       public add_partitions_pspec_result getResult(I iface, add_partitions_pspec_args args) throws org.apache.thrift.TException {
-        add_partitions_pspec_result result = new add_partitions_pspec_result();
+        add_partitions_pspec_result result = getEmptyResultInstance();
         try {
           result.success = iface.add_partitions_pspec(args.new_parts);
           result.setSuccessIsSet(true);
@@ -21557,16 +23362,18 @@ public add_partitions_pspec_result getResult(I iface, add_partitions_pspec_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_args, append_partition_result> {
       public append_partition() {
         super("append_partition");
       }
 
+      @Override
       public append_partition_args getEmptyArgsInstance() {
         return new append_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21575,8 +23382,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public append_partition_result getEmptyResultInstance() {
+        return new append_partition_result();
+      }
+
+      @Override
       public append_partition_result getResult(I iface, append_partition_args args) throws org.apache.thrift.TException {
-        append_partition_result result = new append_partition_result();
+        append_partition_result result = getEmptyResultInstance();
         try {
           result.success = iface.append_partition(args.db_name, args.tbl_name, args.part_vals);
         } catch (InvalidObjectException o1) {
@@ -21590,16 +23403,18 @@ public append_partition_result getResult(I iface, append_partition_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partitions_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_partitions_req_args, add_partitions_req_result> {
       public add_partitions_req() {
         super("add_partitions_req");
       }
 
+      @Override
       public add_partitions_req_args getEmptyArgsInstance() {
         return new add_partitions_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21608,8 +23423,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_partitions_req_result getEmptyResultInstance() {
+        return new add_partitions_req_result();
+      }
+
+      @Override
       public add_partitions_req_result getResult(I iface, add_partitions_req_args args) throws org.apache.thrift.TException {
-        add_partitions_req_result result = new add_partitions_req_result();
+        add_partitions_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.add_partitions_req(args.request);
         } catch (InvalidObjectException o1) {
@@ -21623,16 +23444,18 @@ public add_partitions_req_result getResult(I iface, add_partitions_req_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_with_environment_context_args, append_partition_with_environment_context_result> {
       public append_partition_with_environment_context() {
         super("append_partition_with_environment_context");
       }
 
+      @Override
       public append_partition_with_environment_context_args getEmptyArgsInstance() {
         return new append_partition_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21641,8 +23464,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public append_partition_with_environment_context_result getEmptyResultInstance() {
+        return new append_partition_with_environment_context_result();
+      }
+
+      @Override
       public append_partition_with_environment_context_result getResult(I iface, append_partition_with_environment_context_args args) throws org.apache.thrift.TException {
-        append_partition_with_environment_context_result result = new append_partition_with_environment_context_result();
+        append_partition_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.append_partition_with_environment_context(args.db_name, args.tbl_name, args.part_vals, args.environment_context);
         } catch (InvalidObjectException o1) {
@@ -21656,16 +23485,18 @@ public append_partition_with_environment_context_result getResult(I iface, appen
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_req_args, append_partition_req_result> {
       public append_partition_req() {
         super("append_partition_req");
       }
 
+      @Override
       public append_partition_req_args getEmptyArgsInstance() {
         return new append_partition_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21674,8 +23505,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public append_partition_req_result getEmptyResultInstance() {
+        return new append_partition_req_result();
+      }
+
+      @Override
       public append_partition_req_result getResult(I iface, append_partition_req_args args) throws org.apache.thrift.TException {
-        append_partition_req_result result = new append_partition_req_result();
+        append_partition_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.append_partition_req(args.appendPartitionsReq);
         } catch (InvalidObjectException o1) {
@@ -21689,16 +23526,18 @@ public append_partition_req_result getResult(I iface, append_partition_req_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_by_name_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_by_name_args, append_partition_by_name_result> {
       public append_partition_by_name() {
         super("append_partition_by_name");
       }
 
+      @Override
       public append_partition_by_name_args getEmptyArgsInstance() {
         return new append_partition_by_name_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21707,8 +23546,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public append_partition_by_name_result getEmptyResultInstance() {
+        return new append_partition_by_name_result();
+      }
+
+      @Override
       public append_partition_by_name_result getResult(I iface, append_partition_by_name_args args) throws org.apache.thrift.TException {
-        append_partition_by_name_result result = new append_partition_by_name_result();
+        append_partition_by_name_result result = getEmptyResultInstance();
         try {
           result.success = iface.append_partition_by_name(args.db_name, args.tbl_name, args.part_name);
         } catch (InvalidObjectException o1) {
@@ -21722,16 +23567,18 @@ public append_partition_by_name_result getResult(I iface, append_partition_by_na
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_by_name_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, append_partition_by_name_with_environment_context_args, append_partition_by_name_with_environment_context_result> {
       public append_partition_by_name_with_environment_context() {
         super("append_partition_by_name_with_environment_context");
       }
 
+      @Override
       public append_partition_by_name_with_environment_context_args getEmptyArgsInstance() {
         return new append_partition_by_name_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21740,8 +23587,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public append_partition_by_name_with_environment_context_result getEmptyResultInstance() {
+        return new append_partition_by_name_with_environment_context_result();
+      }
+
+      @Override
       public append_partition_by_name_with_environment_context_result getResult(I iface, append_partition_by_name_with_environment_context_args args) throws org.apache.thrift.TException {
-        append_partition_by_name_with_environment_context_result result = new append_partition_by_name_with_environment_context_result();
+        append_partition_by_name_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.append_partition_by_name_with_environment_context(args.db_name, args.tbl_name, args.part_name, args.environment_context);
         } catch (InvalidObjectException o1) {
@@ -21755,16 +23608,18 @@ public append_partition_by_name_with_environment_context_result getResult(I ifac
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_args, drop_partition_result> {
       public drop_partition() {
         super("drop_partition");
       }
 
+      @Override
       public drop_partition_args getEmptyArgsInstance() {
         return new drop_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21773,8 +23628,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_partition_result getEmptyResultInstance() {
+        return new drop_partition_result();
+      }
+
+      @Override
       public drop_partition_result getResult(I iface, drop_partition_args args) throws org.apache.thrift.TException {
-        drop_partition_result result = new drop_partition_result();
+        drop_partition_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_partition(args.db_name, args.tbl_name, args.part_vals, args.deleteData);
           result.setSuccessIsSet(true);
@@ -21787,16 +23648,18 @@ public drop_partition_result getResult(I iface, drop_partition_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_with_environment_context_args, drop_partition_with_environment_context_result> {
       public drop_partition_with_environment_context() {
         super("drop_partition_with_environment_context");
       }
 
+      @Override
       public drop_partition_with_environment_context_args getEmptyArgsInstance() {
         return new drop_partition_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21805,8 +23668,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_partition_with_environment_context_result getEmptyResultInstance() {
+        return new drop_partition_with_environment_context_result();
+      }
+
+      @Override
       public drop_partition_with_environment_context_result getResult(I iface, drop_partition_with_environment_context_args args) throws org.apache.thrift.TException {
-        drop_partition_with_environment_context_result result = new drop_partition_with_environment_context_result();
+        drop_partition_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_partition_with_environment_context(args.db_name, args.tbl_name, args.part_vals, args.deleteData, args.environment_context);
           result.setSuccessIsSet(true);
@@ -21819,16 +23688,18 @@ public drop_partition_with_environment_context_result getResult(I iface, drop_pa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_req_args, drop_partition_req_result> {
       public drop_partition_req() {
         super("drop_partition_req");
       }
 
+      @Override
       public drop_partition_req_args getEmptyArgsInstance() {
         return new drop_partition_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21837,8 +23708,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_partition_req_result getEmptyResultInstance() {
+        return new drop_partition_req_result();
+      }
+
+      @Override
       public drop_partition_req_result getResult(I iface, drop_partition_req_args args) throws org.apache.thrift.TException {
-        drop_partition_req_result result = new drop_partition_req_result();
+        drop_partition_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_partition_req(args.dropPartitionReq);
           result.setSuccessIsSet(true);
@@ -21851,16 +23728,18 @@ public drop_partition_req_result getResult(I iface, drop_partition_req_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_by_name_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_by_name_args, drop_partition_by_name_result> {
       public drop_partition_by_name() {
         super("drop_partition_by_name");
       }
 
+      @Override
       public drop_partition_by_name_args getEmptyArgsInstance() {
         return new drop_partition_by_name_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21869,8 +23748,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_partition_by_name_result getEmptyResultInstance() {
+        return new drop_partition_by_name_result();
+      }
+
+      @Override
       public drop_partition_by_name_result getResult(I iface, drop_partition_by_name_args args) throws org.apache.thrift.TException {
-        drop_partition_by_name_result result = new drop_partition_by_name_result();
+        drop_partition_by_name_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_partition_by_name(args.db_name, args.tbl_name, args.part_name, args.deleteData);
           result.setSuccessIsSet(true);
@@ -21883,16 +23768,18 @@ public drop_partition_by_name_result getResult(I iface, drop_partition_by_name_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_by_name_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partition_by_name_with_environment_context_args, drop_partition_by_name_with_environment_context_result> {
       public drop_partition_by_name_with_environment_context() {
         super("drop_partition_by_name_with_environment_context");
       }
 
+      @Override
       public drop_partition_by_name_with_environment_context_args getEmptyArgsInstance() {
         return new drop_partition_by_name_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21901,8 +23788,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_partition_by_name_with_environment_context_result getEmptyResultInstance() {
+        return new drop_partition_by_name_with_environment_context_result();
+      }
+
+      @Override
       public drop_partition_by_name_with_environment_context_result getResult(I iface, drop_partition_by_name_with_environment_context_args args) throws org.apache.thrift.TException {
-        drop_partition_by_name_with_environment_context_result result = new drop_partition_by_name_with_environment_context_result();
+        drop_partition_by_name_with_environment_context_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_partition_by_name_with_environment_context(args.db_name, args.tbl_name, args.part_name, args.deleteData, args.environment_context);
           result.setSuccessIsSet(true);
@@ -21915,16 +23808,18 @@ public drop_partition_by_name_with_environment_context_result getResult(I iface,
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partitions_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_partitions_req_args, drop_partitions_req_result> {
       public drop_partitions_req() {
         super("drop_partitions_req");
       }
 
+      @Override
       public drop_partitions_req_args getEmptyArgsInstance() {
         return new drop_partitions_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21933,8 +23828,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_partitions_req_result getEmptyResultInstance() {
+        return new drop_partitions_req_result();
+      }
+
+      @Override
       public drop_partitions_req_result getResult(I iface, drop_partitions_req_args args) throws org.apache.thrift.TException {
-        drop_partitions_req_result result = new drop_partitions_req_result();
+        drop_partitions_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_partitions_req(args.req);
         } catch (NoSuchObjectException o1) {
@@ -21946,16 +23847,18 @@ public drop_partitions_req_result getResult(I iface, drop_partitions_req_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_args, get_partition_result> {
       public get_partition() {
         super("get_partition");
       }
 
+      @Override
       public get_partition_args getEmptyArgsInstance() {
         return new get_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21964,8 +23867,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_result getEmptyResultInstance() {
+        return new get_partition_result();
+      }
+
+      @Override
       public get_partition_result getResult(I iface, get_partition_args args) throws org.apache.thrift.TException {
-        get_partition_result result = new get_partition_result();
+        get_partition_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition(args.db_name, args.tbl_name, args.part_vals);
         } catch (MetaException o1) {
@@ -21977,16 +23886,18 @@ public get_partition_result getResult(I iface, get_partition_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_req_args, get_partition_req_result> {
       public get_partition_req() {
         super("get_partition_req");
       }
 
+      @Override
       public get_partition_req_args getEmptyArgsInstance() {
         return new get_partition_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -21995,8 +23906,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_req_result getEmptyResultInstance() {
+        return new get_partition_req_result();
+      }
+
+      @Override
       public get_partition_req_result getResult(I iface, get_partition_req_args args) throws org.apache.thrift.TException {
-        get_partition_req_result result = new get_partition_req_result();
+        get_partition_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_req(args.req);
         } catch (MetaException o1) {
@@ -22008,16 +23925,18 @@ public get_partition_req_result getResult(I iface, get_partition_req_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exchange_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exchange_partition_args, exchange_partition_result> {
       public exchange_partition() {
         super("exchange_partition");
       }
 
+      @Override
       public exchange_partition_args getEmptyArgsInstance() {
         return new exchange_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22026,8 +23945,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public exchange_partition_result getEmptyResultInstance() {
+        return new exchange_partition_result();
+      }
+
+      @Override
       public exchange_partition_result getResult(I iface, exchange_partition_args args) throws org.apache.thrift.TException {
-        exchange_partition_result result = new exchange_partition_result();
+        exchange_partition_result result = getEmptyResultInstance();
         try {
           result.success = iface.exchange_partition(args.partitionSpecs, args.source_db, args.source_table_name, args.dest_db, args.dest_table_name);
         } catch (MetaException o1) {
@@ -22043,16 +23968,18 @@ public exchange_partition_result getResult(I iface, exchange_partition_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exchange_partitions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exchange_partitions_args, exchange_partitions_result> {
       public exchange_partitions() {
         super("exchange_partitions");
       }
 
+      @Override
       public exchange_partitions_args getEmptyArgsInstance() {
         return new exchange_partitions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22061,8 +23988,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public exchange_partitions_result getEmptyResultInstance() {
+        return new exchange_partitions_result();
+      }
+
+      @Override
       public exchange_partitions_result getResult(I iface, exchange_partitions_args args) throws org.apache.thrift.TException {
-        exchange_partitions_result result = new exchange_partitions_result();
+        exchange_partitions_result result = getEmptyResultInstance();
         try {
           result.success = iface.exchange_partitions(args.partitionSpecs, args.source_db, args.source_table_name, args.dest_db, args.dest_table_name);
         } catch (MetaException o1) {
@@ -22078,16 +24011,18 @@ public exchange_partitions_result getResult(I iface, exchange_partitions_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_with_auth<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_with_auth_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_with_auth<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_with_auth_args, get_partition_with_auth_result> {
       public get_partition_with_auth() {
         super("get_partition_with_auth");
       }
 
+      @Override
       public get_partition_with_auth_args getEmptyArgsInstance() {
         return new get_partition_with_auth_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22096,8 +24031,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_with_auth_result getEmptyResultInstance() {
+        return new get_partition_with_auth_result();
+      }
+
+      @Override
       public get_partition_with_auth_result getResult(I iface, get_partition_with_auth_args args) throws org.apache.thrift.TException {
-        get_partition_with_auth_result result = new get_partition_with_auth_result();
+        get_partition_with_auth_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_with_auth(args.db_name, args.tbl_name, args.part_vals, args.user_name, args.group_names);
         } catch (MetaException o1) {
@@ -22109,16 +24050,18 @@ public get_partition_with_auth_result getResult(I iface, get_partition_with_auth
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_by_name<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_by_name_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_by_name<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_by_name_args, get_partition_by_name_result> {
       public get_partition_by_name() {
         super("get_partition_by_name");
       }
 
+      @Override
       public get_partition_by_name_args getEmptyArgsInstance() {
         return new get_partition_by_name_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22127,8 +24070,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_by_name_result getEmptyResultInstance() {
+        return new get_partition_by_name_result();
+      }
+
+      @Override
       public get_partition_by_name_result getResult(I iface, get_partition_by_name_args args) throws org.apache.thrift.TException {
-        get_partition_by_name_result result = new get_partition_by_name_result();
+        get_partition_by_name_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_by_name(args.db_name, args.tbl_name, args.part_name);
         } catch (MetaException o1) {
@@ -22140,16 +24089,18 @@ public get_partition_by_name_result getResult(I iface, get_partition_by_name_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_args, get_partitions_result> {
       public get_partitions() {
         super("get_partitions");
       }
 
+      @Override
       public get_partitions_args getEmptyArgsInstance() {
         return new get_partitions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22158,8 +24109,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_result getEmptyResultInstance() {
+        return new get_partitions_result();
+      }
+
+      @Override
       public get_partitions_result getResult(I iface, get_partitions_args args) throws org.apache.thrift.TException {
-        get_partitions_result result = new get_partitions_result();
+        get_partitions_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions(args.db_name, args.tbl_name, args.max_parts);
         } catch (NoSuchObjectException o1) {
@@ -22171,16 +24128,18 @@ public get_partitions_result getResult(I iface, get_partitions_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_req_args, get_partitions_req_result> {
       public get_partitions_req() {
         super("get_partitions_req");
       }
 
+      @Override
       public get_partitions_req_args getEmptyArgsInstance() {
         return new get_partitions_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22189,8 +24148,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_req_result getEmptyResultInstance() {
+        return new get_partitions_req_result();
+      }
+
+      @Override
       public get_partitions_req_result getResult(I iface, get_partitions_req_args args) throws org.apache.thrift.TException {
-        get_partitions_req_result result = new get_partitions_req_result();
+        get_partitions_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_req(args.req);
         } catch (NoSuchObjectException o1) {
@@ -22202,16 +24167,18 @@ public get_partitions_req_result getResult(I iface, get_partitions_req_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_auth<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_with_auth_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_auth<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_with_auth_args, get_partitions_with_auth_result> {
       public get_partitions_with_auth() {
         super("get_partitions_with_auth");
       }
 
+      @Override
       public get_partitions_with_auth_args getEmptyArgsInstance() {
         return new get_partitions_with_auth_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22220,8 +24187,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_with_auth_result getEmptyResultInstance() {
+        return new get_partitions_with_auth_result();
+      }
+
+      @Override
       public get_partitions_with_auth_result getResult(I iface, get_partitions_with_auth_args args) throws org.apache.thrift.TException {
-        get_partitions_with_auth_result result = new get_partitions_with_auth_result();
+        get_partitions_with_auth_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_with_auth(args.db_name, args.tbl_name, args.max_parts, args.user_name, args.group_names);
         } catch (NoSuchObjectException o1) {
@@ -22233,16 +24206,18 @@ public get_partitions_with_auth_result getResult(I iface, get_partitions_with_au
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_pspec<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_pspec_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_pspec<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_pspec_args, get_partitions_pspec_result> {
       public get_partitions_pspec() {
         super("get_partitions_pspec");
       }
 
+      @Override
       public get_partitions_pspec_args getEmptyArgsInstance() {
         return new get_partitions_pspec_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22251,8 +24226,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_pspec_result getEmptyResultInstance() {
+        return new get_partitions_pspec_result();
+      }
+
+      @Override
       public get_partitions_pspec_result getResult(I iface, get_partitions_pspec_args args) throws org.apache.thrift.TException {
-        get_partitions_pspec_result result = new get_partitions_pspec_result();
+        get_partitions_pspec_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_pspec(args.db_name, args.tbl_name, args.max_parts);
         } catch (NoSuchObjectException o1) {
@@ -22264,16 +24245,18 @@ public get_partitions_pspec_result getResult(I iface, get_partitions_pspec_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_args, get_partition_names_result> {
       public get_partition_names() {
         super("get_partition_names");
       }
 
+      @Override
       public get_partition_names_args getEmptyArgsInstance() {
         return new get_partition_names_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22282,8 +24265,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_names_result getEmptyResultInstance() {
+        return new get_partition_names_result();
+      }
+
+      @Override
       public get_partition_names_result getResult(I iface, get_partition_names_args args) throws org.apache.thrift.TException {
-        get_partition_names_result result = new get_partition_names_result();
+        get_partition_names_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_names(args.db_name, args.tbl_name, args.max_parts);
         } catch (NoSuchObjectException o1) {
@@ -22295,16 +24284,18 @@ public get_partition_names_result getResult(I iface, get_partition_names_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fetch_partition_names_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetch_partition_names_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fetch_partition_names_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetch_partition_names_req_args, fetch_partition_names_req_result> {
       public fetch_partition_names_req() {
         super("fetch_partition_names_req");
       }
 
+      @Override
       public fetch_partition_names_req_args getEmptyArgsInstance() {
         return new fetch_partition_names_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22313,8 +24304,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public fetch_partition_names_req_result getEmptyResultInstance() {
+        return new fetch_partition_names_req_result();
+      }
+
+      @Override
       public fetch_partition_names_req_result getResult(I iface, fetch_partition_names_req_args args) throws org.apache.thrift.TException {
-        fetch_partition_names_req_result result = new fetch_partition_names_req_result();
+        fetch_partition_names_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.fetch_partition_names_req(args.partitionReq);
         } catch (NoSuchObjectException o1) {
@@ -22326,16 +24323,18 @@ public fetch_partition_names_req_result getResult(I iface, fetch_partition_names
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_values<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_values_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_values<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_values_args, get_partition_values_result> {
       public get_partition_values() {
         super("get_partition_values");
       }
 
+      @Override
       public get_partition_values_args getEmptyArgsInstance() {
         return new get_partition_values_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22344,8 +24343,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_values_result getEmptyResultInstance() {
+        return new get_partition_values_result();
+      }
+
+      @Override
       public get_partition_values_result getResult(I iface, get_partition_values_args args) throws org.apache.thrift.TException {
-        get_partition_values_result result = new get_partition_values_result();
+        get_partition_values_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_values(args.request);
         } catch (MetaException o1) {
@@ -22357,16 +24362,18 @@ public get_partition_values_result getResult(I iface, get_partition_values_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_ps_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_ps_args, get_partitions_ps_result> {
       public get_partitions_ps() {
         super("get_partitions_ps");
       }
 
+      @Override
       public get_partitions_ps_args getEmptyArgsInstance() {
         return new get_partitions_ps_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22375,8 +24382,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_ps_result getEmptyResultInstance() {
+        return new get_partitions_ps_result();
+      }
+
+      @Override
       public get_partitions_ps_result getResult(I iface, get_partitions_ps_args args) throws org.apache.thrift.TException {
-        get_partitions_ps_result result = new get_partitions_ps_result();
+        get_partitions_ps_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_ps(args.db_name, args.tbl_name, args.part_vals, args.max_parts);
         } catch (MetaException o1) {
@@ -22388,16 +24401,18 @@ public get_partitions_ps_result getResult(I iface, get_partitions_ps_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_ps_with_auth_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_ps_with_auth_args, get_partitions_ps_with_auth_result> {
       public get_partitions_ps_with_auth() {
         super("get_partitions_ps_with_auth");
       }
 
+      @Override
       public get_partitions_ps_with_auth_args getEmptyArgsInstance() {
         return new get_partitions_ps_with_auth_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22406,8 +24421,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_ps_with_auth_result getEmptyResultInstance() {
+        return new get_partitions_ps_with_auth_result();
+      }
+
+      @Override
       public get_partitions_ps_with_auth_result getResult(I iface, get_partitions_ps_with_auth_args args) throws org.apache.thrift.TException {
-        get_partitions_ps_with_auth_result result = new get_partitions_ps_with_auth_result();
+        get_partitions_ps_with_auth_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_ps_with_auth(args.db_name, args.tbl_name, args.part_vals, args.max_parts, args.user_name, args.group_names);
         } catch (NoSuchObjectException o1) {
@@ -22419,16 +24440,18 @@ public get_partitions_ps_with_auth_result getResult(I iface, get_partitions_ps_w
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_ps_with_auth_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_ps_with_auth_req_args, get_partitions_ps_with_auth_req_result> {
       public get_partitions_ps_with_auth_req() {
         super("get_partitions_ps_with_auth_req");
       }
 
+      @Override
       public get_partitions_ps_with_auth_req_args getEmptyArgsInstance() {
         return new get_partitions_ps_with_auth_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22437,8 +24460,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_ps_with_auth_req_result getEmptyResultInstance() {
+        return new get_partitions_ps_with_auth_req_result();
+      }
+
+      @Override
       public get_partitions_ps_with_auth_req_result getResult(I iface, get_partitions_ps_with_auth_req_args args) throws org.apache.thrift.TException {
-        get_partitions_ps_with_auth_req_result result = new get_partitions_ps_with_auth_req_result();
+        get_partitions_ps_with_auth_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_ps_with_auth_req(args.req);
         } catch (MetaException o1) {
@@ -22450,16 +24479,18 @@ public get_partitions_ps_with_auth_req_result getResult(I iface, get_partitions_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_ps_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_ps_args, get_partition_names_ps_result> {
       public get_partition_names_ps() {
         super("get_partition_names_ps");
       }
 
+      @Override
       public get_partition_names_ps_args getEmptyArgsInstance() {
         return new get_partition_names_ps_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22468,8 +24499,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_names_ps_result getEmptyResultInstance() {
+        return new get_partition_names_ps_result();
+      }
+
+      @Override
       public get_partition_names_ps_result getResult(I iface, get_partition_names_ps_args args) throws org.apache.thrift.TException {
-        get_partition_names_ps_result result = new get_partition_names_ps_result();
+        get_partition_names_ps_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_names_ps(args.db_name, args.tbl_name, args.part_vals, args.max_parts);
         } catch (MetaException o1) {
@@ -22481,16 +24518,18 @@ public get_partition_names_ps_result getResult(I iface, get_partition_names_ps_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_ps_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_ps_req_args, get_partition_names_ps_req_result> {
       public get_partition_names_ps_req() {
         super("get_partition_names_ps_req");
       }
 
+      @Override
       public get_partition_names_ps_req_args getEmptyArgsInstance() {
         return new get_partition_names_ps_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22499,8 +24538,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_names_ps_req_result getEmptyResultInstance() {
+        return new get_partition_names_ps_req_result();
+      }
+
+      @Override
       public get_partition_names_ps_req_result getResult(I iface, get_partition_names_ps_req_args args) throws org.apache.thrift.TException {
-        get_partition_names_ps_req_result result = new get_partition_names_ps_req_result();
+        get_partition_names_ps_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_names_ps_req(args.req);
         } catch (MetaException o1) {
@@ -22512,16 +24557,18 @@ public get_partition_names_ps_req_result getResult(I iface, get_partition_names_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_names_req_args, get_partition_names_req_result> {
       public get_partition_names_req() {
         super("get_partition_names_req");
       }
 
+      @Override
       public get_partition_names_req_args getEmptyArgsInstance() {
         return new get_partition_names_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22530,8 +24577,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_names_req_result getEmptyResultInstance() {
+        return new get_partition_names_req_result();
+      }
+
+      @Override
       public get_partition_names_req_result getResult(I iface, get_partition_names_req_args args) throws org.apache.thrift.TException {
-        get_partition_names_req_result result = new get_partition_names_req_result();
+        get_partition_names_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_names_req(args.req);
         } catch (MetaException o1) {
@@ -22543,16 +24596,18 @@ public get_partition_names_req_result getResult(I iface, get_partition_names_req
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_filter_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_filter_args, get_partitions_by_filter_result> {
       public get_partitions_by_filter() {
         super("get_partitions_by_filter");
       }
 
+      @Override
       public get_partitions_by_filter_args getEmptyArgsInstance() {
         return new get_partitions_by_filter_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22561,8 +24616,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_by_filter_result getEmptyResultInstance() {
+        return new get_partitions_by_filter_result();
+      }
+
+      @Override
       public get_partitions_by_filter_result getResult(I iface, get_partitions_by_filter_args args) throws org.apache.thrift.TException {
-        get_partitions_by_filter_result result = new get_partitions_by_filter_result();
+        get_partitions_by_filter_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_by_filter(args.db_name, args.tbl_name, args.filter, args.max_parts);
         } catch (MetaException o1) {
@@ -22574,16 +24635,18 @@ public get_partitions_by_filter_result getResult(I iface, get_partitions_by_filt
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_filter_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_filter_req_args, get_partitions_by_filter_req_result> {
       public get_partitions_by_filter_req() {
         super("get_partitions_by_filter_req");
       }
 
+      @Override
       public get_partitions_by_filter_req_args getEmptyArgsInstance() {
         return new get_partitions_by_filter_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22592,8 +24655,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_by_filter_req_result getEmptyResultInstance() {
+        return new get_partitions_by_filter_req_result();
+      }
+
+      @Override
       public get_partitions_by_filter_req_result getResult(I iface, get_partitions_by_filter_req_args args) throws org.apache.thrift.TException {
-        get_partitions_by_filter_req_result result = new get_partitions_by_filter_req_result();
+        get_partitions_by_filter_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_by_filter_req(args.req);
         } catch (MetaException o1) {
@@ -22605,16 +24674,18 @@ public get_partitions_by_filter_req_result getResult(I iface, get_partitions_by_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_part_specs_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_part_specs_by_filter_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_part_specs_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_part_specs_by_filter_args, get_part_specs_by_filter_result> {
       public get_part_specs_by_filter() {
         super("get_part_specs_by_filter");
       }
 
+      @Override
       public get_part_specs_by_filter_args getEmptyArgsInstance() {
         return new get_part_specs_by_filter_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22623,8 +24694,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_part_specs_by_filter_result getEmptyResultInstance() {
+        return new get_part_specs_by_filter_result();
+      }
+
+      @Override
       public get_part_specs_by_filter_result getResult(I iface, get_part_specs_by_filter_args args) throws org.apache.thrift.TException {
-        get_part_specs_by_filter_result result = new get_part_specs_by_filter_result();
+        get_part_specs_by_filter_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_part_specs_by_filter(args.db_name, args.tbl_name, args.filter, args.max_parts);
         } catch (MetaException o1) {
@@ -22636,16 +24713,18 @@ public get_part_specs_by_filter_result getResult(I iface, get_part_specs_by_filt
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_expr<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_expr_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_expr<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_expr_args, get_partitions_by_expr_result> {
       public get_partitions_by_expr() {
         super("get_partitions_by_expr");
       }
 
+      @Override
       public get_partitions_by_expr_args getEmptyArgsInstance() {
         return new get_partitions_by_expr_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22654,8 +24733,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_by_expr_result getEmptyResultInstance() {
+        return new get_partitions_by_expr_result();
+      }
+
+      @Override
       public get_partitions_by_expr_result getResult(I iface, get_partitions_by_expr_args args) throws org.apache.thrift.TException {
-        get_partitions_by_expr_result result = new get_partitions_by_expr_result();
+        get_partitions_by_expr_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_by_expr(args.req);
         } catch (MetaException o1) {
@@ -22667,16 +24752,18 @@ public get_partitions_by_expr_result getResult(I iface, get_partitions_by_expr_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_spec_by_expr<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_spec_by_expr_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_spec_by_expr<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_spec_by_expr_args, get_partitions_spec_by_expr_result> {
       public get_partitions_spec_by_expr() {
         super("get_partitions_spec_by_expr");
       }
 
+      @Override
       public get_partitions_spec_by_expr_args getEmptyArgsInstance() {
         return new get_partitions_spec_by_expr_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22685,8 +24772,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_spec_by_expr_result getEmptyResultInstance() {
+        return new get_partitions_spec_by_expr_result();
+      }
+
+      @Override
       public get_partitions_spec_by_expr_result getResult(I iface, get_partitions_spec_by_expr_args args) throws org.apache.thrift.TException {
-        get_partitions_spec_by_expr_result result = new get_partitions_spec_by_expr_result();
+        get_partitions_spec_by_expr_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_spec_by_expr(args.req);
         } catch (MetaException o1) {
@@ -22698,16 +24791,18 @@ public get_partitions_spec_by_expr_result getResult(I iface, get_partitions_spec
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_num_partitions_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_num_partitions_by_filter_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_num_partitions_by_filter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_num_partitions_by_filter_args, get_num_partitions_by_filter_result> {
       public get_num_partitions_by_filter() {
         super("get_num_partitions_by_filter");
       }
 
+      @Override
       public get_num_partitions_by_filter_args getEmptyArgsInstance() {
         return new get_num_partitions_by_filter_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22716,8 +24811,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_num_partitions_by_filter_result getEmptyResultInstance() {
+        return new get_num_partitions_by_filter_result();
+      }
+
+      @Override
       public get_num_partitions_by_filter_result getResult(I iface, get_num_partitions_by_filter_args args) throws org.apache.thrift.TException {
-        get_num_partitions_by_filter_result result = new get_num_partitions_by_filter_result();
+        get_num_partitions_by_filter_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_num_partitions_by_filter(args.db_name, args.tbl_name, args.filter);
           result.setSuccessIsSet(true);
@@ -22730,16 +24831,18 @@ public get_num_partitions_by_filter_result getResult(I iface, get_num_partitions
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_names_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_names_args, get_partitions_by_names_result> {
       public get_partitions_by_names() {
         super("get_partitions_by_names");
       }
 
+      @Override
       public get_partitions_by_names_args getEmptyArgsInstance() {
         return new get_partitions_by_names_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22748,8 +24851,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_by_names_result getEmptyResultInstance() {
+        return new get_partitions_by_names_result();
+      }
+
+      @Override
       public get_partitions_by_names_result getResult(I iface, get_partitions_by_names_args args) throws org.apache.thrift.TException {
-        get_partitions_by_names_result result = new get_partitions_by_names_result();
+        get_partitions_by_names_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_by_names(args.db_name, args.tbl_name, args.names);
         } catch (MetaException o1) {
@@ -22763,16 +24872,18 @@ public get_partitions_by_names_result getResult(I iface, get_partitions_by_names
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_names_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_by_names_req_args, get_partitions_by_names_req_result> {
       public get_partitions_by_names_req() {
         super("get_partitions_by_names_req");
       }
 
+      @Override
       public get_partitions_by_names_req_args getEmptyArgsInstance() {
         return new get_partitions_by_names_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22781,8 +24892,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_by_names_req_result getEmptyResultInstance() {
+        return new get_partitions_by_names_req_result();
+      }
+
+      @Override
       public get_partitions_by_names_req_result getResult(I iface, get_partitions_by_names_req_args args) throws org.apache.thrift.TException {
-        get_partitions_by_names_req_result result = new get_partitions_by_names_req_result();
+        get_partitions_by_names_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_by_names_req(args.req);
         } catch (MetaException o1) {
@@ -22796,16 +24913,18 @@ public get_partitions_by_names_req_result getResult(I iface, get_partitions_by_n
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_properties<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_properties_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_properties<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_properties_args, get_properties_result> {
       public get_properties() {
         super("get_properties");
       }
 
+      @Override
       public get_properties_args getEmptyArgsInstance() {
         return new get_properties_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22814,8 +24933,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_properties_result getEmptyResultInstance() {
+        return new get_properties_result();
+      }
+
+      @Override
       public get_properties_result getResult(I iface, get_properties_args args) throws org.apache.thrift.TException {
-        get_properties_result result = new get_properties_result();
+        get_properties_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_properties(args.req);
         } catch (MetaException e1) {
@@ -22827,16 +24952,18 @@ public get_properties_result getResult(I iface, get_properties_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_properties<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_properties_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_properties<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_properties_args, set_properties_result> {
       public set_properties() {
         super("set_properties");
       }
 
+      @Override
       public set_properties_args getEmptyArgsInstance() {
         return new set_properties_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22845,8 +24972,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public set_properties_result getEmptyResultInstance() {
+        return new set_properties_result();
+      }
+
+      @Override
       public set_properties_result getResult(I iface, set_properties_args args) throws org.apache.thrift.TException {
-        set_properties_result result = new set_properties_result();
+        set_properties_result result = getEmptyResultInstance();
         try {
           result.success = iface.set_properties(args.req);
           result.setSuccessIsSet(true);
@@ -22859,16 +24992,18 @@ public set_properties_result getResult(I iface, set_properties_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partition_args, alter_partition_result> {
       public alter_partition() {
         super("alter_partition");
       }
 
+      @Override
       public alter_partition_args getEmptyArgsInstance() {
         return new alter_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22877,8 +25012,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_partition_result getEmptyResultInstance() {
+        return new alter_partition_result();
+      }
+
+      @Override
       public alter_partition_result getResult(I iface, alter_partition_args args) throws org.apache.thrift.TException {
-        alter_partition_result result = new alter_partition_result();
+        alter_partition_result result = getEmptyResultInstance();
         try {
           iface.alter_partition(args.db_name, args.tbl_name, args.new_part);
         } catch (InvalidOperationException o1) {
@@ -22890,16 +25031,18 @@ public alter_partition_result getResult(I iface, alter_partition_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partitions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partitions_args, alter_partitions_result> {
       public alter_partitions() {
         super("alter_partitions");
       }
 
+      @Override
       public alter_partitions_args getEmptyArgsInstance() {
         return new alter_partitions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22908,8 +25051,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_partitions_result getEmptyResultInstance() {
+        return new alter_partitions_result();
+      }
+
+      @Override
       public alter_partitions_result getResult(I iface, alter_partitions_args args) throws org.apache.thrift.TException {
-        alter_partitions_result result = new alter_partitions_result();
+        alter_partitions_result result = getEmptyResultInstance();
         try {
           iface.alter_partitions(args.db_name, args.tbl_name, args.new_parts);
         } catch (InvalidOperationException o1) {
@@ -22921,16 +25070,18 @@ public alter_partitions_result getResult(I iface, alter_partitions_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partitions_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partitions_with_environment_context_args, alter_partitions_with_environment_context_result> {
       public alter_partitions_with_environment_context() {
         super("alter_partitions_with_environment_context");
       }
 
+      @Override
       public alter_partitions_with_environment_context_args getEmptyArgsInstance() {
         return new alter_partitions_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22939,8 +25090,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_partitions_with_environment_context_result getEmptyResultInstance() {
+        return new alter_partitions_with_environment_context_result();
+      }
+
+      @Override
       public alter_partitions_with_environment_context_result getResult(I iface, alter_partitions_with_environment_context_args args) throws org.apache.thrift.TException {
-        alter_partitions_with_environment_context_result result = new alter_partitions_with_environment_context_result();
+        alter_partitions_with_environment_context_result result = getEmptyResultInstance();
         try {
           iface.alter_partitions_with_environment_context(args.db_name, args.tbl_name, args.new_parts, args.environment_context);
         } catch (InvalidOperationException o1) {
@@ -22952,16 +25109,18 @@ public alter_partitions_with_environment_context_result getResult(I iface, alter
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partitions_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partitions_req_args, alter_partitions_req_result> {
       public alter_partitions_req() {
         super("alter_partitions_req");
       }
 
+      @Override
       public alter_partitions_req_args getEmptyArgsInstance() {
         return new alter_partitions_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -22970,8 +25129,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_partitions_req_result getEmptyResultInstance() {
+        return new alter_partitions_req_result();
+      }
+
+      @Override
       public alter_partitions_req_result getResult(I iface, alter_partitions_req_args args) throws org.apache.thrift.TException {
-        alter_partitions_req_result result = new alter_partitions_req_result();
+        alter_partitions_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.alter_partitions_req(args.req);
         } catch (InvalidOperationException o1) {
@@ -22983,16 +25148,18 @@ public alter_partitions_req_result getResult(I iface, alter_partitions_req_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partition_with_environment_context_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_with_environment_context<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_partition_with_environment_context_args, alter_partition_with_environment_context_result> {
       public alter_partition_with_environment_context() {
         super("alter_partition_with_environment_context");
       }
 
+      @Override
       public alter_partition_with_environment_context_args getEmptyArgsInstance() {
         return new alter_partition_with_environment_context_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23001,8 +25168,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_partition_with_environment_context_result getEmptyResultInstance() {
+        return new alter_partition_with_environment_context_result();
+      }
+
+      @Override
       public alter_partition_with_environment_context_result getResult(I iface, alter_partition_with_environment_context_args args) throws org.apache.thrift.TException {
-        alter_partition_with_environment_context_result result = new alter_partition_with_environment_context_result();
+        alter_partition_with_environment_context_result result = getEmptyResultInstance();
         try {
           iface.alter_partition_with_environment_context(args.db_name, args.tbl_name, args.new_part, args.environment_context);
         } catch (InvalidOperationException o1) {
@@ -23014,16 +25187,18 @@ public alter_partition_with_environment_context_result getResult(I iface, alter_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rename_partition_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rename_partition_args, rename_partition_result> {
       public rename_partition() {
         super("rename_partition");
       }
 
+      @Override
       public rename_partition_args getEmptyArgsInstance() {
         return new rename_partition_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23032,8 +25207,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public rename_partition_result getEmptyResultInstance() {
+        return new rename_partition_result();
+      }
+
+      @Override
       public rename_partition_result getResult(I iface, rename_partition_args args) throws org.apache.thrift.TException {
-        rename_partition_result result = new rename_partition_result();
+        rename_partition_result result = getEmptyResultInstance();
         try {
           iface.rename_partition(args.db_name, args.tbl_name, args.part_vals, args.new_part);
         } catch (InvalidOperationException o1) {
@@ -23045,16 +25226,18 @@ public rename_partition_result getResult(I iface, rename_partition_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rename_partition_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rename_partition_req_args, rename_partition_req_result> {
       public rename_partition_req() {
         super("rename_partition_req");
       }
 
+      @Override
       public rename_partition_req_args getEmptyArgsInstance() {
         return new rename_partition_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23063,8 +25246,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public rename_partition_req_result getEmptyResultInstance() {
+        return new rename_partition_req_result();
+      }
+
+      @Override
       public rename_partition_req_result getResult(I iface, rename_partition_req_args args) throws org.apache.thrift.TException {
-        rename_partition_req_result result = new rename_partition_req_result();
+        rename_partition_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.rename_partition_req(args.req);
         } catch (InvalidOperationException o1) {
@@ -23076,16 +25265,18 @@ public rename_partition_req_result getResult(I iface, rename_partition_req_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_has_valid_characters<I extends Iface> extends org.apache.thrift.ProcessFunction<I, partition_name_has_valid_characters_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_has_valid_characters<I extends Iface> extends org.apache.thrift.ProcessFunction<I, partition_name_has_valid_characters_args, partition_name_has_valid_characters_result> {
       public partition_name_has_valid_characters() {
         super("partition_name_has_valid_characters");
       }
 
+      @Override
       public partition_name_has_valid_characters_args getEmptyArgsInstance() {
         return new partition_name_has_valid_characters_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23094,8 +25285,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public partition_name_has_valid_characters_result getEmptyResultInstance() {
+        return new partition_name_has_valid_characters_result();
+      }
+
+      @Override
       public partition_name_has_valid_characters_result getResult(I iface, partition_name_has_valid_characters_args args) throws org.apache.thrift.TException {
-        partition_name_has_valid_characters_result result = new partition_name_has_valid_characters_result();
+        partition_name_has_valid_characters_result result = getEmptyResultInstance();
         try {
           result.success = iface.partition_name_has_valid_characters(args.part_vals, args.throw_exception);
           result.setSuccessIsSet(true);
@@ -23106,16 +25303,18 @@ public partition_name_has_valid_characters_result getResult(I iface, partition_n
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_config_value<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_config_value_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_config_value<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_config_value_args, get_config_value_result> {
       public get_config_value() {
         super("get_config_value");
       }
 
+      @Override
       public get_config_value_args getEmptyArgsInstance() {
         return new get_config_value_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23124,8 +25323,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_config_value_result getEmptyResultInstance() {
+        return new get_config_value_result();
+      }
+
+      @Override
       public get_config_value_result getResult(I iface, get_config_value_args args) throws org.apache.thrift.TException {
-        get_config_value_result result = new get_config_value_result();
+        get_config_value_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_config_value(args.name, args.defaultValue);
         } catch (ConfigValSecurityException o1) {
@@ -23135,16 +25340,18 @@ public get_config_value_result getResult(I iface, get_config_value_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_vals<I extends Iface> extends org.apache.thrift.ProcessFunction<I, partition_name_to_vals_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_vals<I extends Iface> extends org.apache.thrift.ProcessFunction<I, partition_name_to_vals_args, partition_name_to_vals_result> {
       public partition_name_to_vals() {
         super("partition_name_to_vals");
       }
 
+      @Override
       public partition_name_to_vals_args getEmptyArgsInstance() {
         return new partition_name_to_vals_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23153,8 +25360,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public partition_name_to_vals_result getEmptyResultInstance() {
+        return new partition_name_to_vals_result();
+      }
+
+      @Override
       public partition_name_to_vals_result getResult(I iface, partition_name_to_vals_args args) throws org.apache.thrift.TException {
-        partition_name_to_vals_result result = new partition_name_to_vals_result();
+        partition_name_to_vals_result result = getEmptyResultInstance();
         try {
           result.success = iface.partition_name_to_vals(args.part_name);
         } catch (MetaException o1) {
@@ -23164,16 +25377,18 @@ public partition_name_to_vals_result getResult(I iface, partition_name_to_vals_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_spec<I extends Iface> extends org.apache.thrift.ProcessFunction<I, partition_name_to_spec_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_spec<I extends Iface> extends org.apache.thrift.ProcessFunction<I, partition_name_to_spec_args, partition_name_to_spec_result> {
       public partition_name_to_spec() {
         super("partition_name_to_spec");
       }
 
+      @Override
       public partition_name_to_spec_args getEmptyArgsInstance() {
         return new partition_name_to_spec_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23182,8 +25397,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public partition_name_to_spec_result getEmptyResultInstance() {
+        return new partition_name_to_spec_result();
+      }
+
+      @Override
       public partition_name_to_spec_result getResult(I iface, partition_name_to_spec_args args) throws org.apache.thrift.TException {
-        partition_name_to_spec_result result = new partition_name_to_spec_result();
+        partition_name_to_spec_result result = getEmptyResultInstance();
         try {
           result.success = iface.partition_name_to_spec(args.part_name);
         } catch (MetaException o1) {
@@ -23193,16 +25414,18 @@ public partition_name_to_spec_result getResult(I iface, partition_name_to_spec_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class markPartitionForEvent<I extends Iface> extends org.apache.thrift.ProcessFunction<I, markPartitionForEvent_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class markPartitionForEvent<I extends Iface> extends org.apache.thrift.ProcessFunction<I, markPartitionForEvent_args, markPartitionForEvent_result> {
       public markPartitionForEvent() {
         super("markPartitionForEvent");
       }
 
+      @Override
       public markPartitionForEvent_args getEmptyArgsInstance() {
         return new markPartitionForEvent_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23211,8 +25434,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public markPartitionForEvent_result getEmptyResultInstance() {
+        return new markPartitionForEvent_result();
+      }
+
+      @Override
       public markPartitionForEvent_result getResult(I iface, markPartitionForEvent_args args) throws org.apache.thrift.TException {
-        markPartitionForEvent_result result = new markPartitionForEvent_result();
+        markPartitionForEvent_result result = getEmptyResultInstance();
         try {
           iface.markPartitionForEvent(args.db_name, args.tbl_name, args.part_vals, args.eventType);
         } catch (MetaException o1) {
@@ -23232,16 +25461,18 @@ public markPartitionForEvent_result getResult(I iface, markPartitionForEvent_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class isPartitionMarkedForEvent<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isPartitionMarkedForEvent_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class isPartitionMarkedForEvent<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isPartitionMarkedForEvent_args, isPartitionMarkedForEvent_result> {
       public isPartitionMarkedForEvent() {
         super("isPartitionMarkedForEvent");
       }
 
+      @Override
       public isPartitionMarkedForEvent_args getEmptyArgsInstance() {
         return new isPartitionMarkedForEvent_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23250,8 +25481,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public isPartitionMarkedForEvent_result getEmptyResultInstance() {
+        return new isPartitionMarkedForEvent_result();
+      }
+
+      @Override
       public isPartitionMarkedForEvent_result getResult(I iface, isPartitionMarkedForEvent_args args) throws org.apache.thrift.TException {
-        isPartitionMarkedForEvent_result result = new isPartitionMarkedForEvent_result();
+        isPartitionMarkedForEvent_result result = getEmptyResultInstance();
         try {
           result.success = iface.isPartitionMarkedForEvent(args.db_name, args.tbl_name, args.part_vals, args.eventType);
           result.setSuccessIsSet(true);
@@ -23272,16 +25509,18 @@ public isPartitionMarkedForEvent_result getResult(I iface, isPartitionMarkedForE
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_primary_keys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_primary_keys_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_primary_keys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_primary_keys_args, get_primary_keys_result> {
       public get_primary_keys() {
         super("get_primary_keys");
       }
 
+      @Override
       public get_primary_keys_args getEmptyArgsInstance() {
         return new get_primary_keys_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23290,8 +25529,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_primary_keys_result getEmptyResultInstance() {
+        return new get_primary_keys_result();
+      }
+
+      @Override
       public get_primary_keys_result getResult(I iface, get_primary_keys_args args) throws org.apache.thrift.TException {
-        get_primary_keys_result result = new get_primary_keys_result();
+        get_primary_keys_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_primary_keys(args.request);
         } catch (MetaException o1) {
@@ -23303,16 +25548,18 @@ public get_primary_keys_result getResult(I iface, get_primary_keys_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_foreign_keys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_foreign_keys_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_foreign_keys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_foreign_keys_args, get_foreign_keys_result> {
       public get_foreign_keys() {
         super("get_foreign_keys");
       }
 
+      @Override
       public get_foreign_keys_args getEmptyArgsInstance() {
         return new get_foreign_keys_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23321,8 +25568,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_foreign_keys_result getEmptyResultInstance() {
+        return new get_foreign_keys_result();
+      }
+
+      @Override
       public get_foreign_keys_result getResult(I iface, get_foreign_keys_args args) throws org.apache.thrift.TException {
-        get_foreign_keys_result result = new get_foreign_keys_result();
+        get_foreign_keys_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_foreign_keys(args.request);
         } catch (MetaException o1) {
@@ -23334,16 +25587,18 @@ public get_foreign_keys_result getResult(I iface, get_foreign_keys_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_unique_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_unique_constraints_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_unique_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_unique_constraints_args, get_unique_constraints_result> {
       public get_unique_constraints() {
         super("get_unique_constraints");
       }
 
+      @Override
       public get_unique_constraints_args getEmptyArgsInstance() {
         return new get_unique_constraints_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23352,8 +25607,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_unique_constraints_result getEmptyResultInstance() {
+        return new get_unique_constraints_result();
+      }
+
+      @Override
       public get_unique_constraints_result getResult(I iface, get_unique_constraints_args args) throws org.apache.thrift.TException {
-        get_unique_constraints_result result = new get_unique_constraints_result();
+        get_unique_constraints_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_unique_constraints(args.request);
         } catch (MetaException o1) {
@@ -23365,16 +25626,18 @@ public get_unique_constraints_result getResult(I iface, get_unique_constraints_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_not_null_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_not_null_constraints_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_not_null_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_not_null_constraints_args, get_not_null_constraints_result> {
       public get_not_null_constraints() {
         super("get_not_null_constraints");
       }
 
+      @Override
       public get_not_null_constraints_args getEmptyArgsInstance() {
         return new get_not_null_constraints_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23383,8 +25646,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_not_null_constraints_result getEmptyResultInstance() {
+        return new get_not_null_constraints_result();
+      }
+
+      @Override
       public get_not_null_constraints_result getResult(I iface, get_not_null_constraints_args args) throws org.apache.thrift.TException {
-        get_not_null_constraints_result result = new get_not_null_constraints_result();
+        get_not_null_constraints_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_not_null_constraints(args.request);
         } catch (MetaException o1) {
@@ -23396,16 +25665,18 @@ public get_not_null_constraints_result getResult(I iface, get_not_null_constrain
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_default_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_default_constraints_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_default_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_default_constraints_args, get_default_constraints_result> {
       public get_default_constraints() {
         super("get_default_constraints");
       }
 
+      @Override
       public get_default_constraints_args getEmptyArgsInstance() {
         return new get_default_constraints_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23414,8 +25685,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_default_constraints_result getEmptyResultInstance() {
+        return new get_default_constraints_result();
+      }
+
+      @Override
       public get_default_constraints_result getResult(I iface, get_default_constraints_args args) throws org.apache.thrift.TException {
-        get_default_constraints_result result = new get_default_constraints_result();
+        get_default_constraints_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_default_constraints(args.request);
         } catch (MetaException o1) {
@@ -23427,16 +25704,18 @@ public get_default_constraints_result getResult(I iface, get_default_constraints
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_check_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_check_constraints_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_check_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_check_constraints_args, get_check_constraints_result> {
       public get_check_constraints() {
         super("get_check_constraints");
       }
 
+      @Override
       public get_check_constraints_args getEmptyArgsInstance() {
         return new get_check_constraints_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23445,8 +25724,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_check_constraints_result getEmptyResultInstance() {
+        return new get_check_constraints_result();
+      }
+
+      @Override
       public get_check_constraints_result getResult(I iface, get_check_constraints_args args) throws org.apache.thrift.TException {
-        get_check_constraints_result result = new get_check_constraints_result();
+        get_check_constraints_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_check_constraints(args.request);
         } catch (MetaException o1) {
@@ -23458,16 +25743,18 @@ public get_check_constraints_result getResult(I iface, get_check_constraints_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_table_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_table_constraints_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_table_constraints<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_table_constraints_args, get_all_table_constraints_result> {
       public get_all_table_constraints() {
         super("get_all_table_constraints");
       }
 
+      @Override
       public get_all_table_constraints_args getEmptyArgsInstance() {
         return new get_all_table_constraints_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23476,8 +25763,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_table_constraints_result getEmptyResultInstance() {
+        return new get_all_table_constraints_result();
+      }
+
+      @Override
       public get_all_table_constraints_result getResult(I iface, get_all_table_constraints_args args) throws org.apache.thrift.TException {
-        get_all_table_constraints_result result = new get_all_table_constraints_result();
+        get_all_table_constraints_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_table_constraints(args.request);
         } catch (MetaException o1) {
@@ -23489,16 +25782,18 @@ public get_all_table_constraints_result getResult(I iface, get_all_table_constra
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_table_column_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_table_column_statistics_args, update_table_column_statistics_result> {
       public update_table_column_statistics() {
         super("update_table_column_statistics");
       }
 
+      @Override
       public update_table_column_statistics_args getEmptyArgsInstance() {
         return new update_table_column_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23507,8 +25802,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_table_column_statistics_result getEmptyResultInstance() {
+        return new update_table_column_statistics_result();
+      }
+
+      @Override
       public update_table_column_statistics_result getResult(I iface, update_table_column_statistics_args args) throws org.apache.thrift.TException {
-        update_table_column_statistics_result result = new update_table_column_statistics_result();
+        update_table_column_statistics_result result = getEmptyResultInstance();
         try {
           result.success = iface.update_table_column_statistics(args.stats_obj);
           result.setSuccessIsSet(true);
@@ -23525,16 +25826,18 @@ public update_table_column_statistics_result getResult(I iface, update_table_col
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_partition_column_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_partition_column_statistics_args, update_partition_column_statistics_result> {
       public update_partition_column_statistics() {
         super("update_partition_column_statistics");
       }
 
+      @Override
       public update_partition_column_statistics_args getEmptyArgsInstance() {
         return new update_partition_column_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23543,8 +25846,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_partition_column_statistics_result getEmptyResultInstance() {
+        return new update_partition_column_statistics_result();
+      }
+
+      @Override
       public update_partition_column_statistics_result getResult(I iface, update_partition_column_statistics_args args) throws org.apache.thrift.TException {
-        update_partition_column_statistics_result result = new update_partition_column_statistics_result();
+        update_partition_column_statistics_result result = getEmptyResultInstance();
         try {
           result.success = iface.update_partition_column_statistics(args.stats_obj);
           result.setSuccessIsSet(true);
@@ -23561,16 +25870,18 @@ public update_partition_column_statistics_result getResult(I iface, update_parti
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_table_column_statistics_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_table_column_statistics_req_args, update_table_column_statistics_req_result> {
       public update_table_column_statistics_req() {
         super("update_table_column_statistics_req");
       }
 
+      @Override
       public update_table_column_statistics_req_args getEmptyArgsInstance() {
         return new update_table_column_statistics_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23579,8 +25890,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_table_column_statistics_req_result getEmptyResultInstance() {
+        return new update_table_column_statistics_req_result();
+      }
+
+      @Override
       public update_table_column_statistics_req_result getResult(I iface, update_table_column_statistics_req_args args) throws org.apache.thrift.TException {
-        update_table_column_statistics_req_result result = new update_table_column_statistics_req_result();
+        update_table_column_statistics_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.update_table_column_statistics_req(args.req);
         } catch (NoSuchObjectException o1) {
@@ -23596,16 +25913,18 @@ public update_table_column_statistics_req_result getResult(I iface, update_table
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_partition_column_statistics_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_partition_column_statistics_req_args, update_partition_column_statistics_req_result> {
       public update_partition_column_statistics_req() {
         super("update_partition_column_statistics_req");
       }
 
+      @Override
       public update_partition_column_statistics_req_args getEmptyArgsInstance() {
         return new update_partition_column_statistics_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23614,8 +25933,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_partition_column_statistics_req_result getEmptyResultInstance() {
+        return new update_partition_column_statistics_req_result();
+      }
+
+      @Override
       public update_partition_column_statistics_req_result getResult(I iface, update_partition_column_statistics_req_args args) throws org.apache.thrift.TException {
-        update_partition_column_statistics_req_result result = new update_partition_column_statistics_req_result();
+        update_partition_column_statistics_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.update_partition_column_statistics_req(args.req);
         } catch (NoSuchObjectException o1) {
@@ -23631,16 +25956,18 @@ public update_partition_column_statistics_req_result getResult(I iface, update_p
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_transaction_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_transaction_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_transaction_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_transaction_statistics_args, update_transaction_statistics_result> {
       public update_transaction_statistics() {
         super("update_transaction_statistics");
       }
 
+      @Override
       public update_transaction_statistics_args getEmptyArgsInstance() {
         return new update_transaction_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23649,8 +25976,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_transaction_statistics_result getEmptyResultInstance() {
+        return new update_transaction_statistics_result();
+      }
+
+      @Override
       public update_transaction_statistics_result getResult(I iface, update_transaction_statistics_args args) throws org.apache.thrift.TException {
-        update_transaction_statistics_result result = new update_transaction_statistics_result();
+        update_transaction_statistics_result result = getEmptyResultInstance();
         try {
           iface.update_transaction_statistics(args.req);
         } catch (MetaException o1) {
@@ -23660,16 +25993,18 @@ public update_transaction_statistics_result getResult(I iface, update_transactio
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_column_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_column_statistics_args, get_table_column_statistics_result> {
       public get_table_column_statistics() {
         super("get_table_column_statistics");
       }
 
+      @Override
       public get_table_column_statistics_args getEmptyArgsInstance() {
         return new get_table_column_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23678,8 +26013,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_table_column_statistics_result getEmptyResultInstance() {
+        return new get_table_column_statistics_result();
+      }
+
+      @Override
       public get_table_column_statistics_result getResult(I iface, get_table_column_statistics_args args) throws org.apache.thrift.TException {
-        get_table_column_statistics_result result = new get_table_column_statistics_result();
+        get_table_column_statistics_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_table_column_statistics(args.db_name, args.tbl_name, args.col_name);
         } catch (NoSuchObjectException o1) {
@@ -23695,16 +26036,18 @@ public get_table_column_statistics_result getResult(I iface, get_table_column_st
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_column_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partition_column_statistics_args, get_partition_column_statistics_result> {
       public get_partition_column_statistics() {
         super("get_partition_column_statistics");
       }
 
+      @Override
       public get_partition_column_statistics_args getEmptyArgsInstance() {
         return new get_partition_column_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23713,8 +26056,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partition_column_statistics_result getEmptyResultInstance() {
+        return new get_partition_column_statistics_result();
+      }
+
+      @Override
       public get_partition_column_statistics_result getResult(I iface, get_partition_column_statistics_args args) throws org.apache.thrift.TException {
-        get_partition_column_statistics_result result = new get_partition_column_statistics_result();
+        get_partition_column_statistics_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partition_column_statistics(args.db_name, args.tbl_name, args.part_name, args.col_name);
         } catch (NoSuchObjectException o1) {
@@ -23730,16 +26079,18 @@ public get_partition_column_statistics_result getResult(I iface, get_partition_c
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_statistics_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_table_statistics_req_args, get_table_statistics_req_result> {
       public get_table_statistics_req() {
         super("get_table_statistics_req");
       }
 
+      @Override
       public get_table_statistics_req_args getEmptyArgsInstance() {
         return new get_table_statistics_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23748,8 +26099,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_table_statistics_req_result getEmptyResultInstance() {
+        return new get_table_statistics_req_result();
+      }
+
+      @Override
       public get_table_statistics_req_result getResult(I iface, get_table_statistics_req_args args) throws org.apache.thrift.TException {
-        get_table_statistics_req_result result = new get_table_statistics_req_result();
+        get_table_statistics_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_table_statistics_req(args.request);
         } catch (NoSuchObjectException o1) {
@@ -23761,16 +26118,18 @@ public get_table_statistics_req_result getResult(I iface, get_table_statistics_r
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_statistics_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_statistics_req_args, get_partitions_statistics_req_result> {
       public get_partitions_statistics_req() {
         super("get_partitions_statistics_req");
       }
 
+      @Override
       public get_partitions_statistics_req_args getEmptyArgsInstance() {
         return new get_partitions_statistics_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23779,8 +26138,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_statistics_req_result getEmptyResultInstance() {
+        return new get_partitions_statistics_req_result();
+      }
+
+      @Override
       public get_partitions_statistics_req_result getResult(I iface, get_partitions_statistics_req_args args) throws org.apache.thrift.TException {
-        get_partitions_statistics_req_result result = new get_partitions_statistics_req_result();
+        get_partitions_statistics_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_statistics_req(args.request);
         } catch (NoSuchObjectException o1) {
@@ -23792,16 +26157,18 @@ public get_partitions_statistics_req_result getResult(I iface, get_partitions_st
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_aggr_stats_for<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_aggr_stats_for_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_aggr_stats_for<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_aggr_stats_for_args, get_aggr_stats_for_result> {
       public get_aggr_stats_for() {
         super("get_aggr_stats_for");
       }
 
+      @Override
       public get_aggr_stats_for_args getEmptyArgsInstance() {
         return new get_aggr_stats_for_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23810,8 +26177,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_aggr_stats_for_result getEmptyResultInstance() {
+        return new get_aggr_stats_for_result();
+      }
+
+      @Override
       public get_aggr_stats_for_result getResult(I iface, get_aggr_stats_for_args args) throws org.apache.thrift.TException {
-        get_aggr_stats_for_result result = new get_aggr_stats_for_result();
+        get_aggr_stats_for_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_aggr_stats_for(args.request);
         } catch (NoSuchObjectException o1) {
@@ -23823,16 +26196,18 @@ public get_aggr_stats_for_result getResult(I iface, get_aggr_stats_for_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_aggr_stats_for<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_aggr_stats_for_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_aggr_stats_for<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_aggr_stats_for_args, set_aggr_stats_for_result> {
       public set_aggr_stats_for() {
         super("set_aggr_stats_for");
       }
 
+      @Override
       public set_aggr_stats_for_args getEmptyArgsInstance() {
         return new set_aggr_stats_for_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23841,8 +26216,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public set_aggr_stats_for_result getEmptyResultInstance() {
+        return new set_aggr_stats_for_result();
+      }
+
+      @Override
       public set_aggr_stats_for_result getResult(I iface, set_aggr_stats_for_args args) throws org.apache.thrift.TException {
-        set_aggr_stats_for_result result = new set_aggr_stats_for_result();
+        set_aggr_stats_for_result result = getEmptyResultInstance();
         try {
           result.success = iface.set_aggr_stats_for(args.request);
           result.setSuccessIsSet(true);
@@ -23859,16 +26240,18 @@ public set_aggr_stats_for_result getResult(I iface, set_aggr_stats_for_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_partition_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, delete_partition_column_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_partition_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, delete_partition_column_statistics_args, delete_partition_column_statistics_result> {
       public delete_partition_column_statistics() {
         super("delete_partition_column_statistics");
       }
 
+      @Override
       public delete_partition_column_statistics_args getEmptyArgsInstance() {
         return new delete_partition_column_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23877,8 +26260,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public delete_partition_column_statistics_result getEmptyResultInstance() {
+        return new delete_partition_column_statistics_result();
+      }
+
+      @Override
       public delete_partition_column_statistics_result getResult(I iface, delete_partition_column_statistics_args args) throws org.apache.thrift.TException {
-        delete_partition_column_statistics_result result = new delete_partition_column_statistics_result();
+        delete_partition_column_statistics_result result = getEmptyResultInstance();
         try {
           result.success = iface.delete_partition_column_statistics(args.db_name, args.tbl_name, args.part_name, args.col_name, args.engine);
           result.setSuccessIsSet(true);
@@ -23895,16 +26284,18 @@ public delete_partition_column_statistics_result getResult(I iface, delete_parti
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_table_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, delete_table_column_statistics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_table_column_statistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, delete_table_column_statistics_args, delete_table_column_statistics_result> {
       public delete_table_column_statistics() {
         super("delete_table_column_statistics");
       }
 
+      @Override
       public delete_table_column_statistics_args getEmptyArgsInstance() {
         return new delete_table_column_statistics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23913,8 +26304,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public delete_table_column_statistics_result getEmptyResultInstance() {
+        return new delete_table_column_statistics_result();
+      }
+
+      @Override
       public delete_table_column_statistics_result getResult(I iface, delete_table_column_statistics_args args) throws org.apache.thrift.TException {
-        delete_table_column_statistics_result result = new delete_table_column_statistics_result();
+        delete_table_column_statistics_result result = getEmptyResultInstance();
         try {
           result.success = iface.delete_table_column_statistics(args.db_name, args.tbl_name, args.col_name, args.engine);
           result.setSuccessIsSet(true);
@@ -23931,16 +26328,18 @@ public delete_table_column_statistics_result getResult(I iface, delete_table_col
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_column_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, delete_column_statistics_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_column_statistics_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, delete_column_statistics_req_args, delete_column_statistics_req_result> {
       public delete_column_statistics_req() {
         super("delete_column_statistics_req");
       }
 
+      @Override
       public delete_column_statistics_req_args getEmptyArgsInstance() {
         return new delete_column_statistics_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23949,8 +26348,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public delete_column_statistics_req_result getEmptyResultInstance() {
+        return new delete_column_statistics_req_result();
+      }
+
+      @Override
       public delete_column_statistics_req_result getResult(I iface, delete_column_statistics_req_args args) throws org.apache.thrift.TException {
-        delete_column_statistics_req_result result = new delete_column_statistics_req_result();
+        delete_column_statistics_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.delete_column_statistics_req(args.req);
           result.setSuccessIsSet(true);
@@ -23967,16 +26372,18 @@ public delete_column_statistics_req_result getResult(I iface, delete_column_stat
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_function_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_function_args, create_function_result> {
       public create_function() {
         super("create_function");
       }
 
+      @Override
       public create_function_args getEmptyArgsInstance() {
         return new create_function_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -23985,8 +26392,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_function_result getEmptyResultInstance() {
+        return new create_function_result();
+      }
+
+      @Override
       public create_function_result getResult(I iface, create_function_args args) throws org.apache.thrift.TException {
-        create_function_result result = new create_function_result();
+        create_function_result result = getEmptyResultInstance();
         try {
           iface.create_function(args.func);
         } catch (AlreadyExistsException o1) {
@@ -24002,16 +26415,18 @@ public create_function_result getResult(I iface, create_function_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_function_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_function_args, drop_function_result> {
       public drop_function() {
         super("drop_function");
       }
 
+      @Override
       public drop_function_args getEmptyArgsInstance() {
         return new drop_function_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24020,8 +26435,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_function_result getEmptyResultInstance() {
+        return new drop_function_result();
+      }
+
+      @Override
       public drop_function_result getResult(I iface, drop_function_args args) throws org.apache.thrift.TException {
-        drop_function_result result = new drop_function_result();
+        drop_function_result result = getEmptyResultInstance();
         try {
           iface.drop_function(args.dbName, args.funcName);
         } catch (NoSuchObjectException o1) {
@@ -24033,16 +26454,18 @@ public drop_function_result getResult(I iface, drop_function_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_function_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_function_args, alter_function_result> {
       public alter_function() {
         super("alter_function");
       }
 
+      @Override
       public alter_function_args getEmptyArgsInstance() {
         return new alter_function_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24051,8 +26474,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_function_result getEmptyResultInstance() {
+        return new alter_function_result();
+      }
+
+      @Override
       public alter_function_result getResult(I iface, alter_function_args args) throws org.apache.thrift.TException {
-        alter_function_result result = new alter_function_result();
+        alter_function_result result = getEmptyResultInstance();
         try {
           iface.alter_function(args.dbName, args.funcName, args.newFunc);
         } catch (InvalidOperationException o1) {
@@ -24064,16 +26493,18 @@ public alter_function_result getResult(I iface, alter_function_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_functions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_functions_args, get_functions_result> {
       public get_functions() {
         super("get_functions");
       }
 
+      @Override
       public get_functions_args getEmptyArgsInstance() {
         return new get_functions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24082,8 +26513,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_functions_result getEmptyResultInstance() {
+        return new get_functions_result();
+      }
+
+      @Override
       public get_functions_result getResult(I iface, get_functions_args args) throws org.apache.thrift.TException {
-        get_functions_result result = new get_functions_result();
+        get_functions_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_functions(args.dbName, args.pattern);
         } catch (MetaException o1) {
@@ -24093,16 +26530,18 @@ public get_functions_result getResult(I iface, get_functions_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_functions_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_functions_req_args, get_functions_req_result> {
       public get_functions_req() {
         super("get_functions_req");
       }
 
+      @Override
       public get_functions_req_args getEmptyArgsInstance() {
         return new get_functions_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24111,8 +26550,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_functions_req_result getEmptyResultInstance() {
+        return new get_functions_req_result();
+      }
+
+      @Override
       public get_functions_req_result getResult(I iface, get_functions_req_args args) throws org.apache.thrift.TException {
-        get_functions_req_result result = new get_functions_req_result();
+        get_functions_req_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_functions_req(args.request);
         } catch (MetaException o1) {
@@ -24122,16 +26567,18 @@ public get_functions_req_result getResult(I iface, get_functions_req_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_function_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_function<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_function_args, get_function_result> {
       public get_function() {
         super("get_function");
       }
 
+      @Override
       public get_function_args getEmptyArgsInstance() {
         return new get_function_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24140,8 +26587,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_function_result getEmptyResultInstance() {
+        return new get_function_result();
+      }
+
+      @Override
       public get_function_result getResult(I iface, get_function_args args) throws org.apache.thrift.TException {
-        get_function_result result = new get_function_result();
+        get_function_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_function(args.dbName, args.funcName);
         } catch (MetaException o1) {
@@ -24153,16 +26606,18 @@ public get_function_result getResult(I iface, get_function_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_functions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_functions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_functions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_functions_args, get_all_functions_result> {
       public get_all_functions() {
         super("get_all_functions");
       }
 
+      @Override
       public get_all_functions_args getEmptyArgsInstance() {
         return new get_all_functions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24171,8 +26626,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_functions_result getEmptyResultInstance() {
+        return new get_all_functions_result();
+      }
+
+      @Override
       public get_all_functions_result getResult(I iface, get_all_functions_args args) throws org.apache.thrift.TException {
-        get_all_functions_result result = new get_all_functions_result();
+        get_all_functions_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_functions();
         } catch (MetaException o1) {
@@ -24182,16 +26643,18 @@ public get_all_functions_result getResult(I iface, get_all_functions_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_role_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_role_args, create_role_result> {
       public create_role() {
         super("create_role");
       }
 
+      @Override
       public create_role_args getEmptyArgsInstance() {
         return new create_role_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24200,8 +26663,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_role_result getEmptyResultInstance() {
+        return new create_role_result();
+      }
+
+      @Override
       public create_role_result getResult(I iface, create_role_args args) throws org.apache.thrift.TException {
-        create_role_result result = new create_role_result();
+        create_role_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_role(args.role);
           result.setSuccessIsSet(true);
@@ -24212,16 +26681,18 @@ public create_role_result getResult(I iface, create_role_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_role_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_role_args, drop_role_result> {
       public drop_role() {
         super("drop_role");
       }
 
+      @Override
       public drop_role_args getEmptyArgsInstance() {
         return new drop_role_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24230,8 +26701,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_role_result getEmptyResultInstance() {
+        return new drop_role_result();
+      }
+
+      @Override
       public drop_role_result getResult(I iface, drop_role_args args) throws org.apache.thrift.TException {
-        drop_role_result result = new drop_role_result();
+        drop_role_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_role(args.role_name);
           result.setSuccessIsSet(true);
@@ -24242,16 +26719,18 @@ public drop_role_result getResult(I iface, drop_role_args args) throws org.apach
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_names<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_role_names_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_names<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_role_names_args, get_role_names_result> {
       public get_role_names() {
         super("get_role_names");
       }
 
+      @Override
       public get_role_names_args getEmptyArgsInstance() {
         return new get_role_names_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24260,8 +26739,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_role_names_result getEmptyResultInstance() {
+        return new get_role_names_result();
+      }
+
+      @Override
       public get_role_names_result getResult(I iface, get_role_names_args args) throws org.apache.thrift.TException {
-        get_role_names_result result = new get_role_names_result();
+        get_role_names_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_role_names();
         } catch (MetaException o1) {
@@ -24271,16 +26756,18 @@ public get_role_names_result getResult(I iface, get_role_names_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_role_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_role_args, grant_role_result> {
       public grant_role() {
         super("grant_role");
       }
 
+      @Override
       public grant_role_args getEmptyArgsInstance() {
         return new grant_role_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24289,8 +26776,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public grant_role_result getEmptyResultInstance() {
+        return new grant_role_result();
+      }
+
+      @Override
       public grant_role_result getResult(I iface, grant_role_args args) throws org.apache.thrift.TException {
-        grant_role_result result = new grant_role_result();
+        grant_role_result result = getEmptyResultInstance();
         try {
           result.success = iface.grant_role(args.role_name, args.principal_name, args.principal_type, args.grantor, args.grantorType, args.grant_option);
           result.setSuccessIsSet(true);
@@ -24301,16 +26794,18 @@ public grant_role_result getResult(I iface, grant_role_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revoke_role_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revoke_role_args, revoke_role_result> {
       public revoke_role() {
         super("revoke_role");
       }
 
+      @Override
       public revoke_role_args getEmptyArgsInstance() {
         return new revoke_role_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24319,8 +26814,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public revoke_role_result getEmptyResultInstance() {
+        return new revoke_role_result();
+      }
+
+      @Override
       public revoke_role_result getResult(I iface, revoke_role_args args) throws org.apache.thrift.TException {
-        revoke_role_result result = new revoke_role_result();
+        revoke_role_result result = getEmptyResultInstance();
         try {
           result.success = iface.revoke_role(args.role_name, args.principal_name, args.principal_type);
           result.setSuccessIsSet(true);
@@ -24331,16 +26832,18 @@ public revoke_role_result getResult(I iface, revoke_role_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_roles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, list_roles_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_roles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, list_roles_args, list_roles_result> {
       public list_roles() {
         super("list_roles");
       }
 
+      @Override
       public list_roles_args getEmptyArgsInstance() {
         return new list_roles_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24349,8 +26852,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public list_roles_result getEmptyResultInstance() {
+        return new list_roles_result();
+      }
+
+      @Override
       public list_roles_result getResult(I iface, list_roles_args args) throws org.apache.thrift.TException {
-        list_roles_result result = new list_roles_result();
+        list_roles_result result = getEmptyResultInstance();
         try {
           result.success = iface.list_roles(args.principal_name, args.principal_type);
         } catch (MetaException o1) {
@@ -24360,16 +26869,18 @@ public list_roles_result getResult(I iface, list_roles_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_revoke_role_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_revoke_role_args, grant_revoke_role_result> {
       public grant_revoke_role() {
         super("grant_revoke_role");
       }
 
+      @Override
       public grant_revoke_role_args getEmptyArgsInstance() {
         return new grant_revoke_role_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24378,8 +26889,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public grant_revoke_role_result getEmptyResultInstance() {
+        return new grant_revoke_role_result();
+      }
+
+      @Override
       public grant_revoke_role_result getResult(I iface, grant_revoke_role_args args) throws org.apache.thrift.TException {
-        grant_revoke_role_result result = new grant_revoke_role_result();
+        grant_revoke_role_result result = getEmptyResultInstance();
         try {
           result.success = iface.grant_revoke_role(args.request);
         } catch (MetaException o1) {
@@ -24389,16 +26906,18 @@ public grant_revoke_role_result getResult(I iface, grant_revoke_role_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_principals_in_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_principals_in_role_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_principals_in_role<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_principals_in_role_args, get_principals_in_role_result> {
       public get_principals_in_role() {
         super("get_principals_in_role");
       }
 
+      @Override
       public get_principals_in_role_args getEmptyArgsInstance() {
         return new get_principals_in_role_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24407,8 +26926,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_principals_in_role_result getEmptyResultInstance() {
+        return new get_principals_in_role_result();
+      }
+
+      @Override
       public get_principals_in_role_result getResult(I iface, get_principals_in_role_args args) throws org.apache.thrift.TException {
-        get_principals_in_role_result result = new get_principals_in_role_result();
+        get_principals_in_role_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_principals_in_role(args.request);
         } catch (MetaException o1) {
@@ -24418,16 +26943,18 @@ public get_principals_in_role_result getResult(I iface, get_principals_in_role_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_grants_for_principal<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_role_grants_for_principal_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_grants_for_principal<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_role_grants_for_principal_args, get_role_grants_for_principal_result> {
       public get_role_grants_for_principal() {
         super("get_role_grants_for_principal");
       }
 
+      @Override
       public get_role_grants_for_principal_args getEmptyArgsInstance() {
         return new get_role_grants_for_principal_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24436,8 +26963,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_role_grants_for_principal_result getEmptyResultInstance() {
+        return new get_role_grants_for_principal_result();
+      }
+
+      @Override
       public get_role_grants_for_principal_result getResult(I iface, get_role_grants_for_principal_args args) throws org.apache.thrift.TException {
-        get_role_grants_for_principal_result result = new get_role_grants_for_principal_result();
+        get_role_grants_for_principal_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_role_grants_for_principal(args.request);
         } catch (MetaException o1) {
@@ -24447,16 +26980,18 @@ public get_role_grants_for_principal_result getResult(I iface, get_role_grants_f
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_privilege_set<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_privilege_set_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_privilege_set<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_privilege_set_args, get_privilege_set_result> {
       public get_privilege_set() {
         super("get_privilege_set");
       }
 
+      @Override
       public get_privilege_set_args getEmptyArgsInstance() {
         return new get_privilege_set_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24465,8 +27000,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_privilege_set_result getEmptyResultInstance() {
+        return new get_privilege_set_result();
+      }
+
+      @Override
       public get_privilege_set_result getResult(I iface, get_privilege_set_args args) throws org.apache.thrift.TException {
-        get_privilege_set_result result = new get_privilege_set_result();
+        get_privilege_set_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_privilege_set(args.hiveObject, args.user_name, args.group_names);
         } catch (MetaException o1) {
@@ -24476,16 +27017,18 @@ public get_privilege_set_result getResult(I iface, get_privilege_set_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, list_privileges_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, list_privileges_args, list_privileges_result> {
       public list_privileges() {
         super("list_privileges");
       }
 
+      @Override
       public list_privileges_args getEmptyArgsInstance() {
         return new list_privileges_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24494,8 +27037,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public list_privileges_result getEmptyResultInstance() {
+        return new list_privileges_result();
+      }
+
+      @Override
       public list_privileges_result getResult(I iface, list_privileges_args args) throws org.apache.thrift.TException {
-        list_privileges_result result = new list_privileges_result();
+        list_privileges_result result = getEmptyResultInstance();
         try {
           result.success = iface.list_privileges(args.principal_name, args.principal_type, args.hiveObject);
         } catch (MetaException o1) {
@@ -24505,16 +27054,18 @@ public list_privileges_result getResult(I iface, list_privileges_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_privileges_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_privileges_args, grant_privileges_result> {
       public grant_privileges() {
         super("grant_privileges");
       }
 
+      @Override
       public grant_privileges_args getEmptyArgsInstance() {
         return new grant_privileges_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24523,8 +27074,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public grant_privileges_result getEmptyResultInstance() {
+        return new grant_privileges_result();
+      }
+
+      @Override
       public grant_privileges_result getResult(I iface, grant_privileges_args args) throws org.apache.thrift.TException {
-        grant_privileges_result result = new grant_privileges_result();
+        grant_privileges_result result = getEmptyResultInstance();
         try {
           result.success = iface.grant_privileges(args.privileges);
           result.setSuccessIsSet(true);
@@ -24535,16 +27092,18 @@ public grant_privileges_result getResult(I iface, grant_privileges_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revoke_privileges_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revoke_privileges_args, revoke_privileges_result> {
       public revoke_privileges() {
         super("revoke_privileges");
       }
 
+      @Override
       public revoke_privileges_args getEmptyArgsInstance() {
         return new revoke_privileges_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24553,8 +27112,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public revoke_privileges_result getEmptyResultInstance() {
+        return new revoke_privileges_result();
+      }
+
+      @Override
       public revoke_privileges_result getResult(I iface, revoke_privileges_args args) throws org.apache.thrift.TException {
-        revoke_privileges_result result = new revoke_privileges_result();
+        revoke_privileges_result result = getEmptyResultInstance();
         try {
           result.success = iface.revoke_privileges(args.privileges);
           result.setSuccessIsSet(true);
@@ -24565,16 +27130,18 @@ public revoke_privileges_result getResult(I iface, revoke_privileges_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_revoke_privileges_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, grant_revoke_privileges_args, grant_revoke_privileges_result> {
       public grant_revoke_privileges() {
         super("grant_revoke_privileges");
       }
 
+      @Override
       public grant_revoke_privileges_args getEmptyArgsInstance() {
         return new grant_revoke_privileges_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24583,8 +27150,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public grant_revoke_privileges_result getEmptyResultInstance() {
+        return new grant_revoke_privileges_result();
+      }
+
+      @Override
       public grant_revoke_privileges_result getResult(I iface, grant_revoke_privileges_args args) throws org.apache.thrift.TException {
-        grant_revoke_privileges_result result = new grant_revoke_privileges_result();
+        grant_revoke_privileges_result result = getEmptyResultInstance();
         try {
           result.success = iface.grant_revoke_privileges(args.request);
         } catch (MetaException o1) {
@@ -24594,16 +27167,18 @@ public grant_revoke_privileges_result getResult(I iface, grant_revoke_privileges
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class refresh_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, refresh_privileges_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class refresh_privileges<I extends Iface> extends org.apache.thrift.ProcessFunction<I, refresh_privileges_args, refresh_privileges_result> {
       public refresh_privileges() {
         super("refresh_privileges");
       }
 
+      @Override
       public refresh_privileges_args getEmptyArgsInstance() {
         return new refresh_privileges_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24612,8 +27187,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public refresh_privileges_result getEmptyResultInstance() {
+        return new refresh_privileges_result();
+      }
+
+      @Override
       public refresh_privileges_result getResult(I iface, refresh_privileges_args args) throws org.apache.thrift.TException {
-        refresh_privileges_result result = new refresh_privileges_result();
+        refresh_privileges_result result = getEmptyResultInstance();
         try {
           result.success = iface.refresh_privileges(args.objToRefresh, args.authorizer, args.grantRequest);
         } catch (MetaException o1) {
@@ -24623,16 +27204,18 @@ public refresh_privileges_result getResult(I iface, refresh_privileges_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_ugi<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_ugi_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_ugi<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_ugi_args, set_ugi_result> {
       public set_ugi() {
         super("set_ugi");
       }
 
+      @Override
       public set_ugi_args getEmptyArgsInstance() {
         return new set_ugi_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24641,8 +27224,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public set_ugi_result getEmptyResultInstance() {
+        return new set_ugi_result();
+      }
+
+      @Override
       public set_ugi_result getResult(I iface, set_ugi_args args) throws org.apache.thrift.TException {
-        set_ugi_result result = new set_ugi_result();
+        set_ugi_result result = getEmptyResultInstance();
         try {
           result.success = iface.set_ugi(args.user_name, args.group_names);
         } catch (MetaException o1) {
@@ -24652,16 +27241,18 @@ public set_ugi_result getResult(I iface, set_ugi_args args) throws org.apache.th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_delegation_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_delegation_token_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_delegation_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_delegation_token_args, get_delegation_token_result> {
       public get_delegation_token() {
         super("get_delegation_token");
       }
 
+      @Override
       public get_delegation_token_args getEmptyArgsInstance() {
         return new get_delegation_token_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24670,8 +27261,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_delegation_token_result getEmptyResultInstance() {
+        return new get_delegation_token_result();
+      }
+
+      @Override
       public get_delegation_token_result getResult(I iface, get_delegation_token_args args) throws org.apache.thrift.TException {
-        get_delegation_token_result result = new get_delegation_token_result();
+        get_delegation_token_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_delegation_token(args.token_owner, args.renewer_kerberos_principal_name);
         } catch (MetaException o1) {
@@ -24681,16 +27278,18 @@ public get_delegation_token_result getResult(I iface, get_delegation_token_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class renew_delegation_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, renew_delegation_token_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class renew_delegation_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, renew_delegation_token_args, renew_delegation_token_result> {
       public renew_delegation_token() {
         super("renew_delegation_token");
       }
 
+      @Override
       public renew_delegation_token_args getEmptyArgsInstance() {
         return new renew_delegation_token_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24699,8 +27298,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public renew_delegation_token_result getEmptyResultInstance() {
+        return new renew_delegation_token_result();
+      }
+
+      @Override
       public renew_delegation_token_result getResult(I iface, renew_delegation_token_args args) throws org.apache.thrift.TException {
-        renew_delegation_token_result result = new renew_delegation_token_result();
+        renew_delegation_token_result result = getEmptyResultInstance();
         try {
           result.success = iface.renew_delegation_token(args.token_str_form);
           result.setSuccessIsSet(true);
@@ -24711,16 +27316,18 @@ public renew_delegation_token_result getResult(I iface, renew_delegation_token_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cancel_delegation_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cancel_delegation_token_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cancel_delegation_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cancel_delegation_token_args, cancel_delegation_token_result> {
       public cancel_delegation_token() {
         super("cancel_delegation_token");
       }
 
+      @Override
       public cancel_delegation_token_args getEmptyArgsInstance() {
         return new cancel_delegation_token_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24729,8 +27336,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public cancel_delegation_token_result getEmptyResultInstance() {
+        return new cancel_delegation_token_result();
+      }
+
+      @Override
       public cancel_delegation_token_result getResult(I iface, cancel_delegation_token_args args) throws org.apache.thrift.TException {
-        cancel_delegation_token_result result = new cancel_delegation_token_result();
+        cancel_delegation_token_result result = getEmptyResultInstance();
         try {
           iface.cancel_delegation_token(args.token_str_form);
         } catch (MetaException o1) {
@@ -24740,16 +27353,18 @@ public cancel_delegation_token_result getResult(I iface, cancel_delegation_token
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_token_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_token_args, add_token_result> {
       public add_token() {
         super("add_token");
       }
 
+      @Override
       public add_token_args getEmptyArgsInstance() {
         return new add_token_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24758,24 +27373,32 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_token_result getEmptyResultInstance() {
+        return new add_token_result();
+      }
+
+      @Override
       public add_token_result getResult(I iface, add_token_args args) throws org.apache.thrift.TException {
-        add_token_result result = new add_token_result();
+        add_token_result result = getEmptyResultInstance();
         result.success = iface.add_token(args.token_identifier, args.delegation_token);
         result.setSuccessIsSet(true);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_token_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_token_args, remove_token_result> {
       public remove_token() {
         super("remove_token");
       }
 
+      @Override
       public remove_token_args getEmptyArgsInstance() {
         return new remove_token_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24784,24 +27407,32 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public remove_token_result getEmptyResultInstance() {
+        return new remove_token_result();
+      }
+
+      @Override
       public remove_token_result getResult(I iface, remove_token_args args) throws org.apache.thrift.TException {
-        remove_token_result result = new remove_token_result();
+        remove_token_result result = getEmptyResultInstance();
         result.success = iface.remove_token(args.token_identifier);
         result.setSuccessIsSet(true);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_token_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_token<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_token_args, get_token_result> {
       public get_token() {
         super("get_token");
       }
 
+      @Override
       public get_token_args getEmptyArgsInstance() {
         return new get_token_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24810,23 +27441,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_token_result getEmptyResultInstance() {
+        return new get_token_result();
+      }
+
+      @Override
       public get_token_result getResult(I iface, get_token_args args) throws org.apache.thrift.TException {
-        get_token_result result = new get_token_result();
+        get_token_result result = getEmptyResultInstance();
         result.success = iface.get_token(args.token_identifier);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_token_identifiers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_token_identifiers_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_token_identifiers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_token_identifiers_args, get_all_token_identifiers_result> {
       public get_all_token_identifiers() {
         super("get_all_token_identifiers");
       }
 
+      @Override
       public get_all_token_identifiers_args getEmptyArgsInstance() {
         return new get_all_token_identifiers_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24835,23 +27474,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_token_identifiers_result getEmptyResultInstance() {
+        return new get_all_token_identifiers_result();
+      }
+
+      @Override
       public get_all_token_identifiers_result getResult(I iface, get_all_token_identifiers_args args) throws org.apache.thrift.TException {
-        get_all_token_identifiers_result result = new get_all_token_identifiers_result();
+        get_all_token_identifiers_result result = getEmptyResultInstance();
         result.success = iface.get_all_token_identifiers();
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_master_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_master_key_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_master_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_master_key_args, add_master_key_result> {
       public add_master_key() {
         super("add_master_key");
       }
 
+      @Override
       public add_master_key_args getEmptyArgsInstance() {
         return new add_master_key_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24860,8 +27507,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_master_key_result getEmptyResultInstance() {
+        return new add_master_key_result();
+      }
+
+      @Override
       public add_master_key_result getResult(I iface, add_master_key_args args) throws org.apache.thrift.TException {
-        add_master_key_result result = new add_master_key_result();
+        add_master_key_result result = getEmptyResultInstance();
         try {
           result.success = iface.add_master_key(args.key);
           result.setSuccessIsSet(true);
@@ -24872,16 +27525,18 @@ public add_master_key_result getResult(I iface, add_master_key_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_master_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_master_key_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_master_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_master_key_args, update_master_key_result> {
       public update_master_key() {
         super("update_master_key");
       }
 
+      @Override
       public update_master_key_args getEmptyArgsInstance() {
         return new update_master_key_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24890,8 +27545,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_master_key_result getEmptyResultInstance() {
+        return new update_master_key_result();
+      }
+
+      @Override
       public update_master_key_result getResult(I iface, update_master_key_args args) throws org.apache.thrift.TException {
-        update_master_key_result result = new update_master_key_result();
+        update_master_key_result result = getEmptyResultInstance();
         try {
           iface.update_master_key(args.seq_number, args.key);
         } catch (NoSuchObjectException o1) {
@@ -24903,16 +27564,18 @@ public update_master_key_result getResult(I iface, update_master_key_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_master_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_master_key_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_master_key<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_master_key_args, remove_master_key_result> {
       public remove_master_key() {
         super("remove_master_key");
       }
 
+      @Override
       public remove_master_key_args getEmptyArgsInstance() {
         return new remove_master_key_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24921,24 +27584,32 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public remove_master_key_result getEmptyResultInstance() {
+        return new remove_master_key_result();
+      }
+
+      @Override
       public remove_master_key_result getResult(I iface, remove_master_key_args args) throws org.apache.thrift.TException {
-        remove_master_key_result result = new remove_master_key_result();
+        remove_master_key_result result = getEmptyResultInstance();
         result.success = iface.remove_master_key(args.key_seq);
         result.setSuccessIsSet(true);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_master_keys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_master_keys_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_master_keys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_master_keys_args, get_master_keys_result> {
       public get_master_keys() {
         super("get_master_keys");
       }
 
+      @Override
       public get_master_keys_args getEmptyArgsInstance() {
         return new get_master_keys_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24947,23 +27618,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_master_keys_result getEmptyResultInstance() {
+        return new get_master_keys_result();
+      }
+
+      @Override
       public get_master_keys_result getResult(I iface, get_master_keys_args args) throws org.apache.thrift.TException {
-        get_master_keys_result result = new get_master_keys_result();
+        get_master_keys_result result = getEmptyResultInstance();
         result.success = iface.get_master_keys();
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_open_txns_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_open_txns_args, get_open_txns_result> {
       public get_open_txns() {
         super("get_open_txns");
       }
 
+      @Override
       public get_open_txns_args getEmptyArgsInstance() {
         return new get_open_txns_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24972,23 +27651,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_open_txns_result getEmptyResultInstance() {
+        return new get_open_txns_result();
+      }
+
+      @Override
       public get_open_txns_result getResult(I iface, get_open_txns_args args) throws org.apache.thrift.TException {
-        get_open_txns_result result = new get_open_txns_result();
+        get_open_txns_result result = getEmptyResultInstance();
         result.success = iface.get_open_txns();
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_open_txns_info_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_open_txns_info_args, get_open_txns_info_result> {
       public get_open_txns_info() {
         super("get_open_txns_info");
       }
 
+      @Override
       public get_open_txns_info_args getEmptyArgsInstance() {
         return new get_open_txns_info_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -24997,23 +27684,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_open_txns_info_result getEmptyResultInstance() {
+        return new get_open_txns_info_result();
+      }
+
+      @Override
       public get_open_txns_info_result getResult(I iface, get_open_txns_info_args args) throws org.apache.thrift.TException {
-        get_open_txns_info_result result = new get_open_txns_info_result();
+        get_open_txns_info_result result = getEmptyResultInstance();
         result.success = iface.get_open_txns_info();
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class open_txns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, open_txns_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class open_txns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, open_txns_args, open_txns_result> {
       public open_txns() {
         super("open_txns");
       }
 
+      @Override
       public open_txns_args getEmptyArgsInstance() {
         return new open_txns_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25022,23 +27717,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public open_txns_result getEmptyResultInstance() {
+        return new open_txns_result();
+      }
+
+      @Override
       public open_txns_result getResult(I iface, open_txns_args args) throws org.apache.thrift.TException {
-        open_txns_result result = new open_txns_result();
+        open_txns_result result = getEmptyResultInstance();
         result.success = iface.open_txns(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txn<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abort_txn_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txn<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abort_txn_args, abort_txn_result> {
       public abort_txn() {
         super("abort_txn");
       }
 
+      @Override
       public abort_txn_args getEmptyArgsInstance() {
         return new abort_txn_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25047,8 +27750,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public abort_txn_result getEmptyResultInstance() {
+        return new abort_txn_result();
+      }
+
+      @Override
       public abort_txn_result getResult(I iface, abort_txn_args args) throws org.apache.thrift.TException {
-        abort_txn_result result = new abort_txn_result();
+        abort_txn_result result = getEmptyResultInstance();
         try {
           iface.abort_txn(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25058,16 +27767,18 @@ public abort_txn_result getResult(I iface, abort_txn_args args) throws org.apach
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abort_txns_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txns<I extends Iface> extends org.apache.thrift.ProcessFunction<I, abort_txns_args, abort_txns_result> {
       public abort_txns() {
         super("abort_txns");
       }
 
+      @Override
       public abort_txns_args getEmptyArgsInstance() {
         return new abort_txns_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25076,8 +27787,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public abort_txns_result getEmptyResultInstance() {
+        return new abort_txns_result();
+      }
+
+      @Override
       public abort_txns_result getResult(I iface, abort_txns_args args) throws org.apache.thrift.TException {
-        abort_txns_result result = new abort_txns_result();
+        abort_txns_result result = getEmptyResultInstance();
         try {
           iface.abort_txns(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25087,16 +27804,18 @@ public abort_txns_result getResult(I iface, abort_txns_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class commit_txn<I extends Iface> extends org.apache.thrift.ProcessFunction<I, commit_txn_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class commit_txn<I extends Iface> extends org.apache.thrift.ProcessFunction<I, commit_txn_args, commit_txn_result> {
       public commit_txn() {
         super("commit_txn");
       }
 
+      @Override
       public commit_txn_args getEmptyArgsInstance() {
         return new commit_txn_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25105,8 +27824,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public commit_txn_result getEmptyResultInstance() {
+        return new commit_txn_result();
+      }
+
+      @Override
       public commit_txn_result getResult(I iface, commit_txn_args args) throws org.apache.thrift.TException {
-        commit_txn_result result = new commit_txn_result();
+        commit_txn_result result = getEmptyResultInstance();
         try {
           iface.commit_txn(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25118,16 +27843,18 @@ public commit_txn_result getResult(I iface, commit_txn_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_txnid_in_conflict<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_latest_txnid_in_conflict_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_txnid_in_conflict<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_latest_txnid_in_conflict_args, get_latest_txnid_in_conflict_result> {
       public get_latest_txnid_in_conflict() {
         super("get_latest_txnid_in_conflict");
       }
 
+      @Override
       public get_latest_txnid_in_conflict_args getEmptyArgsInstance() {
         return new get_latest_txnid_in_conflict_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25136,8 +27863,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_latest_txnid_in_conflict_result getEmptyResultInstance() {
+        return new get_latest_txnid_in_conflict_result();
+      }
+
+      @Override
       public get_latest_txnid_in_conflict_result getResult(I iface, get_latest_txnid_in_conflict_args args) throws org.apache.thrift.TException {
-        get_latest_txnid_in_conflict_result result = new get_latest_txnid_in_conflict_result();
+        get_latest_txnid_in_conflict_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_latest_txnid_in_conflict(args.txnId);
           result.setSuccessIsSet(true);
@@ -25148,16 +27881,18 @@ public get_latest_txnid_in_conflict_result getResult(I iface, get_latest_txnid_i
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class repl_tbl_writeid_state<I extends Iface> extends org.apache.thrift.ProcessFunction<I, repl_tbl_writeid_state_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class repl_tbl_writeid_state<I extends Iface> extends org.apache.thrift.ProcessFunction<I, repl_tbl_writeid_state_args, repl_tbl_writeid_state_result> {
       public repl_tbl_writeid_state() {
         super("repl_tbl_writeid_state");
       }
 
+      @Override
       public repl_tbl_writeid_state_args getEmptyArgsInstance() {
         return new repl_tbl_writeid_state_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25166,23 +27901,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public repl_tbl_writeid_state_result getEmptyResultInstance() {
+        return new repl_tbl_writeid_state_result();
+      }
+
+      @Override
       public repl_tbl_writeid_state_result getResult(I iface, repl_tbl_writeid_state_args args) throws org.apache.thrift.TException {
-        repl_tbl_writeid_state_result result = new repl_tbl_writeid_state_result();
+        repl_tbl_writeid_state_result result = getEmptyResultInstance();
         iface.repl_tbl_writeid_state(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_valid_write_ids<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_valid_write_ids_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_valid_write_ids<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_valid_write_ids_args, get_valid_write_ids_result> {
       public get_valid_write_ids() {
         super("get_valid_write_ids");
       }
 
+      @Override
       public get_valid_write_ids_args getEmptyArgsInstance() {
         return new get_valid_write_ids_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25191,8 +27934,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_valid_write_ids_result getEmptyResultInstance() {
+        return new get_valid_write_ids_result();
+      }
+
+      @Override
       public get_valid_write_ids_result getResult(I iface, get_valid_write_ids_args args) throws org.apache.thrift.TException {
-        get_valid_write_ids_result result = new get_valid_write_ids_result();
+        get_valid_write_ids_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_valid_write_ids(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25204,16 +27953,18 @@ public get_valid_write_ids_result getResult(I iface, get_valid_write_ids_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_ids_to_min_history<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_write_ids_to_min_history_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_ids_to_min_history<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_write_ids_to_min_history_args, add_write_ids_to_min_history_result> {
       public add_write_ids_to_min_history() {
         super("add_write_ids_to_min_history");
       }
 
+      @Override
       public add_write_ids_to_min_history_args getEmptyArgsInstance() {
         return new add_write_ids_to_min_history_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25222,8 +27973,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_write_ids_to_min_history_result getEmptyResultInstance() {
+        return new add_write_ids_to_min_history_result();
+      }
+
+      @Override
       public add_write_ids_to_min_history_result getResult(I iface, add_write_ids_to_min_history_args args) throws org.apache.thrift.TException {
-        add_write_ids_to_min_history_result result = new add_write_ids_to_min_history_result();
+        add_write_ids_to_min_history_result result = getEmptyResultInstance();
         try {
           iface.add_write_ids_to_min_history(args.txnId, args.writeIds);
         } catch (MetaException o2) {
@@ -25233,16 +27990,18 @@ public add_write_ids_to_min_history_result getResult(I iface, add_write_ids_to_m
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class allocate_table_write_ids<I extends Iface> extends org.apache.thrift.ProcessFunction<I, allocate_table_write_ids_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class allocate_table_write_ids<I extends Iface> extends org.apache.thrift.ProcessFunction<I, allocate_table_write_ids_args, allocate_table_write_ids_result> {
       public allocate_table_write_ids() {
         super("allocate_table_write_ids");
       }
 
+      @Override
       public allocate_table_write_ids_args getEmptyArgsInstance() {
         return new allocate_table_write_ids_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25251,8 +28010,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public allocate_table_write_ids_result getEmptyResultInstance() {
+        return new allocate_table_write_ids_result();
+      }
+
+      @Override
       public allocate_table_write_ids_result getResult(I iface, allocate_table_write_ids_args args) throws org.apache.thrift.TException {
-        allocate_table_write_ids_result result = new allocate_table_write_ids_result();
+        allocate_table_write_ids_result result = getEmptyResultInstance();
         try {
           result.success = iface.allocate_table_write_ids(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25266,16 +28031,18 @@ public allocate_table_write_ids_result getResult(I iface, allocate_table_write_i
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_max_allocated_table_write_id<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_max_allocated_table_write_id_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_max_allocated_table_write_id<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_max_allocated_table_write_id_args, get_max_allocated_table_write_id_result> {
       public get_max_allocated_table_write_id() {
         super("get_max_allocated_table_write_id");
       }
 
+      @Override
       public get_max_allocated_table_write_id_args getEmptyArgsInstance() {
         return new get_max_allocated_table_write_id_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25284,8 +28051,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_max_allocated_table_write_id_result getEmptyResultInstance() {
+        return new get_max_allocated_table_write_id_result();
+      }
+
+      @Override
       public get_max_allocated_table_write_id_result getResult(I iface, get_max_allocated_table_write_id_args args) throws org.apache.thrift.TException {
-        get_max_allocated_table_write_id_result result = new get_max_allocated_table_write_id_result();
+        get_max_allocated_table_write_id_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_max_allocated_table_write_id(args.rqst);
         } catch (MetaException o1) {
@@ -25295,16 +28068,18 @@ public get_max_allocated_table_write_id_result getResult(I iface, get_max_alloca
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_write_id<I extends Iface> extends org.apache.thrift.ProcessFunction<I, seed_write_id_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_write_id<I extends Iface> extends org.apache.thrift.ProcessFunction<I, seed_write_id_args, seed_write_id_result> {
       public seed_write_id() {
         super("seed_write_id");
       }
 
+      @Override
       public seed_write_id_args getEmptyArgsInstance() {
         return new seed_write_id_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25313,8 +28088,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public seed_write_id_result getEmptyResultInstance() {
+        return new seed_write_id_result();
+      }
+
+      @Override
       public seed_write_id_result getResult(I iface, seed_write_id_args args) throws org.apache.thrift.TException {
-        seed_write_id_result result = new seed_write_id_result();
+        seed_write_id_result result = getEmptyResultInstance();
         try {
           iface.seed_write_id(args.rqst);
         } catch (MetaException o1) {
@@ -25324,16 +28105,18 @@ public seed_write_id_result getResult(I iface, seed_write_id_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_txn_id<I extends Iface> extends org.apache.thrift.ProcessFunction<I, seed_txn_id_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_txn_id<I extends Iface> extends org.apache.thrift.ProcessFunction<I, seed_txn_id_args, seed_txn_id_result> {
       public seed_txn_id() {
         super("seed_txn_id");
       }
 
+      @Override
       public seed_txn_id_args getEmptyArgsInstance() {
         return new seed_txn_id_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25342,8 +28125,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public seed_txn_id_result getEmptyResultInstance() {
+        return new seed_txn_id_result();
+      }
+
+      @Override
       public seed_txn_id_result getResult(I iface, seed_txn_id_args args) throws org.apache.thrift.TException {
-        seed_txn_id_result result = new seed_txn_id_result();
+        seed_txn_id_result result = getEmptyResultInstance();
         try {
           iface.seed_txn_id(args.rqst);
         } catch (MetaException o1) {
@@ -25353,16 +28142,18 @@ public seed_txn_id_result getResult(I iface, seed_txn_id_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class lock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, lock_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class lock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, lock_args, lock_result> {
       public lock() {
         super("lock");
       }
 
+      @Override
       public lock_args getEmptyArgsInstance() {
         return new lock_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25371,8 +28162,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public lock_result getEmptyResultInstance() {
+        return new lock_result();
+      }
+
+      @Override
       public lock_result getResult(I iface, lock_args args) throws org.apache.thrift.TException {
-        lock_result result = new lock_result();
+        lock_result result = getEmptyResultInstance();
         try {
           result.success = iface.lock(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25384,16 +28181,18 @@ public lock_result getResult(I iface, lock_args args) throws org.apache.thrift.T
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class check_lock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, check_lock_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class check_lock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, check_lock_args, check_lock_result> {
       public check_lock() {
         super("check_lock");
       }
 
+      @Override
       public check_lock_args getEmptyArgsInstance() {
         return new check_lock_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25402,8 +28201,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public check_lock_result getEmptyResultInstance() {
+        return new check_lock_result();
+      }
+
+      @Override
       public check_lock_result getResult(I iface, check_lock_args args) throws org.apache.thrift.TException {
-        check_lock_result result = new check_lock_result();
+        check_lock_result result = getEmptyResultInstance();
         try {
           result.success = iface.check_lock(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25417,16 +28222,18 @@ public check_lock_result getResult(I iface, check_lock_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class unlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, unlock_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class unlock<I extends Iface> extends org.apache.thrift.ProcessFunction<I, unlock_args, unlock_result> {
       public unlock() {
         super("unlock");
       }
 
+      @Override
       public unlock_args getEmptyArgsInstance() {
         return new unlock_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25435,8 +28242,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public unlock_result getEmptyResultInstance() {
+        return new unlock_result();
+      }
+
+      @Override
       public unlock_result getResult(I iface, unlock_args args) throws org.apache.thrift.TException {
-        unlock_result result = new unlock_result();
+        unlock_result result = getEmptyResultInstance();
         try {
           iface.unlock(args.rqst);
         } catch (NoSuchLockException o1) {
@@ -25448,16 +28261,18 @@ public unlock_result getResult(I iface, unlock_args args) throws org.apache.thri
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_locks<I extends Iface> extends org.apache.thrift.ProcessFunction<I, show_locks_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_locks<I extends Iface> extends org.apache.thrift.ProcessFunction<I, show_locks_args, show_locks_result> {
       public show_locks() {
         super("show_locks");
       }
 
+      @Override
       public show_locks_args getEmptyArgsInstance() {
         return new show_locks_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25466,23 +28281,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public show_locks_result getEmptyResultInstance() {
+        return new show_locks_result();
+      }
+
+      @Override
       public show_locks_result getResult(I iface, show_locks_args args) throws org.apache.thrift.TException {
-        show_locks_result result = new show_locks_result();
+        show_locks_result result = getEmptyResultInstance();
         result.success = iface.show_locks(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_args, heartbeat_result> {
       public heartbeat() {
         super("heartbeat");
       }
 
+      @Override
       public heartbeat_args getEmptyArgsInstance() {
         return new heartbeat_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25491,8 +28314,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public heartbeat_result getEmptyResultInstance() {
+        return new heartbeat_result();
+      }
+
+      @Override
       public heartbeat_result getResult(I iface, heartbeat_args args) throws org.apache.thrift.TException {
-        heartbeat_result result = new heartbeat_result();
+        heartbeat_result result = getEmptyResultInstance();
         try {
           iface.heartbeat(args.ids);
         } catch (NoSuchLockException o1) {
@@ -25506,16 +28335,18 @@ public heartbeat_result getResult(I iface, heartbeat_args args) throws org.apach
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_txn_range<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_txn_range_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_txn_range<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_txn_range_args, heartbeat_txn_range_result> {
       public heartbeat_txn_range() {
         super("heartbeat_txn_range");
       }
 
+      @Override
       public heartbeat_txn_range_args getEmptyArgsInstance() {
         return new heartbeat_txn_range_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25524,23 +28355,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public heartbeat_txn_range_result getEmptyResultInstance() {
+        return new heartbeat_txn_range_result();
+      }
+
+      @Override
       public heartbeat_txn_range_result getResult(I iface, heartbeat_txn_range_args args) throws org.apache.thrift.TException {
-        heartbeat_txn_range_result result = new heartbeat_txn_range_result();
+        heartbeat_txn_range_result result = getEmptyResultInstance();
         result.success = iface.heartbeat_txn_range(args.txns);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact<I extends Iface> extends org.apache.thrift.ProcessFunction<I, compact_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact<I extends Iface> extends org.apache.thrift.ProcessFunction<I, compact_args, compact_result> {
       public compact() {
         super("compact");
       }
 
+      @Override
       public compact_args getEmptyArgsInstance() {
         return new compact_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25549,23 +28388,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public compact_result getEmptyResultInstance() {
+        return new compact_result();
+      }
+
+      @Override
       public compact_result getResult(I iface, compact_args args) throws org.apache.thrift.TException {
-        compact_result result = new compact_result();
+        compact_result result = getEmptyResultInstance();
         iface.compact(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact2<I extends Iface> extends org.apache.thrift.ProcessFunction<I, compact2_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact2<I extends Iface> extends org.apache.thrift.ProcessFunction<I, compact2_args, compact2_result> {
       public compact2() {
         super("compact2");
       }
 
+      @Override
       public compact2_args getEmptyArgsInstance() {
         return new compact2_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25574,23 +28421,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public compact2_result getEmptyResultInstance() {
+        return new compact2_result();
+      }
+
+      @Override
       public compact2_result getResult(I iface, compact2_args args) throws org.apache.thrift.TException {
-        compact2_result result = new compact2_result();
+        compact2_result result = getEmptyResultInstance();
         result.success = iface.compact2(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_compact<I extends Iface> extends org.apache.thrift.ProcessFunction<I, show_compact_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_compact<I extends Iface> extends org.apache.thrift.ProcessFunction<I, show_compact_args, show_compact_result> {
       public show_compact() {
         super("show_compact");
       }
 
+      @Override
       public show_compact_args getEmptyArgsInstance() {
         return new show_compact_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25599,23 +28454,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public show_compact_result getEmptyResultInstance() {
+        return new show_compact_result();
+      }
+
+      @Override
       public show_compact_result getResult(I iface, show_compact_args args) throws org.apache.thrift.TException {
-        show_compact_result result = new show_compact_result();
+        show_compact_result result = getEmptyResultInstance();
         result.success = iface.show_compact(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class submit_for_cleanup<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submit_for_cleanup_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class submit_for_cleanup<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submit_for_cleanup_args, submit_for_cleanup_result> {
       public submit_for_cleanup() {
         super("submit_for_cleanup");
       }
 
+      @Override
       public submit_for_cleanup_args getEmptyArgsInstance() {
         return new submit_for_cleanup_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25624,8 +28487,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public submit_for_cleanup_result getEmptyResultInstance() {
+        return new submit_for_cleanup_result();
+      }
+
+      @Override
       public submit_for_cleanup_result getResult(I iface, submit_for_cleanup_args args) throws org.apache.thrift.TException {
-        submit_for_cleanup_result result = new submit_for_cleanup_result();
+        submit_for_cleanup_result result = getEmptyResultInstance();
         try {
           result.success = iface.submit_for_cleanup(args.o1, args.o2, args.o3);
           result.setSuccessIsSet(true);
@@ -25636,16 +28505,18 @@ public submit_for_cleanup_result getResult(I iface, submit_for_cleanup_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_dynamic_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_dynamic_partitions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_dynamic_partitions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_dynamic_partitions_args, add_dynamic_partitions_result> {
       public add_dynamic_partitions() {
         super("add_dynamic_partitions");
       }
 
+      @Override
       public add_dynamic_partitions_args getEmptyArgsInstance() {
         return new add_dynamic_partitions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25654,8 +28525,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_dynamic_partitions_result getEmptyResultInstance() {
+        return new add_dynamic_partitions_result();
+      }
+
+      @Override
       public add_dynamic_partitions_result getResult(I iface, add_dynamic_partitions_args args) throws org.apache.thrift.TException {
-        add_dynamic_partitions_result result = new add_dynamic_partitions_result();
+        add_dynamic_partitions_result result = getEmptyResultInstance();
         try {
           iface.add_dynamic_partitions(args.rqst);
         } catch (NoSuchTxnException o1) {
@@ -25667,16 +28544,18 @@ public add_dynamic_partitions_result getResult(I iface, add_dynamic_partitions_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_next_compact_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_next_compact_args, find_next_compact_result> {
       public find_next_compact() {
         super("find_next_compact");
       }
 
+      @Override
       public find_next_compact_args getEmptyArgsInstance() {
         return new find_next_compact_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25685,8 +28564,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public find_next_compact_result getEmptyResultInstance() {
+        return new find_next_compact_result();
+      }
+
+      @Override
       public find_next_compact_result getResult(I iface, find_next_compact_args args) throws org.apache.thrift.TException {
-        find_next_compact_result result = new find_next_compact_result();
+        find_next_compact_result result = getEmptyResultInstance();
         try {
           result.success = iface.find_next_compact(args.workerId);
         } catch (MetaException o1) {
@@ -25696,16 +28581,18 @@ public find_next_compact_result getResult(I iface, find_next_compact_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact2<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_next_compact2_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact2<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_next_compact2_args, find_next_compact2_result> {
       public find_next_compact2() {
         super("find_next_compact2");
       }
 
+      @Override
       public find_next_compact2_args getEmptyArgsInstance() {
         return new find_next_compact2_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25714,8 +28601,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public find_next_compact2_result getEmptyResultInstance() {
+        return new find_next_compact2_result();
+      }
+
+      @Override
       public find_next_compact2_result getResult(I iface, find_next_compact2_args args) throws org.apache.thrift.TException {
-        find_next_compact2_result result = new find_next_compact2_result();
+        find_next_compact2_result result = getEmptyResultInstance();
         try {
           result.success = iface.find_next_compact2(args.rqst);
         } catch (MetaException o1) {
@@ -25725,16 +28618,18 @@ public find_next_compact2_result getResult(I iface, find_next_compact2_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compactor_state<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_compactor_state_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compactor_state<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_compactor_state_args, update_compactor_state_result> {
       public update_compactor_state() {
         super("update_compactor_state");
       }
 
+      @Override
       public update_compactor_state_args getEmptyArgsInstance() {
         return new update_compactor_state_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25743,23 +28638,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_compactor_state_result getEmptyResultInstance() {
+        return new update_compactor_state_result();
+      }
+
+      @Override
       public update_compactor_state_result getResult(I iface, update_compactor_state_args args) throws org.apache.thrift.TException {
-        update_compactor_state_result result = new update_compactor_state_result();
+        update_compactor_state_result result = getEmptyResultInstance();
         iface.update_compactor_state(args.cr, args.txn_id);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_columns_with_stats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_columns_with_stats_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_columns_with_stats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_columns_with_stats_args, find_columns_with_stats_result> {
       public find_columns_with_stats() {
         super("find_columns_with_stats");
       }
 
+      @Override
       public find_columns_with_stats_args getEmptyArgsInstance() {
         return new find_columns_with_stats_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25768,23 +28671,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public find_columns_with_stats_result getEmptyResultInstance() {
+        return new find_columns_with_stats_result();
+      }
+
+      @Override
       public find_columns_with_stats_result getResult(I iface, find_columns_with_stats_args args) throws org.apache.thrift.TException {
-        find_columns_with_stats_result result = new find_columns_with_stats_result();
+        find_columns_with_stats_result result = getEmptyResultInstance();
         result.success = iface.find_columns_with_stats(args.cr);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_cleaned<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_cleaned_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_cleaned<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_cleaned_args, mark_cleaned_result> {
       public mark_cleaned() {
         super("mark_cleaned");
       }
 
+      @Override
       public mark_cleaned_args getEmptyArgsInstance() {
         return new mark_cleaned_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25793,8 +28704,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public mark_cleaned_result getEmptyResultInstance() {
+        return new mark_cleaned_result();
+      }
+
+      @Override
       public mark_cleaned_result getResult(I iface, mark_cleaned_args args) throws org.apache.thrift.TException {
-        mark_cleaned_result result = new mark_cleaned_result();
+        mark_cleaned_result result = getEmptyResultInstance();
         try {
           iface.mark_cleaned(args.cr);
         } catch (MetaException o1) {
@@ -25804,16 +28721,18 @@ public mark_cleaned_result getResult(I iface, mark_cleaned_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_compacted<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_compacted_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_compacted<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_compacted_args, mark_compacted_result> {
       public mark_compacted() {
         super("mark_compacted");
       }
 
+      @Override
       public mark_compacted_args getEmptyArgsInstance() {
         return new mark_compacted_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25822,8 +28741,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public mark_compacted_result getEmptyResultInstance() {
+        return new mark_compacted_result();
+      }
+
+      @Override
       public mark_compacted_result getResult(I iface, mark_compacted_args args) throws org.apache.thrift.TException {
-        mark_compacted_result result = new mark_compacted_result();
+        mark_compacted_result result = getEmptyResultInstance();
         try {
           iface.mark_compacted(args.cr);
         } catch (MetaException o1) {
@@ -25833,16 +28758,18 @@ public mark_compacted_result getResult(I iface, mark_compacted_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_failed<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_failed_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_failed<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_failed_args, mark_failed_result> {
       public mark_failed() {
         super("mark_failed");
       }
 
+      @Override
       public mark_failed_args getEmptyArgsInstance() {
         return new mark_failed_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25851,8 +28778,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public mark_failed_result getEmptyResultInstance() {
+        return new mark_failed_result();
+      }
+
+      @Override
       public mark_failed_result getResult(I iface, mark_failed_args args) throws org.apache.thrift.TException {
-        mark_failed_result result = new mark_failed_result();
+        mark_failed_result result = getEmptyResultInstance();
         try {
           iface.mark_failed(args.cr);
         } catch (MetaException o1) {
@@ -25862,16 +28795,18 @@ public mark_failed_result getResult(I iface, mark_failed_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_refused<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_refused_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_refused<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mark_refused_args, mark_refused_result> {
       public mark_refused() {
         super("mark_refused");
       }
 
+      @Override
       public mark_refused_args getEmptyArgsInstance() {
         return new mark_refused_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25880,8 +28815,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public mark_refused_result getEmptyResultInstance() {
+        return new mark_refused_result();
+      }
+
+      @Override
       public mark_refused_result getResult(I iface, mark_refused_args args) throws org.apache.thrift.TException {
-        mark_refused_result result = new mark_refused_result();
+        mark_refused_result result = getEmptyResultInstance();
         try {
           iface.mark_refused(args.cr);
         } catch (MetaException o1) {
@@ -25891,16 +28832,18 @@ public mark_refused_result getResult(I iface, mark_refused_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compaction_metrics_data<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_compaction_metrics_data_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compaction_metrics_data<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_compaction_metrics_data_args, update_compaction_metrics_data_result> {
       public update_compaction_metrics_data() {
         super("update_compaction_metrics_data");
       }
 
+      @Override
       public update_compaction_metrics_data_args getEmptyArgsInstance() {
         return new update_compaction_metrics_data_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25909,8 +28852,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public update_compaction_metrics_data_result getEmptyResultInstance() {
+        return new update_compaction_metrics_data_result();
+      }
+
+      @Override
       public update_compaction_metrics_data_result getResult(I iface, update_compaction_metrics_data_args args) throws org.apache.thrift.TException {
-        update_compaction_metrics_data_result result = new update_compaction_metrics_data_result();
+        update_compaction_metrics_data_result result = getEmptyResultInstance();
         try {
           result.success = iface.update_compaction_metrics_data(args.data);
           result.setSuccessIsSet(true);
@@ -25921,16 +28870,18 @@ public update_compaction_metrics_data_result getResult(I iface, update_compactio
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_compaction_metrics_data<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_compaction_metrics_data_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_compaction_metrics_data<I extends Iface> extends org.apache.thrift.ProcessFunction<I, remove_compaction_metrics_data_args, remove_compaction_metrics_data_result> {
       public remove_compaction_metrics_data() {
         super("remove_compaction_metrics_data");
       }
 
+      @Override
       public remove_compaction_metrics_data_args getEmptyArgsInstance() {
         return new remove_compaction_metrics_data_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25939,8 +28890,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public remove_compaction_metrics_data_result getEmptyResultInstance() {
+        return new remove_compaction_metrics_data_result();
+      }
+
+      @Override
       public remove_compaction_metrics_data_result getResult(I iface, remove_compaction_metrics_data_args args) throws org.apache.thrift.TException {
-        remove_compaction_metrics_data_result result = new remove_compaction_metrics_data_result();
+        remove_compaction_metrics_data_result result = getEmptyResultInstance();
         try {
           iface.remove_compaction_metrics_data(args.request);
         } catch (MetaException o1) {
@@ -25950,16 +28907,18 @@ public remove_compaction_metrics_data_result getResult(I iface, remove_compactio
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_hadoop_jobid<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_hadoop_jobid_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_hadoop_jobid<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_hadoop_jobid_args, set_hadoop_jobid_result> {
       public set_hadoop_jobid() {
         super("set_hadoop_jobid");
       }
 
+      @Override
       public set_hadoop_jobid_args getEmptyArgsInstance() {
         return new set_hadoop_jobid_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25968,23 +28927,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public set_hadoop_jobid_result getEmptyResultInstance() {
+        return new set_hadoop_jobid_result();
+      }
+
+      @Override
       public set_hadoop_jobid_result getResult(I iface, set_hadoop_jobid_args args) throws org.apache.thrift.TException {
-        set_hadoop_jobid_result result = new set_hadoop_jobid_result();
+        set_hadoop_jobid_result result = getEmptyResultInstance();
         iface.set_hadoop_jobid(args.jobId, args.cq_id);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_committed_compaction_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_latest_committed_compaction_info_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_committed_compaction_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_latest_committed_compaction_info_args, get_latest_committed_compaction_info_result> {
       public get_latest_committed_compaction_info() {
         super("get_latest_committed_compaction_info");
       }
 
+      @Override
       public get_latest_committed_compaction_info_args getEmptyArgsInstance() {
         return new get_latest_committed_compaction_info_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -25993,23 +28960,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_latest_committed_compaction_info_result getEmptyResultInstance() {
+        return new get_latest_committed_compaction_info_result();
+      }
+
+      @Override
       public get_latest_committed_compaction_info_result getResult(I iface, get_latest_committed_compaction_info_args args) throws org.apache.thrift.TException {
-        get_latest_committed_compaction_info_result result = new get_latest_committed_compaction_info_result();
+        get_latest_committed_compaction_info_result result = getEmptyResultInstance();
         result.success = iface.get_latest_committed_compaction_info(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_next_notification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_next_notification_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_next_notification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_next_notification_args, get_next_notification_result> {
       public get_next_notification() {
         super("get_next_notification");
       }
 
+      @Override
       public get_next_notification_args getEmptyArgsInstance() {
         return new get_next_notification_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26018,23 +28993,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_next_notification_result getEmptyResultInstance() {
+        return new get_next_notification_result();
+      }
+
+      @Override
       public get_next_notification_result getResult(I iface, get_next_notification_args args) throws org.apache.thrift.TException {
-        get_next_notification_result result = new get_next_notification_result();
+        get_next_notification_result result = getEmptyResultInstance();
         result.success = iface.get_next_notification(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_current_notificationEventId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_current_notificationEventId_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_current_notificationEventId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_current_notificationEventId_args, get_current_notificationEventId_result> {
       public get_current_notificationEventId() {
         super("get_current_notificationEventId");
       }
 
+      @Override
       public get_current_notificationEventId_args getEmptyArgsInstance() {
         return new get_current_notificationEventId_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26043,23 +29026,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_current_notificationEventId_result getEmptyResultInstance() {
+        return new get_current_notificationEventId_result();
+      }
+
+      @Override
       public get_current_notificationEventId_result getResult(I iface, get_current_notificationEventId_args args) throws org.apache.thrift.TException {
-        get_current_notificationEventId_result result = new get_current_notificationEventId_result();
+        get_current_notificationEventId_result result = getEmptyResultInstance();
         result.success = iface.get_current_notificationEventId();
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_notification_events_count<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_notification_events_count_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_notification_events_count<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_notification_events_count_args, get_notification_events_count_result> {
       public get_notification_events_count() {
         super("get_notification_events_count");
       }
 
+      @Override
       public get_notification_events_count_args getEmptyArgsInstance() {
         return new get_notification_events_count_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26068,23 +29059,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_notification_events_count_result getEmptyResultInstance() {
+        return new get_notification_events_count_result();
+      }
+
+      @Override
       public get_notification_events_count_result getResult(I iface, get_notification_events_count_args args) throws org.apache.thrift.TException {
-        get_notification_events_count_result result = new get_notification_events_count_result();
+        get_notification_events_count_result result = getEmptyResultInstance();
         result.success = iface.get_notification_events_count(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fire_listener_event<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fire_listener_event_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fire_listener_event<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fire_listener_event_args, fire_listener_event_result> {
       public fire_listener_event() {
         super("fire_listener_event");
       }
 
+      @Override
       public fire_listener_event_args getEmptyArgsInstance() {
         return new fire_listener_event_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26093,23 +29092,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public fire_listener_event_result getEmptyResultInstance() {
+        return new fire_listener_event_result();
+      }
+
+      @Override
       public fire_listener_event_result getResult(I iface, fire_listener_event_args args) throws org.apache.thrift.TException {
-        fire_listener_event_result result = new fire_listener_event_result();
+        fire_listener_event_result result = getEmptyResultInstance();
         result.success = iface.fire_listener_event(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class flushCache<I extends Iface> extends org.apache.thrift.ProcessFunction<I, flushCache_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class flushCache<I extends Iface> extends org.apache.thrift.ProcessFunction<I, flushCache_args, flushCache_result> {
       public flushCache() {
         super("flushCache");
       }
 
+      @Override
       public flushCache_args getEmptyArgsInstance() {
         return new flushCache_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26118,23 +29125,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public flushCache_result getEmptyResultInstance() {
+        return new flushCache_result();
+      }
+
+      @Override
       public flushCache_result getResult(I iface, flushCache_args args) throws org.apache.thrift.TException {
-        flushCache_result result = new flushCache_result();
+        flushCache_result result = getEmptyResultInstance();
         iface.flushCache();
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_write_notification_log_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_write_notification_log_args, add_write_notification_log_result> {
       public add_write_notification_log() {
         super("add_write_notification_log");
       }
 
+      @Override
       public add_write_notification_log_args getEmptyArgsInstance() {
         return new add_write_notification_log_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26143,23 +29158,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_write_notification_log_result getEmptyResultInstance() {
+        return new add_write_notification_log_result();
+      }
+
+      @Override
       public add_write_notification_log_result getResult(I iface, add_write_notification_log_args args) throws org.apache.thrift.TException {
-        add_write_notification_log_result result = new add_write_notification_log_result();
+        add_write_notification_log_result result = getEmptyResultInstance();
         result.success = iface.add_write_notification_log(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_in_batch<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_write_notification_log_in_batch_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_in_batch<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_write_notification_log_in_batch_args, add_write_notification_log_in_batch_result> {
       public add_write_notification_log_in_batch() {
         super("add_write_notification_log_in_batch");
       }
 
+      @Override
       public add_write_notification_log_in_batch_args getEmptyArgsInstance() {
         return new add_write_notification_log_in_batch_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26168,23 +29191,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_write_notification_log_in_batch_result getEmptyResultInstance() {
+        return new add_write_notification_log_in_batch_result();
+      }
+
+      @Override
       public add_write_notification_log_in_batch_result getResult(I iface, add_write_notification_log_in_batch_args args) throws org.apache.thrift.TException {
-        add_write_notification_log_in_batch_result result = new add_write_notification_log_in_batch_result();
+        add_write_notification_log_in_batch_result result = getEmptyResultInstance();
         result.success = iface.add_write_notification_log_in_batch(args.rqst);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cm_recycle<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cm_recycle_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cm_recycle<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cm_recycle_args, cm_recycle_result> {
       public cm_recycle() {
         super("cm_recycle");
       }
 
+      @Override
       public cm_recycle_args getEmptyArgsInstance() {
         return new cm_recycle_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26193,8 +29224,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public cm_recycle_result getEmptyResultInstance() {
+        return new cm_recycle_result();
+      }
+
+      @Override
       public cm_recycle_result getResult(I iface, cm_recycle_args args) throws org.apache.thrift.TException {
-        cm_recycle_result result = new cm_recycle_result();
+        cm_recycle_result result = getEmptyResultInstance();
         try {
           result.success = iface.cm_recycle(args.request);
         } catch (MetaException o1) {
@@ -26204,16 +29241,18 @@ public cm_recycle_result getResult(I iface, cm_recycle_args args) throws org.apa
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_by_expr<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_file_metadata_by_expr_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_by_expr<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_file_metadata_by_expr_args, get_file_metadata_by_expr_result> {
       public get_file_metadata_by_expr() {
         super("get_file_metadata_by_expr");
       }
 
+      @Override
       public get_file_metadata_by_expr_args getEmptyArgsInstance() {
         return new get_file_metadata_by_expr_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26222,23 +29261,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_file_metadata_by_expr_result getEmptyResultInstance() {
+        return new get_file_metadata_by_expr_result();
+      }
+
+      @Override
       public get_file_metadata_by_expr_result getResult(I iface, get_file_metadata_by_expr_args args) throws org.apache.thrift.TException {
-        get_file_metadata_by_expr_result result = new get_file_metadata_by_expr_result();
+        get_file_metadata_by_expr_result result = getEmptyResultInstance();
         result.success = iface.get_file_metadata_by_expr(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_file_metadata_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_file_metadata_args, get_file_metadata_result> {
       public get_file_metadata() {
         super("get_file_metadata");
       }
 
+      @Override
       public get_file_metadata_args getEmptyArgsInstance() {
         return new get_file_metadata_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26247,23 +29294,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_file_metadata_result getEmptyResultInstance() {
+        return new get_file_metadata_result();
+      }
+
+      @Override
       public get_file_metadata_result getResult(I iface, get_file_metadata_args args) throws org.apache.thrift.TException {
-        get_file_metadata_result result = new get_file_metadata_result();
+        get_file_metadata_result result = getEmptyResultInstance();
         result.success = iface.get_file_metadata(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class put_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, put_file_metadata_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class put_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, put_file_metadata_args, put_file_metadata_result> {
       public put_file_metadata() {
         super("put_file_metadata");
       }
 
+      @Override
       public put_file_metadata_args getEmptyArgsInstance() {
         return new put_file_metadata_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26272,23 +29327,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public put_file_metadata_result getEmptyResultInstance() {
+        return new put_file_metadata_result();
+      }
+
+      @Override
       public put_file_metadata_result getResult(I iface, put_file_metadata_args args) throws org.apache.thrift.TException {
-        put_file_metadata_result result = new put_file_metadata_result();
+        put_file_metadata_result result = getEmptyResultInstance();
         result.success = iface.put_file_metadata(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class clear_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, clear_file_metadata_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class clear_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, clear_file_metadata_args, clear_file_metadata_result> {
       public clear_file_metadata() {
         super("clear_file_metadata");
       }
 
+      @Override
       public clear_file_metadata_args getEmptyArgsInstance() {
         return new clear_file_metadata_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26297,23 +29360,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public clear_file_metadata_result getEmptyResultInstance() {
+        return new clear_file_metadata_result();
+      }
+
+      @Override
       public clear_file_metadata_result getResult(I iface, clear_file_metadata_args args) throws org.apache.thrift.TException {
-        clear_file_metadata_result result = new clear_file_metadata_result();
+        clear_file_metadata_result result = getEmptyResultInstance();
         result.success = iface.clear_file_metadata(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cache_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cache_file_metadata_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cache_file_metadata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cache_file_metadata_args, cache_file_metadata_result> {
       public cache_file_metadata() {
         super("cache_file_metadata");
       }
 
+      @Override
       public cache_file_metadata_args getEmptyArgsInstance() {
         return new cache_file_metadata_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26322,23 +29393,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public cache_file_metadata_result getEmptyResultInstance() {
+        return new cache_file_metadata_result();
+      }
+
+      @Override
       public cache_file_metadata_result getResult(I iface, cache_file_metadata_args args) throws org.apache.thrift.TException {
-        cache_file_metadata_result result = new cache_file_metadata_result();
+        cache_file_metadata_result result = getEmptyResultInstance();
         result.success = iface.cache_file_metadata(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_metastore_db_uuid<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_metastore_db_uuid_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_metastore_db_uuid<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_metastore_db_uuid_args, get_metastore_db_uuid_result> {
       public get_metastore_db_uuid() {
         super("get_metastore_db_uuid");
       }
 
+      @Override
       public get_metastore_db_uuid_args getEmptyArgsInstance() {
         return new get_metastore_db_uuid_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26347,8 +29426,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_metastore_db_uuid_result getEmptyResultInstance() {
+        return new get_metastore_db_uuid_result();
+      }
+
+      @Override
       public get_metastore_db_uuid_result getResult(I iface, get_metastore_db_uuid_args args) throws org.apache.thrift.TException {
-        get_metastore_db_uuid_result result = new get_metastore_db_uuid_result();
+        get_metastore_db_uuid_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_metastore_db_uuid();
         } catch (MetaException o1) {
@@ -26358,16 +29443,18 @@ public get_metastore_db_uuid_result getResult(I iface, get_metastore_db_uuid_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_resource_plan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_resource_plan_args, create_resource_plan_result> {
       public create_resource_plan() {
         super("create_resource_plan");
       }
 
+      @Override
       public create_resource_plan_args getEmptyArgsInstance() {
         return new create_resource_plan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26376,8 +29463,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_resource_plan_result getEmptyResultInstance() {
+        return new create_resource_plan_result();
+      }
+
+      @Override
       public create_resource_plan_result getResult(I iface, create_resource_plan_args args) throws org.apache.thrift.TException {
-        create_resource_plan_result result = new create_resource_plan_result();
+        create_resource_plan_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_resource_plan(args.request);
         } catch (AlreadyExistsException o1) {
@@ -26391,16 +29484,18 @@ public create_resource_plan_result getResult(I iface, create_resource_plan_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_resource_plan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_resource_plan_args, get_resource_plan_result> {
       public get_resource_plan() {
         super("get_resource_plan");
       }
 
+      @Override
       public get_resource_plan_args getEmptyArgsInstance() {
         return new get_resource_plan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26409,8 +29504,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_resource_plan_result getEmptyResultInstance() {
+        return new get_resource_plan_result();
+      }
+
+      @Override
       public get_resource_plan_result getResult(I iface, get_resource_plan_args args) throws org.apache.thrift.TException {
-        get_resource_plan_result result = new get_resource_plan_result();
+        get_resource_plan_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_resource_plan(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26422,16 +29523,18 @@ public get_resource_plan_result getResult(I iface, get_resource_plan_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_active_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_active_resource_plan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_active_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_active_resource_plan_args, get_active_resource_plan_result> {
       public get_active_resource_plan() {
         super("get_active_resource_plan");
       }
 
+      @Override
       public get_active_resource_plan_args getEmptyArgsInstance() {
         return new get_active_resource_plan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26440,8 +29543,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_active_resource_plan_result getEmptyResultInstance() {
+        return new get_active_resource_plan_result();
+      }
+
+      @Override
       public get_active_resource_plan_result getResult(I iface, get_active_resource_plan_args args) throws org.apache.thrift.TException {
-        get_active_resource_plan_result result = new get_active_resource_plan_result();
+        get_active_resource_plan_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_active_resource_plan(args.request);
         } catch (MetaException o2) {
@@ -26451,16 +29560,18 @@ public get_active_resource_plan_result getResult(I iface, get_active_resource_pl
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_resource_plans<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_resource_plans_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_resource_plans<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_resource_plans_args, get_all_resource_plans_result> {
       public get_all_resource_plans() {
         super("get_all_resource_plans");
       }
 
+      @Override
       public get_all_resource_plans_args getEmptyArgsInstance() {
         return new get_all_resource_plans_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26469,8 +29580,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_resource_plans_result getEmptyResultInstance() {
+        return new get_all_resource_plans_result();
+      }
+
+      @Override
       public get_all_resource_plans_result getResult(I iface, get_all_resource_plans_args args) throws org.apache.thrift.TException {
-        get_all_resource_plans_result result = new get_all_resource_plans_result();
+        get_all_resource_plans_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_resource_plans(args.request);
         } catch (MetaException o1) {
@@ -26480,16 +29597,18 @@ public get_all_resource_plans_result getResult(I iface, get_all_resource_plans_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_resource_plan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_resource_plan_args, alter_resource_plan_result> {
       public alter_resource_plan() {
         super("alter_resource_plan");
       }
 
+      @Override
       public alter_resource_plan_args getEmptyArgsInstance() {
         return new alter_resource_plan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26498,8 +29617,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_resource_plan_result getEmptyResultInstance() {
+        return new alter_resource_plan_result();
+      }
+
+      @Override
       public alter_resource_plan_result getResult(I iface, alter_resource_plan_args args) throws org.apache.thrift.TException {
-        alter_resource_plan_result result = new alter_resource_plan_result();
+        alter_resource_plan_result result = getEmptyResultInstance();
         try {
           result.success = iface.alter_resource_plan(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26513,16 +29638,18 @@ public alter_resource_plan_result getResult(I iface, alter_resource_plan_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class validate_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, validate_resource_plan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class validate_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, validate_resource_plan_args, validate_resource_plan_result> {
       public validate_resource_plan() {
         super("validate_resource_plan");
       }
 
+      @Override
       public validate_resource_plan_args getEmptyArgsInstance() {
         return new validate_resource_plan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26531,8 +29658,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public validate_resource_plan_result getEmptyResultInstance() {
+        return new validate_resource_plan_result();
+      }
+
+      @Override
       public validate_resource_plan_result getResult(I iface, validate_resource_plan_args args) throws org.apache.thrift.TException {
-        validate_resource_plan_result result = new validate_resource_plan_result();
+        validate_resource_plan_result result = getEmptyResultInstance();
         try {
           result.success = iface.validate_resource_plan(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26544,16 +29677,18 @@ public validate_resource_plan_result getResult(I iface, validate_resource_plan_a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_resource_plan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_resource_plan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_resource_plan_args, drop_resource_plan_result> {
       public drop_resource_plan() {
         super("drop_resource_plan");
       }
 
+      @Override
       public drop_resource_plan_args getEmptyArgsInstance() {
         return new drop_resource_plan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26562,8 +29697,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_resource_plan_result getEmptyResultInstance() {
+        return new drop_resource_plan_result();
+      }
+
+      @Override
       public drop_resource_plan_result getResult(I iface, drop_resource_plan_args args) throws org.apache.thrift.TException {
-        drop_resource_plan_result result = new drop_resource_plan_result();
+        drop_resource_plan_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_resource_plan(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26577,16 +29718,18 @@ public drop_resource_plan_result getResult(I iface, drop_resource_plan_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_trigger<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_wm_trigger_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_trigger<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_wm_trigger_args, create_wm_trigger_result> {
       public create_wm_trigger() {
         super("create_wm_trigger");
       }
 
+      @Override
       public create_wm_trigger_args getEmptyArgsInstance() {
         return new create_wm_trigger_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26595,8 +29738,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_wm_trigger_result getEmptyResultInstance() {
+        return new create_wm_trigger_result();
+      }
+
+      @Override
       public create_wm_trigger_result getResult(I iface, create_wm_trigger_args args) throws org.apache.thrift.TException {
-        create_wm_trigger_result result = new create_wm_trigger_result();
+        create_wm_trigger_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_wm_trigger(args.request);
         } catch (AlreadyExistsException o1) {
@@ -26612,16 +29761,18 @@ public create_wm_trigger_result getResult(I iface, create_wm_trigger_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_trigger<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_wm_trigger_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_trigger<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_wm_trigger_args, alter_wm_trigger_result> {
       public alter_wm_trigger() {
         super("alter_wm_trigger");
       }
 
+      @Override
       public alter_wm_trigger_args getEmptyArgsInstance() {
         return new alter_wm_trigger_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26630,8 +29781,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_wm_trigger_result getEmptyResultInstance() {
+        return new alter_wm_trigger_result();
+      }
+
+      @Override
       public alter_wm_trigger_result getResult(I iface, alter_wm_trigger_args args) throws org.apache.thrift.TException {
-        alter_wm_trigger_result result = new alter_wm_trigger_result();
+        alter_wm_trigger_result result = getEmptyResultInstance();
         try {
           result.success = iface.alter_wm_trigger(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26645,16 +29802,18 @@ public alter_wm_trigger_result getResult(I iface, alter_wm_trigger_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_trigger<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_wm_trigger_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_trigger<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_wm_trigger_args, drop_wm_trigger_result> {
       public drop_wm_trigger() {
         super("drop_wm_trigger");
       }
 
+      @Override
       public drop_wm_trigger_args getEmptyArgsInstance() {
         return new drop_wm_trigger_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26663,8 +29822,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_wm_trigger_result getEmptyResultInstance() {
+        return new drop_wm_trigger_result();
+      }
+
+      @Override
       public drop_wm_trigger_result getResult(I iface, drop_wm_trigger_args args) throws org.apache.thrift.TException {
-        drop_wm_trigger_result result = new drop_wm_trigger_result();
+        drop_wm_trigger_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_wm_trigger(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26678,16 +29843,18 @@ public drop_wm_trigger_result getResult(I iface, drop_wm_trigger_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_triggers_for_resourceplan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_triggers_for_resourceplan_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_triggers_for_resourceplan<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_triggers_for_resourceplan_args, get_triggers_for_resourceplan_result> {
       public get_triggers_for_resourceplan() {
         super("get_triggers_for_resourceplan");
       }
 
+      @Override
       public get_triggers_for_resourceplan_args getEmptyArgsInstance() {
         return new get_triggers_for_resourceplan_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26696,8 +29863,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_triggers_for_resourceplan_result getEmptyResultInstance() {
+        return new get_triggers_for_resourceplan_result();
+      }
+
+      @Override
       public get_triggers_for_resourceplan_result getResult(I iface, get_triggers_for_resourceplan_args args) throws org.apache.thrift.TException {
-        get_triggers_for_resourceplan_result result = new get_triggers_for_resourceplan_result();
+        get_triggers_for_resourceplan_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_triggers_for_resourceplan(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26709,16 +29882,18 @@ public get_triggers_for_resourceplan_result getResult(I iface, get_triggers_for_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_pool<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_wm_pool_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_pool<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_wm_pool_args, create_wm_pool_result> {
       public create_wm_pool() {
         super("create_wm_pool");
       }
 
+      @Override
       public create_wm_pool_args getEmptyArgsInstance() {
         return new create_wm_pool_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26727,8 +29902,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_wm_pool_result getEmptyResultInstance() {
+        return new create_wm_pool_result();
+      }
+
+      @Override
       public create_wm_pool_result getResult(I iface, create_wm_pool_args args) throws org.apache.thrift.TException {
-        create_wm_pool_result result = new create_wm_pool_result();
+        create_wm_pool_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_wm_pool(args.request);
         } catch (AlreadyExistsException o1) {
@@ -26744,16 +29925,18 @@ public create_wm_pool_result getResult(I iface, create_wm_pool_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_pool<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_wm_pool_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_pool<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_wm_pool_args, alter_wm_pool_result> {
       public alter_wm_pool() {
         super("alter_wm_pool");
       }
 
+      @Override
       public alter_wm_pool_args getEmptyArgsInstance() {
         return new alter_wm_pool_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26762,8 +29945,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_wm_pool_result getEmptyResultInstance() {
+        return new alter_wm_pool_result();
+      }
+
+      @Override
       public alter_wm_pool_result getResult(I iface, alter_wm_pool_args args) throws org.apache.thrift.TException {
-        alter_wm_pool_result result = new alter_wm_pool_result();
+        alter_wm_pool_result result = getEmptyResultInstance();
         try {
           result.success = iface.alter_wm_pool(args.request);
         } catch (AlreadyExistsException o1) {
@@ -26779,16 +29968,18 @@ public alter_wm_pool_result getResult(I iface, alter_wm_pool_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_pool<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_wm_pool_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_pool<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_wm_pool_args, drop_wm_pool_result> {
       public drop_wm_pool() {
         super("drop_wm_pool");
       }
 
+      @Override
       public drop_wm_pool_args getEmptyArgsInstance() {
         return new drop_wm_pool_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26797,8 +29988,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_wm_pool_result getEmptyResultInstance() {
+        return new drop_wm_pool_result();
+      }
+
+      @Override
       public drop_wm_pool_result getResult(I iface, drop_wm_pool_args args) throws org.apache.thrift.TException {
-        drop_wm_pool_result result = new drop_wm_pool_result();
+        drop_wm_pool_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_wm_pool(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26812,16 +30009,18 @@ public drop_wm_pool_result getResult(I iface, drop_wm_pool_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_update_wm_mapping<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_or_update_wm_mapping_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_update_wm_mapping<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_or_update_wm_mapping_args, create_or_update_wm_mapping_result> {
       public create_or_update_wm_mapping() {
         super("create_or_update_wm_mapping");
       }
 
+      @Override
       public create_or_update_wm_mapping_args getEmptyArgsInstance() {
         return new create_or_update_wm_mapping_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26830,8 +30029,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_or_update_wm_mapping_result getEmptyResultInstance() {
+        return new create_or_update_wm_mapping_result();
+      }
+
+      @Override
       public create_or_update_wm_mapping_result getResult(I iface, create_or_update_wm_mapping_args args) throws org.apache.thrift.TException {
-        create_or_update_wm_mapping_result result = new create_or_update_wm_mapping_result();
+        create_or_update_wm_mapping_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_or_update_wm_mapping(args.request);
         } catch (AlreadyExistsException o1) {
@@ -26847,16 +30052,18 @@ public create_or_update_wm_mapping_result getResult(I iface, create_or_update_wm
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_mapping<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_wm_mapping_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_mapping<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_wm_mapping_args, drop_wm_mapping_result> {
       public drop_wm_mapping() {
         super("drop_wm_mapping");
       }
 
+      @Override
       public drop_wm_mapping_args getEmptyArgsInstance() {
         return new drop_wm_mapping_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26865,8 +30072,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_wm_mapping_result getEmptyResultInstance() {
+        return new drop_wm_mapping_result();
+      }
+
+      @Override
       public drop_wm_mapping_result getResult(I iface, drop_wm_mapping_args args) throws org.apache.thrift.TException {
-        drop_wm_mapping_result result = new drop_wm_mapping_result();
+        drop_wm_mapping_result result = getEmptyResultInstance();
         try {
           result.success = iface.drop_wm_mapping(args.request);
         } catch (NoSuchObjectException o1) {
@@ -26880,16 +30093,18 @@ public drop_wm_mapping_result getResult(I iface, drop_wm_mapping_args args) thro
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_drop_wm_trigger_to_pool_mapping<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_or_drop_wm_trigger_to_pool_mapping_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_drop_wm_trigger_to_pool_mapping<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_or_drop_wm_trigger_to_pool_mapping_args, create_or_drop_wm_trigger_to_pool_mapping_result> {
       public create_or_drop_wm_trigger_to_pool_mapping() {
         super("create_or_drop_wm_trigger_to_pool_mapping");
       }
 
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_args getEmptyArgsInstance() {
         return new create_or_drop_wm_trigger_to_pool_mapping_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26898,8 +30113,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_or_drop_wm_trigger_to_pool_mapping_result getEmptyResultInstance() {
+        return new create_or_drop_wm_trigger_to_pool_mapping_result();
+      }
+
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_result getResult(I iface, create_or_drop_wm_trigger_to_pool_mapping_args args) throws org.apache.thrift.TException {
-        create_or_drop_wm_trigger_to_pool_mapping_result result = new create_or_drop_wm_trigger_to_pool_mapping_result();
+        create_or_drop_wm_trigger_to_pool_mapping_result result = getEmptyResultInstance();
         try {
           result.success = iface.create_or_drop_wm_trigger_to_pool_mapping(args.request);
         } catch (AlreadyExistsException o1) {
@@ -26915,16 +30136,18 @@ public create_or_drop_wm_trigger_to_pool_mapping_result getResult(I iface, creat
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_ischema_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_ischema_args, create_ischema_result> {
       public create_ischema() {
         super("create_ischema");
       }
 
+      @Override
       public create_ischema_args getEmptyArgsInstance() {
         return new create_ischema_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26933,8 +30156,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_ischema_result getEmptyResultInstance() {
+        return new create_ischema_result();
+      }
+
+      @Override
       public create_ischema_result getResult(I iface, create_ischema_args args) throws org.apache.thrift.TException {
-        create_ischema_result result = new create_ischema_result();
+        create_ischema_result result = getEmptyResultInstance();
         try {
           iface.create_ischema(args.schema);
         } catch (AlreadyExistsException o1) {
@@ -26948,16 +30177,18 @@ public create_ischema_result getResult(I iface, create_ischema_args args) throws
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_ischema_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, alter_ischema_args, alter_ischema_result> {
       public alter_ischema() {
         super("alter_ischema");
       }
 
+      @Override
       public alter_ischema_args getEmptyArgsInstance() {
         return new alter_ischema_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26966,8 +30197,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public alter_ischema_result getEmptyResultInstance() {
+        return new alter_ischema_result();
+      }
+
+      @Override
       public alter_ischema_result getResult(I iface, alter_ischema_args args) throws org.apache.thrift.TException {
-        alter_ischema_result result = new alter_ischema_result();
+        alter_ischema_result result = getEmptyResultInstance();
         try {
           iface.alter_ischema(args.rqst);
         } catch (NoSuchObjectException o1) {
@@ -26979,16 +30216,18 @@ public alter_ischema_result getResult(I iface, alter_ischema_args args) throws o
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_ischema_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_ischema_args, get_ischema_result> {
       public get_ischema() {
         super("get_ischema");
       }
 
+      @Override
       public get_ischema_args getEmptyArgsInstance() {
         return new get_ischema_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -26997,8 +30236,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_ischema_result getEmptyResultInstance() {
+        return new get_ischema_result();
+      }
+
+      @Override
       public get_ischema_result getResult(I iface, get_ischema_args args) throws org.apache.thrift.TException {
-        get_ischema_result result = new get_ischema_result();
+        get_ischema_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_ischema(args.name);
         } catch (NoSuchObjectException o1) {
@@ -27010,16 +30255,18 @@ public get_ischema_result getResult(I iface, get_ischema_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_ischema_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_ischema<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_ischema_args, drop_ischema_result> {
       public drop_ischema() {
         super("drop_ischema");
       }
 
+      @Override
       public drop_ischema_args getEmptyArgsInstance() {
         return new drop_ischema_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27028,8 +30275,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_ischema_result getEmptyResultInstance() {
+        return new drop_ischema_result();
+      }
+
+      @Override
       public drop_ischema_result getResult(I iface, drop_ischema_args args) throws org.apache.thrift.TException {
-        drop_ischema_result result = new drop_ischema_result();
+        drop_ischema_result result = getEmptyResultInstance();
         try {
           iface.drop_ischema(args.name);
         } catch (NoSuchObjectException o1) {
@@ -27043,16 +30296,18 @@ public drop_ischema_result getResult(I iface, drop_ischema_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_schema_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_schema_version_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_schema_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_schema_version_args, add_schema_version_result> {
       public add_schema_version() {
         super("add_schema_version");
       }
 
+      @Override
       public add_schema_version_args getEmptyArgsInstance() {
         return new add_schema_version_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27061,8 +30316,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_schema_version_result getEmptyResultInstance() {
+        return new add_schema_version_result();
+      }
+
+      @Override
       public add_schema_version_result getResult(I iface, add_schema_version_args args) throws org.apache.thrift.TException {
-        add_schema_version_result result = new add_schema_version_result();
+        add_schema_version_result result = getEmptyResultInstance();
         try {
           iface.add_schema_version(args.schemaVersion);
         } catch (AlreadyExistsException o1) {
@@ -27076,16 +30337,18 @@ public add_schema_version_result getResult(I iface, add_schema_version_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_version_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_version_args, get_schema_version_result> {
       public get_schema_version() {
         super("get_schema_version");
       }
 
+      @Override
       public get_schema_version_args getEmptyArgsInstance() {
         return new get_schema_version_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27094,8 +30357,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schema_version_result getEmptyResultInstance() {
+        return new get_schema_version_result();
+      }
+
+      @Override
       public get_schema_version_result getResult(I iface, get_schema_version_args args) throws org.apache.thrift.TException {
-        get_schema_version_result result = new get_schema_version_result();
+        get_schema_version_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schema_version(args.schemaVersion);
         } catch (NoSuchObjectException o1) {
@@ -27107,16 +30376,18 @@ public get_schema_version_result getResult(I iface, get_schema_version_args args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_latest_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_latest_version_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_latest_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_latest_version_args, get_schema_latest_version_result> {
       public get_schema_latest_version() {
         super("get_schema_latest_version");
       }
 
+      @Override
       public get_schema_latest_version_args getEmptyArgsInstance() {
         return new get_schema_latest_version_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27125,8 +30396,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schema_latest_version_result getEmptyResultInstance() {
+        return new get_schema_latest_version_result();
+      }
+
+      @Override
       public get_schema_latest_version_result getResult(I iface, get_schema_latest_version_args args) throws org.apache.thrift.TException {
-        get_schema_latest_version_result result = new get_schema_latest_version_result();
+        get_schema_latest_version_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schema_latest_version(args.schemaName);
         } catch (NoSuchObjectException o1) {
@@ -27138,16 +30415,18 @@ public get_schema_latest_version_result getResult(I iface, get_schema_latest_ver
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_all_versions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_all_versions_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_all_versions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schema_all_versions_args, get_schema_all_versions_result> {
       public get_schema_all_versions() {
         super("get_schema_all_versions");
       }
 
+      @Override
       public get_schema_all_versions_args getEmptyArgsInstance() {
         return new get_schema_all_versions_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27156,8 +30435,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schema_all_versions_result getEmptyResultInstance() {
+        return new get_schema_all_versions_result();
+      }
+
+      @Override
       public get_schema_all_versions_result getResult(I iface, get_schema_all_versions_args args) throws org.apache.thrift.TException {
-        get_schema_all_versions_result result = new get_schema_all_versions_result();
+        get_schema_all_versions_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schema_all_versions(args.schemaName);
         } catch (NoSuchObjectException o1) {
@@ -27169,16 +30454,18 @@ public get_schema_all_versions_result getResult(I iface, get_schema_all_versions
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_schema_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_schema_version_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_schema_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_schema_version_args, drop_schema_version_result> {
       public drop_schema_version() {
         super("drop_schema_version");
       }
 
+      @Override
       public drop_schema_version_args getEmptyArgsInstance() {
         return new drop_schema_version_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27187,8 +30474,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_schema_version_result getEmptyResultInstance() {
+        return new drop_schema_version_result();
+      }
+
+      @Override
       public drop_schema_version_result getResult(I iface, drop_schema_version_args args) throws org.apache.thrift.TException {
-        drop_schema_version_result result = new drop_schema_version_result();
+        drop_schema_version_result result = getEmptyResultInstance();
         try {
           iface.drop_schema_version(args.schemaVersion);
         } catch (NoSuchObjectException o1) {
@@ -27200,16 +30493,18 @@ public drop_schema_version_result getResult(I iface, drop_schema_version_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schemas_by_cols<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schemas_by_cols_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schemas_by_cols<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_schemas_by_cols_args, get_schemas_by_cols_result> {
       public get_schemas_by_cols() {
         super("get_schemas_by_cols");
       }
 
+      @Override
       public get_schemas_by_cols_args getEmptyArgsInstance() {
         return new get_schemas_by_cols_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27218,8 +30513,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_schemas_by_cols_result getEmptyResultInstance() {
+        return new get_schemas_by_cols_result();
+      }
+
+      @Override
       public get_schemas_by_cols_result getResult(I iface, get_schemas_by_cols_args args) throws org.apache.thrift.TException {
-        get_schemas_by_cols_result result = new get_schemas_by_cols_result();
+        get_schemas_by_cols_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_schemas_by_cols(args.rqst);
         } catch (MetaException o1) {
@@ -27229,16 +30530,18 @@ public get_schemas_by_cols_result getResult(I iface, get_schemas_by_cols_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class map_schema_version_to_serde<I extends Iface> extends org.apache.thrift.ProcessFunction<I, map_schema_version_to_serde_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class map_schema_version_to_serde<I extends Iface> extends org.apache.thrift.ProcessFunction<I, map_schema_version_to_serde_args, map_schema_version_to_serde_result> {
       public map_schema_version_to_serde() {
         super("map_schema_version_to_serde");
       }
 
+      @Override
       public map_schema_version_to_serde_args getEmptyArgsInstance() {
         return new map_schema_version_to_serde_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27247,8 +30550,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public map_schema_version_to_serde_result getEmptyResultInstance() {
+        return new map_schema_version_to_serde_result();
+      }
+
+      @Override
       public map_schema_version_to_serde_result getResult(I iface, map_schema_version_to_serde_args args) throws org.apache.thrift.TException {
-        map_schema_version_to_serde_result result = new map_schema_version_to_serde_result();
+        map_schema_version_to_serde_result result = getEmptyResultInstance();
         try {
           iface.map_schema_version_to_serde(args.rqst);
         } catch (NoSuchObjectException o1) {
@@ -27260,16 +30569,18 @@ public map_schema_version_to_serde_result getResult(I iface, map_schema_version_
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_schema_version_state<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_schema_version_state_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_schema_version_state<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_schema_version_state_args, set_schema_version_state_result> {
       public set_schema_version_state() {
         super("set_schema_version_state");
       }
 
+      @Override
       public set_schema_version_state_args getEmptyArgsInstance() {
         return new set_schema_version_state_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27278,8 +30589,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public set_schema_version_state_result getEmptyResultInstance() {
+        return new set_schema_version_state_result();
+      }
+
+      @Override
       public set_schema_version_state_result getResult(I iface, set_schema_version_state_args args) throws org.apache.thrift.TException {
-        set_schema_version_state_result result = new set_schema_version_state_result();
+        set_schema_version_state_result result = getEmptyResultInstance();
         try {
           iface.set_schema_version_state(args.rqst);
         } catch (NoSuchObjectException o1) {
@@ -27293,16 +30610,18 @@ public set_schema_version_state_result getResult(I iface, set_schema_version_sta
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_serde<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_serde_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_serde<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_serde_args, add_serde_result> {
       public add_serde() {
         super("add_serde");
       }
 
+      @Override
       public add_serde_args getEmptyArgsInstance() {
         return new add_serde_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27311,8 +30630,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_serde_result getEmptyResultInstance() {
+        return new add_serde_result();
+      }
+
+      @Override
       public add_serde_result getResult(I iface, add_serde_args args) throws org.apache.thrift.TException {
-        add_serde_result result = new add_serde_result();
+        add_serde_result result = getEmptyResultInstance();
         try {
           iface.add_serde(args.serde);
         } catch (AlreadyExistsException o1) {
@@ -27324,16 +30649,18 @@ public add_serde_result getResult(I iface, add_serde_args args) throws org.apach
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_serde<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_serde_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_serde<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_serde_args, get_serde_result> {
       public get_serde() {
         super("get_serde");
       }
 
+      @Override
       public get_serde_args getEmptyArgsInstance() {
         return new get_serde_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27342,8 +30669,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_serde_result getEmptyResultInstance() {
+        return new get_serde_result();
+      }
+
+      @Override
       public get_serde_result getResult(I iface, get_serde_args args) throws org.apache.thrift.TException {
-        get_serde_result result = new get_serde_result();
+        get_serde_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_serde(args.rqst);
         } catch (NoSuchObjectException o1) {
@@ -27355,16 +30688,18 @@ public get_serde_result getResult(I iface, get_serde_args args) throws org.apach
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_lock_materialization_rebuild_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_lock_materialization_rebuild_args, get_lock_materialization_rebuild_result> {
       public get_lock_materialization_rebuild() {
         super("get_lock_materialization_rebuild");
       }
 
+      @Override
       public get_lock_materialization_rebuild_args getEmptyArgsInstance() {
         return new get_lock_materialization_rebuild_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27373,23 +30708,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_lock_materialization_rebuild_result getEmptyResultInstance() {
+        return new get_lock_materialization_rebuild_result();
+      }
+
+      @Override
       public get_lock_materialization_rebuild_result getResult(I iface, get_lock_materialization_rebuild_args args) throws org.apache.thrift.TException {
-        get_lock_materialization_rebuild_result result = new get_lock_materialization_rebuild_result();
+        get_lock_materialization_rebuild_result result = getEmptyResultInstance();
         result.success = iface.get_lock_materialization_rebuild(args.dbName, args.tableName, args.txnId);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_lock_materialization_rebuild_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_lock_materialization_rebuild_args, heartbeat_lock_materialization_rebuild_result> {
       public heartbeat_lock_materialization_rebuild() {
         super("heartbeat_lock_materialization_rebuild");
       }
 
+      @Override
       public heartbeat_lock_materialization_rebuild_args getEmptyArgsInstance() {
         return new heartbeat_lock_materialization_rebuild_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27398,24 +30741,32 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public heartbeat_lock_materialization_rebuild_result getEmptyResultInstance() {
+        return new heartbeat_lock_materialization_rebuild_result();
+      }
+
+      @Override
       public heartbeat_lock_materialization_rebuild_result getResult(I iface, heartbeat_lock_materialization_rebuild_args args) throws org.apache.thrift.TException {
-        heartbeat_lock_materialization_rebuild_result result = new heartbeat_lock_materialization_rebuild_result();
+        heartbeat_lock_materialization_rebuild_result result = getEmptyResultInstance();
         result.success = iface.heartbeat_lock_materialization_rebuild(args.dbName, args.tableName, args.txnId);
         result.setSuccessIsSet(true);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_lock_materialization_rebuild_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_lock_materialization_rebuild_req_args, get_lock_materialization_rebuild_req_result> {
       public get_lock_materialization_rebuild_req() {
         super("get_lock_materialization_rebuild_req");
       }
 
+      @Override
       public get_lock_materialization_rebuild_req_args getEmptyArgsInstance() {
         return new get_lock_materialization_rebuild_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27424,23 +30775,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_lock_materialization_rebuild_req_result getEmptyResultInstance() {
+        return new get_lock_materialization_rebuild_req_result();
+      }
+
+      @Override
       public get_lock_materialization_rebuild_req_result getResult(I iface, get_lock_materialization_rebuild_req_args args) throws org.apache.thrift.TException {
-        get_lock_materialization_rebuild_req_result result = new get_lock_materialization_rebuild_req_result();
+        get_lock_materialization_rebuild_req_result result = getEmptyResultInstance();
         result.success = iface.get_lock_materialization_rebuild_req(args.req);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_lock_materialization_rebuild_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, heartbeat_lock_materialization_rebuild_req_args, heartbeat_lock_materialization_rebuild_req_result> {
       public heartbeat_lock_materialization_rebuild_req() {
         super("heartbeat_lock_materialization_rebuild_req");
       }
 
+      @Override
       public heartbeat_lock_materialization_rebuild_req_args getEmptyArgsInstance() {
         return new heartbeat_lock_materialization_rebuild_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27449,24 +30808,32 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public heartbeat_lock_materialization_rebuild_req_result getEmptyResultInstance() {
+        return new heartbeat_lock_materialization_rebuild_req_result();
+      }
+
+      @Override
       public heartbeat_lock_materialization_rebuild_req_result getResult(I iface, heartbeat_lock_materialization_rebuild_req_args args) throws org.apache.thrift.TException {
-        heartbeat_lock_materialization_rebuild_req_result result = new heartbeat_lock_materialization_rebuild_req_result();
+        heartbeat_lock_materialization_rebuild_req_result result = getEmptyResultInstance();
         result.success = iface.heartbeat_lock_materialization_rebuild_req(args.req);
         result.setSuccessIsSet(true);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_runtime_stats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_runtime_stats_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_runtime_stats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_runtime_stats_args, add_runtime_stats_result> {
       public add_runtime_stats() {
         super("add_runtime_stats");
       }
 
+      @Override
       public add_runtime_stats_args getEmptyArgsInstance() {
         return new add_runtime_stats_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27475,8 +30842,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_runtime_stats_result getEmptyResultInstance() {
+        return new add_runtime_stats_result();
+      }
+
+      @Override
       public add_runtime_stats_result getResult(I iface, add_runtime_stats_args args) throws org.apache.thrift.TException {
-        add_runtime_stats_result result = new add_runtime_stats_result();
+        add_runtime_stats_result result = getEmptyResultInstance();
         try {
           iface.add_runtime_stats(args.stat);
         } catch (MetaException o1) {
@@ -27486,16 +30859,18 @@ public add_runtime_stats_result getResult(I iface, add_runtime_stats_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_runtime_stats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_runtime_stats_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_runtime_stats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_runtime_stats_args, get_runtime_stats_result> {
       public get_runtime_stats() {
         super("get_runtime_stats");
       }
 
+      @Override
       public get_runtime_stats_args getEmptyArgsInstance() {
         return new get_runtime_stats_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27504,8 +30879,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_runtime_stats_result getEmptyResultInstance() {
+        return new get_runtime_stats_result();
+      }
+
+      @Override
       public get_runtime_stats_result getResult(I iface, get_runtime_stats_args args) throws org.apache.thrift.TException {
-        get_runtime_stats_result result = new get_runtime_stats_result();
+        get_runtime_stats_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_runtime_stats(args.rqst);
         } catch (MetaException o1) {
@@ -27515,16 +30896,18 @@ public get_runtime_stats_result getResult(I iface, get_runtime_stats_args args)
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_specs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_with_specs_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_specs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_partitions_with_specs_args, get_partitions_with_specs_result> {
       public get_partitions_with_specs() {
         super("get_partitions_with_specs");
       }
 
+      @Override
       public get_partitions_with_specs_args getEmptyArgsInstance() {
         return new get_partitions_with_specs_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27533,8 +30916,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_partitions_with_specs_result getEmptyResultInstance() {
+        return new get_partitions_with_specs_result();
+      }
+
+      @Override
       public get_partitions_with_specs_result getResult(I iface, get_partitions_with_specs_args args) throws org.apache.thrift.TException {
-        get_partitions_with_specs_result result = new get_partitions_with_specs_result();
+        get_partitions_with_specs_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_partitions_with_specs(args.request);
         } catch (MetaException o1) {
@@ -27544,16 +30933,18 @@ public get_partitions_with_specs_result getResult(I iface, get_partitions_with_s
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_poll<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scheduled_query_poll_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_poll<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scheduled_query_poll_args, scheduled_query_poll_result> {
       public scheduled_query_poll() {
         super("scheduled_query_poll");
       }
 
+      @Override
       public scheduled_query_poll_args getEmptyArgsInstance() {
         return new scheduled_query_poll_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27562,8 +30953,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public scheduled_query_poll_result getEmptyResultInstance() {
+        return new scheduled_query_poll_result();
+      }
+
+      @Override
       public scheduled_query_poll_result getResult(I iface, scheduled_query_poll_args args) throws org.apache.thrift.TException {
-        scheduled_query_poll_result result = new scheduled_query_poll_result();
+        scheduled_query_poll_result result = getEmptyResultInstance();
         try {
           result.success = iface.scheduled_query_poll(args.request);
         } catch (MetaException o1) {
@@ -27573,16 +30970,18 @@ public scheduled_query_poll_result getResult(I iface, scheduled_query_poll_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_maintenance<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scheduled_query_maintenance_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_maintenance<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scheduled_query_maintenance_args, scheduled_query_maintenance_result> {
       public scheduled_query_maintenance() {
         super("scheduled_query_maintenance");
       }
 
+      @Override
       public scheduled_query_maintenance_args getEmptyArgsInstance() {
         return new scheduled_query_maintenance_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27591,8 +30990,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public scheduled_query_maintenance_result getEmptyResultInstance() {
+        return new scheduled_query_maintenance_result();
+      }
+
+      @Override
       public scheduled_query_maintenance_result getResult(I iface, scheduled_query_maintenance_args args) throws org.apache.thrift.TException {
-        scheduled_query_maintenance_result result = new scheduled_query_maintenance_result();
+        scheduled_query_maintenance_result result = getEmptyResultInstance();
         try {
           iface.scheduled_query_maintenance(args.request);
         } catch (MetaException o1) {
@@ -27608,16 +31013,18 @@ public scheduled_query_maintenance_result getResult(I iface, scheduled_query_mai
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_progress<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scheduled_query_progress_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_progress<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scheduled_query_progress_args, scheduled_query_progress_result> {
       public scheduled_query_progress() {
         super("scheduled_query_progress");
       }
 
+      @Override
       public scheduled_query_progress_args getEmptyArgsInstance() {
         return new scheduled_query_progress_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27626,8 +31033,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public scheduled_query_progress_result getEmptyResultInstance() {
+        return new scheduled_query_progress_result();
+      }
+
+      @Override
       public scheduled_query_progress_result getResult(I iface, scheduled_query_progress_args args) throws org.apache.thrift.TException {
-        scheduled_query_progress_result result = new scheduled_query_progress_result();
+        scheduled_query_progress_result result = getEmptyResultInstance();
         try {
           iface.scheduled_query_progress(args.info);
         } catch (MetaException o1) {
@@ -27639,16 +31052,18 @@ public scheduled_query_progress_result getResult(I iface, scheduled_query_progre
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_scheduled_query<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_scheduled_query_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_scheduled_query<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_scheduled_query_args, get_scheduled_query_result> {
       public get_scheduled_query() {
         super("get_scheduled_query");
       }
 
+      @Override
       public get_scheduled_query_args getEmptyArgsInstance() {
         return new get_scheduled_query_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27657,8 +31072,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_scheduled_query_result getEmptyResultInstance() {
+        return new get_scheduled_query_result();
+      }
+
+      @Override
       public get_scheduled_query_result getResult(I iface, get_scheduled_query_args args) throws org.apache.thrift.TException {
-        get_scheduled_query_result result = new get_scheduled_query_result();
+        get_scheduled_query_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_scheduled_query(args.scheduleKey);
         } catch (MetaException o1) {
@@ -27670,16 +31091,18 @@ public get_scheduled_query_result getResult(I iface, get_scheduled_query_args ar
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_replication_metrics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_replication_metrics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_replication_metrics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_replication_metrics_args, add_replication_metrics_result> {
       public add_replication_metrics() {
         super("add_replication_metrics");
       }
 
+      @Override
       public add_replication_metrics_args getEmptyArgsInstance() {
         return new add_replication_metrics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27688,8 +31111,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_replication_metrics_result getEmptyResultInstance() {
+        return new add_replication_metrics_result();
+      }
+
+      @Override
       public add_replication_metrics_result getResult(I iface, add_replication_metrics_args args) throws org.apache.thrift.TException {
-        add_replication_metrics_result result = new add_replication_metrics_result();
+        add_replication_metrics_result result = getEmptyResultInstance();
         try {
           iface.add_replication_metrics(args.replicationMetricList);
         } catch (MetaException o1) {
@@ -27699,16 +31128,18 @@ public add_replication_metrics_result getResult(I iface, add_replication_metrics
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replication_metrics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_replication_metrics_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replication_metrics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_replication_metrics_args, get_replication_metrics_result> {
       public get_replication_metrics() {
         super("get_replication_metrics");
       }
 
+      @Override
       public get_replication_metrics_args getEmptyArgsInstance() {
         return new get_replication_metrics_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27717,8 +31148,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_replication_metrics_result getEmptyResultInstance() {
+        return new get_replication_metrics_result();
+      }
+
+      @Override
       public get_replication_metrics_result getResult(I iface, get_replication_metrics_args args) throws org.apache.thrift.TException {
-        get_replication_metrics_result result = new get_replication_metrics_result();
+        get_replication_metrics_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_replication_metrics(args.rqst);
         } catch (MetaException o1) {
@@ -27728,16 +31165,18 @@ public get_replication_metrics_result getResult(I iface, get_replication_metrics
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_open_txns_req_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_req<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_open_txns_req_args, get_open_txns_req_result> {
       public get_open_txns_req() {
         super("get_open_txns_req");
       }
 
+      @Override
       public get_open_txns_req_args getEmptyArgsInstance() {
         return new get_open_txns_req_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27746,23 +31185,31 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_open_txns_req_result getEmptyResultInstance() {
+        return new get_open_txns_req_result();
+      }
+
+      @Override
       public get_open_txns_req_result getResult(I iface, get_open_txns_req_args args) throws org.apache.thrift.TException {
-        get_open_txns_req_result result = new get_open_txns_req_result();
+        get_open_txns_req_result result = getEmptyResultInstance();
         result.success = iface.get_open_txns_req(args.getOpenTxnsRequest);
         return result;
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_stored_procedure_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure<I extends Iface> extends org.apache.thrift.ProcessFunction<I, create_stored_procedure_args, create_stored_procedure_result> {
       public create_stored_procedure() {
         super("create_stored_procedure");
       }
 
+      @Override
       public create_stored_procedure_args getEmptyArgsInstance() {
         return new create_stored_procedure_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27771,8 +31218,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public create_stored_procedure_result getEmptyResultInstance() {
+        return new create_stored_procedure_result();
+      }
+
+      @Override
       public create_stored_procedure_result getResult(I iface, create_stored_procedure_args args) throws org.apache.thrift.TException {
-        create_stored_procedure_result result = new create_stored_procedure_result();
+        create_stored_procedure_result result = getEmptyResultInstance();
         try {
           iface.create_stored_procedure(args.proc);
         } catch (NoSuchObjectException o1) {
@@ -27784,16 +31237,18 @@ public create_stored_procedure_result getResult(I iface, create_stored_procedure
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_stored_procedure_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_stored_procedure_args, get_stored_procedure_result> {
       public get_stored_procedure() {
         super("get_stored_procedure");
       }
 
+      @Override
       public get_stored_procedure_args getEmptyArgsInstance() {
         return new get_stored_procedure_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27802,8 +31257,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_stored_procedure_result getEmptyResultInstance() {
+        return new get_stored_procedure_result();
+      }
+
+      @Override
       public get_stored_procedure_result getResult(I iface, get_stored_procedure_args args) throws org.apache.thrift.TException {
-        get_stored_procedure_result result = new get_stored_procedure_result();
+        get_stored_procedure_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_stored_procedure(args.request);
         } catch (MetaException o1) {
@@ -27815,16 +31276,18 @@ public get_stored_procedure_result getResult(I iface, get_stored_procedure_args
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_stored_procedure_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_stored_procedure_args, drop_stored_procedure_result> {
       public drop_stored_procedure() {
         super("drop_stored_procedure");
       }
 
+      @Override
       public drop_stored_procedure_args getEmptyArgsInstance() {
         return new drop_stored_procedure_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27833,8 +31296,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_stored_procedure_result getEmptyResultInstance() {
+        return new drop_stored_procedure_result();
+      }
+
+      @Override
       public drop_stored_procedure_result getResult(I iface, drop_stored_procedure_args args) throws org.apache.thrift.TException {
-        drop_stored_procedure_result result = new drop_stored_procedure_result();
+        drop_stored_procedure_result result = getEmptyResultInstance();
         try {
           iface.drop_stored_procedure(args.request);
         } catch (MetaException o1) {
@@ -27844,16 +31313,18 @@ public drop_stored_procedure_result getResult(I iface, drop_stored_procedure_arg
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_stored_procedures_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_stored_procedures_args, get_all_stored_procedures_result> {
       public get_all_stored_procedures() {
         super("get_all_stored_procedures");
       }
 
+      @Override
       public get_all_stored_procedures_args getEmptyArgsInstance() {
         return new get_all_stored_procedures_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27862,8 +31333,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_stored_procedures_result getEmptyResultInstance() {
+        return new get_all_stored_procedures_result();
+      }
+
+      @Override
       public get_all_stored_procedures_result getResult(I iface, get_all_stored_procedures_args args) throws org.apache.thrift.TException {
-        get_all_stored_procedures_result result = new get_all_stored_procedures_result();
+        get_all_stored_procedures_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_stored_procedures(args.request);
         } catch (MetaException o1) {
@@ -27873,16 +31350,18 @@ public get_all_stored_procedures_result getResult(I iface, get_all_stored_proced
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_package_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package<I extends Iface> extends org.apache.thrift.ProcessFunction<I, find_package_args, find_package_result> {
       public find_package() {
         super("find_package");
       }
 
+      @Override
       public find_package_args getEmptyArgsInstance() {
         return new find_package_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27891,8 +31370,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public find_package_result getEmptyResultInstance() {
+        return new find_package_result();
+      }
+
+      @Override
       public find_package_result getResult(I iface, find_package_args args) throws org.apache.thrift.TException {
-        find_package_result result = new find_package_result();
+        find_package_result result = getEmptyResultInstance();
         try {
           result.success = iface.find_package(args.request);
         } catch (MetaException o1) {
@@ -27904,16 +31389,18 @@ public find_package_result getResult(I iface, find_package_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_package_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package<I extends Iface> extends org.apache.thrift.ProcessFunction<I, add_package_args, add_package_result> {
       public add_package() {
         super("add_package");
       }
 
+      @Override
       public add_package_args getEmptyArgsInstance() {
         return new add_package_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27922,8 +31409,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public add_package_result getEmptyResultInstance() {
+        return new add_package_result();
+      }
+
+      @Override
       public add_package_result getResult(I iface, add_package_args args) throws org.apache.thrift.TException {
-        add_package_result result = new add_package_result();
+        add_package_result result = getEmptyResultInstance();
         try {
           iface.add_package(args.request);
         } catch (MetaException o1) {
@@ -27933,16 +31426,18 @@ public add_package_result getResult(I iface, add_package_args args) throws org.a
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_packages_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_packages_args, get_all_packages_result> {
       public get_all_packages() {
         super("get_all_packages");
       }
 
+      @Override
       public get_all_packages_args getEmptyArgsInstance() {
         return new get_all_packages_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27951,8 +31446,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_packages_result getEmptyResultInstance() {
+        return new get_all_packages_result();
+      }
+
+      @Override
       public get_all_packages_result getResult(I iface, get_all_packages_args args) throws org.apache.thrift.TException {
-        get_all_packages_result result = new get_all_packages_result();
+        get_all_packages_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_packages(args.request);
         } catch (MetaException o1) {
@@ -27962,16 +31463,18 @@ public get_all_packages_result getResult(I iface, get_all_packages_args args) th
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_package_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package<I extends Iface> extends org.apache.thrift.ProcessFunction<I, drop_package_args, drop_package_result> {
       public drop_package() {
         super("drop_package");
       }
 
+      @Override
       public drop_package_args getEmptyArgsInstance() {
         return new drop_package_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -27980,8 +31483,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public drop_package_result getEmptyResultInstance() {
+        return new drop_package_result();
+      }
+
+      @Override
       public drop_package_result getResult(I iface, drop_package_args args) throws org.apache.thrift.TException {
-        drop_package_result result = new drop_package_result();
+        drop_package_result result = getEmptyResultInstance();
         try {
           iface.drop_package(args.request);
         } catch (MetaException o1) {
@@ -27991,16 +31500,18 @@ public drop_package_result getResult(I iface, drop_package_args args) throws org
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_write_event_info_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_all_write_event_info_args, get_all_write_event_info_result> {
       public get_all_write_event_info() {
         super("get_all_write_event_info");
       }
 
+      @Override
       public get_all_write_event_info_args getEmptyArgsInstance() {
         return new get_all_write_event_info_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -28009,8 +31520,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_all_write_event_info_result getEmptyResultInstance() {
+        return new get_all_write_event_info_result();
+      }
+
+      @Override
       public get_all_write_event_info_result getResult(I iface, get_all_write_event_info_args args) throws org.apache.thrift.TException {
-        get_all_write_event_info_result result = new get_all_write_event_info_result();
+        get_all_write_event_info_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_all_write_event_info(args.request);
         } catch (MetaException o1) {
@@ -28020,16 +31537,18 @@ public get_all_write_event_info_result getResult(I iface, get_all_write_event_in
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_replayed_txns_for_policy_args> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_replayed_txns_for_policy_args, get_replayed_txns_for_policy_result> {
       public get_replayed_txns_for_policy() {
         super("get_replayed_txns_for_policy");
       }
 
+      @Override
       public get_replayed_txns_for_policy_args getEmptyArgsInstance() {
         return new get_replayed_txns_for_policy_args();
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
@@ -28038,8 +31557,14 @@ protected boolean rethrowUnhandledExceptions() {
         return false;
       }
 
+      @Override
+      public get_replayed_txns_for_policy_result getEmptyResultInstance() {
+        return new get_replayed_txns_for_policy_result();
+      }
+
+      @Override
       public get_replayed_txns_for_policy_result getResult(I iface, get_replayed_txns_for_policy_args args) throws org.apache.thrift.TException {
-        get_replayed_txns_for_policy_result result = new get_replayed_txns_for_policy_result();
+        get_replayed_txns_for_policy_result result = getEmptyResultInstance();
         try {
           result.success = iface.get_replayed_txns_for_policy(args.policyName);
         } catch (MetaException o1) {
@@ -28054,14 +31579,14 @@ public get_replayed_txns_for_policy_result getResult(I iface, get_replayed_txns_
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class AsyncProcessor<I extends AsyncIface> extends com.facebook.fb303.FacebookService.AsyncProcessor<I> {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>>()));
     }
 
-    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
       processMap.put("abort_Compactions", new abort_Compactions());
       processMap.put("getMetaConf", new getMetaConf());
       processMap.put("setMetaConf", new setMetaConf());
@@ -28352,18 +31877,26 @@ protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.th
       return processMap;
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, abort_Compactions_args, AbortCompactResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, abort_Compactions_args, AbortCompactResponse, abort_Compactions_result> {
       public abort_Compactions() {
         super("abort_Compactions");
       }
 
+      @Override
+      public abort_Compactions_result getEmptyResultInstance() {
+        return new abort_Compactions_result();
+      }
+
+      @Override
       public abort_Compactions_args getEmptyArgsInstance() {
         return new abort_Compactions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AbortCompactResponse> 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<AbortCompactResponse>() { 
+          @Override
           public void onComplete(AbortCompactResponse o) {
             abort_Compactions_result result = new abort_Compactions_result();
             result.success = o;
@@ -28377,6 +31910,7 @@ public void onComplete(AbortCompactResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28404,27 +31938,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, abort_Compactions_args args, org.apache.thrift.async.AsyncMethodCallback<AbortCompactResponse> resultHandler) throws org.apache.thrift.TException {
         iface.abort_Compactions(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getMetaConf_args, java.lang.String> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getMetaConf_args, java.lang.String, getMetaConf_result> {
       public getMetaConf() {
         super("getMetaConf");
       }
 
+      @Override
+      public getMetaConf_result getEmptyResultInstance() {
+        return new getMetaConf_result();
+      }
+
+      @Override
       public getMetaConf_args getEmptyArgsInstance() {
         return new getMetaConf_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
           public void onComplete(java.lang.String o) {
             getMetaConf_result result = new getMetaConf_result();
             result.success = o;
@@ -28438,6 +31982,7 @@ public void onComplete(java.lang.String o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28469,27 +32014,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, getMetaConf_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.getMetaConf(args.key,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class setMetaConf<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setMetaConf_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class setMetaConf<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setMetaConf_args, Void, setMetaConf_result> {
       public setMetaConf() {
         super("setMetaConf");
       }
 
+      @Override
+      public setMetaConf_result getEmptyResultInstance() {
+        return new setMetaConf_result();
+      }
+
+      @Override
       public setMetaConf_args getEmptyArgsInstance() {
         return new setMetaConf_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             setMetaConf_result result = new setMetaConf_result();
             try {
@@ -28502,6 +32057,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28533,27 +32089,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, setMetaConf_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setMetaConf(args.key, args.value,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_catalog_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_catalog_args, Void, create_catalog_result> {
       public create_catalog() {
         super("create_catalog");
       }
 
+      @Override
+      public create_catalog_result getEmptyResultInstance() {
+        return new create_catalog_result();
+      }
+
+      @Override
       public create_catalog_args getEmptyArgsInstance() {
         return new create_catalog_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_catalog_result result = new create_catalog_result();
             try {
@@ -28566,6 +32132,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28605,27 +32172,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_catalog_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_catalog(args.catalog,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_catalog_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_catalog_args, Void, alter_catalog_result> {
       public alter_catalog() {
         super("alter_catalog");
       }
 
+      @Override
+      public alter_catalog_result getEmptyResultInstance() {
+        return new alter_catalog_result();
+      }
+
+      @Override
       public alter_catalog_args getEmptyArgsInstance() {
         return new alter_catalog_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_catalog_result result = new alter_catalog_result();
             try {
@@ -28638,6 +32215,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28677,27 +32255,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_catalog_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_catalog(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_catalog_args, GetCatalogResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_catalog_args, GetCatalogResponse, get_catalog_result> {
       public get_catalog() {
         super("get_catalog");
       }
 
+      @Override
+      public get_catalog_result getEmptyResultInstance() {
+        return new get_catalog_result();
+      }
+
+      @Override
       public get_catalog_args getEmptyArgsInstance() {
         return new get_catalog_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetCatalogResponse> 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<GetCatalogResponse>() { 
+          @Override
           public void onComplete(GetCatalogResponse o) {
             get_catalog_result result = new get_catalog_result();
             result.success = o;
@@ -28711,6 +32299,7 @@ public void onComplete(GetCatalogResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28746,27 +32335,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_catalog_args args, org.apache.thrift.async.AsyncMethodCallback<GetCatalogResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_catalog(args.catName,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalogs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_catalogs_args, GetCatalogsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalogs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_catalogs_args, GetCatalogsResponse, get_catalogs_result> {
       public get_catalogs() {
         super("get_catalogs");
       }
 
+      @Override
+      public get_catalogs_result getEmptyResultInstance() {
+        return new get_catalogs_result();
+      }
+
+      @Override
       public get_catalogs_args getEmptyArgsInstance() {
         return new get_catalogs_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetCatalogsResponse> 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<GetCatalogsResponse>() { 
+          @Override
           public void onComplete(GetCatalogsResponse o) {
             get_catalogs_result result = new get_catalogs_result();
             result.success = o;
@@ -28780,6 +32379,7 @@ public void onComplete(GetCatalogsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28811,27 +32411,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_catalogs_args args, org.apache.thrift.async.AsyncMethodCallback<GetCatalogsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_catalogs(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_catalog_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_catalog<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_catalog_args, Void, drop_catalog_result> {
       public drop_catalog() {
         super("drop_catalog");
       }
 
+      @Override
+      public drop_catalog_result getEmptyResultInstance() {
+        return new drop_catalog_result();
+      }
+
+      @Override
       public drop_catalog_args getEmptyArgsInstance() {
         return new drop_catalog_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_catalog_result result = new drop_catalog_result();
             try {
@@ -28844,6 +32454,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28883,27 +32494,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_catalog_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_catalog(args.catName,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_database_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_database_args, Void, create_database_result> {
       public create_database() {
         super("create_database");
       }
 
+      @Override
+      public create_database_result getEmptyResultInstance() {
+        return new create_database_result();
+      }
+
+      @Override
       public create_database_args getEmptyArgsInstance() {
         return new create_database_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_database_result result = new create_database_result();
             try {
@@ -28916,6 +32537,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -28955,27 +32577,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_database_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_database(args.database,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_database_req_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_database_req_args, Void, create_database_req_result> {
       public create_database_req() {
         super("create_database_req");
       }
 
+      @Override
+      public create_database_req_result getEmptyResultInstance() {
+        return new create_database_req_result();
+      }
+
+      @Override
       public create_database_req_args getEmptyArgsInstance() {
         return new create_database_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_database_req_result result = new create_database_req_result();
             try {
@@ -28988,6 +32620,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29027,27 +32660,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_database_req_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_database_req(args.createDatabaseRequest,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_database_args, Database> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_database_args, Database, get_database_result> {
       public get_database() {
         super("get_database");
       }
 
+      @Override
+      public get_database_result getEmptyResultInstance() {
+        return new get_database_result();
+      }
+
+      @Override
       public get_database_args getEmptyArgsInstance() {
         return new get_database_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Database> 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<Database>() { 
+          @Override
           public void onComplete(Database o) {
             get_database_result result = new get_database_result();
             result.success = o;
@@ -29061,6 +32704,7 @@ public void onComplete(Database o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29096,27 +32740,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_database_args args, org.apache.thrift.async.AsyncMethodCallback<Database> resultHandler) throws org.apache.thrift.TException {
         iface.get_database(args.name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_database_req_args, Database> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_database_req_args, Database, get_database_req_result> {
       public get_database_req() {
         super("get_database_req");
       }
 
+      @Override
+      public get_database_req_result getEmptyResultInstance() {
+        return new get_database_req_result();
+      }
+
+      @Override
       public get_database_req_args getEmptyArgsInstance() {
         return new get_database_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Database> 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<Database>() { 
+          @Override
           public void onComplete(Database o) {
             get_database_req_result result = new get_database_req_result();
             result.success = o;
@@ -29130,6 +32784,7 @@ public void onComplete(Database o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29165,27 +32820,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_database_req_args args, org.apache.thrift.async.AsyncMethodCallback<Database> resultHandler) throws org.apache.thrift.TException {
         iface.get_database_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_database_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_database_args, Void, drop_database_result> {
       public drop_database() {
         super("drop_database");
       }
 
+      @Override
+      public drop_database_result getEmptyResultInstance() {
+        return new drop_database_result();
+      }
+
+      @Override
       public drop_database_args getEmptyArgsInstance() {
         return new drop_database_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_database_result result = new drop_database_result();
             try {
@@ -29198,6 +32863,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29237,27 +32903,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_database_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_database(args.name, args.deleteData, args.cascade,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_database_req_args, AsyncOperationResp> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_database_req_args, AsyncOperationResp, drop_database_req_result> {
       public drop_database_req() {
         super("drop_database_req");
       }
 
+      @Override
+      public drop_database_req_result getEmptyResultInstance() {
+        return new drop_database_req_result();
+      }
+
+      @Override
       public drop_database_req_args getEmptyArgsInstance() {
         return new drop_database_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AsyncOperationResp> 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<AsyncOperationResp>() { 
+          @Override
           public void onComplete(AsyncOperationResp o) {
             drop_database_req_result result = new drop_database_req_result();
             result.success = o;
@@ -29271,6 +32947,7 @@ public void onComplete(AsyncOperationResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29310,27 +32987,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_database_req_args args, org.apache.thrift.async.AsyncMethodCallback<AsyncOperationResp> resultHandler) throws org.apache.thrift.TException {
         iface.drop_database_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_databases_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_databases_args, java.util.List<java.lang.String>, get_databases_result> {
       public get_databases() {
         super("get_databases");
       }
 
+      @Override
+      public get_databases_result getEmptyResultInstance() {
+        return new get_databases_result();
+      }
+
+      @Override
       public get_databases_args getEmptyArgsInstance() {
         return new get_databases_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_databases_result result = new get_databases_result();
             result.success = o;
@@ -29344,6 +33031,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29375,27 +33063,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_databases_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_databases(args.pattern,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_databases<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_databases_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_databases<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_databases_args, java.util.List<java.lang.String>, get_all_databases_result> {
       public get_all_databases() {
         super("get_all_databases");
       }
 
+      @Override
+      public get_all_databases_result getEmptyResultInstance() {
+        return new get_all_databases_result();
+      }
+
+      @Override
       public get_all_databases_args getEmptyArgsInstance() {
         return new get_all_databases_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_all_databases_result result = new get_all_databases_result();
             result.success = o;
@@ -29409,6 +33107,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29440,27 +33139,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_databases_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_databases(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_databases_req_args, GetDatabaseObjectsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_databases_req_args, GetDatabaseObjectsResponse, get_databases_req_result> {
       public get_databases_req() {
         super("get_databases_req");
       }
 
+      @Override
+      public get_databases_req_result getEmptyResultInstance() {
+        return new get_databases_req_result();
+      }
+
+      @Override
       public get_databases_req_args getEmptyArgsInstance() {
         return new get_databases_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetDatabaseObjectsResponse> 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<GetDatabaseObjectsResponse>() { 
+          @Override
           public void onComplete(GetDatabaseObjectsResponse o) {
             get_databases_req_result result = new get_databases_req_result();
             result.success = o;
@@ -29474,6 +33183,7 @@ public void onComplete(GetDatabaseObjectsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29505,27 +33215,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_databases_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetDatabaseObjectsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_databases_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_database_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_database_args, Void, alter_database_result> {
       public alter_database() {
         super("alter_database");
       }
 
+      @Override
+      public alter_database_result getEmptyResultInstance() {
+        return new alter_database_result();
+      }
+
+      @Override
       public alter_database_args getEmptyArgsInstance() {
         return new alter_database_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_database_result result = new alter_database_result();
             try {
@@ -29538,6 +33258,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29573,27 +33294,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_database_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_database(args.dbname, args.db,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_database_req_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_database_req_args, Void, alter_database_req_result> {
       public alter_database_req() {
         super("alter_database_req");
       }
 
+      @Override
+      public alter_database_req_result getEmptyResultInstance() {
+        return new alter_database_req_result();
+      }
+
+      @Override
       public alter_database_req_args getEmptyArgsInstance() {
         return new alter_database_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_database_req_result result = new alter_database_req_result();
             try {
@@ -29606,6 +33337,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29641,27 +33373,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_database_req_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_database_req(args.alterDbReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_dataconnector_req_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_dataconnector_req_args, Void, create_dataconnector_req_result> {
       public create_dataconnector_req() {
         super("create_dataconnector_req");
       }
 
+      @Override
+      public create_dataconnector_req_result getEmptyResultInstance() {
+        return new create_dataconnector_req_result();
+      }
+
+      @Override
       public create_dataconnector_req_args getEmptyArgsInstance() {
         return new create_dataconnector_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_dataconnector_req_result result = new create_dataconnector_req_result();
             try {
@@ -29674,6 +33416,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29713,27 +33456,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_dataconnector_req_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_dataconnector_req(args.connectorReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_dataconnector_req_args, DataConnector> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_dataconnector_req_args, DataConnector, get_dataconnector_req_result> {
       public get_dataconnector_req() {
         super("get_dataconnector_req");
       }
 
+      @Override
+      public get_dataconnector_req_result getEmptyResultInstance() {
+        return new get_dataconnector_req_result();
+      }
+
+      @Override
       public get_dataconnector_req_args getEmptyArgsInstance() {
         return new get_dataconnector_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<DataConnector> 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<DataConnector>() { 
+          @Override
           public void onComplete(DataConnector o) {
             get_dataconnector_req_result result = new get_dataconnector_req_result();
             result.success = o;
@@ -29747,6 +33500,7 @@ public void onComplete(DataConnector o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29782,27 +33536,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_dataconnector_req_args args, org.apache.thrift.async.AsyncMethodCallback<DataConnector> resultHandler) throws org.apache.thrift.TException {
         iface.get_dataconnector_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_dataconnector_req_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_dataconnector_req_args, Void, drop_dataconnector_req_result> {
       public drop_dataconnector_req() {
         super("drop_dataconnector_req");
       }
 
+      @Override
+      public drop_dataconnector_req_result getEmptyResultInstance() {
+        return new drop_dataconnector_req_result();
+      }
+
+      @Override
       public drop_dataconnector_req_args getEmptyArgsInstance() {
         return new drop_dataconnector_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_dataconnector_req_result result = new drop_dataconnector_req_result();
             try {
@@ -29815,6 +33579,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29854,27 +33619,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_dataconnector_req_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_dataconnector_req(args.dropDcReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnectors<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_dataconnectors_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnectors<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_dataconnectors_args, java.util.List<java.lang.String>, get_dataconnectors_result> {
       public get_dataconnectors() {
         super("get_dataconnectors");
       }
 
+      @Override
+      public get_dataconnectors_result getEmptyResultInstance() {
+        return new get_dataconnectors_result();
+      }
+
+      @Override
       public get_dataconnectors_args getEmptyArgsInstance() {
         return new get_dataconnectors_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_dataconnectors_result result = new get_dataconnectors_result();
             result.success = o;
@@ -29888,6 +33663,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29919,27 +33695,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_dataconnectors_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_dataconnectors(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_dataconnector_req_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_dataconnector_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_dataconnector_req_args, Void, alter_dataconnector_req_result> {
       public alter_dataconnector_req() {
         super("alter_dataconnector_req");
       }
 
+      @Override
+      public alter_dataconnector_req_result getEmptyResultInstance() {
+        return new alter_dataconnector_req_result();
+      }
+
+      @Override
       public alter_dataconnector_req_args getEmptyArgsInstance() {
         return new alter_dataconnector_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_dataconnector_req_result result = new alter_dataconnector_req_result();
             try {
@@ -29952,6 +33738,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -29987,27 +33774,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_dataconnector_req_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_dataconnector_req(args.alterReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_type_args, Type> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_type_args, Type, get_type_result> {
       public get_type() {
         super("get_type");
       }
 
+      @Override
+      public get_type_result getEmptyResultInstance() {
+        return new get_type_result();
+      }
+
+      @Override
       public get_type_args getEmptyArgsInstance() {
         return new get_type_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Type> 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<Type>() { 
+          @Override
           public void onComplete(Type o) {
             get_type_result result = new get_type_result();
             result.success = o;
@@ -30021,6 +33818,7 @@ public void onComplete(Type o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30056,27 +33854,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_type_args args, org.apache.thrift.async.AsyncMethodCallback<Type> resultHandler) throws org.apache.thrift.TException {
         iface.get_type(args.name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_type_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_type_args, java.lang.Boolean, create_type_result> {
       public create_type() {
         super("create_type");
       }
 
+      @Override
+      public create_type_result getEmptyResultInstance() {
+        return new create_type_result();
+      }
+
+      @Override
       public create_type_args getEmptyArgsInstance() {
         return new create_type_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             create_type_result result = new create_type_result();
             result.success = o;
@@ -30091,6 +33899,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30130,27 +33939,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_type_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.create_type(args.type,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_type_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_type_args, java.lang.Boolean, drop_type_result> {
       public drop_type() {
         super("drop_type");
       }
 
+      @Override
+      public drop_type_result getEmptyResultInstance() {
+        return new drop_type_result();
+      }
+
+      @Override
       public drop_type_args getEmptyArgsInstance() {
         return new drop_type_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_type_result result = new drop_type_result();
             result.success = o;
@@ -30165,6 +33984,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30200,27 +34020,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_type_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_type(args.type,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_all<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_type_all_args, java.util.Map<java.lang.String,Type>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_all<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_type_all_args, java.util.Map<java.lang.String,Type>, get_type_all_result> {
       public get_type_all() {
         super("get_type_all");
       }
 
+      @Override
+      public get_type_all_result getEmptyResultInstance() {
+        return new get_type_all_result();
+      }
+
+      @Override
       public get_type_all_args getEmptyArgsInstance() {
         return new get_type_all_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,Type>> 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<java.util.Map<java.lang.String,Type>>() { 
+          @Override
           public void onComplete(java.util.Map<java.lang.String,Type> o) {
             get_type_all_result result = new get_type_all_result();
             result.success = o;
@@ -30234,6 +34064,7 @@ public void onComplete(java.util.Map<java.lang.String,Type> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30265,27 +34096,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_type_all_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,Type>> resultHandler) throws org.apache.thrift.TException {
         iface.get_type_all(args.name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_fields_args, java.util.List<FieldSchema>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_fields_args, java.util.List<FieldSchema>, get_fields_result> {
       public get_fields() {
         super("get_fields");
       }
 
+      @Override
+      public get_fields_result getEmptyResultInstance() {
+        return new get_fields_result();
+      }
+
+      @Override
       public get_fields_args getEmptyArgsInstance() {
         return new get_fields_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> 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<java.util.List<FieldSchema>>() { 
+          @Override
           public void onComplete(java.util.List<FieldSchema> o) {
             get_fields_result result = new get_fields_result();
             result.success = o;
@@ -30299,6 +34140,7 @@ public void onComplete(java.util.List<FieldSchema> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30338,27 +34180,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_fields_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
         iface.get_fields(args.db_name, args.table_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_fields_with_environment_context_args, java.util.List<FieldSchema>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_fields_with_environment_context_args, java.util.List<FieldSchema>, get_fields_with_environment_context_result> {
       public get_fields_with_environment_context() {
         super("get_fields_with_environment_context");
       }
 
+      @Override
+      public get_fields_with_environment_context_result getEmptyResultInstance() {
+        return new get_fields_with_environment_context_result();
+      }
+
+      @Override
       public get_fields_with_environment_context_args getEmptyArgsInstance() {
         return new get_fields_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> 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<java.util.List<FieldSchema>>() { 
+          @Override
           public void onComplete(java.util.List<FieldSchema> o) {
             get_fields_with_environment_context_result result = new get_fields_with_environment_context_result();
             result.success = o;
@@ -30372,6 +34224,7 @@ public void onComplete(java.util.List<FieldSchema> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30411,27 +34264,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_fields_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
         iface.get_fields_with_environment_context(args.db_name, args.table_name, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_fields_req_args, GetFieldsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_fields_req_args, GetFieldsResponse, get_fields_req_result> {
       public get_fields_req() {
         super("get_fields_req");
       }
 
+      @Override
+      public get_fields_req_result getEmptyResultInstance() {
+        return new get_fields_req_result();
+      }
+
+      @Override
       public get_fields_req_args getEmptyArgsInstance() {
         return new get_fields_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetFieldsResponse> 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<GetFieldsResponse>() { 
+          @Override
           public void onComplete(GetFieldsResponse o) {
             get_fields_req_result result = new get_fields_req_result();
             result.success = o;
@@ -30445,6 +34308,7 @@ public void onComplete(GetFieldsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30484,27 +34348,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_fields_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetFieldsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_fields_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_args, java.util.List<FieldSchema>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_args, java.util.List<FieldSchema>, get_schema_result> {
       public get_schema() {
         super("get_schema");
       }
 
+      @Override
+      public get_schema_result getEmptyResultInstance() {
+        return new get_schema_result();
+      }
+
+      @Override
       public get_schema_args getEmptyArgsInstance() {
         return new get_schema_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> 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<java.util.List<FieldSchema>>() { 
+          @Override
           public void onComplete(java.util.List<FieldSchema> o) {
             get_schema_result result = new get_schema_result();
             result.success = o;
@@ -30518,6 +34392,7 @@ public void onComplete(java.util.List<FieldSchema> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30557,27 +34432,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schema_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
         iface.get_schema(args.db_name, args.table_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_with_environment_context_args, java.util.List<FieldSchema>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_with_environment_context_args, java.util.List<FieldSchema>, get_schema_with_environment_context_result> {
       public get_schema_with_environment_context() {
         super("get_schema_with_environment_context");
       }
 
+      @Override
+      public get_schema_with_environment_context_result getEmptyResultInstance() {
+        return new get_schema_with_environment_context_result();
+      }
+
+      @Override
       public get_schema_with_environment_context_args getEmptyArgsInstance() {
         return new get_schema_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> 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<java.util.List<FieldSchema>>() { 
+          @Override
           public void onComplete(java.util.List<FieldSchema> o) {
             get_schema_with_environment_context_result result = new get_schema_with_environment_context_result();
             result.success = o;
@@ -30591,6 +34476,7 @@ public void onComplete(java.util.List<FieldSchema> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30630,27 +34516,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schema_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<FieldSchema>> resultHandler) throws org.apache.thrift.TException {
         iface.get_schema_with_environment_context(args.db_name, args.table_name, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_req_args, GetSchemaResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_req_args, GetSchemaResponse, get_schema_req_result> {
       public get_schema_req() {
         super("get_schema_req");
       }
 
+      @Override
+      public get_schema_req_result getEmptyResultInstance() {
+        return new get_schema_req_result();
+      }
+
+      @Override
       public get_schema_req_args getEmptyArgsInstance() {
         return new get_schema_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetSchemaResponse> 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<GetSchemaResponse>() { 
+          @Override
           public void onComplete(GetSchemaResponse o) {
             get_schema_req_result result = new get_schema_req_result();
             result.success = o;
@@ -30664,6 +34560,7 @@ public void onComplete(GetSchemaResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30703,27 +34600,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schema_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetSchemaResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_schema_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_args, Void, create_table_result> {
       public create_table() {
         super("create_table");
       }
 
+      @Override
+      public create_table_result getEmptyResultInstance() {
+        return new create_table_result();
+      }
+
+      @Override
       public create_table_args getEmptyArgsInstance() {
         return new create_table_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_table_result result = new create_table_result();
             try {
@@ -30736,6 +34643,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30779,27 +34687,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_table_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_table(args.tbl,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_with_environment_context_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_with_environment_context_args, Void, create_table_with_environment_context_result> {
       public create_table_with_environment_context() {
         super("create_table_with_environment_context");
       }
 
+      @Override
+      public create_table_with_environment_context_result getEmptyResultInstance() {
+        return new create_table_with_environment_context_result();
+      }
+
+      @Override
       public create_table_with_environment_context_args getEmptyArgsInstance() {
         return new create_table_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_table_with_environment_context_result result = new create_table_with_environment_context_result();
             try {
@@ -30812,6 +34730,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30855,27 +34774,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_table_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_table_with_environment_context(args.tbl, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_with_constraints_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_with_constraints_args, Void, create_table_with_constraints_result> {
       public create_table_with_constraints() {
         super("create_table_with_constraints");
       }
 
+      @Override
+      public create_table_with_constraints_result getEmptyResultInstance() {
+        return new create_table_with_constraints_result();
+      }
+
+      @Override
       public create_table_with_constraints_args getEmptyArgsInstance() {
         return new create_table_with_constraints_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_table_with_constraints_result result = new create_table_with_constraints_result();
             try {
@@ -30888,6 +34817,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -30931,27 +34861,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_table_with_constraints_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_table_with_constraints(args.tbl, args.primaryKeys, args.foreignKeys, args.uniqueConstraints, args.notNullConstraints, args.defaultConstraints, args.checkConstraints,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_req_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_table_req_args, Void, create_table_req_result> {
       public create_table_req() {
         super("create_table_req");
       }
 
+      @Override
+      public create_table_req_result getEmptyResultInstance() {
+        return new create_table_req_result();
+      }
+
+      @Override
       public create_table_req_args getEmptyArgsInstance() {
         return new create_table_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_table_req_result result = new create_table_req_result();
             try {
@@ -30964,6 +34904,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31007,27 +34948,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_table_req_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_table_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_constraint_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_constraint_args, Void, drop_constraint_result> {
       public drop_constraint() {
         super("drop_constraint");
       }
 
+      @Override
+      public drop_constraint_result getEmptyResultInstance() {
+        return new drop_constraint_result();
+      }
+
+      @Override
       public drop_constraint_args getEmptyArgsInstance() {
         return new drop_constraint_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_constraint_result result = new drop_constraint_result();
             try {
@@ -31040,6 +34991,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31075,27 +35027,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_constraint_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_constraint(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_primary_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_primary_key_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_primary_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_primary_key_args, Void, add_primary_key_result> {
       public add_primary_key() {
         super("add_primary_key");
       }
 
+      @Override
+      public add_primary_key_result getEmptyResultInstance() {
+        return new add_primary_key_result();
+      }
+
+      @Override
       public add_primary_key_args getEmptyArgsInstance() {
         return new add_primary_key_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_primary_key_result result = new add_primary_key_result();
             try {
@@ -31108,6 +35070,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31143,27 +35106,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_primary_key_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_primary_key(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_foreign_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_foreign_key_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_foreign_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_foreign_key_args, Void, add_foreign_key_result> {
       public add_foreign_key() {
         super("add_foreign_key");
       }
 
+      @Override
+      public add_foreign_key_result getEmptyResultInstance() {
+        return new add_foreign_key_result();
+      }
+
+      @Override
       public add_foreign_key_args getEmptyArgsInstance() {
         return new add_foreign_key_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_foreign_key_result result = new add_foreign_key_result();
             try {
@@ -31176,6 +35149,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31211,27 +35185,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_foreign_key_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_foreign_key(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_unique_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_unique_constraint_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_unique_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_unique_constraint_args, Void, add_unique_constraint_result> {
       public add_unique_constraint() {
         super("add_unique_constraint");
       }
 
+      @Override
+      public add_unique_constraint_result getEmptyResultInstance() {
+        return new add_unique_constraint_result();
+      }
+
+      @Override
       public add_unique_constraint_args getEmptyArgsInstance() {
         return new add_unique_constraint_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_unique_constraint_result result = new add_unique_constraint_result();
             try {
@@ -31244,6 +35228,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31279,27 +35264,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_unique_constraint_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_unique_constraint(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_not_null_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_not_null_constraint_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_not_null_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_not_null_constraint_args, Void, add_not_null_constraint_result> {
       public add_not_null_constraint() {
         super("add_not_null_constraint");
       }
 
+      @Override
+      public add_not_null_constraint_result getEmptyResultInstance() {
+        return new add_not_null_constraint_result();
+      }
+
+      @Override
       public add_not_null_constraint_args getEmptyArgsInstance() {
         return new add_not_null_constraint_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_not_null_constraint_result result = new add_not_null_constraint_result();
             try {
@@ -31312,6 +35307,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31347,27 +35343,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_not_null_constraint_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_not_null_constraint(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_default_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_default_constraint_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_default_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_default_constraint_args, Void, add_default_constraint_result> {
       public add_default_constraint() {
         super("add_default_constraint");
       }
 
+      @Override
+      public add_default_constraint_result getEmptyResultInstance() {
+        return new add_default_constraint_result();
+      }
+
+      @Override
       public add_default_constraint_args getEmptyArgsInstance() {
         return new add_default_constraint_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_default_constraint_result result = new add_default_constraint_result();
             try {
@@ -31380,6 +35386,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31415,27 +35422,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_default_constraint_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_default_constraint(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_check_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_check_constraint_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_check_constraint<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_check_constraint_args, Void, add_check_constraint_result> {
       public add_check_constraint() {
         super("add_check_constraint");
       }
 
+      @Override
+      public add_check_constraint_result getEmptyResultInstance() {
+        return new add_check_constraint_result();
+      }
+
+      @Override
       public add_check_constraint_args getEmptyArgsInstance() {
         return new add_check_constraint_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_check_constraint_result result = new add_check_constraint_result();
             try {
@@ -31448,6 +35465,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31483,27 +35501,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_check_constraint_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_check_constraint(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class translate_table_dryrun<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, translate_table_dryrun_args, Table> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class translate_table_dryrun<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, translate_table_dryrun_args, Table, translate_table_dryrun_result> {
       public translate_table_dryrun() {
         super("translate_table_dryrun");
       }
 
+      @Override
+      public translate_table_dryrun_result getEmptyResultInstance() {
+        return new translate_table_dryrun_result();
+      }
+
+      @Override
       public translate_table_dryrun_args getEmptyArgsInstance() {
         return new translate_table_dryrun_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Table> 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<Table>() { 
+          @Override
           public void onComplete(Table o) {
             translate_table_dryrun_result result = new translate_table_dryrun_result();
             result.success = o;
@@ -31517,6 +35545,7 @@ public void onComplete(Table o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31560,27 +35589,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, translate_table_dryrun_args args, org.apache.thrift.async.AsyncMethodCallback<Table> resultHandler) throws org.apache.thrift.TException {
         iface.translate_table_dryrun(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_table_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_table_args, Void, drop_table_result> {
       public drop_table() {
         super("drop_table");
       }
 
+      @Override
+      public drop_table_result getEmptyResultInstance() {
+        return new drop_table_result();
+      }
+
+      @Override
       public drop_table_args getEmptyArgsInstance() {
         return new drop_table_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_table_result result = new drop_table_result();
             try {
@@ -31593,6 +35632,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31628,27 +35668,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_table_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_table(args.dbname, args.name, args.deleteData,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_table_with_environment_context_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_table_with_environment_context_args, Void, drop_table_with_environment_context_result> {
       public drop_table_with_environment_context() {
         super("drop_table_with_environment_context");
       }
 
+      @Override
+      public drop_table_with_environment_context_result getEmptyResultInstance() {
+        return new drop_table_with_environment_context_result();
+      }
+
+      @Override
       public drop_table_with_environment_context_args getEmptyArgsInstance() {
         return new drop_table_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_table_with_environment_context_result result = new drop_table_with_environment_context_result();
             try {
@@ -31661,6 +35711,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31696,27 +35747,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_table_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_table_with_environment_context(args.dbname, args.name, args.deleteData, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_table_req_args, AsyncOperationResp> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_table_req_args, AsyncOperationResp, drop_table_req_result> {
       public drop_table_req() {
         super("drop_table_req");
       }
 
+      @Override
+      public drop_table_req_result getEmptyResultInstance() {
+        return new drop_table_req_result();
+      }
+
+      @Override
       public drop_table_req_args getEmptyArgsInstance() {
         return new drop_table_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AsyncOperationResp> 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<AsyncOperationResp>() { 
+          @Override
           public void onComplete(AsyncOperationResp o) {
             drop_table_req_result result = new drop_table_req_result();
             result.success = o;
@@ -31730,6 +35791,7 @@ public void onComplete(AsyncOperationResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31765,27 +35827,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_table_req_args args, org.apache.thrift.async.AsyncMethodCallback<AsyncOperationResp> resultHandler) throws org.apache.thrift.TException {
         iface.drop_table_req(args.dropTableReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, truncate_table_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, truncate_table_args, Void, truncate_table_result> {
       public truncate_table() {
         super("truncate_table");
       }
 
+      @Override
+      public truncate_table_result getEmptyResultInstance() {
+        return new truncate_table_result();
+      }
+
+      @Override
       public truncate_table_args getEmptyArgsInstance() {
         return new truncate_table_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             truncate_table_result result = new truncate_table_result();
             try {
@@ -31798,6 +35870,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31829,27 +35902,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, truncate_table_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.truncate_table(args.dbName, args.tableName, args.partNames,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, truncate_table_req_args, TruncateTableResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, truncate_table_req_args, TruncateTableResponse, truncate_table_req_result> {
       public truncate_table_req() {
         super("truncate_table_req");
       }
 
+      @Override
+      public truncate_table_req_result getEmptyResultInstance() {
+        return new truncate_table_req_result();
+      }
+
+      @Override
       public truncate_table_req_args getEmptyArgsInstance() {
         return new truncate_table_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TruncateTableResponse> 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<TruncateTableResponse>() { 
+          @Override
           public void onComplete(TruncateTableResponse o) {
             truncate_table_req_result result = new truncate_table_req_result();
             result.success = o;
@@ -31863,6 +35946,7 @@ public void onComplete(TruncateTableResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31894,27 +35978,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, truncate_table_req_args args, org.apache.thrift.async.AsyncMethodCallback<TruncateTableResponse> resultHandler) throws org.apache.thrift.TException {
         iface.truncate_table_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_tables_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_tables_args, java.util.List<java.lang.String>, get_tables_result> {
       public get_tables() {
         super("get_tables");
       }
 
+      @Override
+      public get_tables_result getEmptyResultInstance() {
+        return new get_tables_result();
+      }
+
+      @Override
       public get_tables_args getEmptyArgsInstance() {
         return new get_tables_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_tables_result result = new get_tables_result();
             result.success = o;
@@ -31928,6 +36022,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -31959,27 +36054,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_tables_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_tables(args.db_name, args.pattern,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_by_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_tables_by_type_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_by_type<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_tables_by_type_args, java.util.List<java.lang.String>, get_tables_by_type_result> {
       public get_tables_by_type() {
         super("get_tables_by_type");
       }
 
+      @Override
+      public get_tables_by_type_result getEmptyResultInstance() {
+        return new get_tables_by_type_result();
+      }
+
+      @Override
       public get_tables_by_type_args getEmptyArgsInstance() {
         return new get_tables_by_type_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_tables_by_type_result result = new get_tables_by_type_result();
             result.success = o;
@@ -31993,6 +36098,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32024,27 +36130,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_tables_by_type_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_tables_by_type(args.db_name, args.pattern, args.tableType,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_materialized_view_objects_for_rewriting<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_materialized_view_objects_for_rewriting_args, java.util.List<Table>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_materialized_view_objects_for_rewriting<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_materialized_view_objects_for_rewriting_args, java.util.List<Table>, get_all_materialized_view_objects_for_rewriting_result> {
       public get_all_materialized_view_objects_for_rewriting() {
         super("get_all_materialized_view_objects_for_rewriting");
       }
 
+      @Override
+      public get_all_materialized_view_objects_for_rewriting_result getEmptyResultInstance() {
+        return new get_all_materialized_view_objects_for_rewriting_result();
+      }
+
+      @Override
       public get_all_materialized_view_objects_for_rewriting_args getEmptyArgsInstance() {
         return new get_all_materialized_view_objects_for_rewriting_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Table>> 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<java.util.List<Table>>() { 
+          @Override
           public void onComplete(java.util.List<Table> o) {
             get_all_materialized_view_objects_for_rewriting_result result = new get_all_materialized_view_objects_for_rewriting_result();
             result.success = o;
@@ -32058,6 +36174,7 @@ public void onComplete(java.util.List<Table> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32089,27 +36206,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_materialized_view_objects_for_rewriting_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Table>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_materialized_view_objects_for_rewriting(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialized_views_for_rewriting<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_materialized_views_for_rewriting_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialized_views_for_rewriting<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_materialized_views_for_rewriting_args, java.util.List<java.lang.String>, get_materialized_views_for_rewriting_result> {
       public get_materialized_views_for_rewriting() {
         super("get_materialized_views_for_rewriting");
       }
 
+      @Override
+      public get_materialized_views_for_rewriting_result getEmptyResultInstance() {
+        return new get_materialized_views_for_rewriting_result();
+      }
+
+      @Override
       public get_materialized_views_for_rewriting_args getEmptyArgsInstance() {
         return new get_materialized_views_for_rewriting_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_materialized_views_for_rewriting_result result = new get_materialized_views_for_rewriting_result();
             result.success = o;
@@ -32123,6 +36250,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32154,27 +36282,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_materialized_views_for_rewriting_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_materialized_views_for_rewriting(args.db_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_meta<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_meta_args, java.util.List<TableMeta>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_meta<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_meta_args, java.util.List<TableMeta>, get_table_meta_result> {
       public get_table_meta() {
         super("get_table_meta");
       }
 
+      @Override
+      public get_table_meta_result getEmptyResultInstance() {
+        return new get_table_meta_result();
+      }
+
+      @Override
       public get_table_meta_args getEmptyArgsInstance() {
         return new get_table_meta_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<TableMeta>> 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<java.util.List<TableMeta>>() { 
+          @Override
           public void onComplete(java.util.List<TableMeta> o) {
             get_table_meta_result result = new get_table_meta_result();
             result.success = o;
@@ -32188,6 +36326,7 @@ public void onComplete(java.util.List<TableMeta> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32219,27 +36358,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_table_meta_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<TableMeta>> resultHandler) throws org.apache.thrift.TException {
         iface.get_table_meta(args.db_patterns, args.tbl_patterns, args.tbl_types,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_tables<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_tables_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_tables<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_tables_args, java.util.List<java.lang.String>, get_all_tables_result> {
       public get_all_tables() {
         super("get_all_tables");
       }
 
+      @Override
+      public get_all_tables_result getEmptyResultInstance() {
+        return new get_all_tables_result();
+      }
+
+      @Override
       public get_all_tables_args getEmptyArgsInstance() {
         return new get_all_tables_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_all_tables_result result = new get_all_tables_result();
             result.success = o;
@@ -32253,6 +36402,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32284,27 +36434,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_tables_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_tables(args.db_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_ext<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_tables_ext_args, java.util.List<ExtendedTableInfo>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_ext<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_tables_ext_args, java.util.List<ExtendedTableInfo>, get_tables_ext_result> {
       public get_tables_ext() {
         super("get_tables_ext");
       }
 
+      @Override
+      public get_tables_ext_result getEmptyResultInstance() {
+        return new get_tables_ext_result();
+      }
+
+      @Override
       public get_tables_ext_args getEmptyArgsInstance() {
         return new get_tables_ext_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<ExtendedTableInfo>> 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<java.util.List<ExtendedTableInfo>>() { 
+          @Override
           public void onComplete(java.util.List<ExtendedTableInfo> o) {
             get_tables_ext_result result = new get_tables_ext_result();
             result.success = o;
@@ -32318,6 +36478,7 @@ public void onComplete(java.util.List<ExtendedTableInfo> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32349,27 +36510,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_tables_ext_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ExtendedTableInfo>> resultHandler) throws org.apache.thrift.TException {
         iface.get_tables_ext(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_req_args, GetTableResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_req_args, GetTableResult, get_table_req_result> {
       public get_table_req() {
         super("get_table_req");
       }
 
+      @Override
+      public get_table_req_result getEmptyResultInstance() {
+        return new get_table_req_result();
+      }
+
+      @Override
       public get_table_req_args getEmptyArgsInstance() {
         return new get_table_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetTableResult> 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<GetTableResult>() { 
+          @Override
           public void onComplete(GetTableResult o) {
             get_table_req_result result = new get_table_req_result();
             result.success = o;
@@ -32383,6 +36554,7 @@ public void onComplete(GetTableResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32418,27 +36590,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_table_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetTableResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_table_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_objects_by_name_req_args, GetTablesResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_objects_by_name_req_args, GetTablesResult, get_table_objects_by_name_req_result> {
       public get_table_objects_by_name_req() {
         super("get_table_objects_by_name_req");
       }
 
+      @Override
+      public get_table_objects_by_name_req_result getEmptyResultInstance() {
+        return new get_table_objects_by_name_req_result();
+      }
+
+      @Override
       public get_table_objects_by_name_req_args getEmptyArgsInstance() {
         return new get_table_objects_by_name_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetTablesResult> 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<GetTablesResult>() { 
+          @Override
           public void onComplete(GetTablesResult o) {
             get_table_objects_by_name_req_result result = new get_table_objects_by_name_req_result();
             result.success = o;
@@ -32452,6 +36634,7 @@ public void onComplete(GetTablesResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32491,27 +36674,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_table_objects_by_name_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetTablesResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_table_objects_by_name_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialization_invalidation_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_materialization_invalidation_info_args, Materialization> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialization_invalidation_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_materialization_invalidation_info_args, Materialization, get_materialization_invalidation_info_result> {
       public get_materialization_invalidation_info() {
         super("get_materialization_invalidation_info");
       }
 
+      @Override
+      public get_materialization_invalidation_info_result getEmptyResultInstance() {
+        return new get_materialization_invalidation_info_result();
+      }
+
+      @Override
       public get_materialization_invalidation_info_args getEmptyArgsInstance() {
         return new get_materialization_invalidation_info_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Materialization> 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<Materialization>() { 
+          @Override
           public void onComplete(Materialization o) {
             get_materialization_invalidation_info_result result = new get_materialization_invalidation_info_result();
             result.success = o;
@@ -32525,6 +36718,7 @@ public void onComplete(Materialization o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32564,27 +36758,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_materialization_invalidation_info_args args, org.apache.thrift.async.AsyncMethodCallback<Materialization> resultHandler) throws org.apache.thrift.TException {
         iface.get_materialization_invalidation_info(args.creation_metadata, args.validTxnList,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_creation_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_creation_metadata_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_creation_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_creation_metadata_args, Void, update_creation_metadata_result> {
       public update_creation_metadata() {
         super("update_creation_metadata");
       }
 
+      @Override
+      public update_creation_metadata_result getEmptyResultInstance() {
+        return new update_creation_metadata_result();
+      }
+
+      @Override
       public update_creation_metadata_args getEmptyArgsInstance() {
         return new update_creation_metadata_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             update_creation_metadata_result result = new update_creation_metadata_result();
             try {
@@ -32597,6 +36801,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32636,27 +36841,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_creation_metadata_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.update_creation_metadata(args.catName, args.dbname, args.tbl_name, args.creation_metadata,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_names_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_names_by_filter_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_names_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_names_by_filter_args, java.util.List<java.lang.String>, get_table_names_by_filter_result> {
       public get_table_names_by_filter() {
         super("get_table_names_by_filter");
       }
 
+      @Override
+      public get_table_names_by_filter_result getEmptyResultInstance() {
+        return new get_table_names_by_filter_result();
+      }
+
+      @Override
       public get_table_names_by_filter_args getEmptyArgsInstance() {
         return new get_table_names_by_filter_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_table_names_by_filter_result result = new get_table_names_by_filter_result();
             result.success = o;
@@ -32670,6 +36885,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32709,27 +36925,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_table_names_by_filter_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_table_names_by_filter(args.dbname, args.filter, args.max_tables,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_args, Void, alter_table_result> {
       public alter_table() {
         super("alter_table");
       }
 
+      @Override
+      public alter_table_result getEmptyResultInstance() {
+        return new alter_table_result();
+      }
+
+      @Override
       public alter_table_args getEmptyArgsInstance() {
         return new alter_table_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_table_result result = new alter_table_result();
             try {
@@ -32742,6 +36968,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32777,27 +37004,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_table_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_table(args.dbname, args.tbl_name, args.new_tbl,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_with_environment_context_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_with_environment_context_args, Void, alter_table_with_environment_context_result> {
       public alter_table_with_environment_context() {
         super("alter_table_with_environment_context");
       }
 
+      @Override
+      public alter_table_with_environment_context_result getEmptyResultInstance() {
+        return new alter_table_with_environment_context_result();
+      }
+
+      @Override
       public alter_table_with_environment_context_args getEmptyArgsInstance() {
         return new alter_table_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_table_with_environment_context_result result = new alter_table_with_environment_context_result();
             try {
@@ -32810,6 +37047,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32845,27 +37083,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_table_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_table_with_environment_context(args.dbname, args.tbl_name, args.new_tbl, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_cascade<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_with_cascade_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_cascade<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_with_cascade_args, Void, alter_table_with_cascade_result> {
       public alter_table_with_cascade() {
         super("alter_table_with_cascade");
       }
 
+      @Override
+      public alter_table_with_cascade_result getEmptyResultInstance() {
+        return new alter_table_with_cascade_result();
+      }
+
+      @Override
       public alter_table_with_cascade_args getEmptyArgsInstance() {
         return new alter_table_with_cascade_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_table_with_cascade_result result = new alter_table_with_cascade_result();
             try {
@@ -32878,6 +37126,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32913,27 +37162,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_table_with_cascade_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_table_with_cascade(args.dbname, args.tbl_name, args.new_tbl, args.cascade,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_req_args, AlterTableResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_table_req_args, AlterTableResponse, alter_table_req_result> {
       public alter_table_req() {
         super("alter_table_req");
       }
 
+      @Override
+      public alter_table_req_result getEmptyResultInstance() {
+        return new alter_table_req_result();
+      }
+
+      @Override
       public alter_table_req_args getEmptyArgsInstance() {
         return new alter_table_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AlterTableResponse> 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<AlterTableResponse>() { 
+          @Override
           public void onComplete(AlterTableResponse o) {
             alter_table_req_result result = new alter_table_req_result();
             result.success = o;
@@ -32947,6 +37206,7 @@ public void onComplete(AlterTableResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -32982,27 +37242,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_table_req_args args, org.apache.thrift.async.AsyncMethodCallback<AlterTableResponse> resultHandler) throws org.apache.thrift.TException {
         iface.alter_table_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_params<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_table_params_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_params<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_table_params_args, Void, update_table_params_result> {
       public update_table_params() {
         super("update_table_params");
       }
 
+      @Override
+      public update_table_params_result getEmptyResultInstance() {
+        return new update_table_params_result();
+      }
+
+      @Override
       public update_table_params_args getEmptyArgsInstance() {
         return new update_table_params_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             update_table_params_result result = new update_table_params_result();
             try {
@@ -33015,6 +37285,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33046,27 +37317,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_table_params_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.update_table_params(args.updates,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partition_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partition_args, Partition, add_partition_result> {
       public add_partition() {
         super("add_partition");
       }
 
+      @Override
+      public add_partition_result getEmptyResultInstance() {
+        return new add_partition_result();
+      }
+
+      @Override
       public add_partition_args getEmptyArgsInstance() {
         return new add_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             add_partition_result result = new add_partition_result();
             result.success = o;
@@ -33080,6 +37361,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33119,27 +37401,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_partition_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.add_partition(args.new_part,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partition_with_environment_context_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partition_with_environment_context_args, Partition, add_partition_with_environment_context_result> {
       public add_partition_with_environment_context() {
         super("add_partition_with_environment_context");
       }
 
+      @Override
+      public add_partition_with_environment_context_result getEmptyResultInstance() {
+        return new add_partition_with_environment_context_result();
+      }
+
+      @Override
       public add_partition_with_environment_context_args getEmptyArgsInstance() {
         return new add_partition_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             add_partition_with_environment_context_result result = new add_partition_with_environment_context_result();
             result.success = o;
@@ -33153,6 +37445,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33192,27 +37485,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_partition_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.add_partition_with_environment_context(args.new_part, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partitions_args, java.lang.Integer> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partitions_args, java.lang.Integer, add_partitions_result> {
       public add_partitions() {
         super("add_partitions");
       }
 
+      @Override
+      public add_partitions_result getEmptyResultInstance() {
+        return new add_partitions_result();
+      }
+
+      @Override
       public add_partitions_args getEmptyArgsInstance() {
         return new add_partitions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> 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<java.lang.Integer>() { 
+          @Override
           public void onComplete(java.lang.Integer o) {
             add_partitions_result result = new add_partitions_result();
             result.success = o;
@@ -33227,6 +37530,7 @@ public void onComplete(java.lang.Integer o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33266,27 +37570,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_partitions_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
         iface.add_partitions(args.new_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_pspec<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partitions_pspec_args, java.lang.Integer> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_pspec<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partitions_pspec_args, java.lang.Integer, add_partitions_pspec_result> {
       public add_partitions_pspec() {
         super("add_partitions_pspec");
       }
 
+      @Override
+      public add_partitions_pspec_result getEmptyResultInstance() {
+        return new add_partitions_pspec_result();
+      }
+
+      @Override
       public add_partitions_pspec_args getEmptyArgsInstance() {
         return new add_partitions_pspec_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> 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<java.lang.Integer>() { 
+          @Override
           public void onComplete(java.lang.Integer o) {
             add_partitions_pspec_result result = new add_partitions_pspec_result();
             result.success = o;
@@ -33301,6 +37615,7 @@ public void onComplete(java.lang.Integer o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33340,27 +37655,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_partitions_pspec_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
         iface.add_partitions_pspec(args.new_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_args, Partition, append_partition_result> {
       public append_partition() {
         super("append_partition");
       }
 
+      @Override
+      public append_partition_result getEmptyResultInstance() {
+        return new append_partition_result();
+      }
+
+      @Override
       public append_partition_args getEmptyArgsInstance() {
         return new append_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             append_partition_result result = new append_partition_result();
             result.success = o;
@@ -33374,6 +37699,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33413,27 +37739,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, append_partition_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.append_partition(args.db_name, args.tbl_name, args.part_vals,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partitions_req_args, AddPartitionsResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_partitions_req_args, AddPartitionsResult, add_partitions_req_result> {
       public add_partitions_req() {
         super("add_partitions_req");
       }
 
+      @Override
+      public add_partitions_req_result getEmptyResultInstance() {
+        return new add_partitions_req_result();
+      }
+
+      @Override
       public add_partitions_req_args getEmptyArgsInstance() {
         return new add_partitions_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AddPartitionsResult> 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<AddPartitionsResult>() { 
+          @Override
           public void onComplete(AddPartitionsResult o) {
             add_partitions_req_result result = new add_partitions_req_result();
             result.success = o;
@@ -33447,6 +37783,7 @@ public void onComplete(AddPartitionsResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33486,27 +37823,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_partitions_req_args args, org.apache.thrift.async.AsyncMethodCallback<AddPartitionsResult> resultHandler) throws org.apache.thrift.TException {
         iface.add_partitions_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_with_environment_context_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_with_environment_context_args, Partition, append_partition_with_environment_context_result> {
       public append_partition_with_environment_context() {
         super("append_partition_with_environment_context");
       }
 
+      @Override
+      public append_partition_with_environment_context_result getEmptyResultInstance() {
+        return new append_partition_with_environment_context_result();
+      }
+
+      @Override
       public append_partition_with_environment_context_args getEmptyArgsInstance() {
         return new append_partition_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             append_partition_with_environment_context_result result = new append_partition_with_environment_context_result();
             result.success = o;
@@ -33520,6 +37867,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33559,27 +37907,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, append_partition_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.append_partition_with_environment_context(args.db_name, args.tbl_name, args.part_vals, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_req_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_req_args, Partition, append_partition_req_result> {
       public append_partition_req() {
         super("append_partition_req");
       }
 
+      @Override
+      public append_partition_req_result getEmptyResultInstance() {
+        return new append_partition_req_result();
+      }
+
+      @Override
       public append_partition_req_args getEmptyArgsInstance() {
         return new append_partition_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             append_partition_req_result result = new append_partition_req_result();
             result.success = o;
@@ -33593,6 +37951,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33632,27 +37991,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, append_partition_req_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.append_partition_req(args.appendPartitionsReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_by_name_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_by_name_args, Partition, append_partition_by_name_result> {
       public append_partition_by_name() {
         super("append_partition_by_name");
       }
 
+      @Override
+      public append_partition_by_name_result getEmptyResultInstance() {
+        return new append_partition_by_name_result();
+      }
+
+      @Override
       public append_partition_by_name_args getEmptyArgsInstance() {
         return new append_partition_by_name_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             append_partition_by_name_result result = new append_partition_by_name_result();
             result.success = o;
@@ -33666,6 +38035,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33705,27 +38075,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, append_partition_by_name_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.append_partition_by_name(args.db_name, args.tbl_name, args.part_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_by_name_with_environment_context_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, append_partition_by_name_with_environment_context_args, Partition, append_partition_by_name_with_environment_context_result> {
       public append_partition_by_name_with_environment_context() {
         super("append_partition_by_name_with_environment_context");
       }
 
+      @Override
+      public append_partition_by_name_with_environment_context_result getEmptyResultInstance() {
+        return new append_partition_by_name_with_environment_context_result();
+      }
+
+      @Override
       public append_partition_by_name_with_environment_context_args getEmptyArgsInstance() {
         return new append_partition_by_name_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             append_partition_by_name_with_environment_context_result result = new append_partition_by_name_with_environment_context_result();
             result.success = o;
@@ -33739,6 +38119,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33778,27 +38159,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, append_partition_by_name_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.append_partition_by_name_with_environment_context(args.db_name, args.tbl_name, args.part_name, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_args, java.lang.Boolean, drop_partition_result> {
       public drop_partition() {
         super("drop_partition");
       }
 
+      @Override
+      public drop_partition_result getEmptyResultInstance() {
+        return new drop_partition_result();
+      }
+
+      @Override
       public drop_partition_args getEmptyArgsInstance() {
         return new drop_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_partition_result result = new drop_partition_result();
             result.success = o;
@@ -33813,6 +38204,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33848,27 +38240,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_partition_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_partition(args.db_name, args.tbl_name, args.part_vals, args.deleteData,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_with_environment_context_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_with_environment_context_args, java.lang.Boolean, drop_partition_with_environment_context_result> {
       public drop_partition_with_environment_context() {
         super("drop_partition_with_environment_context");
       }
 
+      @Override
+      public drop_partition_with_environment_context_result getEmptyResultInstance() {
+        return new drop_partition_with_environment_context_result();
+      }
+
+      @Override
       public drop_partition_with_environment_context_args getEmptyArgsInstance() {
         return new drop_partition_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_partition_with_environment_context_result result = new drop_partition_with_environment_context_result();
             result.success = o;
@@ -33883,6 +38285,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33918,27 +38321,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_partition_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_partition_with_environment_context(args.db_name, args.tbl_name, args.part_vals, args.deleteData, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_req_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_req_args, java.lang.Boolean, drop_partition_req_result> {
       public drop_partition_req() {
         super("drop_partition_req");
       }
 
+      @Override
+      public drop_partition_req_result getEmptyResultInstance() {
+        return new drop_partition_req_result();
+      }
+
+      @Override
       public drop_partition_req_args getEmptyArgsInstance() {
         return new drop_partition_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_partition_req_result result = new drop_partition_req_result();
             result.success = o;
@@ -33953,6 +38366,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -33988,27 +38402,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_partition_req_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_partition_req(args.dropPartitionReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_by_name_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_by_name_args, java.lang.Boolean, drop_partition_by_name_result> {
       public drop_partition_by_name() {
         super("drop_partition_by_name");
       }
 
+      @Override
+      public drop_partition_by_name_result getEmptyResultInstance() {
+        return new drop_partition_by_name_result();
+      }
+
+      @Override
       public drop_partition_by_name_args getEmptyArgsInstance() {
         return new drop_partition_by_name_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_partition_by_name_result result = new drop_partition_by_name_result();
             result.success = o;
@@ -34023,6 +38447,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34058,27 +38483,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_partition_by_name_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_partition_by_name(args.db_name, args.tbl_name, args.part_name, args.deleteData,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_by_name_with_environment_context_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partition_by_name_with_environment_context_args, java.lang.Boolean, drop_partition_by_name_with_environment_context_result> {
       public drop_partition_by_name_with_environment_context() {
         super("drop_partition_by_name_with_environment_context");
       }
 
+      @Override
+      public drop_partition_by_name_with_environment_context_result getEmptyResultInstance() {
+        return new drop_partition_by_name_with_environment_context_result();
+      }
+
+      @Override
       public drop_partition_by_name_with_environment_context_args getEmptyArgsInstance() {
         return new drop_partition_by_name_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_partition_by_name_with_environment_context_result result = new drop_partition_by_name_with_environment_context_result();
             result.success = o;
@@ -34093,6 +38528,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34128,27 +38564,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_partition_by_name_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_partition_by_name_with_environment_context(args.db_name, args.tbl_name, args.part_name, args.deleteData, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partitions_req_args, DropPartitionsResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_partitions_req_args, DropPartitionsResult, drop_partitions_req_result> {
       public drop_partitions_req() {
         super("drop_partitions_req");
       }
 
+      @Override
+      public drop_partitions_req_result getEmptyResultInstance() {
+        return new drop_partitions_req_result();
+      }
+
+      @Override
       public drop_partitions_req_args getEmptyArgsInstance() {
         return new drop_partitions_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<DropPartitionsResult> 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<DropPartitionsResult>() { 
+          @Override
           public void onComplete(DropPartitionsResult o) {
             drop_partitions_req_result result = new drop_partitions_req_result();
             result.success = o;
@@ -34162,6 +38608,7 @@ public void onComplete(DropPartitionsResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34197,27 +38644,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_partitions_req_args args, org.apache.thrift.async.AsyncMethodCallback<DropPartitionsResult> resultHandler) throws org.apache.thrift.TException {
         iface.drop_partitions_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_args, Partition, get_partition_result> {
       public get_partition() {
         super("get_partition");
       }
 
+      @Override
+      public get_partition_result getEmptyResultInstance() {
+        return new get_partition_result();
+      }
+
+      @Override
       public get_partition_args getEmptyArgsInstance() {
         return new get_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             get_partition_result result = new get_partition_result();
             result.success = o;
@@ -34231,6 +38688,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34266,27 +38724,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition(args.db_name, args.tbl_name, args.part_vals,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_req_args, GetPartitionResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_req_args, GetPartitionResponse, get_partition_req_result> {
       public get_partition_req() {
         super("get_partition_req");
       }
 
+      @Override
+      public get_partition_req_result getEmptyResultInstance() {
+        return new get_partition_req_result();
+      }
+
+      @Override
       public get_partition_req_args getEmptyArgsInstance() {
         return new get_partition_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetPartitionResponse> 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<GetPartitionResponse>() { 
+          @Override
           public void onComplete(GetPartitionResponse o) {
             get_partition_req_result result = new get_partition_req_result();
             result.success = o;
@@ -34300,6 +38768,7 @@ public void onComplete(GetPartitionResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34335,27 +38804,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetPartitionResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, exchange_partition_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, exchange_partition_args, Partition, exchange_partition_result> {
       public exchange_partition() {
         super("exchange_partition");
       }
 
+      @Override
+      public exchange_partition_result getEmptyResultInstance() {
+        return new exchange_partition_result();
+      }
+
+      @Override
       public exchange_partition_args getEmptyArgsInstance() {
         return new exchange_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             exchange_partition_result result = new exchange_partition_result();
             result.success = o;
@@ -34369,6 +38848,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34412,27 +38892,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, exchange_partition_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.exchange_partition(args.partitionSpecs, args.source_db, args.source_table_name, args.dest_db, args.dest_table_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, exchange_partitions_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, exchange_partitions_args, java.util.List<Partition>, exchange_partitions_result> {
       public exchange_partitions() {
         super("exchange_partitions");
       }
 
+      @Override
+      public exchange_partitions_result getEmptyResultInstance() {
+        return new exchange_partitions_result();
+      }
+
+      @Override
       public exchange_partitions_args getEmptyArgsInstance() {
         return new exchange_partitions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             exchange_partitions_result result = new exchange_partitions_result();
             result.success = o;
@@ -34446,6 +38936,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34489,27 +38980,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, exchange_partitions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.exchange_partitions(args.partitionSpecs, args.source_db, args.source_table_name, args.dest_db, args.dest_table_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_with_auth<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_with_auth_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_with_auth<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_with_auth_args, Partition, get_partition_with_auth_result> {
       public get_partition_with_auth() {
         super("get_partition_with_auth");
       }
 
+      @Override
+      public get_partition_with_auth_result getEmptyResultInstance() {
+        return new get_partition_with_auth_result();
+      }
+
+      @Override
       public get_partition_with_auth_args getEmptyArgsInstance() {
         return new get_partition_with_auth_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             get_partition_with_auth_result result = new get_partition_with_auth_result();
             result.success = o;
@@ -34523,6 +39024,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34558,27 +39060,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_with_auth_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_with_auth(args.db_name, args.tbl_name, args.part_vals, args.user_name, args.group_names,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_by_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_by_name_args, Partition> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_by_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_by_name_args, Partition, get_partition_by_name_result> {
       public get_partition_by_name() {
         super("get_partition_by_name");
       }
 
+      @Override
+      public get_partition_by_name_result getEmptyResultInstance() {
+        return new get_partition_by_name_result();
+      }
+
+      @Override
       public get_partition_by_name_args getEmptyArgsInstance() {
         return new get_partition_by_name_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Partition> 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<Partition>() { 
+          @Override
           public void onComplete(Partition o) {
             get_partition_by_name_result result = new get_partition_by_name_result();
             result.success = o;
@@ -34592,6 +39104,7 @@ public void onComplete(Partition o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34627,27 +39140,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_by_name_args args, org.apache.thrift.async.AsyncMethodCallback<Partition> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_by_name(args.db_name, args.tbl_name, args.part_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_args, java.util.List<Partition>, get_partitions_result> {
       public get_partitions() {
         super("get_partitions");
       }
 
+      @Override
+      public get_partitions_result getEmptyResultInstance() {
+        return new get_partitions_result();
+      }
+
+      @Override
       public get_partitions_args getEmptyArgsInstance() {
         return new get_partitions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_result result = new get_partitions_result();
             result.success = o;
@@ -34661,6 +39184,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34696,27 +39220,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions(args.db_name, args.tbl_name, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_req_args, PartitionsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_req_args, PartitionsResponse, get_partitions_req_result> {
       public get_partitions_req() {
         super("get_partitions_req");
       }
 
+      @Override
+      public get_partitions_req_result getEmptyResultInstance() {
+        return new get_partitions_req_result();
+      }
+
+      @Override
       public get_partitions_req_args getEmptyArgsInstance() {
         return new get_partitions_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PartitionsResponse> 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<PartitionsResponse>() { 
+          @Override
           public void onComplete(PartitionsResponse o) {
             get_partitions_req_result result = new get_partitions_req_result();
             result.success = o;
@@ -34730,6 +39264,7 @@ public void onComplete(PartitionsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34765,27 +39300,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_req_args args, org.apache.thrift.async.AsyncMethodCallback<PartitionsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_auth<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_with_auth_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_auth<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_with_auth_args, java.util.List<Partition>, get_partitions_with_auth_result> {
       public get_partitions_with_auth() {
         super("get_partitions_with_auth");
       }
 
+      @Override
+      public get_partitions_with_auth_result getEmptyResultInstance() {
+        return new get_partitions_with_auth_result();
+      }
+
+      @Override
       public get_partitions_with_auth_args getEmptyArgsInstance() {
         return new get_partitions_with_auth_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_with_auth_result result = new get_partitions_with_auth_result();
             result.success = o;
@@ -34799,6 +39344,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34834,27 +39380,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_with_auth_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_with_auth(args.db_name, args.tbl_name, args.max_parts, args.user_name, args.group_names,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_pspec<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_pspec_args, java.util.List<PartitionSpec>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_pspec<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_pspec_args, java.util.List<PartitionSpec>, get_partitions_pspec_result> {
       public get_partitions_pspec() {
         super("get_partitions_pspec");
       }
 
+      @Override
+      public get_partitions_pspec_result getEmptyResultInstance() {
+        return new get_partitions_pspec_result();
+      }
+
+      @Override
       public get_partitions_pspec_args getEmptyArgsInstance() {
         return new get_partitions_pspec_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<PartitionSpec>> 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<java.util.List<PartitionSpec>>() { 
+          @Override
           public void onComplete(java.util.List<PartitionSpec> o) {
             get_partitions_pspec_result result = new get_partitions_pspec_result();
             result.success = o;
@@ -34868,6 +39424,7 @@ public void onComplete(java.util.List<PartitionSpec> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34903,27 +39460,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_pspec_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<PartitionSpec>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_pspec(args.db_name, args.tbl_name, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_args, java.util.List<java.lang.String>, get_partition_names_result> {
       public get_partition_names() {
         super("get_partition_names");
       }
 
+      @Override
+      public get_partition_names_result getEmptyResultInstance() {
+        return new get_partition_names_result();
+      }
+
+      @Override
       public get_partition_names_args getEmptyArgsInstance() {
         return new get_partition_names_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_partition_names_result result = new get_partition_names_result();
             result.success = o;
@@ -34937,6 +39504,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -34972,27 +39540,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_names_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_names(args.db_name, args.tbl_name, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fetch_partition_names_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fetch_partition_names_req_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fetch_partition_names_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fetch_partition_names_req_args, java.util.List<java.lang.String>, fetch_partition_names_req_result> {
       public fetch_partition_names_req() {
         super("fetch_partition_names_req");
       }
 
+      @Override
+      public fetch_partition_names_req_result getEmptyResultInstance() {
+        return new fetch_partition_names_req_result();
+      }
+
+      @Override
       public fetch_partition_names_req_args getEmptyArgsInstance() {
         return new fetch_partition_names_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             fetch_partition_names_req_result result = new fetch_partition_names_req_result();
             result.success = o;
@@ -35006,6 +39584,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35041,27 +39620,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, fetch_partition_names_req_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.fetch_partition_names_req(args.partitionReq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_values<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_values_args, PartitionValuesResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_values<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_values_args, PartitionValuesResponse, get_partition_values_result> {
       public get_partition_values() {
         super("get_partition_values");
       }
 
+      @Override
+      public get_partition_values_result getEmptyResultInstance() {
+        return new get_partition_values_result();
+      }
+
+      @Override
       public get_partition_values_args getEmptyArgsInstance() {
         return new get_partition_values_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PartitionValuesResponse> 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<PartitionValuesResponse>() { 
+          @Override
           public void onComplete(PartitionValuesResponse o) {
             get_partition_values_result result = new get_partition_values_result();
             result.success = o;
@@ -35075,6 +39664,7 @@ public void onComplete(PartitionValuesResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35110,27 +39700,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_values_args args, org.apache.thrift.async.AsyncMethodCallback<PartitionValuesResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_values(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_ps_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_ps_args, java.util.List<Partition>, get_partitions_ps_result> {
       public get_partitions_ps() {
         super("get_partitions_ps");
       }
 
+      @Override
+      public get_partitions_ps_result getEmptyResultInstance() {
+        return new get_partitions_ps_result();
+      }
+
+      @Override
       public get_partitions_ps_args getEmptyArgsInstance() {
         return new get_partitions_ps_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_ps_result result = new get_partitions_ps_result();
             result.success = o;
@@ -35144,6 +39744,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35179,27 +39780,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_ps_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_ps(args.db_name, args.tbl_name, args.part_vals, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_ps_with_auth_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_ps_with_auth_args, java.util.List<Partition>, get_partitions_ps_with_auth_result> {
       public get_partitions_ps_with_auth() {
         super("get_partitions_ps_with_auth");
       }
 
+      @Override
+      public get_partitions_ps_with_auth_result getEmptyResultInstance() {
+        return new get_partitions_ps_with_auth_result();
+      }
+
+      @Override
       public get_partitions_ps_with_auth_args getEmptyArgsInstance() {
         return new get_partitions_ps_with_auth_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_ps_with_auth_result result = new get_partitions_ps_with_auth_result();
             result.success = o;
@@ -35213,6 +39824,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35248,27 +39860,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_ps_with_auth_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_ps_with_auth(args.db_name, args.tbl_name, args.part_vals, args.max_parts, args.user_name, args.group_names,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_ps_with_auth_req_args, GetPartitionsPsWithAuthResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_ps_with_auth_req_args, GetPartitionsPsWithAuthResponse, get_partitions_ps_with_auth_req_result> {
       public get_partitions_ps_with_auth_req() {
         super("get_partitions_ps_with_auth_req");
       }
 
+      @Override
+      public get_partitions_ps_with_auth_req_result getEmptyResultInstance() {
+        return new get_partitions_ps_with_auth_req_result();
+      }
+
+      @Override
       public get_partitions_ps_with_auth_req_args getEmptyArgsInstance() {
         return new get_partitions_ps_with_auth_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetPartitionsPsWithAuthResponse> 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<GetPartitionsPsWithAuthResponse>() { 
+          @Override
           public void onComplete(GetPartitionsPsWithAuthResponse o) {
             get_partitions_ps_with_auth_req_result result = new get_partitions_ps_with_auth_req_result();
             result.success = o;
@@ -35282,6 +39904,7 @@ public void onComplete(GetPartitionsPsWithAuthResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35317,27 +39940,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_ps_with_auth_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetPartitionsPsWithAuthResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_ps_with_auth_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_ps_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_ps_args, java.util.List<java.lang.String>, get_partition_names_ps_result> {
       public get_partition_names_ps() {
         super("get_partition_names_ps");
       }
 
+      @Override
+      public get_partition_names_ps_result getEmptyResultInstance() {
+        return new get_partition_names_ps_result();
+      }
+
+      @Override
       public get_partition_names_ps_args getEmptyArgsInstance() {
         return new get_partition_names_ps_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_partition_names_ps_result result = new get_partition_names_ps_result();
             result.success = o;
@@ -35351,6 +39984,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35386,27 +40020,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_names_ps_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_names_ps(args.db_name, args.tbl_name, args.part_vals, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_ps_req_args, GetPartitionNamesPsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_ps_req_args, GetPartitionNamesPsResponse, get_partition_names_ps_req_result> {
       public get_partition_names_ps_req() {
         super("get_partition_names_ps_req");
       }
 
+      @Override
+      public get_partition_names_ps_req_result getEmptyResultInstance() {
+        return new get_partition_names_ps_req_result();
+      }
+
+      @Override
       public get_partition_names_ps_req_args getEmptyArgsInstance() {
         return new get_partition_names_ps_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetPartitionNamesPsResponse> 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<GetPartitionNamesPsResponse>() { 
+          @Override
           public void onComplete(GetPartitionNamesPsResponse o) {
             get_partition_names_ps_req_result result = new get_partition_names_ps_req_result();
             result.success = o;
@@ -35420,6 +40064,7 @@ public void onComplete(GetPartitionNamesPsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35455,27 +40100,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_names_ps_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetPartitionNamesPsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_names_ps_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_req_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_names_req_args, java.util.List<java.lang.String>, get_partition_names_req_result> {
       public get_partition_names_req() {
         super("get_partition_names_req");
       }
 
+      @Override
+      public get_partition_names_req_result getEmptyResultInstance() {
+        return new get_partition_names_req_result();
+      }
+
+      @Override
       public get_partition_names_req_args getEmptyArgsInstance() {
         return new get_partition_names_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_partition_names_req_result result = new get_partition_names_req_result();
             result.success = o;
@@ -35489,6 +40144,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35524,27 +40180,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_names_req_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_names_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_filter_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_filter_args, java.util.List<Partition>, get_partitions_by_filter_result> {
       public get_partitions_by_filter() {
         super("get_partitions_by_filter");
       }
 
+      @Override
+      public get_partitions_by_filter_result getEmptyResultInstance() {
+        return new get_partitions_by_filter_result();
+      }
+
+      @Override
       public get_partitions_by_filter_args getEmptyArgsInstance() {
         return new get_partitions_by_filter_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_by_filter_result result = new get_partitions_by_filter_result();
             result.success = o;
@@ -35558,6 +40224,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35593,27 +40260,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_by_filter_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_by_filter(args.db_name, args.tbl_name, args.filter, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_filter_req_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_filter_req_args, java.util.List<Partition>, get_partitions_by_filter_req_result> {
       public get_partitions_by_filter_req() {
         super("get_partitions_by_filter_req");
       }
 
+      @Override
+      public get_partitions_by_filter_req_result getEmptyResultInstance() {
+        return new get_partitions_by_filter_req_result();
+      }
+
+      @Override
       public get_partitions_by_filter_req_args getEmptyArgsInstance() {
         return new get_partitions_by_filter_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_by_filter_req_result result = new get_partitions_by_filter_req_result();
             result.success = o;
@@ -35627,6 +40304,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35662,27 +40340,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_by_filter_req_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_by_filter_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_part_specs_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_part_specs_by_filter_args, java.util.List<PartitionSpec>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_part_specs_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_part_specs_by_filter_args, java.util.List<PartitionSpec>, get_part_specs_by_filter_result> {
       public get_part_specs_by_filter() {
         super("get_part_specs_by_filter");
       }
 
+      @Override
+      public get_part_specs_by_filter_result getEmptyResultInstance() {
+        return new get_part_specs_by_filter_result();
+      }
+
+      @Override
       public get_part_specs_by_filter_args getEmptyArgsInstance() {
         return new get_part_specs_by_filter_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<PartitionSpec>> 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<java.util.List<PartitionSpec>>() { 
+          @Override
           public void onComplete(java.util.List<PartitionSpec> o) {
             get_part_specs_by_filter_result result = new get_part_specs_by_filter_result();
             result.success = o;
@@ -35696,6 +40384,7 @@ public void onComplete(java.util.List<PartitionSpec> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35731,27 +40420,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_part_specs_by_filter_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<PartitionSpec>> resultHandler) throws org.apache.thrift.TException {
         iface.get_part_specs_by_filter(args.db_name, args.tbl_name, args.filter, args.max_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_expr<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_expr_args, PartitionsByExprResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_expr<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_expr_args, PartitionsByExprResult, get_partitions_by_expr_result> {
       public get_partitions_by_expr() {
         super("get_partitions_by_expr");
       }
 
+      @Override
+      public get_partitions_by_expr_result getEmptyResultInstance() {
+        return new get_partitions_by_expr_result();
+      }
+
+      @Override
       public get_partitions_by_expr_args getEmptyArgsInstance() {
         return new get_partitions_by_expr_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PartitionsByExprResult> 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<PartitionsByExprResult>() { 
+          @Override
           public void onComplete(PartitionsByExprResult o) {
             get_partitions_by_expr_result result = new get_partitions_by_expr_result();
             result.success = o;
@@ -35765,6 +40464,7 @@ public void onComplete(PartitionsByExprResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35800,27 +40500,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_by_expr_args args, org.apache.thrift.async.AsyncMethodCallback<PartitionsByExprResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_by_expr(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_spec_by_expr<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_spec_by_expr_args, PartitionsSpecByExprResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_spec_by_expr<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_spec_by_expr_args, PartitionsSpecByExprResult, get_partitions_spec_by_expr_result> {
       public get_partitions_spec_by_expr() {
         super("get_partitions_spec_by_expr");
       }
 
+      @Override
+      public get_partitions_spec_by_expr_result getEmptyResultInstance() {
+        return new get_partitions_spec_by_expr_result();
+      }
+
+      @Override
       public get_partitions_spec_by_expr_args getEmptyArgsInstance() {
         return new get_partitions_spec_by_expr_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PartitionsSpecByExprResult> 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<PartitionsSpecByExprResult>() { 
+          @Override
           public void onComplete(PartitionsSpecByExprResult o) {
             get_partitions_spec_by_expr_result result = new get_partitions_spec_by_expr_result();
             result.success = o;
@@ -35834,6 +40544,7 @@ public void onComplete(PartitionsSpecByExprResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35869,27 +40580,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_spec_by_expr_args args, org.apache.thrift.async.AsyncMethodCallback<PartitionsSpecByExprResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_spec_by_expr(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_num_partitions_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_num_partitions_by_filter_args, java.lang.Integer> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_num_partitions_by_filter<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_num_partitions_by_filter_args, java.lang.Integer, get_num_partitions_by_filter_result> {
       public get_num_partitions_by_filter() {
         super("get_num_partitions_by_filter");
       }
 
+      @Override
+      public get_num_partitions_by_filter_result getEmptyResultInstance() {
+        return new get_num_partitions_by_filter_result();
+      }
+
+      @Override
       public get_num_partitions_by_filter_args getEmptyArgsInstance() {
         return new get_num_partitions_by_filter_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> 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<java.lang.Integer>() { 
+          @Override
           public void onComplete(java.lang.Integer o) {
             get_num_partitions_by_filter_result result = new get_num_partitions_by_filter_result();
             result.success = o;
@@ -35904,6 +40625,7 @@ public void onComplete(java.lang.Integer o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -35939,27 +40661,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_num_partitions_by_filter_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
         iface.get_num_partitions_by_filter(args.db_name, args.tbl_name, args.filter,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_names_args, java.util.List<Partition>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_names_args, java.util.List<Partition>, get_partitions_by_names_result> {
       public get_partitions_by_names() {
         super("get_partitions_by_names");
       }
 
+      @Override
+      public get_partitions_by_names_result getEmptyResultInstance() {
+        return new get_partitions_by_names_result();
+      }
+
+      @Override
       public get_partitions_by_names_args getEmptyArgsInstance() {
         return new get_partitions_by_names_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> 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<java.util.List<Partition>>() { 
+          @Override
           public void onComplete(java.util.List<Partition> o) {
             get_partitions_by_names_result result = new get_partitions_by_names_result();
             result.success = o;
@@ -35973,6 +40705,7 @@ public void onComplete(java.util.List<Partition> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36012,27 +40745,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_by_names_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Partition>> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_by_names(args.db_name, args.tbl_name, args.names,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_names_req_args, GetPartitionsByNamesResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_by_names_req_args, GetPartitionsByNamesResult, get_partitions_by_names_req_result> {
       public get_partitions_by_names_req() {
         super("get_partitions_by_names_req");
       }
 
+      @Override
+      public get_partitions_by_names_req_result getEmptyResultInstance() {
+        return new get_partitions_by_names_req_result();
+      }
+
+      @Override
       public get_partitions_by_names_req_args getEmptyArgsInstance() {
         return new get_partitions_by_names_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetPartitionsByNamesResult> 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<GetPartitionsByNamesResult>() { 
+          @Override
           public void onComplete(GetPartitionsByNamesResult o) {
             get_partitions_by_names_req_result result = new get_partitions_by_names_req_result();
             result.success = o;
@@ -36046,6 +40789,7 @@ public void onComplete(GetPartitionsByNamesResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36085,27 +40829,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_by_names_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetPartitionsByNamesResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_by_names_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_properties<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_properties_args, PropertyGetResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_properties<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_properties_args, PropertyGetResponse, get_properties_result> {
       public get_properties() {
         super("get_properties");
       }
 
+      @Override
+      public get_properties_result getEmptyResultInstance() {
+        return new get_properties_result();
+      }
+
+      @Override
       public get_properties_args getEmptyArgsInstance() {
         return new get_properties_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PropertyGetResponse> 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<PropertyGetResponse>() { 
+          @Override
           public void onComplete(PropertyGetResponse o) {
             get_properties_result result = new get_properties_result();
             result.success = o;
@@ -36119,6 +40873,7 @@ public void onComplete(PropertyGetResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36154,27 +40909,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_properties_args args, org.apache.thrift.async.AsyncMethodCallback<PropertyGetResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_properties(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_properties<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_properties_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_properties<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_properties_args, java.lang.Boolean, set_properties_result> {
       public set_properties() {
         super("set_properties");
       }
 
+      @Override
+      public set_properties_result getEmptyResultInstance() {
+        return new set_properties_result();
+      }
+
+      @Override
       public set_properties_args getEmptyArgsInstance() {
         return new set_properties_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             set_properties_result result = new set_properties_result();
             result.success = o;
@@ -36189,6 +40954,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36224,27 +40990,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, set_properties_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.set_properties(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partition_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partition_args, Void, alter_partition_result> {
       public alter_partition() {
         super("alter_partition");
       }
 
+      @Override
+      public alter_partition_result getEmptyResultInstance() {
+        return new alter_partition_result();
+      }
+
+      @Override
       public alter_partition_args getEmptyArgsInstance() {
         return new alter_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_partition_result result = new alter_partition_result();
             try {
@@ -36257,6 +41033,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36292,27 +41069,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_partition_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_partition(args.db_name, args.tbl_name, args.new_part,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partitions_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partitions_args, Void, alter_partitions_result> {
       public alter_partitions() {
         super("alter_partitions");
       }
 
+      @Override
+      public alter_partitions_result getEmptyResultInstance() {
+        return new alter_partitions_result();
+      }
+
+      @Override
       public alter_partitions_args getEmptyArgsInstance() {
         return new alter_partitions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_partitions_result result = new alter_partitions_result();
             try {
@@ -36325,6 +41112,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36360,27 +41148,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_partitions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_partitions(args.db_name, args.tbl_name, args.new_parts,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partitions_with_environment_context_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partitions_with_environment_context_args, Void, alter_partitions_with_environment_context_result> {
       public alter_partitions_with_environment_context() {
         super("alter_partitions_with_environment_context");
       }
 
+      @Override
+      public alter_partitions_with_environment_context_result getEmptyResultInstance() {
+        return new alter_partitions_with_environment_context_result();
+      }
+
+      @Override
       public alter_partitions_with_environment_context_args getEmptyArgsInstance() {
         return new alter_partitions_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_partitions_with_environment_context_result result = new alter_partitions_with_environment_context_result();
             try {
@@ -36393,6 +41191,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36428,27 +41227,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_partitions_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_partitions_with_environment_context(args.db_name, args.tbl_name, args.new_parts, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partitions_req_args, AlterPartitionsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partitions_req_args, AlterPartitionsResponse, alter_partitions_req_result> {
       public alter_partitions_req() {
         super("alter_partitions_req");
       }
 
+      @Override
+      public alter_partitions_req_result getEmptyResultInstance() {
+        return new alter_partitions_req_result();
+      }
+
+      @Override
       public alter_partitions_req_args getEmptyArgsInstance() {
         return new alter_partitions_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AlterPartitionsResponse> 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<AlterPartitionsResponse>() { 
+          @Override
           public void onComplete(AlterPartitionsResponse o) {
             alter_partitions_req_result result = new alter_partitions_req_result();
             result.success = o;
@@ -36462,6 +41271,7 @@ public void onComplete(AlterPartitionsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36497,27 +41307,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_partitions_req_args args, org.apache.thrift.async.AsyncMethodCallback<AlterPartitionsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.alter_partitions_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partition_with_environment_context_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_with_environment_context<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_partition_with_environment_context_args, Void, alter_partition_with_environment_context_result> {
       public alter_partition_with_environment_context() {
         super("alter_partition_with_environment_context");
       }
 
+      @Override
+      public alter_partition_with_environment_context_result getEmptyResultInstance() {
+        return new alter_partition_with_environment_context_result();
+      }
+
+      @Override
       public alter_partition_with_environment_context_args getEmptyArgsInstance() {
         return new alter_partition_with_environment_context_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_partition_with_environment_context_result result = new alter_partition_with_environment_context_result();
             try {
@@ -36530,6 +41350,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36565,27 +41386,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_partition_with_environment_context_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_partition_with_environment_context(args.db_name, args.tbl_name, args.new_part, args.environment_context,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, rename_partition_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, rename_partition_args, Void, rename_partition_result> {
       public rename_partition() {
         super("rename_partition");
       }
 
+      @Override
+      public rename_partition_result getEmptyResultInstance() {
+        return new rename_partition_result();
+      }
+
+      @Override
       public rename_partition_args getEmptyArgsInstance() {
         return new rename_partition_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             rename_partition_result result = new rename_partition_result();
             try {
@@ -36598,6 +41429,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36633,27 +41465,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, rename_partition_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.rename_partition(args.db_name, args.tbl_name, args.part_vals, args.new_part,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, rename_partition_req_args, RenamePartitionResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, rename_partition_req_args, RenamePartitionResponse, rename_partition_req_result> {
       public rename_partition_req() {
         super("rename_partition_req");
       }
 
+      @Override
+      public rename_partition_req_result getEmptyResultInstance() {
+        return new rename_partition_req_result();
+      }
+
+      @Override
       public rename_partition_req_args getEmptyArgsInstance() {
         return new rename_partition_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<RenamePartitionResponse> 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<RenamePartitionResponse>() { 
+          @Override
           public void onComplete(RenamePartitionResponse o) {
             rename_partition_req_result result = new rename_partition_req_result();
             result.success = o;
@@ -36667,6 +41509,7 @@ public void onComplete(RenamePartitionResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36702,27 +41545,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, rename_partition_req_args args, org.apache.thrift.async.AsyncMethodCallback<RenamePartitionResponse> resultHandler) throws org.apache.thrift.TException {
         iface.rename_partition_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_has_valid_characters<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, partition_name_has_valid_characters_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_has_valid_characters<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, partition_name_has_valid_characters_args, java.lang.Boolean, partition_name_has_valid_characters_result> {
       public partition_name_has_valid_characters() {
         super("partition_name_has_valid_characters");
       }
 
+      @Override
+      public partition_name_has_valid_characters_result getEmptyResultInstance() {
+        return new partition_name_has_valid_characters_result();
+      }
+
+      @Override
       public partition_name_has_valid_characters_args getEmptyArgsInstance() {
         return new partition_name_has_valid_characters_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             partition_name_has_valid_characters_result result = new partition_name_has_valid_characters_result();
             result.success = o;
@@ -36737,6 +41590,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36768,27 +41622,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, partition_name_has_valid_characters_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.partition_name_has_valid_characters(args.part_vals, args.throw_exception,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_config_value<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_config_value_args, java.lang.String> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_config_value<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_config_value_args, java.lang.String, get_config_value_result> {
       public get_config_value() {
         super("get_config_value");
       }
 
+      @Override
+      public get_config_value_result getEmptyResultInstance() {
+        return new get_config_value_result();
+      }
+
+      @Override
       public get_config_value_args getEmptyArgsInstance() {
         return new get_config_value_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
           public void onComplete(java.lang.String o) {
             get_config_value_result result = new get_config_value_result();
             result.success = o;
@@ -36802,6 +41666,7 @@ public void onComplete(java.lang.String o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36833,27 +41698,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_config_value_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.get_config_value(args.name, args.defaultValue,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_vals<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, partition_name_to_vals_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_vals<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, partition_name_to_vals_args, java.util.List<java.lang.String>, partition_name_to_vals_result> {
       public partition_name_to_vals() {
         super("partition_name_to_vals");
       }
 
+      @Override
+      public partition_name_to_vals_result getEmptyResultInstance() {
+        return new partition_name_to_vals_result();
+      }
+
+      @Override
       public partition_name_to_vals_args getEmptyArgsInstance() {
         return new partition_name_to_vals_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             partition_name_to_vals_result result = new partition_name_to_vals_result();
             result.success = o;
@@ -36867,6 +41742,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36898,27 +41774,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, partition_name_to_vals_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.partition_name_to_vals(args.part_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_spec<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, partition_name_to_spec_args, java.util.Map<java.lang.String,java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_spec<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, partition_name_to_spec_args, java.util.Map<java.lang.String,java.lang.String>, partition_name_to_spec_result> {
       public partition_name_to_spec() {
         super("partition_name_to_spec");
       }
 
+      @Override
+      public partition_name_to_spec_result getEmptyResultInstance() {
+        return new partition_name_to_spec_result();
+      }
+
+      @Override
       public partition_name_to_spec_args getEmptyArgsInstance() {
         return new partition_name_to_spec_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> 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<java.util.Map<java.lang.String,java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.Map<java.lang.String,java.lang.String> o) {
             partition_name_to_spec_result result = new partition_name_to_spec_result();
             result.success = o;
@@ -36932,6 +41818,7 @@ public void onComplete(java.util.Map<java.lang.String,java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -36963,27 +41850,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, partition_name_to_spec_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.partition_name_to_spec(args.part_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class markPartitionForEvent<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, markPartitionForEvent_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class markPartitionForEvent<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, markPartitionForEvent_args, Void, markPartitionForEvent_result> {
       public markPartitionForEvent() {
         super("markPartitionForEvent");
       }
 
+      @Override
+      public markPartitionForEvent_result getEmptyResultInstance() {
+        return new markPartitionForEvent_result();
+      }
+
+      @Override
       public markPartitionForEvent_args getEmptyArgsInstance() {
         return new markPartitionForEvent_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             markPartitionForEvent_result result = new markPartitionForEvent_result();
             try {
@@ -36996,6 +41893,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37047,27 +41945,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, markPartitionForEvent_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.markPartitionForEvent(args.db_name, args.tbl_name, args.part_vals, args.eventType,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class isPartitionMarkedForEvent<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isPartitionMarkedForEvent_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class isPartitionMarkedForEvent<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isPartitionMarkedForEvent_args, java.lang.Boolean, isPartitionMarkedForEvent_result> {
       public isPartitionMarkedForEvent() {
         super("isPartitionMarkedForEvent");
       }
 
+      @Override
+      public isPartitionMarkedForEvent_result getEmptyResultInstance() {
+        return new isPartitionMarkedForEvent_result();
+      }
+
+      @Override
       public isPartitionMarkedForEvent_args getEmptyArgsInstance() {
         return new isPartitionMarkedForEvent_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             isPartitionMarkedForEvent_result result = new isPartitionMarkedForEvent_result();
             result.success = o;
@@ -37082,6 +41990,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37133,27 +42042,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, isPartitionMarkedForEvent_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.isPartitionMarkedForEvent(args.db_name, args.tbl_name, args.part_vals, args.eventType,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_primary_keys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_primary_keys_args, PrimaryKeysResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_primary_keys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_primary_keys_args, PrimaryKeysResponse, get_primary_keys_result> {
       public get_primary_keys() {
         super("get_primary_keys");
       }
 
+      @Override
+      public get_primary_keys_result getEmptyResultInstance() {
+        return new get_primary_keys_result();
+      }
+
+      @Override
       public get_primary_keys_args getEmptyArgsInstance() {
         return new get_primary_keys_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PrimaryKeysResponse> 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<PrimaryKeysResponse>() { 
+          @Override
           public void onComplete(PrimaryKeysResponse o) {
             get_primary_keys_result result = new get_primary_keys_result();
             result.success = o;
@@ -37167,6 +42086,7 @@ public void onComplete(PrimaryKeysResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37202,27 +42122,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_primary_keys_args args, org.apache.thrift.async.AsyncMethodCallback<PrimaryKeysResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_primary_keys(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_foreign_keys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_foreign_keys_args, ForeignKeysResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_foreign_keys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_foreign_keys_args, ForeignKeysResponse, get_foreign_keys_result> {
       public get_foreign_keys() {
         super("get_foreign_keys");
       }
 
+      @Override
+      public get_foreign_keys_result getEmptyResultInstance() {
+        return new get_foreign_keys_result();
+      }
+
+      @Override
       public get_foreign_keys_args getEmptyArgsInstance() {
         return new get_foreign_keys_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ForeignKeysResponse> 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<ForeignKeysResponse>() { 
+          @Override
           public void onComplete(ForeignKeysResponse o) {
             get_foreign_keys_result result = new get_foreign_keys_result();
             result.success = o;
@@ -37236,6 +42166,7 @@ public void onComplete(ForeignKeysResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37271,27 +42202,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_foreign_keys_args args, org.apache.thrift.async.AsyncMethodCallback<ForeignKeysResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_foreign_keys(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_unique_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_unique_constraints_args, UniqueConstraintsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_unique_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_unique_constraints_args, UniqueConstraintsResponse, get_unique_constraints_result> {
       public get_unique_constraints() {
         super("get_unique_constraints");
       }
 
+      @Override
+      public get_unique_constraints_result getEmptyResultInstance() {
+        return new get_unique_constraints_result();
+      }
+
+      @Override
       public get_unique_constraints_args getEmptyArgsInstance() {
         return new get_unique_constraints_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<UniqueConstraintsResponse> 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<UniqueConstraintsResponse>() { 
+          @Override
           public void onComplete(UniqueConstraintsResponse o) {
             get_unique_constraints_result result = new get_unique_constraints_result();
             result.success = o;
@@ -37305,6 +42246,7 @@ public void onComplete(UniqueConstraintsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37340,27 +42282,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_unique_constraints_args args, org.apache.thrift.async.AsyncMethodCallback<UniqueConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_unique_constraints(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_not_null_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_not_null_constraints_args, NotNullConstraintsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_not_null_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_not_null_constraints_args, NotNullConstraintsResponse, get_not_null_constraints_result> {
       public get_not_null_constraints() {
         super("get_not_null_constraints");
       }
 
+      @Override
+      public get_not_null_constraints_result getEmptyResultInstance() {
+        return new get_not_null_constraints_result();
+      }
+
+      @Override
       public get_not_null_constraints_args getEmptyArgsInstance() {
         return new get_not_null_constraints_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<NotNullConstraintsResponse> 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<NotNullConstraintsResponse>() { 
+          @Override
           public void onComplete(NotNullConstraintsResponse o) {
             get_not_null_constraints_result result = new get_not_null_constraints_result();
             result.success = o;
@@ -37374,6 +42326,7 @@ public void onComplete(NotNullConstraintsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37409,27 +42362,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_not_null_constraints_args args, org.apache.thrift.async.AsyncMethodCallback<NotNullConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_not_null_constraints(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_default_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_default_constraints_args, DefaultConstraintsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_default_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_default_constraints_args, DefaultConstraintsResponse, get_default_constraints_result> {
       public get_default_constraints() {
         super("get_default_constraints");
       }
 
+      @Override
+      public get_default_constraints_result getEmptyResultInstance() {
+        return new get_default_constraints_result();
+      }
+
+      @Override
       public get_default_constraints_args getEmptyArgsInstance() {
         return new get_default_constraints_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<DefaultConstraintsResponse> 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<DefaultConstraintsResponse>() { 
+          @Override
           public void onComplete(DefaultConstraintsResponse o) {
             get_default_constraints_result result = new get_default_constraints_result();
             result.success = o;
@@ -37443,6 +42406,7 @@ public void onComplete(DefaultConstraintsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37478,27 +42442,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_default_constraints_args args, org.apache.thrift.async.AsyncMethodCallback<DefaultConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_default_constraints(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_check_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_check_constraints_args, CheckConstraintsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_check_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_check_constraints_args, CheckConstraintsResponse, get_check_constraints_result> {
       public get_check_constraints() {
         super("get_check_constraints");
       }
 
+      @Override
+      public get_check_constraints_result getEmptyResultInstance() {
+        return new get_check_constraints_result();
+      }
+
+      @Override
       public get_check_constraints_args getEmptyArgsInstance() {
         return new get_check_constraints_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<CheckConstraintsResponse> 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<CheckConstraintsResponse>() { 
+          @Override
           public void onComplete(CheckConstraintsResponse o) {
             get_check_constraints_result result = new get_check_constraints_result();
             result.success = o;
@@ -37512,6 +42486,7 @@ public void onComplete(CheckConstraintsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37547,27 +42522,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_check_constraints_args args, org.apache.thrift.async.AsyncMethodCallback<CheckConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_check_constraints(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_table_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_table_constraints_args, AllTableConstraintsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_table_constraints<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_table_constraints_args, AllTableConstraintsResponse, get_all_table_constraints_result> {
       public get_all_table_constraints() {
         super("get_all_table_constraints");
       }
 
+      @Override
+      public get_all_table_constraints_result getEmptyResultInstance() {
+        return new get_all_table_constraints_result();
+      }
+
+      @Override
       public get_all_table_constraints_args getEmptyArgsInstance() {
         return new get_all_table_constraints_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AllTableConstraintsResponse> 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<AllTableConstraintsResponse>() { 
+          @Override
           public void onComplete(AllTableConstraintsResponse o) {
             get_all_table_constraints_result result = new get_all_table_constraints_result();
             result.success = o;
@@ -37581,6 +42566,7 @@ public void onComplete(AllTableConstraintsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37616,27 +42602,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_table_constraints_args args, org.apache.thrift.async.AsyncMethodCallback<AllTableConstraintsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_table_constraints(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_table_column_statistics_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_table_column_statistics_args, java.lang.Boolean, update_table_column_statistics_result> {
       public update_table_column_statistics() {
         super("update_table_column_statistics");
       }
 
+      @Override
+      public update_table_column_statistics_result getEmptyResultInstance() {
+        return new update_table_column_statistics_result();
+      }
+
+      @Override
       public update_table_column_statistics_args getEmptyArgsInstance() {
         return new update_table_column_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             update_table_column_statistics_result result = new update_table_column_statistics_result();
             result.success = o;
@@ -37651,6 +42647,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37694,27 +42691,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_table_column_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.update_table_column_statistics(args.stats_obj,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_partition_column_statistics_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_partition_column_statistics_args, java.lang.Boolean, update_partition_column_statistics_result> {
       public update_partition_column_statistics() {
         super("update_partition_column_statistics");
       }
 
+      @Override
+      public update_partition_column_statistics_result getEmptyResultInstance() {
+        return new update_partition_column_statistics_result();
+      }
+
+      @Override
       public update_partition_column_statistics_args getEmptyArgsInstance() {
         return new update_partition_column_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             update_partition_column_statistics_result result = new update_partition_column_statistics_result();
             result.success = o;
@@ -37729,6 +42736,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37772,27 +42780,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_partition_column_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.update_partition_column_statistics(args.stats_obj,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_table_column_statistics_req_args, SetPartitionsStatsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_table_column_statistics_req_args, SetPartitionsStatsResponse, update_table_column_statistics_req_result> {
       public update_table_column_statistics_req() {
         super("update_table_column_statistics_req");
       }
 
+      @Override
+      public update_table_column_statistics_req_result getEmptyResultInstance() {
+        return new update_table_column_statistics_req_result();
+      }
+
+      @Override
       public update_table_column_statistics_req_args getEmptyArgsInstance() {
         return new update_table_column_statistics_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<SetPartitionsStatsResponse> 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<SetPartitionsStatsResponse>() { 
+          @Override
           public void onComplete(SetPartitionsStatsResponse o) {
             update_table_column_statistics_req_result result = new update_table_column_statistics_req_result();
             result.success = o;
@@ -37806,6 +42824,7 @@ public void onComplete(SetPartitionsStatsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37849,27 +42868,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_table_column_statistics_req_args args, org.apache.thrift.async.AsyncMethodCallback<SetPartitionsStatsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.update_table_column_statistics_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_partition_column_statistics_req_args, SetPartitionsStatsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_partition_column_statistics_req_args, SetPartitionsStatsResponse, update_partition_column_statistics_req_result> {
       public update_partition_column_statistics_req() {
         super("update_partition_column_statistics_req");
       }
 
+      @Override
+      public update_partition_column_statistics_req_result getEmptyResultInstance() {
+        return new update_partition_column_statistics_req_result();
+      }
+
+      @Override
       public update_partition_column_statistics_req_args getEmptyArgsInstance() {
         return new update_partition_column_statistics_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<SetPartitionsStatsResponse> 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<SetPartitionsStatsResponse>() { 
+          @Override
           public void onComplete(SetPartitionsStatsResponse o) {
             update_partition_column_statistics_req_result result = new update_partition_column_statistics_req_result();
             result.success = o;
@@ -37883,6 +42912,7 @@ public void onComplete(SetPartitionsStatsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37926,27 +42956,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_partition_column_statistics_req_args args, org.apache.thrift.async.AsyncMethodCallback<SetPartitionsStatsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.update_partition_column_statistics_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_transaction_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_transaction_statistics_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_transaction_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_transaction_statistics_args, Void, update_transaction_statistics_result> {
       public update_transaction_statistics() {
         super("update_transaction_statistics");
       }
 
+      @Override
+      public update_transaction_statistics_result getEmptyResultInstance() {
+        return new update_transaction_statistics_result();
+      }
+
+      @Override
       public update_transaction_statistics_args getEmptyArgsInstance() {
         return new update_transaction_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             update_transaction_statistics_result result = new update_transaction_statistics_result();
             try {
@@ -37959,6 +42999,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -37990,27 +43031,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_transaction_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.update_transaction_statistics(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_column_statistics_args, ColumnStatistics> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_column_statistics_args, ColumnStatistics, get_table_column_statistics_result> {
       public get_table_column_statistics() {
         super("get_table_column_statistics");
       }
 
+      @Override
+      public get_table_column_statistics_result getEmptyResultInstance() {
+        return new get_table_column_statistics_result();
+      }
+
+      @Override
       public get_table_column_statistics_args getEmptyArgsInstance() {
         return new get_table_column_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ColumnStatistics> 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<ColumnStatistics>() { 
+          @Override
           public void onComplete(ColumnStatistics o) {
             get_table_column_statistics_result result = new get_table_column_statistics_result();
             result.success = o;
@@ -38024,6 +43075,7 @@ public void onComplete(ColumnStatistics o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38067,27 +43119,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_table_column_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<ColumnStatistics> resultHandler) throws org.apache.thrift.TException {
         iface.get_table_column_statistics(args.db_name, args.tbl_name, args.col_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_column_statistics_args, ColumnStatistics> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partition_column_statistics_args, ColumnStatistics, get_partition_column_statistics_result> {
       public get_partition_column_statistics() {
         super("get_partition_column_statistics");
       }
 
+      @Override
+      public get_partition_column_statistics_result getEmptyResultInstance() {
+        return new get_partition_column_statistics_result();
+      }
+
+      @Override
       public get_partition_column_statistics_args getEmptyArgsInstance() {
         return new get_partition_column_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ColumnStatistics> 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<ColumnStatistics>() { 
+          @Override
           public void onComplete(ColumnStatistics o) {
             get_partition_column_statistics_result result = new get_partition_column_statistics_result();
             result.success = o;
@@ -38101,6 +43163,7 @@ public void onComplete(ColumnStatistics o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38144,27 +43207,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partition_column_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<ColumnStatistics> resultHandler) throws org.apache.thrift.TException {
         iface.get_partition_column_statistics(args.db_name, args.tbl_name, args.part_name, args.col_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_statistics_req_args, TableStatsResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_table_statistics_req_args, TableStatsResult, get_table_statistics_req_result> {
       public get_table_statistics_req() {
         super("get_table_statistics_req");
       }
 
+      @Override
+      public get_table_statistics_req_result getEmptyResultInstance() {
+        return new get_table_statistics_req_result();
+      }
+
+      @Override
       public get_table_statistics_req_args getEmptyArgsInstance() {
         return new get_table_statistics_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<TableStatsResult> 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<TableStatsResult>() { 
+          @Override
           public void onComplete(TableStatsResult o) {
             get_table_statistics_req_result result = new get_table_statistics_req_result();
             result.success = o;
@@ -38178,6 +43251,7 @@ public void onComplete(TableStatsResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38213,27 +43287,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_table_statistics_req_args args, org.apache.thrift.async.AsyncMethodCallback<TableStatsResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_table_statistics_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_statistics_req_args, PartitionsStatsResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_statistics_req_args, PartitionsStatsResult, get_partitions_statistics_req_result> {
       public get_partitions_statistics_req() {
         super("get_partitions_statistics_req");
       }
 
+      @Override
+      public get_partitions_statistics_req_result getEmptyResultInstance() {
+        return new get_partitions_statistics_req_result();
+      }
+
+      @Override
       public get_partitions_statistics_req_args getEmptyArgsInstance() {
         return new get_partitions_statistics_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PartitionsStatsResult> 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<PartitionsStatsResult>() { 
+          @Override
           public void onComplete(PartitionsStatsResult o) {
             get_partitions_statistics_req_result result = new get_partitions_statistics_req_result();
             result.success = o;
@@ -38247,6 +43331,7 @@ public void onComplete(PartitionsStatsResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38282,27 +43367,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_statistics_req_args args, org.apache.thrift.async.AsyncMethodCallback<PartitionsStatsResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_statistics_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_aggr_stats_for<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_aggr_stats_for_args, AggrStats> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_aggr_stats_for<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_aggr_stats_for_args, AggrStats, get_aggr_stats_for_result> {
       public get_aggr_stats_for() {
         super("get_aggr_stats_for");
       }
 
+      @Override
+      public get_aggr_stats_for_result getEmptyResultInstance() {
+        return new get_aggr_stats_for_result();
+      }
+
+      @Override
       public get_aggr_stats_for_args getEmptyArgsInstance() {
         return new get_aggr_stats_for_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AggrStats> 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<AggrStats>() { 
+          @Override
           public void onComplete(AggrStats o) {
             get_aggr_stats_for_result result = new get_aggr_stats_for_result();
             result.success = o;
@@ -38316,6 +43411,7 @@ public void onComplete(AggrStats o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38351,27 +43447,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_aggr_stats_for_args args, org.apache.thrift.async.AsyncMethodCallback<AggrStats> resultHandler) throws org.apache.thrift.TException {
         iface.get_aggr_stats_for(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_aggr_stats_for<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_aggr_stats_for_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_aggr_stats_for<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_aggr_stats_for_args, java.lang.Boolean, set_aggr_stats_for_result> {
       public set_aggr_stats_for() {
         super("set_aggr_stats_for");
       }
 
+      @Override
+      public set_aggr_stats_for_result getEmptyResultInstance() {
+        return new set_aggr_stats_for_result();
+      }
+
+      @Override
       public set_aggr_stats_for_args getEmptyArgsInstance() {
         return new set_aggr_stats_for_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             set_aggr_stats_for_result result = new set_aggr_stats_for_result();
             result.success = o;
@@ -38386,6 +43492,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38429,27 +43536,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, set_aggr_stats_for_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.set_aggr_stats_for(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_partition_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, delete_partition_column_statistics_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_partition_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, delete_partition_column_statistics_args, java.lang.Boolean, delete_partition_column_statistics_result> {
       public delete_partition_column_statistics() {
         super("delete_partition_column_statistics");
       }
 
+      @Override
+      public delete_partition_column_statistics_result getEmptyResultInstance() {
+        return new delete_partition_column_statistics_result();
+      }
+
+      @Override
       public delete_partition_column_statistics_args getEmptyArgsInstance() {
         return new delete_partition_column_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             delete_partition_column_statistics_result result = new delete_partition_column_statistics_result();
             result.success = o;
@@ -38464,6 +43581,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38507,27 +43625,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, delete_partition_column_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.delete_partition_column_statistics(args.db_name, args.tbl_name, args.part_name, args.col_name, args.engine,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_table_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, delete_table_column_statistics_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_table_column_statistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, delete_table_column_statistics_args, java.lang.Boolean, delete_table_column_statistics_result> {
       public delete_table_column_statistics() {
         super("delete_table_column_statistics");
       }
 
+      @Override
+      public delete_table_column_statistics_result getEmptyResultInstance() {
+        return new delete_table_column_statistics_result();
+      }
+
+      @Override
       public delete_table_column_statistics_args getEmptyArgsInstance() {
         return new delete_table_column_statistics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             delete_table_column_statistics_result result = new delete_table_column_statistics_result();
             result.success = o;
@@ -38542,6 +43670,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38585,27 +43714,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, delete_table_column_statistics_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.delete_table_column_statistics(args.db_name, args.tbl_name, args.col_name, args.engine,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_column_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, delete_column_statistics_req_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_column_statistics_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, delete_column_statistics_req_args, java.lang.Boolean, delete_column_statistics_req_result> {
       public delete_column_statistics_req() {
         super("delete_column_statistics_req");
       }
 
+      @Override
+      public delete_column_statistics_req_result getEmptyResultInstance() {
+        return new delete_column_statistics_req_result();
+      }
+
+      @Override
       public delete_column_statistics_req_args getEmptyArgsInstance() {
         return new delete_column_statistics_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             delete_column_statistics_req_result result = new delete_column_statistics_req_result();
             result.success = o;
@@ -38620,6 +43759,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38663,27 +43803,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, delete_column_statistics_req_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.delete_column_statistics_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_function_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_function_args, Void, create_function_result> {
       public create_function() {
         super("create_function");
       }
 
+      @Override
+      public create_function_result getEmptyResultInstance() {
+        return new create_function_result();
+      }
+
+      @Override
       public create_function_args getEmptyArgsInstance() {
         return new create_function_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_function_result result = new create_function_result();
             try {
@@ -38696,6 +43846,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38739,27 +43890,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_function_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_function(args.func,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_function_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_function_args, Void, drop_function_result> {
       public drop_function() {
         super("drop_function");
       }
 
+      @Override
+      public drop_function_result getEmptyResultInstance() {
+        return new drop_function_result();
+      }
+
+      @Override
       public drop_function_args getEmptyArgsInstance() {
         return new drop_function_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_function_result result = new drop_function_result();
             try {
@@ -38772,6 +43933,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38807,27 +43969,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_function_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_function(args.dbName, args.funcName,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_function_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_function_args, Void, alter_function_result> {
       public alter_function() {
         super("alter_function");
       }
 
+      @Override
+      public alter_function_result getEmptyResultInstance() {
+        return new alter_function_result();
+      }
+
+      @Override
       public alter_function_args getEmptyArgsInstance() {
         return new alter_function_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_function_result result = new alter_function_result();
             try {
@@ -38840,6 +44012,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38875,27 +44048,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_function_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_function(args.dbName, args.funcName, args.newFunc,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_functions_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_functions_args, java.util.List<java.lang.String>, get_functions_result> {
       public get_functions() {
         super("get_functions");
       }
 
+      @Override
+      public get_functions_result getEmptyResultInstance() {
+        return new get_functions_result();
+      }
+
+      @Override
       public get_functions_args getEmptyArgsInstance() {
         return new get_functions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_functions_result result = new get_functions_result();
             result.success = o;
@@ -38909,6 +44092,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -38940,27 +44124,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_functions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_functions(args.dbName, args.pattern,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_functions_req_args, GetFunctionsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_functions_req_args, GetFunctionsResponse, get_functions_req_result> {
       public get_functions_req() {
         super("get_functions_req");
       }
 
+      @Override
+      public get_functions_req_result getEmptyResultInstance() {
+        return new get_functions_req_result();
+      }
+
+      @Override
       public get_functions_req_args getEmptyArgsInstance() {
         return new get_functions_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetFunctionsResponse> 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<GetFunctionsResponse>() { 
+          @Override
           public void onComplete(GetFunctionsResponse o) {
             get_functions_req_result result = new get_functions_req_result();
             result.success = o;
@@ -38974,6 +44168,7 @@ public void onComplete(GetFunctionsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39005,27 +44200,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_functions_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetFunctionsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_functions_req(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_function_args, Function> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_function<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_function_args, Function, get_function_result> {
       public get_function() {
         super("get_function");
       }
 
+      @Override
+      public get_function_result getEmptyResultInstance() {
+        return new get_function_result();
+      }
+
+      @Override
       public get_function_args getEmptyArgsInstance() {
         return new get_function_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Function> 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<Function>() { 
+          @Override
           public void onComplete(Function o) {
             get_function_result result = new get_function_result();
             result.success = o;
@@ -39039,6 +44244,7 @@ public void onComplete(Function o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39074,27 +44280,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_function_args args, org.apache.thrift.async.AsyncMethodCallback<Function> resultHandler) throws org.apache.thrift.TException {
         iface.get_function(args.dbName, args.funcName,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_functions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_functions_args, GetAllFunctionsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_functions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_functions_args, GetAllFunctionsResponse, get_all_functions_result> {
       public get_all_functions() {
         super("get_all_functions");
       }
 
+      @Override
+      public get_all_functions_result getEmptyResultInstance() {
+        return new get_all_functions_result();
+      }
+
+      @Override
       public get_all_functions_args getEmptyArgsInstance() {
         return new get_all_functions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetAllFunctionsResponse> 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<GetAllFunctionsResponse>() { 
+          @Override
           public void onComplete(GetAllFunctionsResponse o) {
             get_all_functions_result result = new get_all_functions_result();
             result.success = o;
@@ -39108,6 +44324,7 @@ public void onComplete(GetAllFunctionsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39139,27 +44356,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_functions_args args, org.apache.thrift.async.AsyncMethodCallback<GetAllFunctionsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_functions(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_role_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_role_args, java.lang.Boolean, create_role_result> {
       public create_role() {
         super("create_role");
       }
 
+      @Override
+      public create_role_result getEmptyResultInstance() {
+        return new create_role_result();
+      }
+
+      @Override
       public create_role_args getEmptyArgsInstance() {
         return new create_role_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             create_role_result result = new create_role_result();
             result.success = o;
@@ -39174,6 +44401,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39205,27 +44433,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_role_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.create_role(args.role,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_role_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_role_args, java.lang.Boolean, drop_role_result> {
       public drop_role() {
         super("drop_role");
       }
 
+      @Override
+      public drop_role_result getEmptyResultInstance() {
+        return new drop_role_result();
+      }
+
+      @Override
       public drop_role_args getEmptyArgsInstance() {
         return new drop_role_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             drop_role_result result = new drop_role_result();
             result.success = o;
@@ -39240,6 +44478,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39271,27 +44510,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_role_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.drop_role(args.role_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_names<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_role_names_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_names<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_role_names_args, java.util.List<java.lang.String>, get_role_names_result> {
       public get_role_names() {
         super("get_role_names");
       }
 
+      @Override
+      public get_role_names_result getEmptyResultInstance() {
+        return new get_role_names_result();
+      }
+
+      @Override
       public get_role_names_args getEmptyArgsInstance() {
         return new get_role_names_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_role_names_result result = new get_role_names_result();
             result.success = o;
@@ -39305,6 +44554,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39336,27 +44586,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_role_names_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_role_names(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_role_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_role_args, java.lang.Boolean, grant_role_result> {
       public grant_role() {
         super("grant_role");
       }
 
+      @Override
+      public grant_role_result getEmptyResultInstance() {
+        return new grant_role_result();
+      }
+
+      @Override
       public grant_role_args getEmptyArgsInstance() {
         return new grant_role_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             grant_role_result result = new grant_role_result();
             result.success = o;
@@ -39371,6 +44631,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39402,27 +44663,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, grant_role_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.grant_role(args.role_name, args.principal_name, args.principal_type, args.grantor, args.grantorType, args.grant_option,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, revoke_role_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, revoke_role_args, java.lang.Boolean, revoke_role_result> {
       public revoke_role() {
         super("revoke_role");
       }
 
+      @Override
+      public revoke_role_result getEmptyResultInstance() {
+        return new revoke_role_result();
+      }
+
+      @Override
       public revoke_role_args getEmptyArgsInstance() {
         return new revoke_role_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             revoke_role_result result = new revoke_role_result();
             result.success = o;
@@ -39437,6 +44708,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39468,27 +44740,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, revoke_role_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.revoke_role(args.role_name, args.principal_name, args.principal_type,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_roles<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, list_roles_args, java.util.List<Role>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_roles<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, list_roles_args, java.util.List<Role>, list_roles_result> {
       public list_roles() {
         super("list_roles");
       }
 
+      @Override
+      public list_roles_result getEmptyResultInstance() {
+        return new list_roles_result();
+      }
+
+      @Override
       public list_roles_args getEmptyArgsInstance() {
         return new list_roles_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Role>> 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<java.util.List<Role>>() { 
+          @Override
           public void onComplete(java.util.List<Role> o) {
             list_roles_result result = new list_roles_result();
             result.success = o;
@@ -39502,6 +44784,7 @@ public void onComplete(java.util.List<Role> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39533,27 +44816,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, list_roles_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Role>> resultHandler) throws org.apache.thrift.TException {
         iface.list_roles(args.principal_name, args.principal_type,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_revoke_role_args, GrantRevokeRoleResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_revoke_role_args, GrantRevokeRoleResponse, grant_revoke_role_result> {
       public grant_revoke_role() {
         super("grant_revoke_role");
       }
 
+      @Override
+      public grant_revoke_role_result getEmptyResultInstance() {
+        return new grant_revoke_role_result();
+      }
+
+      @Override
       public grant_revoke_role_args getEmptyArgsInstance() {
         return new grant_revoke_role_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GrantRevokeRoleResponse> 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<GrantRevokeRoleResponse>() { 
+          @Override
           public void onComplete(GrantRevokeRoleResponse o) {
             grant_revoke_role_result result = new grant_revoke_role_result();
             result.success = o;
@@ -39567,6 +44860,7 @@ public void onComplete(GrantRevokeRoleResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39598,27 +44892,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, grant_revoke_role_args args, org.apache.thrift.async.AsyncMethodCallback<GrantRevokeRoleResponse> resultHandler) throws org.apache.thrift.TException {
         iface.grant_revoke_role(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_principals_in_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_principals_in_role_args, GetPrincipalsInRoleResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_principals_in_role<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_principals_in_role_args, GetPrincipalsInRoleResponse, get_principals_in_role_result> {
       public get_principals_in_role() {
         super("get_principals_in_role");
       }
 
+      @Override
+      public get_principals_in_role_result getEmptyResultInstance() {
+        return new get_principals_in_role_result();
+      }
+
+      @Override
       public get_principals_in_role_args getEmptyArgsInstance() {
         return new get_principals_in_role_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetPrincipalsInRoleResponse> 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<GetPrincipalsInRoleResponse>() { 
+          @Override
           public void onComplete(GetPrincipalsInRoleResponse o) {
             get_principals_in_role_result result = new get_principals_in_role_result();
             result.success = o;
@@ -39632,6 +44936,7 @@ public void onComplete(GetPrincipalsInRoleResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39663,27 +44968,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_principals_in_role_args args, org.apache.thrift.async.AsyncMethodCallback<GetPrincipalsInRoleResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_principals_in_role(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_grants_for_principal<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_role_grants_for_principal_args, GetRoleGrantsForPrincipalResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_grants_for_principal<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_role_grants_for_principal_args, GetRoleGrantsForPrincipalResponse, get_role_grants_for_principal_result> {
       public get_role_grants_for_principal() {
         super("get_role_grants_for_principal");
       }
 
+      @Override
+      public get_role_grants_for_principal_result getEmptyResultInstance() {
+        return new get_role_grants_for_principal_result();
+      }
+
+      @Override
       public get_role_grants_for_principal_args getEmptyArgsInstance() {
         return new get_role_grants_for_principal_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetRoleGrantsForPrincipalResponse> 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<GetRoleGrantsForPrincipalResponse>() { 
+          @Override
           public void onComplete(GetRoleGrantsForPrincipalResponse o) {
             get_role_grants_for_principal_result result = new get_role_grants_for_principal_result();
             result.success = o;
@@ -39697,6 +45012,7 @@ public void onComplete(GetRoleGrantsForPrincipalResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39728,27 +45044,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_role_grants_for_principal_args args, org.apache.thrift.async.AsyncMethodCallback<GetRoleGrantsForPrincipalResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_role_grants_for_principal(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_privilege_set<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_privilege_set_args, PrincipalPrivilegeSet> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_privilege_set<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_privilege_set_args, PrincipalPrivilegeSet, get_privilege_set_result> {
       public get_privilege_set() {
         super("get_privilege_set");
       }
 
+      @Override
+      public get_privilege_set_result getEmptyResultInstance() {
+        return new get_privilege_set_result();
+      }
+
+      @Override
       public get_privilege_set_args getEmptyArgsInstance() {
         return new get_privilege_set_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PrincipalPrivilegeSet> 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<PrincipalPrivilegeSet>() { 
+          @Override
           public void onComplete(PrincipalPrivilegeSet o) {
             get_privilege_set_result result = new get_privilege_set_result();
             result.success = o;
@@ -39762,6 +45088,7 @@ public void onComplete(PrincipalPrivilegeSet o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39793,27 +45120,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_privilege_set_args args, org.apache.thrift.async.AsyncMethodCallback<PrincipalPrivilegeSet> resultHandler) throws org.apache.thrift.TException {
         iface.get_privilege_set(args.hiveObject, args.user_name, args.group_names,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, list_privileges_args, java.util.List<HiveObjectPrivilege>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, list_privileges_args, java.util.List<HiveObjectPrivilege>, list_privileges_result> {
       public list_privileges() {
         super("list_privileges");
       }
 
+      @Override
+      public list_privileges_result getEmptyResultInstance() {
+        return new list_privileges_result();
+      }
+
+      @Override
       public list_privileges_args getEmptyArgsInstance() {
         return new list_privileges_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<HiveObjectPrivilege>> 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<java.util.List<HiveObjectPrivilege>>() { 
+          @Override
           public void onComplete(java.util.List<HiveObjectPrivilege> o) {
             list_privileges_result result = new list_privileges_result();
             result.success = o;
@@ -39827,6 +45164,7 @@ public void onComplete(java.util.List<HiveObjectPrivilege> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39858,27 +45196,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, list_privileges_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<HiveObjectPrivilege>> resultHandler) throws org.apache.thrift.TException {
         iface.list_privileges(args.principal_name, args.principal_type, args.hiveObject,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_privileges_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_privileges_args, java.lang.Boolean, grant_privileges_result> {
       public grant_privileges() {
         super("grant_privileges");
       }
 
+      @Override
+      public grant_privileges_result getEmptyResultInstance() {
+        return new grant_privileges_result();
+      }
+
+      @Override
       public grant_privileges_args getEmptyArgsInstance() {
         return new grant_privileges_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             grant_privileges_result result = new grant_privileges_result();
             result.success = o;
@@ -39893,6 +45241,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39924,27 +45273,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, grant_privileges_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.grant_privileges(args.privileges,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, revoke_privileges_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, revoke_privileges_args, java.lang.Boolean, revoke_privileges_result> {
       public revoke_privileges() {
         super("revoke_privileges");
       }
 
+      @Override
+      public revoke_privileges_result getEmptyResultInstance() {
+        return new revoke_privileges_result();
+      }
+
+      @Override
       public revoke_privileges_args getEmptyArgsInstance() {
         return new revoke_privileges_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             revoke_privileges_result result = new revoke_privileges_result();
             result.success = o;
@@ -39959,6 +45318,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -39990,27 +45350,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, revoke_privileges_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.revoke_privileges(args.privileges,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_revoke_privileges_args, GrantRevokePrivilegeResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, grant_revoke_privileges_args, GrantRevokePrivilegeResponse, grant_revoke_privileges_result> {
       public grant_revoke_privileges() {
         super("grant_revoke_privileges");
       }
 
+      @Override
+      public grant_revoke_privileges_result getEmptyResultInstance() {
+        return new grant_revoke_privileges_result();
+      }
+
+      @Override
       public grant_revoke_privileges_args getEmptyArgsInstance() {
         return new grant_revoke_privileges_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GrantRevokePrivilegeResponse> 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<GrantRevokePrivilegeResponse>() { 
+          @Override
           public void onComplete(GrantRevokePrivilegeResponse o) {
             grant_revoke_privileges_result result = new grant_revoke_privileges_result();
             result.success = o;
@@ -40024,6 +45394,7 @@ public void onComplete(GrantRevokePrivilegeResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40055,27 +45426,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, grant_revoke_privileges_args args, org.apache.thrift.async.AsyncMethodCallback<GrantRevokePrivilegeResponse> resultHandler) throws org.apache.thrift.TException {
         iface.grant_revoke_privileges(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class refresh_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, refresh_privileges_args, GrantRevokePrivilegeResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class refresh_privileges<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, refresh_privileges_args, GrantRevokePrivilegeResponse, refresh_privileges_result> {
       public refresh_privileges() {
         super("refresh_privileges");
       }
 
+      @Override
+      public refresh_privileges_result getEmptyResultInstance() {
+        return new refresh_privileges_result();
+      }
+
+      @Override
       public refresh_privileges_args getEmptyArgsInstance() {
         return new refresh_privileges_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GrantRevokePrivilegeResponse> 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<GrantRevokePrivilegeResponse>() { 
+          @Override
           public void onComplete(GrantRevokePrivilegeResponse o) {
             refresh_privileges_result result = new refresh_privileges_result();
             result.success = o;
@@ -40089,6 +45470,7 @@ public void onComplete(GrantRevokePrivilegeResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40120,27 +45502,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, refresh_privileges_args args, org.apache.thrift.async.AsyncMethodCallback<GrantRevokePrivilegeResponse> resultHandler) throws org.apache.thrift.TException {
         iface.refresh_privileges(args.objToRefresh, args.authorizer, args.grantRequest,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_ugi<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_ugi_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_ugi<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_ugi_args, java.util.List<java.lang.String>, set_ugi_result> {
       public set_ugi() {
         super("set_ugi");
       }
 
+      @Override
+      public set_ugi_result getEmptyResultInstance() {
+        return new set_ugi_result();
+      }
+
+      @Override
       public set_ugi_args getEmptyArgsInstance() {
         return new set_ugi_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             set_ugi_result result = new set_ugi_result();
             result.success = o;
@@ -40154,6 +45546,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40185,27 +45578,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, set_ugi_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.set_ugi(args.user_name, args.group_names,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_delegation_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_delegation_token_args, java.lang.String> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_delegation_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_delegation_token_args, java.lang.String, get_delegation_token_result> {
       public get_delegation_token() {
         super("get_delegation_token");
       }
 
+      @Override
+      public get_delegation_token_result getEmptyResultInstance() {
+        return new get_delegation_token_result();
+      }
+
+      @Override
       public get_delegation_token_args getEmptyArgsInstance() {
         return new get_delegation_token_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
           public void onComplete(java.lang.String o) {
             get_delegation_token_result result = new get_delegation_token_result();
             result.success = o;
@@ -40219,6 +45622,7 @@ public void onComplete(java.lang.String o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40250,27 +45654,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_delegation_token_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.get_delegation_token(args.token_owner, args.renewer_kerberos_principal_name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class renew_delegation_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, renew_delegation_token_args, java.lang.Long> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class renew_delegation_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, renew_delegation_token_args, java.lang.Long, renew_delegation_token_result> {
       public renew_delegation_token() {
         super("renew_delegation_token");
       }
 
+      @Override
+      public renew_delegation_token_result getEmptyResultInstance() {
+        return new renew_delegation_token_result();
+      }
+
+      @Override
       public renew_delegation_token_args getEmptyArgsInstance() {
         return new renew_delegation_token_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> 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<java.lang.Long>() { 
+          @Override
           public void onComplete(java.lang.Long o) {
             renew_delegation_token_result result = new renew_delegation_token_result();
             result.success = o;
@@ -40285,6 +45699,7 @@ public void onComplete(java.lang.Long o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40316,27 +45731,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, renew_delegation_token_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
         iface.renew_delegation_token(args.token_str_form,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cancel_delegation_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cancel_delegation_token_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cancel_delegation_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cancel_delegation_token_args, Void, cancel_delegation_token_result> {
       public cancel_delegation_token() {
         super("cancel_delegation_token");
       }
 
+      @Override
+      public cancel_delegation_token_result getEmptyResultInstance() {
+        return new cancel_delegation_token_result();
+      }
+
+      @Override
       public cancel_delegation_token_args getEmptyArgsInstance() {
         return new cancel_delegation_token_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             cancel_delegation_token_result result = new cancel_delegation_token_result();
             try {
@@ -40349,6 +45774,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40380,27 +45806,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, cancel_delegation_token_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.cancel_delegation_token(args.token_str_form,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_token_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_token_args, java.lang.Boolean, add_token_result> {
       public add_token() {
         super("add_token");
       }
 
+      @Override
+      public add_token_result getEmptyResultInstance() {
+        return new add_token_result();
+      }
+
+      @Override
       public add_token_args getEmptyArgsInstance() {
         return new add_token_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             add_token_result result = new add_token_result();
             result.success = o;
@@ -40415,6 +45851,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40442,27 +45879,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_token_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.add_token(args.token_identifier, args.delegation_token,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, remove_token_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, remove_token_args, java.lang.Boolean, remove_token_result> {
       public remove_token() {
         super("remove_token");
       }
 
+      @Override
+      public remove_token_result getEmptyResultInstance() {
+        return new remove_token_result();
+      }
+
+      @Override
       public remove_token_args getEmptyArgsInstance() {
         return new remove_token_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             remove_token_result result = new remove_token_result();
             result.success = o;
@@ -40477,6 +45924,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40504,27 +45952,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, remove_token_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.remove_token(args.token_identifier,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_token_args, java.lang.String> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_token<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_token_args, java.lang.String, get_token_result> {
       public get_token() {
         super("get_token");
       }
 
+      @Override
+      public get_token_result getEmptyResultInstance() {
+        return new get_token_result();
+      }
+
+      @Override
       public get_token_args getEmptyArgsInstance() {
         return new get_token_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
           public void onComplete(java.lang.String o) {
             get_token_result result = new get_token_result();
             result.success = o;
@@ -40538,6 +45996,7 @@ public void onComplete(java.lang.String o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40565,27 +46024,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_token_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.get_token(args.token_identifier,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_token_identifiers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_token_identifiers_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_token_identifiers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_token_identifiers_args, java.util.List<java.lang.String>, get_all_token_identifiers_result> {
       public get_all_token_identifiers() {
         super("get_all_token_identifiers");
       }
 
+      @Override
+      public get_all_token_identifiers_result getEmptyResultInstance() {
+        return new get_all_token_identifiers_result();
+      }
+
+      @Override
       public get_all_token_identifiers_args getEmptyArgsInstance() {
         return new get_all_token_identifiers_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_all_token_identifiers_result result = new get_all_token_identifiers_result();
             result.success = o;
@@ -40599,6 +46068,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40626,27 +46096,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_token_identifiers_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_token_identifiers(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_master_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_master_key_args, java.lang.Integer> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_master_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_master_key_args, java.lang.Integer, add_master_key_result> {
       public add_master_key() {
         super("add_master_key");
       }
 
+      @Override
+      public add_master_key_result getEmptyResultInstance() {
+        return new add_master_key_result();
+      }
+
+      @Override
       public add_master_key_args getEmptyArgsInstance() {
         return new add_master_key_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> 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<java.lang.Integer>() { 
+          @Override
           public void onComplete(java.lang.Integer o) {
             add_master_key_result result = new add_master_key_result();
             result.success = o;
@@ -40661,6 +46141,7 @@ public void onComplete(java.lang.Integer o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40692,27 +46173,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_master_key_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
         iface.add_master_key(args.key,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_master_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_master_key_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_master_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_master_key_args, Void, update_master_key_result> {
       public update_master_key() {
         super("update_master_key");
       }
 
+      @Override
+      public update_master_key_result getEmptyResultInstance() {
+        return new update_master_key_result();
+      }
+
+      @Override
       public update_master_key_args getEmptyArgsInstance() {
         return new update_master_key_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             update_master_key_result result = new update_master_key_result();
             try {
@@ -40725,6 +46216,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40760,27 +46252,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_master_key_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.update_master_key(args.seq_number, args.key,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_master_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, remove_master_key_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_master_key<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, remove_master_key_args, java.lang.Boolean, remove_master_key_result> {
       public remove_master_key() {
         super("remove_master_key");
       }
 
+      @Override
+      public remove_master_key_result getEmptyResultInstance() {
+        return new remove_master_key_result();
+      }
+
+      @Override
       public remove_master_key_args getEmptyArgsInstance() {
         return new remove_master_key_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             remove_master_key_result result = new remove_master_key_result();
             result.success = o;
@@ -40795,6 +46297,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40822,27 +46325,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, remove_master_key_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.remove_master_key(args.key_seq,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_master_keys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_master_keys_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_master_keys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_master_keys_args, java.util.List<java.lang.String>, get_master_keys_result> {
       public get_master_keys() {
         super("get_master_keys");
       }
 
+      @Override
+      public get_master_keys_result getEmptyResultInstance() {
+        return new get_master_keys_result();
+      }
+
+      @Override
       public get_master_keys_args getEmptyArgsInstance() {
         return new get_master_keys_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_master_keys_result result = new get_master_keys_result();
             result.success = o;
@@ -40856,6 +46369,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40883,27 +46397,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_master_keys_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_master_keys(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_open_txns_args, GetOpenTxnsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_open_txns_args, GetOpenTxnsResponse, get_open_txns_result> {
       public get_open_txns() {
         super("get_open_txns");
       }
 
+      @Override
+      public get_open_txns_result getEmptyResultInstance() {
+        return new get_open_txns_result();
+      }
+
+      @Override
       public get_open_txns_args getEmptyArgsInstance() {
         return new get_open_txns_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsResponse> 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<GetOpenTxnsResponse>() { 
+          @Override
           public void onComplete(GetOpenTxnsResponse o) {
             get_open_txns_result result = new get_open_txns_result();
             result.success = o;
@@ -40917,6 +46441,7 @@ public void onComplete(GetOpenTxnsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -40944,27 +46469,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_open_txns_args args, org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_open_txns(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_open_txns_info_args, GetOpenTxnsInfoResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_open_txns_info_args, GetOpenTxnsInfoResponse, get_open_txns_info_result> {
       public get_open_txns_info() {
         super("get_open_txns_info");
       }
 
+      @Override
+      public get_open_txns_info_result getEmptyResultInstance() {
+        return new get_open_txns_info_result();
+      }
+
+      @Override
       public get_open_txns_info_args getEmptyArgsInstance() {
         return new get_open_txns_info_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsInfoResponse> 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<GetOpenTxnsInfoResponse>() { 
+          @Override
           public void onComplete(GetOpenTxnsInfoResponse o) {
             get_open_txns_info_result result = new get_open_txns_info_result();
             result.success = o;
@@ -40978,6 +46513,7 @@ public void onComplete(GetOpenTxnsInfoResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41005,27 +46541,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_open_txns_info_args args, org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsInfoResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_open_txns_info(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class open_txns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, open_txns_args, OpenTxnsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class open_txns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, open_txns_args, OpenTxnsResponse, open_txns_result> {
       public open_txns() {
         super("open_txns");
       }
 
+      @Override
+      public open_txns_result getEmptyResultInstance() {
+        return new open_txns_result();
+      }
+
+      @Override
       public open_txns_args getEmptyArgsInstance() {
         return new open_txns_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<OpenTxnsResponse> 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<OpenTxnsResponse>() { 
+          @Override
           public void onComplete(OpenTxnsResponse o) {
             open_txns_result result = new open_txns_result();
             result.success = o;
@@ -41039,6 +46585,7 @@ public void onComplete(OpenTxnsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41066,27 +46613,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, open_txns_args args, org.apache.thrift.async.AsyncMethodCallback<OpenTxnsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.open_txns(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txn<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, abort_txn_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txn<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, abort_txn_args, Void, abort_txn_result> {
       public abort_txn() {
         super("abort_txn");
       }
 
+      @Override
+      public abort_txn_result getEmptyResultInstance() {
+        return new abort_txn_result();
+      }
+
+      @Override
       public abort_txn_args getEmptyArgsInstance() {
         return new abort_txn_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             abort_txn_result result = new abort_txn_result();
             try {
@@ -41099,6 +46656,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41130,27 +46688,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, abort_txn_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.abort_txn(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, abort_txns_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txns<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, abort_txns_args, Void, abort_txns_result> {
       public abort_txns() {
         super("abort_txns");
       }
 
+      @Override
+      public abort_txns_result getEmptyResultInstance() {
+        return new abort_txns_result();
+      }
+
+      @Override
       public abort_txns_args getEmptyArgsInstance() {
         return new abort_txns_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             abort_txns_result result = new abort_txns_result();
             try {
@@ -41163,6 +46731,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41194,27 +46763,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, abort_txns_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.abort_txns(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class commit_txn<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, commit_txn_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class commit_txn<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, commit_txn_args, Void, commit_txn_result> {
       public commit_txn() {
         super("commit_txn");
       }
 
+      @Override
+      public commit_txn_result getEmptyResultInstance() {
+        return new commit_txn_result();
+      }
+
+      @Override
       public commit_txn_args getEmptyArgsInstance() {
         return new commit_txn_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             commit_txn_result result = new commit_txn_result();
             try {
@@ -41227,6 +46806,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41262,27 +46842,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, commit_txn_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.commit_txn(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_txnid_in_conflict<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_latest_txnid_in_conflict_args, java.lang.Long> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_txnid_in_conflict<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_latest_txnid_in_conflict_args, java.lang.Long, get_latest_txnid_in_conflict_result> {
       public get_latest_txnid_in_conflict() {
         super("get_latest_txnid_in_conflict");
       }
 
+      @Override
+      public get_latest_txnid_in_conflict_result getEmptyResultInstance() {
+        return new get_latest_txnid_in_conflict_result();
+      }
+
+      @Override
       public get_latest_txnid_in_conflict_args getEmptyArgsInstance() {
         return new get_latest_txnid_in_conflict_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> 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<java.lang.Long>() { 
+          @Override
           public void onComplete(java.lang.Long o) {
             get_latest_txnid_in_conflict_result result = new get_latest_txnid_in_conflict_result();
             result.success = o;
@@ -41297,6 +46887,7 @@ public void onComplete(java.lang.Long o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41328,27 +46919,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_latest_txnid_in_conflict_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
         iface.get_latest_txnid_in_conflict(args.txnId,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class repl_tbl_writeid_state<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, repl_tbl_writeid_state_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class repl_tbl_writeid_state<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, repl_tbl_writeid_state_args, Void, repl_tbl_writeid_state_result> {
       public repl_tbl_writeid_state() {
         super("repl_tbl_writeid_state");
       }
 
+      @Override
+      public repl_tbl_writeid_state_result getEmptyResultInstance() {
+        return new repl_tbl_writeid_state_result();
+      }
+
+      @Override
       public repl_tbl_writeid_state_args getEmptyArgsInstance() {
         return new repl_tbl_writeid_state_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             repl_tbl_writeid_state_result result = new repl_tbl_writeid_state_result();
             try {
@@ -41361,6 +46962,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41388,27 +46990,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, repl_tbl_writeid_state_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.repl_tbl_writeid_state(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_valid_write_ids<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_valid_write_ids_args, GetValidWriteIdsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_valid_write_ids<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_valid_write_ids_args, GetValidWriteIdsResponse, get_valid_write_ids_result> {
       public get_valid_write_ids() {
         super("get_valid_write_ids");
       }
 
+      @Override
+      public get_valid_write_ids_result getEmptyResultInstance() {
+        return new get_valid_write_ids_result();
+      }
+
+      @Override
       public get_valid_write_ids_args getEmptyArgsInstance() {
         return new get_valid_write_ids_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetValidWriteIdsResponse> 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<GetValidWriteIdsResponse>() { 
+          @Override
           public void onComplete(GetValidWriteIdsResponse o) {
             get_valid_write_ids_result result = new get_valid_write_ids_result();
             result.success = o;
@@ -41422,6 +47034,7 @@ public void onComplete(GetValidWriteIdsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41457,27 +47070,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_valid_write_ids_args args, org.apache.thrift.async.AsyncMethodCallback<GetValidWriteIdsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_valid_write_ids(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_ids_to_min_history<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_write_ids_to_min_history_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_ids_to_min_history<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_write_ids_to_min_history_args, Void, add_write_ids_to_min_history_result> {
       public add_write_ids_to_min_history() {
         super("add_write_ids_to_min_history");
       }
 
+      @Override
+      public add_write_ids_to_min_history_result getEmptyResultInstance() {
+        return new add_write_ids_to_min_history_result();
+      }
+
+      @Override
       public add_write_ids_to_min_history_args getEmptyArgsInstance() {
         return new add_write_ids_to_min_history_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_write_ids_to_min_history_result result = new add_write_ids_to_min_history_result();
             try {
@@ -41490,6 +47113,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41521,27 +47145,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_write_ids_to_min_history_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_write_ids_to_min_history(args.txnId, args.writeIds,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class allocate_table_write_ids<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, allocate_table_write_ids_args, AllocateTableWriteIdsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class allocate_table_write_ids<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, allocate_table_write_ids_args, AllocateTableWriteIdsResponse, allocate_table_write_ids_result> {
       public allocate_table_write_ids() {
         super("allocate_table_write_ids");
       }
 
+      @Override
+      public allocate_table_write_ids_result getEmptyResultInstance() {
+        return new allocate_table_write_ids_result();
+      }
+
+      @Override
       public allocate_table_write_ids_args getEmptyArgsInstance() {
         return new allocate_table_write_ids_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<AllocateTableWriteIdsResponse> 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<AllocateTableWriteIdsResponse>() { 
+          @Override
           public void onComplete(AllocateTableWriteIdsResponse o) {
             allocate_table_write_ids_result result = new allocate_table_write_ids_result();
             result.success = o;
@@ -41555,6 +47189,7 @@ public void onComplete(AllocateTableWriteIdsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41594,27 +47229,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, allocate_table_write_ids_args args, org.apache.thrift.async.AsyncMethodCallback<AllocateTableWriteIdsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.allocate_table_write_ids(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_max_allocated_table_write_id<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_max_allocated_table_write_id_args, MaxAllocatedTableWriteIdResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_max_allocated_table_write_id<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_max_allocated_table_write_id_args, MaxAllocatedTableWriteIdResponse, get_max_allocated_table_write_id_result> {
       public get_max_allocated_table_write_id() {
         super("get_max_allocated_table_write_id");
       }
 
+      @Override
+      public get_max_allocated_table_write_id_result getEmptyResultInstance() {
+        return new get_max_allocated_table_write_id_result();
+      }
+
+      @Override
       public get_max_allocated_table_write_id_args getEmptyArgsInstance() {
         return new get_max_allocated_table_write_id_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<MaxAllocatedTableWriteIdResponse> 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<MaxAllocatedTableWriteIdResponse>() { 
+          @Override
           public void onComplete(MaxAllocatedTableWriteIdResponse o) {
             get_max_allocated_table_write_id_result result = new get_max_allocated_table_write_id_result();
             result.success = o;
@@ -41628,6 +47273,7 @@ public void onComplete(MaxAllocatedTableWriteIdResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41659,27 +47305,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_max_allocated_table_write_id_args args, org.apache.thrift.async.AsyncMethodCallback<MaxAllocatedTableWriteIdResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_max_allocated_table_write_id(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_write_id<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, seed_write_id_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_write_id<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, seed_write_id_args, Void, seed_write_id_result> {
       public seed_write_id() {
         super("seed_write_id");
       }
 
+      @Override
+      public seed_write_id_result getEmptyResultInstance() {
+        return new seed_write_id_result();
+      }
+
+      @Override
       public seed_write_id_args getEmptyArgsInstance() {
         return new seed_write_id_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             seed_write_id_result result = new seed_write_id_result();
             try {
@@ -41692,6 +47348,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41723,27 +47380,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, seed_write_id_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.seed_write_id(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_txn_id<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, seed_txn_id_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_txn_id<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, seed_txn_id_args, Void, seed_txn_id_result> {
       public seed_txn_id() {
         super("seed_txn_id");
       }
 
+      @Override
+      public seed_txn_id_result getEmptyResultInstance() {
+        return new seed_txn_id_result();
+      }
+
+      @Override
       public seed_txn_id_args getEmptyArgsInstance() {
         return new seed_txn_id_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             seed_txn_id_result result = new seed_txn_id_result();
             try {
@@ -41756,6 +47423,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41787,27 +47455,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, seed_txn_id_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.seed_txn_id(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class lock<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, lock_args, LockResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class lock<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, lock_args, LockResponse, lock_result> {
       public lock() {
         super("lock");
       }
 
+      @Override
+      public lock_result getEmptyResultInstance() {
+        return new lock_result();
+      }
+
+      @Override
       public lock_args getEmptyArgsInstance() {
         return new lock_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<LockResponse> 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<LockResponse>() { 
+          @Override
           public void onComplete(LockResponse o) {
             lock_result result = new lock_result();
             result.success = o;
@@ -41821,6 +47499,7 @@ public void onComplete(LockResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41856,27 +47535,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, lock_args args, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
         iface.lock(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class check_lock<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, check_lock_args, LockResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class check_lock<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, check_lock_args, LockResponse, check_lock_result> {
       public check_lock() {
         super("check_lock");
       }
 
+      @Override
+      public check_lock_result getEmptyResultInstance() {
+        return new check_lock_result();
+      }
+
+      @Override
       public check_lock_args getEmptyArgsInstance() {
         return new check_lock_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<LockResponse> 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<LockResponse>() { 
+          @Override
           public void onComplete(LockResponse o) {
             check_lock_result result = new check_lock_result();
             result.success = o;
@@ -41890,6 +47579,7 @@ public void onComplete(LockResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41929,27 +47619,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, check_lock_args args, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
         iface.check_lock(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class unlock<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, unlock_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class unlock<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, unlock_args, Void, unlock_result> {
       public unlock() {
         super("unlock");
       }
 
+      @Override
+      public unlock_result getEmptyResultInstance() {
+        return new unlock_result();
+      }
+
+      @Override
       public unlock_args getEmptyArgsInstance() {
         return new unlock_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             unlock_result result = new unlock_result();
             try {
@@ -41962,6 +47662,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -41997,27 +47698,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, unlock_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.unlock(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_locks<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, show_locks_args, ShowLocksResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_locks<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, show_locks_args, ShowLocksResponse, show_locks_result> {
       public show_locks() {
         super("show_locks");
       }
 
+      @Override
+      public show_locks_result getEmptyResultInstance() {
+        return new show_locks_result();
+      }
+
+      @Override
       public show_locks_args getEmptyArgsInstance() {
         return new show_locks_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ShowLocksResponse> 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<ShowLocksResponse>() { 
+          @Override
           public void onComplete(ShowLocksResponse o) {
             show_locks_result result = new show_locks_result();
             result.success = o;
@@ -42031,6 +47742,7 @@ public void onComplete(ShowLocksResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42058,27 +47770,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, show_locks_args args, org.apache.thrift.async.AsyncMethodCallback<ShowLocksResponse> resultHandler) throws org.apache.thrift.TException {
         iface.show_locks(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_args, Void, heartbeat_result> {
       public heartbeat() {
         super("heartbeat");
       }
 
+      @Override
+      public heartbeat_result getEmptyResultInstance() {
+        return new heartbeat_result();
+      }
+
+      @Override
       public heartbeat_args getEmptyArgsInstance() {
         return new heartbeat_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             heartbeat_result result = new heartbeat_result();
             try {
@@ -42091,6 +47813,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42130,27 +47853,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, heartbeat_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.heartbeat(args.ids,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_txn_range<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_txn_range_args, HeartbeatTxnRangeResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_txn_range<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_txn_range_args, HeartbeatTxnRangeResponse, heartbeat_txn_range_result> {
       public heartbeat_txn_range() {
         super("heartbeat_txn_range");
       }
 
+      @Override
+      public heartbeat_txn_range_result getEmptyResultInstance() {
+        return new heartbeat_txn_range_result();
+      }
+
+      @Override
       public heartbeat_txn_range_args getEmptyArgsInstance() {
         return new heartbeat_txn_range_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<HeartbeatTxnRangeResponse> 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<HeartbeatTxnRangeResponse>() { 
+          @Override
           public void onComplete(HeartbeatTxnRangeResponse o) {
             heartbeat_txn_range_result result = new heartbeat_txn_range_result();
             result.success = o;
@@ -42164,6 +47897,7 @@ public void onComplete(HeartbeatTxnRangeResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42191,27 +47925,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, heartbeat_txn_range_args args, org.apache.thrift.async.AsyncMethodCallback<HeartbeatTxnRangeResponse> resultHandler) throws org.apache.thrift.TException {
         iface.heartbeat_txn_range(args.txns,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, compact_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, compact_args, Void, compact_result> {
       public compact() {
         super("compact");
       }
 
+      @Override
+      public compact_result getEmptyResultInstance() {
+        return new compact_result();
+      }
+
+      @Override
       public compact_args getEmptyArgsInstance() {
         return new compact_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             compact_result result = new compact_result();
             try {
@@ -42224,6 +47968,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42251,27 +47996,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, compact_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.compact(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact2<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, compact2_args, CompactionResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact2<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, compact2_args, CompactionResponse, compact2_result> {
       public compact2() {
         super("compact2");
       }
 
+      @Override
+      public compact2_result getEmptyResultInstance() {
+        return new compact2_result();
+      }
+
+      @Override
       public compact2_args getEmptyArgsInstance() {
         return new compact2_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<CompactionResponse> 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<CompactionResponse>() { 
+          @Override
           public void onComplete(CompactionResponse o) {
             compact2_result result = new compact2_result();
             result.success = o;
@@ -42285,6 +48040,7 @@ public void onComplete(CompactionResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42312,27 +48068,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, compact2_args args, org.apache.thrift.async.AsyncMethodCallback<CompactionResponse> resultHandler) throws org.apache.thrift.TException {
         iface.compact2(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_compact<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, show_compact_args, ShowCompactResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_compact<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, show_compact_args, ShowCompactResponse, show_compact_result> {
       public show_compact() {
         super("show_compact");
       }
 
+      @Override
+      public show_compact_result getEmptyResultInstance() {
+        return new show_compact_result();
+      }
+
+      @Override
       public show_compact_args getEmptyArgsInstance() {
         return new show_compact_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ShowCompactResponse> 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<ShowCompactResponse>() { 
+          @Override
           public void onComplete(ShowCompactResponse o) {
             show_compact_result result = new show_compact_result();
             result.success = o;
@@ -42346,6 +48112,7 @@ public void onComplete(ShowCompactResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42373,27 +48140,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, show_compact_args args, org.apache.thrift.async.AsyncMethodCallback<ShowCompactResponse> resultHandler) throws org.apache.thrift.TException {
         iface.show_compact(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class submit_for_cleanup<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submit_for_cleanup_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class submit_for_cleanup<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submit_for_cleanup_args, java.lang.Boolean, submit_for_cleanup_result> {
       public submit_for_cleanup() {
         super("submit_for_cleanup");
       }
 
+      @Override
+      public submit_for_cleanup_result getEmptyResultInstance() {
+        return new submit_for_cleanup_result();
+      }
+
+      @Override
       public submit_for_cleanup_args getEmptyArgsInstance() {
         return new submit_for_cleanup_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             submit_for_cleanup_result result = new submit_for_cleanup_result();
             result.success = o;
@@ -42408,6 +48185,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42439,27 +48217,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, submit_for_cleanup_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.submit_for_cleanup(args.o1, args.o2, args.o3,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_dynamic_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_dynamic_partitions_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_dynamic_partitions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_dynamic_partitions_args, Void, add_dynamic_partitions_result> {
       public add_dynamic_partitions() {
         super("add_dynamic_partitions");
       }
 
+      @Override
+      public add_dynamic_partitions_result getEmptyResultInstance() {
+        return new add_dynamic_partitions_result();
+      }
+
+      @Override
       public add_dynamic_partitions_args getEmptyArgsInstance() {
         return new add_dynamic_partitions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_dynamic_partitions_result result = new add_dynamic_partitions_result();
             try {
@@ -42472,6 +48260,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42507,27 +48296,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_dynamic_partitions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_dynamic_partitions(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_next_compact_args, OptionalCompactionInfoStruct> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_next_compact_args, OptionalCompactionInfoStruct, find_next_compact_result> {
       public find_next_compact() {
         super("find_next_compact");
       }
 
+      @Override
+      public find_next_compact_result getEmptyResultInstance() {
+        return new find_next_compact_result();
+      }
+
+      @Override
       public find_next_compact_args getEmptyArgsInstance() {
         return new find_next_compact_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<OptionalCompactionInfoStruct> 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<OptionalCompactionInfoStruct>() { 
+          @Override
           public void onComplete(OptionalCompactionInfoStruct o) {
             find_next_compact_result result = new find_next_compact_result();
             result.success = o;
@@ -42541,6 +48340,7 @@ public void onComplete(OptionalCompactionInfoStruct o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42572,27 +48372,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, find_next_compact_args args, org.apache.thrift.async.AsyncMethodCallback<OptionalCompactionInfoStruct> resultHandler) throws org.apache.thrift.TException {
         iface.find_next_compact(args.workerId,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact2<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_next_compact2_args, OptionalCompactionInfoStruct> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact2<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_next_compact2_args, OptionalCompactionInfoStruct, find_next_compact2_result> {
       public find_next_compact2() {
         super("find_next_compact2");
       }
 
+      @Override
+      public find_next_compact2_result getEmptyResultInstance() {
+        return new find_next_compact2_result();
+      }
+
+      @Override
       public find_next_compact2_args getEmptyArgsInstance() {
         return new find_next_compact2_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<OptionalCompactionInfoStruct> 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<OptionalCompactionInfoStruct>() { 
+          @Override
           public void onComplete(OptionalCompactionInfoStruct o) {
             find_next_compact2_result result = new find_next_compact2_result();
             result.success = o;
@@ -42606,6 +48416,7 @@ public void onComplete(OptionalCompactionInfoStruct o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42637,27 +48448,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, find_next_compact2_args args, org.apache.thrift.async.AsyncMethodCallback<OptionalCompactionInfoStruct> resultHandler) throws org.apache.thrift.TException {
         iface.find_next_compact2(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compactor_state<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_compactor_state_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compactor_state<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_compactor_state_args, Void, update_compactor_state_result> {
       public update_compactor_state() {
         super("update_compactor_state");
       }
 
+      @Override
+      public update_compactor_state_result getEmptyResultInstance() {
+        return new update_compactor_state_result();
+      }
+
+      @Override
       public update_compactor_state_args getEmptyArgsInstance() {
         return new update_compactor_state_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             update_compactor_state_result result = new update_compactor_state_result();
             try {
@@ -42670,6 +48491,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42697,27 +48519,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_compactor_state_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.update_compactor_state(args.cr, args.txn_id,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_columns_with_stats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_columns_with_stats_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_columns_with_stats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_columns_with_stats_args, java.util.List<java.lang.String>, find_columns_with_stats_result> {
       public find_columns_with_stats() {
         super("find_columns_with_stats");
       }
 
+      @Override
+      public find_columns_with_stats_result getEmptyResultInstance() {
+        return new find_columns_with_stats_result();
+      }
+
+      @Override
       public find_columns_with_stats_args getEmptyArgsInstance() {
         return new find_columns_with_stats_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             find_columns_with_stats_result result = new find_columns_with_stats_result();
             result.success = o;
@@ -42731,6 +48563,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42758,27 +48591,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, find_columns_with_stats_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.find_columns_with_stats(args.cr,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_cleaned<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_cleaned_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_cleaned<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_cleaned_args, Void, mark_cleaned_result> {
       public mark_cleaned() {
         super("mark_cleaned");
       }
 
+      @Override
+      public mark_cleaned_result getEmptyResultInstance() {
+        return new mark_cleaned_result();
+      }
+
+      @Override
       public mark_cleaned_args getEmptyArgsInstance() {
         return new mark_cleaned_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             mark_cleaned_result result = new mark_cleaned_result();
             try {
@@ -42791,6 +48634,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42822,27 +48666,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, mark_cleaned_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.mark_cleaned(args.cr,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_compacted<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_compacted_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_compacted<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_compacted_args, Void, mark_compacted_result> {
       public mark_compacted() {
         super("mark_compacted");
       }
 
+      @Override
+      public mark_compacted_result getEmptyResultInstance() {
+        return new mark_compacted_result();
+      }
+
+      @Override
       public mark_compacted_args getEmptyArgsInstance() {
         return new mark_compacted_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             mark_compacted_result result = new mark_compacted_result();
             try {
@@ -42855,6 +48709,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42886,27 +48741,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, mark_compacted_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.mark_compacted(args.cr,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_failed<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_failed_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_failed<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_failed_args, Void, mark_failed_result> {
       public mark_failed() {
         super("mark_failed");
       }
 
+      @Override
+      public mark_failed_result getEmptyResultInstance() {
+        return new mark_failed_result();
+      }
+
+      @Override
       public mark_failed_args getEmptyArgsInstance() {
         return new mark_failed_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             mark_failed_result result = new mark_failed_result();
             try {
@@ -42919,6 +48784,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -42950,27 +48816,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, mark_failed_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.mark_failed(args.cr,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_refused<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_refused_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_refused<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, mark_refused_args, Void, mark_refused_result> {
       public mark_refused() {
         super("mark_refused");
       }
 
+      @Override
+      public mark_refused_result getEmptyResultInstance() {
+        return new mark_refused_result();
+      }
+
+      @Override
       public mark_refused_args getEmptyArgsInstance() {
         return new mark_refused_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             mark_refused_result result = new mark_refused_result();
             try {
@@ -42983,6 +48859,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43014,27 +48891,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, mark_refused_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.mark_refused(args.cr,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compaction_metrics_data<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_compaction_metrics_data_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compaction_metrics_data<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, update_compaction_metrics_data_args, java.lang.Boolean, update_compaction_metrics_data_result> {
       public update_compaction_metrics_data() {
         super("update_compaction_metrics_data");
       }
 
+      @Override
+      public update_compaction_metrics_data_result getEmptyResultInstance() {
+        return new update_compaction_metrics_data_result();
+      }
+
+      @Override
       public update_compaction_metrics_data_args getEmptyArgsInstance() {
         return new update_compaction_metrics_data_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             update_compaction_metrics_data_result result = new update_compaction_metrics_data_result();
             result.success = o;
@@ -43049,6 +48936,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43080,27 +48968,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, update_compaction_metrics_data_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.update_compaction_metrics_data(args.data,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_compaction_metrics_data<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, remove_compaction_metrics_data_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_compaction_metrics_data<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, remove_compaction_metrics_data_args, Void, remove_compaction_metrics_data_result> {
       public remove_compaction_metrics_data() {
         super("remove_compaction_metrics_data");
       }
 
+      @Override
+      public remove_compaction_metrics_data_result getEmptyResultInstance() {
+        return new remove_compaction_metrics_data_result();
+      }
+
+      @Override
       public remove_compaction_metrics_data_args getEmptyArgsInstance() {
         return new remove_compaction_metrics_data_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             remove_compaction_metrics_data_result result = new remove_compaction_metrics_data_result();
             try {
@@ -43113,6 +49011,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43144,27 +49043,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, remove_compaction_metrics_data_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.remove_compaction_metrics_data(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_hadoop_jobid<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_hadoop_jobid_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_hadoop_jobid<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_hadoop_jobid_args, Void, set_hadoop_jobid_result> {
       public set_hadoop_jobid() {
         super("set_hadoop_jobid");
       }
 
+      @Override
+      public set_hadoop_jobid_result getEmptyResultInstance() {
+        return new set_hadoop_jobid_result();
+      }
+
+      @Override
       public set_hadoop_jobid_args getEmptyArgsInstance() {
         return new set_hadoop_jobid_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             set_hadoop_jobid_result result = new set_hadoop_jobid_result();
             try {
@@ -43177,6 +49086,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43204,27 +49114,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, set_hadoop_jobid_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.set_hadoop_jobid(args.jobId, args.cq_id,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_committed_compaction_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_latest_committed_compaction_info_args, GetLatestCommittedCompactionInfoResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_committed_compaction_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_latest_committed_compaction_info_args, GetLatestCommittedCompactionInfoResponse, get_latest_committed_compaction_info_result> {
       public get_latest_committed_compaction_info() {
         super("get_latest_committed_compaction_info");
       }
 
+      @Override
+      public get_latest_committed_compaction_info_result getEmptyResultInstance() {
+        return new get_latest_committed_compaction_info_result();
+      }
+
+      @Override
       public get_latest_committed_compaction_info_args getEmptyArgsInstance() {
         return new get_latest_committed_compaction_info_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetLatestCommittedCompactionInfoResponse> 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<GetLatestCommittedCompactionInfoResponse>() { 
+          @Override
           public void onComplete(GetLatestCommittedCompactionInfoResponse o) {
             get_latest_committed_compaction_info_result result = new get_latest_committed_compaction_info_result();
             result.success = o;
@@ -43238,6 +49158,7 @@ public void onComplete(GetLatestCommittedCompactionInfoResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43265,27 +49186,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_latest_committed_compaction_info_args args, org.apache.thrift.async.AsyncMethodCallback<GetLatestCommittedCompactionInfoResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_latest_committed_compaction_info(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_next_notification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_next_notification_args, NotificationEventResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_next_notification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_next_notification_args, NotificationEventResponse, get_next_notification_result> {
       public get_next_notification() {
         super("get_next_notification");
       }
 
+      @Override
+      public get_next_notification_result getEmptyResultInstance() {
+        return new get_next_notification_result();
+      }
+
+      @Override
       public get_next_notification_args getEmptyArgsInstance() {
         return new get_next_notification_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<NotificationEventResponse> 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<NotificationEventResponse>() { 
+          @Override
           public void onComplete(NotificationEventResponse o) {
             get_next_notification_result result = new get_next_notification_result();
             result.success = o;
@@ -43299,6 +49230,7 @@ public void onComplete(NotificationEventResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43326,27 +49258,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_next_notification_args args, org.apache.thrift.async.AsyncMethodCallback<NotificationEventResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_next_notification(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_current_notificationEventId<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_current_notificationEventId_args, CurrentNotificationEventId> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_current_notificationEventId<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_current_notificationEventId_args, CurrentNotificationEventId, get_current_notificationEventId_result> {
       public get_current_notificationEventId() {
         super("get_current_notificationEventId");
       }
 
+      @Override
+      public get_current_notificationEventId_result getEmptyResultInstance() {
+        return new get_current_notificationEventId_result();
+      }
+
+      @Override
       public get_current_notificationEventId_args getEmptyArgsInstance() {
         return new get_current_notificationEventId_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<CurrentNotificationEventId> 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<CurrentNotificationEventId>() { 
+          @Override
           public void onComplete(CurrentNotificationEventId o) {
             get_current_notificationEventId_result result = new get_current_notificationEventId_result();
             result.success = o;
@@ -43360,6 +49302,7 @@ public void onComplete(CurrentNotificationEventId o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43387,27 +49330,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_current_notificationEventId_args args, org.apache.thrift.async.AsyncMethodCallback<CurrentNotificationEventId> resultHandler) throws org.apache.thrift.TException {
         iface.get_current_notificationEventId(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_notification_events_count<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_notification_events_count_args, NotificationEventsCountResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_notification_events_count<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_notification_events_count_args, NotificationEventsCountResponse, get_notification_events_count_result> {
       public get_notification_events_count() {
         super("get_notification_events_count");
       }
 
+      @Override
+      public get_notification_events_count_result getEmptyResultInstance() {
+        return new get_notification_events_count_result();
+      }
+
+      @Override
       public get_notification_events_count_args getEmptyArgsInstance() {
         return new get_notification_events_count_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<NotificationEventsCountResponse> 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<NotificationEventsCountResponse>() { 
+          @Override
           public void onComplete(NotificationEventsCountResponse o) {
             get_notification_events_count_result result = new get_notification_events_count_result();
             result.success = o;
@@ -43421,6 +49374,7 @@ public void onComplete(NotificationEventsCountResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43448,27 +49402,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_notification_events_count_args args, org.apache.thrift.async.AsyncMethodCallback<NotificationEventsCountResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_notification_events_count(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fire_listener_event<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fire_listener_event_args, FireEventResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fire_listener_event<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fire_listener_event_args, FireEventResponse, fire_listener_event_result> {
       public fire_listener_event() {
         super("fire_listener_event");
       }
 
+      @Override
+      public fire_listener_event_result getEmptyResultInstance() {
+        return new fire_listener_event_result();
+      }
+
+      @Override
       public fire_listener_event_args getEmptyArgsInstance() {
         return new fire_listener_event_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<FireEventResponse> 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<FireEventResponse>() { 
+          @Override
           public void onComplete(FireEventResponse o) {
             fire_listener_event_result result = new fire_listener_event_result();
             result.success = o;
@@ -43482,6 +49446,7 @@ public void onComplete(FireEventResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43509,27 +49474,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, fire_listener_event_args args, org.apache.thrift.async.AsyncMethodCallback<FireEventResponse> resultHandler) throws org.apache.thrift.TException {
         iface.fire_listener_event(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class flushCache<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, flushCache_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class flushCache<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, flushCache_args, Void, flushCache_result> {
       public flushCache() {
         super("flushCache");
       }
 
+      @Override
+      public flushCache_result getEmptyResultInstance() {
+        return new flushCache_result();
+      }
+
+      @Override
       public flushCache_args getEmptyArgsInstance() {
         return new flushCache_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             flushCache_result result = new flushCache_result();
             try {
@@ -43542,6 +49517,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43569,27 +49545,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, flushCache_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.flushCache(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_write_notification_log_args, WriteNotificationLogResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_write_notification_log_args, WriteNotificationLogResponse, add_write_notification_log_result> {
       public add_write_notification_log() {
         super("add_write_notification_log");
       }
 
+      @Override
+      public add_write_notification_log_result getEmptyResultInstance() {
+        return new add_write_notification_log_result();
+      }
+
+      @Override
       public add_write_notification_log_args getEmptyArgsInstance() {
         return new add_write_notification_log_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WriteNotificationLogResponse> 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<WriteNotificationLogResponse>() { 
+          @Override
           public void onComplete(WriteNotificationLogResponse o) {
             add_write_notification_log_result result = new add_write_notification_log_result();
             result.success = o;
@@ -43603,6 +49589,7 @@ public void onComplete(WriteNotificationLogResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43630,27 +49617,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_write_notification_log_args args, org.apache.thrift.async.AsyncMethodCallback<WriteNotificationLogResponse> resultHandler) throws org.apache.thrift.TException {
         iface.add_write_notification_log(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_in_batch<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_write_notification_log_in_batch_args, WriteNotificationLogBatchResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_in_batch<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_write_notification_log_in_batch_args, WriteNotificationLogBatchResponse, add_write_notification_log_in_batch_result> {
       public add_write_notification_log_in_batch() {
         super("add_write_notification_log_in_batch");
       }
 
+      @Override
+      public add_write_notification_log_in_batch_result getEmptyResultInstance() {
+        return new add_write_notification_log_in_batch_result();
+      }
+
+      @Override
       public add_write_notification_log_in_batch_args getEmptyArgsInstance() {
         return new add_write_notification_log_in_batch_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WriteNotificationLogBatchResponse> 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<WriteNotificationLogBatchResponse>() { 
+          @Override
           public void onComplete(WriteNotificationLogBatchResponse o) {
             add_write_notification_log_in_batch_result result = new add_write_notification_log_in_batch_result();
             result.success = o;
@@ -43664,6 +49661,7 @@ public void onComplete(WriteNotificationLogBatchResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43691,27 +49689,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_write_notification_log_in_batch_args args, org.apache.thrift.async.AsyncMethodCallback<WriteNotificationLogBatchResponse> resultHandler) throws org.apache.thrift.TException {
         iface.add_write_notification_log_in_batch(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cm_recycle<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cm_recycle_args, CmRecycleResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cm_recycle<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cm_recycle_args, CmRecycleResponse, cm_recycle_result> {
       public cm_recycle() {
         super("cm_recycle");
       }
 
+      @Override
+      public cm_recycle_result getEmptyResultInstance() {
+        return new cm_recycle_result();
+      }
+
+      @Override
       public cm_recycle_args getEmptyArgsInstance() {
         return new cm_recycle_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<CmRecycleResponse> 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<CmRecycleResponse>() { 
+          @Override
           public void onComplete(CmRecycleResponse o) {
             cm_recycle_result result = new cm_recycle_result();
             result.success = o;
@@ -43725,6 +49733,7 @@ public void onComplete(CmRecycleResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43756,27 +49765,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, cm_recycle_args args, org.apache.thrift.async.AsyncMethodCallback<CmRecycleResponse> resultHandler) throws org.apache.thrift.TException {
         iface.cm_recycle(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_by_expr<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_file_metadata_by_expr_args, GetFileMetadataByExprResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_by_expr<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_file_metadata_by_expr_args, GetFileMetadataByExprResult, get_file_metadata_by_expr_result> {
       public get_file_metadata_by_expr() {
         super("get_file_metadata_by_expr");
       }
 
+      @Override
+      public get_file_metadata_by_expr_result getEmptyResultInstance() {
+        return new get_file_metadata_by_expr_result();
+      }
+
+      @Override
       public get_file_metadata_by_expr_args getEmptyArgsInstance() {
         return new get_file_metadata_by_expr_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetFileMetadataByExprResult> 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<GetFileMetadataByExprResult>() { 
+          @Override
           public void onComplete(GetFileMetadataByExprResult o) {
             get_file_metadata_by_expr_result result = new get_file_metadata_by_expr_result();
             result.success = o;
@@ -43790,6 +49809,7 @@ public void onComplete(GetFileMetadataByExprResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43817,27 +49837,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_file_metadata_by_expr_args args, org.apache.thrift.async.AsyncMethodCallback<GetFileMetadataByExprResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_file_metadata_by_expr(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_file_metadata_args, GetFileMetadataResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_file_metadata_args, GetFileMetadataResult, get_file_metadata_result> {
       public get_file_metadata() {
         super("get_file_metadata");
       }
 
+      @Override
+      public get_file_metadata_result getEmptyResultInstance() {
+        return new get_file_metadata_result();
+      }
+
+      @Override
       public get_file_metadata_args getEmptyArgsInstance() {
         return new get_file_metadata_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetFileMetadataResult> 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<GetFileMetadataResult>() { 
+          @Override
           public void onComplete(GetFileMetadataResult o) {
             get_file_metadata_result result = new get_file_metadata_result();
             result.success = o;
@@ -43851,6 +49881,7 @@ public void onComplete(GetFileMetadataResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43878,27 +49909,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_file_metadata_args args, org.apache.thrift.async.AsyncMethodCallback<GetFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_file_metadata(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class put_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, put_file_metadata_args, PutFileMetadataResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class put_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, put_file_metadata_args, PutFileMetadataResult, put_file_metadata_result> {
       public put_file_metadata() {
         super("put_file_metadata");
       }
 
+      @Override
+      public put_file_metadata_result getEmptyResultInstance() {
+        return new put_file_metadata_result();
+      }
+
+      @Override
       public put_file_metadata_args getEmptyArgsInstance() {
         return new put_file_metadata_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<PutFileMetadataResult> 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<PutFileMetadataResult>() { 
+          @Override
           public void onComplete(PutFileMetadataResult o) {
             put_file_metadata_result result = new put_file_metadata_result();
             result.success = o;
@@ -43912,6 +49953,7 @@ public void onComplete(PutFileMetadataResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -43939,27 +49981,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, put_file_metadata_args args, org.apache.thrift.async.AsyncMethodCallback<PutFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
         iface.put_file_metadata(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class clear_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, clear_file_metadata_args, ClearFileMetadataResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class clear_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, clear_file_metadata_args, ClearFileMetadataResult, clear_file_metadata_result> {
       public clear_file_metadata() {
         super("clear_file_metadata");
       }
 
+      @Override
+      public clear_file_metadata_result getEmptyResultInstance() {
+        return new clear_file_metadata_result();
+      }
+
+      @Override
       public clear_file_metadata_args getEmptyArgsInstance() {
         return new clear_file_metadata_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ClearFileMetadataResult> 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<ClearFileMetadataResult>() { 
+          @Override
           public void onComplete(ClearFileMetadataResult o) {
             clear_file_metadata_result result = new clear_file_metadata_result();
             result.success = o;
@@ -43973,6 +50025,7 @@ public void onComplete(ClearFileMetadataResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44000,27 +50053,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, clear_file_metadata_args args, org.apache.thrift.async.AsyncMethodCallback<ClearFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
         iface.clear_file_metadata(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cache_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cache_file_metadata_args, CacheFileMetadataResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cache_file_metadata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cache_file_metadata_args, CacheFileMetadataResult, cache_file_metadata_result> {
       public cache_file_metadata() {
         super("cache_file_metadata");
       }
 
+      @Override
+      public cache_file_metadata_result getEmptyResultInstance() {
+        return new cache_file_metadata_result();
+      }
+
+      @Override
       public cache_file_metadata_args getEmptyArgsInstance() {
         return new cache_file_metadata_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<CacheFileMetadataResult> 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<CacheFileMetadataResult>() { 
+          @Override
           public void onComplete(CacheFileMetadataResult o) {
             cache_file_metadata_result result = new cache_file_metadata_result();
             result.success = o;
@@ -44034,6 +50097,7 @@ public void onComplete(CacheFileMetadataResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44061,27 +50125,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, cache_file_metadata_args args, org.apache.thrift.async.AsyncMethodCallback<CacheFileMetadataResult> resultHandler) throws org.apache.thrift.TException {
         iface.cache_file_metadata(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_metastore_db_uuid<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_metastore_db_uuid_args, java.lang.String> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_metastore_db_uuid<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_metastore_db_uuid_args, java.lang.String, get_metastore_db_uuid_result> {
       public get_metastore_db_uuid() {
         super("get_metastore_db_uuid");
       }
 
+      @Override
+      public get_metastore_db_uuid_result getEmptyResultInstance() {
+        return new get_metastore_db_uuid_result();
+      }
+
+      @Override
       public get_metastore_db_uuid_args getEmptyArgsInstance() {
         return new get_metastore_db_uuid_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 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<java.lang.String>() { 
+          @Override
           public void onComplete(java.lang.String o) {
             get_metastore_db_uuid_result result = new get_metastore_db_uuid_result();
             result.success = o;
@@ -44095,6 +50169,7 @@ public void onComplete(java.lang.String o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44126,27 +50201,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_metastore_db_uuid_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.get_metastore_db_uuid(resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_resource_plan_args, WMCreateResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_resource_plan_args, WMCreateResourcePlanResponse, create_resource_plan_result> {
       public create_resource_plan() {
         super("create_resource_plan");
       }
 
+      @Override
+      public create_resource_plan_result getEmptyResultInstance() {
+        return new create_resource_plan_result();
+      }
+
+      @Override
       public create_resource_plan_args getEmptyArgsInstance() {
         return new create_resource_plan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMCreateResourcePlanResponse> 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<WMCreateResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMCreateResourcePlanResponse o) {
             create_resource_plan_result result = new create_resource_plan_result();
             result.success = o;
@@ -44160,6 +50245,7 @@ public void onComplete(WMCreateResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44199,27 +50285,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_resource_plan_args args, org.apache.thrift.async.AsyncMethodCallback<WMCreateResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.create_resource_plan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_resource_plan_args, WMGetResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_resource_plan_args, WMGetResourcePlanResponse, get_resource_plan_result> {
       public get_resource_plan() {
         super("get_resource_plan");
       }
 
+      @Override
+      public get_resource_plan_result getEmptyResultInstance() {
+        return new get_resource_plan_result();
+      }
+
+      @Override
       public get_resource_plan_args getEmptyArgsInstance() {
         return new get_resource_plan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMGetResourcePlanResponse> 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<WMGetResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMGetResourcePlanResponse o) {
             get_resource_plan_result result = new get_resource_plan_result();
             result.success = o;
@@ -44233,6 +50329,7 @@ public void onComplete(WMGetResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44268,27 +50365,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_resource_plan_args args, org.apache.thrift.async.AsyncMethodCallback<WMGetResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_resource_plan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_active_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_active_resource_plan_args, WMGetActiveResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_active_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_active_resource_plan_args, WMGetActiveResourcePlanResponse, get_active_resource_plan_result> {
       public get_active_resource_plan() {
         super("get_active_resource_plan");
       }
 
+      @Override
+      public get_active_resource_plan_result getEmptyResultInstance() {
+        return new get_active_resource_plan_result();
+      }
+
+      @Override
       public get_active_resource_plan_args getEmptyArgsInstance() {
         return new get_active_resource_plan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMGetActiveResourcePlanResponse> 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<WMGetActiveResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMGetActiveResourcePlanResponse o) {
             get_active_resource_plan_result result = new get_active_resource_plan_result();
             result.success = o;
@@ -44302,6 +50409,7 @@ public void onComplete(WMGetActiveResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44333,27 +50441,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_active_resource_plan_args args, org.apache.thrift.async.AsyncMethodCallback<WMGetActiveResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_active_resource_plan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_resource_plans<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_resource_plans_args, WMGetAllResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_resource_plans<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_resource_plans_args, WMGetAllResourcePlanResponse, get_all_resource_plans_result> {
       public get_all_resource_plans() {
         super("get_all_resource_plans");
       }
 
+      @Override
+      public get_all_resource_plans_result getEmptyResultInstance() {
+        return new get_all_resource_plans_result();
+      }
+
+      @Override
       public get_all_resource_plans_args getEmptyArgsInstance() {
         return new get_all_resource_plans_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMGetAllResourcePlanResponse> 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<WMGetAllResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMGetAllResourcePlanResponse o) {
             get_all_resource_plans_result result = new get_all_resource_plans_result();
             result.success = o;
@@ -44367,6 +50485,7 @@ public void onComplete(WMGetAllResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44398,27 +50517,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_resource_plans_args args, org.apache.thrift.async.AsyncMethodCallback<WMGetAllResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_resource_plans(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_resource_plan_args, WMAlterResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_resource_plan_args, WMAlterResourcePlanResponse, alter_resource_plan_result> {
       public alter_resource_plan() {
         super("alter_resource_plan");
       }
 
+      @Override
+      public alter_resource_plan_result getEmptyResultInstance() {
+        return new alter_resource_plan_result();
+      }
+
+      @Override
       public alter_resource_plan_args getEmptyArgsInstance() {
         return new alter_resource_plan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMAlterResourcePlanResponse> 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<WMAlterResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMAlterResourcePlanResponse o) {
             alter_resource_plan_result result = new alter_resource_plan_result();
             result.success = o;
@@ -44432,6 +50561,7 @@ public void onComplete(WMAlterResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44471,27 +50601,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_resource_plan_args args, org.apache.thrift.async.AsyncMethodCallback<WMAlterResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.alter_resource_plan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class validate_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, validate_resource_plan_args, WMValidateResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class validate_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, validate_resource_plan_args, WMValidateResourcePlanResponse, validate_resource_plan_result> {
       public validate_resource_plan() {
         super("validate_resource_plan");
       }
 
+      @Override
+      public validate_resource_plan_result getEmptyResultInstance() {
+        return new validate_resource_plan_result();
+      }
+
+      @Override
       public validate_resource_plan_args getEmptyArgsInstance() {
         return new validate_resource_plan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMValidateResourcePlanResponse> 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<WMValidateResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMValidateResourcePlanResponse o) {
             validate_resource_plan_result result = new validate_resource_plan_result();
             result.success = o;
@@ -44505,6 +50645,7 @@ public void onComplete(WMValidateResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44540,27 +50681,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, validate_resource_plan_args args, org.apache.thrift.async.AsyncMethodCallback<WMValidateResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.validate_resource_plan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_resource_plan_args, WMDropResourcePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_resource_plan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_resource_plan_args, WMDropResourcePlanResponse, drop_resource_plan_result> {
       public drop_resource_plan() {
         super("drop_resource_plan");
       }
 
+      @Override
+      public drop_resource_plan_result getEmptyResultInstance() {
+        return new drop_resource_plan_result();
+      }
+
+      @Override
       public drop_resource_plan_args getEmptyArgsInstance() {
         return new drop_resource_plan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMDropResourcePlanResponse> 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<WMDropResourcePlanResponse>() { 
+          @Override
           public void onComplete(WMDropResourcePlanResponse o) {
             drop_resource_plan_result result = new drop_resource_plan_result();
             result.success = o;
@@ -44574,6 +50725,7 @@ public void onComplete(WMDropResourcePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44613,27 +50765,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_resource_plan_args args, org.apache.thrift.async.AsyncMethodCallback<WMDropResourcePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.drop_resource_plan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_trigger<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_wm_trigger_args, WMCreateTriggerResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_trigger<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_wm_trigger_args, WMCreateTriggerResponse, create_wm_trigger_result> {
       public create_wm_trigger() {
         super("create_wm_trigger");
       }
 
+      @Override
+      public create_wm_trigger_result getEmptyResultInstance() {
+        return new create_wm_trigger_result();
+      }
+
+      @Override
       public create_wm_trigger_args getEmptyArgsInstance() {
         return new create_wm_trigger_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMCreateTriggerResponse> 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<WMCreateTriggerResponse>() { 
+          @Override
           public void onComplete(WMCreateTriggerResponse o) {
             create_wm_trigger_result result = new create_wm_trigger_result();
             result.success = o;
@@ -44647,6 +50809,7 @@ public void onComplete(WMCreateTriggerResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44690,27 +50853,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_wm_trigger_args args, org.apache.thrift.async.AsyncMethodCallback<WMCreateTriggerResponse> resultHandler) throws org.apache.thrift.TException {
         iface.create_wm_trigger(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_trigger<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_wm_trigger_args, WMAlterTriggerResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_trigger<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_wm_trigger_args, WMAlterTriggerResponse, alter_wm_trigger_result> {
       public alter_wm_trigger() {
         super("alter_wm_trigger");
       }
 
+      @Override
+      public alter_wm_trigger_result getEmptyResultInstance() {
+        return new alter_wm_trigger_result();
+      }
+
+      @Override
       public alter_wm_trigger_args getEmptyArgsInstance() {
         return new alter_wm_trigger_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMAlterTriggerResponse> 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<WMAlterTriggerResponse>() { 
+          @Override
           public void onComplete(WMAlterTriggerResponse o) {
             alter_wm_trigger_result result = new alter_wm_trigger_result();
             result.success = o;
@@ -44724,6 +50897,7 @@ public void onComplete(WMAlterTriggerResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44763,27 +50937,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_wm_trigger_args args, org.apache.thrift.async.AsyncMethodCallback<WMAlterTriggerResponse> resultHandler) throws org.apache.thrift.TException {
         iface.alter_wm_trigger(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_trigger<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_wm_trigger_args, WMDropTriggerResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_trigger<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_wm_trigger_args, WMDropTriggerResponse, drop_wm_trigger_result> {
       public drop_wm_trigger() {
         super("drop_wm_trigger");
       }
 
+      @Override
+      public drop_wm_trigger_result getEmptyResultInstance() {
+        return new drop_wm_trigger_result();
+      }
+
+      @Override
       public drop_wm_trigger_args getEmptyArgsInstance() {
         return new drop_wm_trigger_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMDropTriggerResponse> 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<WMDropTriggerResponse>() { 
+          @Override
           public void onComplete(WMDropTriggerResponse o) {
             drop_wm_trigger_result result = new drop_wm_trigger_result();
             result.success = o;
@@ -44797,6 +50981,7 @@ public void onComplete(WMDropTriggerResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44836,27 +51021,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_wm_trigger_args args, org.apache.thrift.async.AsyncMethodCallback<WMDropTriggerResponse> resultHandler) throws org.apache.thrift.TException {
         iface.drop_wm_trigger(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_triggers_for_resourceplan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_triggers_for_resourceplan_args, WMGetTriggersForResourePlanResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_triggers_for_resourceplan<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_triggers_for_resourceplan_args, WMGetTriggersForResourePlanResponse, get_triggers_for_resourceplan_result> {
       public get_triggers_for_resourceplan() {
         super("get_triggers_for_resourceplan");
       }
 
+      @Override
+      public get_triggers_for_resourceplan_result getEmptyResultInstance() {
+        return new get_triggers_for_resourceplan_result();
+      }
+
+      @Override
       public get_triggers_for_resourceplan_args getEmptyArgsInstance() {
         return new get_triggers_for_resourceplan_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMGetTriggersForResourePlanResponse> 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<WMGetTriggersForResourePlanResponse>() { 
+          @Override
           public void onComplete(WMGetTriggersForResourePlanResponse o) {
             get_triggers_for_resourceplan_result result = new get_triggers_for_resourceplan_result();
             result.success = o;
@@ -44870,6 +51065,7 @@ public void onComplete(WMGetTriggersForResourePlanResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44905,27 +51101,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_triggers_for_resourceplan_args args, org.apache.thrift.async.AsyncMethodCallback<WMGetTriggersForResourePlanResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_triggers_for_resourceplan(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_pool<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_wm_pool_args, WMCreatePoolResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_pool<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_wm_pool_args, WMCreatePoolResponse, create_wm_pool_result> {
       public create_wm_pool() {
         super("create_wm_pool");
       }
 
+      @Override
+      public create_wm_pool_result getEmptyResultInstance() {
+        return new create_wm_pool_result();
+      }
+
+      @Override
       public create_wm_pool_args getEmptyArgsInstance() {
         return new create_wm_pool_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMCreatePoolResponse> 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<WMCreatePoolResponse>() { 
+          @Override
           public void onComplete(WMCreatePoolResponse o) {
             create_wm_pool_result result = new create_wm_pool_result();
             result.success = o;
@@ -44939,6 +51145,7 @@ public void onComplete(WMCreatePoolResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -44982,27 +51189,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_wm_pool_args args, org.apache.thrift.async.AsyncMethodCallback<WMCreatePoolResponse> resultHandler) throws org.apache.thrift.TException {
         iface.create_wm_pool(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_pool<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_wm_pool_args, WMAlterPoolResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_pool<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_wm_pool_args, WMAlterPoolResponse, alter_wm_pool_result> {
       public alter_wm_pool() {
         super("alter_wm_pool");
       }
 
+      @Override
+      public alter_wm_pool_result getEmptyResultInstance() {
+        return new alter_wm_pool_result();
+      }
+
+      @Override
       public alter_wm_pool_args getEmptyArgsInstance() {
         return new alter_wm_pool_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMAlterPoolResponse> 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<WMAlterPoolResponse>() { 
+          @Override
           public void onComplete(WMAlterPoolResponse o) {
             alter_wm_pool_result result = new alter_wm_pool_result();
             result.success = o;
@@ -45016,6 +51233,7 @@ public void onComplete(WMAlterPoolResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45059,27 +51277,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_wm_pool_args args, org.apache.thrift.async.AsyncMethodCallback<WMAlterPoolResponse> resultHandler) throws org.apache.thrift.TException {
         iface.alter_wm_pool(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_pool<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_wm_pool_args, WMDropPoolResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_pool<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_wm_pool_args, WMDropPoolResponse, drop_wm_pool_result> {
       public drop_wm_pool() {
         super("drop_wm_pool");
       }
 
+      @Override
+      public drop_wm_pool_result getEmptyResultInstance() {
+        return new drop_wm_pool_result();
+      }
+
+      @Override
       public drop_wm_pool_args getEmptyArgsInstance() {
         return new drop_wm_pool_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMDropPoolResponse> 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<WMDropPoolResponse>() { 
+          @Override
           public void onComplete(WMDropPoolResponse o) {
             drop_wm_pool_result result = new drop_wm_pool_result();
             result.success = o;
@@ -45093,6 +51321,7 @@ public void onComplete(WMDropPoolResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45132,27 +51361,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_wm_pool_args args, org.apache.thrift.async.AsyncMethodCallback<WMDropPoolResponse> resultHandler) throws org.apache.thrift.TException {
         iface.drop_wm_pool(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_update_wm_mapping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_or_update_wm_mapping_args, WMCreateOrUpdateMappingResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_update_wm_mapping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_or_update_wm_mapping_args, WMCreateOrUpdateMappingResponse, create_or_update_wm_mapping_result> {
       public create_or_update_wm_mapping() {
         super("create_or_update_wm_mapping");
       }
 
+      @Override
+      public create_or_update_wm_mapping_result getEmptyResultInstance() {
+        return new create_or_update_wm_mapping_result();
+      }
+
+      @Override
       public create_or_update_wm_mapping_args getEmptyArgsInstance() {
         return new create_or_update_wm_mapping_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMCreateOrUpdateMappingResponse> 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<WMCreateOrUpdateMappingResponse>() { 
+          @Override
           public void onComplete(WMCreateOrUpdateMappingResponse o) {
             create_or_update_wm_mapping_result result = new create_or_update_wm_mapping_result();
             result.success = o;
@@ -45166,6 +51405,7 @@ public void onComplete(WMCreateOrUpdateMappingResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45209,27 +51449,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_or_update_wm_mapping_args args, org.apache.thrift.async.AsyncMethodCallback<WMCreateOrUpdateMappingResponse> resultHandler) throws org.apache.thrift.TException {
         iface.create_or_update_wm_mapping(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_mapping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_wm_mapping_args, WMDropMappingResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_mapping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_wm_mapping_args, WMDropMappingResponse, drop_wm_mapping_result> {
       public drop_wm_mapping() {
         super("drop_wm_mapping");
       }
 
+      @Override
+      public drop_wm_mapping_result getEmptyResultInstance() {
+        return new drop_wm_mapping_result();
+      }
+
+      @Override
       public drop_wm_mapping_args getEmptyArgsInstance() {
         return new drop_wm_mapping_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMDropMappingResponse> 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<WMDropMappingResponse>() { 
+          @Override
           public void onComplete(WMDropMappingResponse o) {
             drop_wm_mapping_result result = new drop_wm_mapping_result();
             result.success = o;
@@ -45243,6 +51493,7 @@ public void onComplete(WMDropMappingResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45282,27 +51533,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_wm_mapping_args args, org.apache.thrift.async.AsyncMethodCallback<WMDropMappingResponse> resultHandler) throws org.apache.thrift.TException {
         iface.drop_wm_mapping(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_drop_wm_trigger_to_pool_mapping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_or_drop_wm_trigger_to_pool_mapping_args, WMCreateOrDropTriggerToPoolMappingResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_drop_wm_trigger_to_pool_mapping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_or_drop_wm_trigger_to_pool_mapping_args, WMCreateOrDropTriggerToPoolMappingResponse, create_or_drop_wm_trigger_to_pool_mapping_result> {
       public create_or_drop_wm_trigger_to_pool_mapping() {
         super("create_or_drop_wm_trigger_to_pool_mapping");
       }
 
+      @Override
+      public create_or_drop_wm_trigger_to_pool_mapping_result getEmptyResultInstance() {
+        return new create_or_drop_wm_trigger_to_pool_mapping_result();
+      }
+
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_args getEmptyArgsInstance() {
         return new create_or_drop_wm_trigger_to_pool_mapping_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<WMCreateOrDropTriggerToPoolMappingResponse> 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<WMCreateOrDropTriggerToPoolMappingResponse>() { 
+          @Override
           public void onComplete(WMCreateOrDropTriggerToPoolMappingResponse o) {
             create_or_drop_wm_trigger_to_pool_mapping_result result = new create_or_drop_wm_trigger_to_pool_mapping_result();
             result.success = o;
@@ -45316,6 +51577,7 @@ public void onComplete(WMCreateOrDropTriggerToPoolMappingResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45359,27 +51621,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_or_drop_wm_trigger_to_pool_mapping_args args, org.apache.thrift.async.AsyncMethodCallback<WMCreateOrDropTriggerToPoolMappingResponse> resultHandler) throws org.apache.thrift.TException {
         iface.create_or_drop_wm_trigger_to_pool_mapping(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_ischema_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_ischema_args, Void, create_ischema_result> {
       public create_ischema() {
         super("create_ischema");
       }
 
+      @Override
+      public create_ischema_result getEmptyResultInstance() {
+        return new create_ischema_result();
+      }
+
+      @Override
       public create_ischema_args getEmptyArgsInstance() {
         return new create_ischema_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_ischema_result result = new create_ischema_result();
             try {
@@ -45392,6 +51664,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45431,27 +51704,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_ischema_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_ischema(args.schema,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_ischema_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, alter_ischema_args, Void, alter_ischema_result> {
       public alter_ischema() {
         super("alter_ischema");
       }
 
+      @Override
+      public alter_ischema_result getEmptyResultInstance() {
+        return new alter_ischema_result();
+      }
+
+      @Override
       public alter_ischema_args getEmptyArgsInstance() {
         return new alter_ischema_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             alter_ischema_result result = new alter_ischema_result();
             try {
@@ -45464,6 +51747,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45499,27 +51783,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, alter_ischema_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.alter_ischema(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_ischema_args, ISchema> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_ischema_args, ISchema, get_ischema_result> {
       public get_ischema() {
         super("get_ischema");
       }
 
+      @Override
+      public get_ischema_result getEmptyResultInstance() {
+        return new get_ischema_result();
+      }
+
+      @Override
       public get_ischema_args getEmptyArgsInstance() {
         return new get_ischema_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ISchema> 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<ISchema>() { 
+          @Override
           public void onComplete(ISchema o) {
             get_ischema_result result = new get_ischema_result();
             result.success = o;
@@ -45533,6 +51827,7 @@ public void onComplete(ISchema o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45568,27 +51863,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_ischema_args args, org.apache.thrift.async.AsyncMethodCallback<ISchema> resultHandler) throws org.apache.thrift.TException {
         iface.get_ischema(args.name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_ischema_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_ischema<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_ischema_args, Void, drop_ischema_result> {
       public drop_ischema() {
         super("drop_ischema");
       }
 
+      @Override
+      public drop_ischema_result getEmptyResultInstance() {
+        return new drop_ischema_result();
+      }
+
+      @Override
       public drop_ischema_args getEmptyArgsInstance() {
         return new drop_ischema_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_ischema_result result = new drop_ischema_result();
             try {
@@ -45601,6 +51906,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45640,27 +51946,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_ischema_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_ischema(args.name,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_schema_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_schema_version_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_schema_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_schema_version_args, Void, add_schema_version_result> {
       public add_schema_version() {
         super("add_schema_version");
       }
 
+      @Override
+      public add_schema_version_result getEmptyResultInstance() {
+        return new add_schema_version_result();
+      }
+
+      @Override
       public add_schema_version_args getEmptyArgsInstance() {
         return new add_schema_version_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_schema_version_result result = new add_schema_version_result();
             try {
@@ -45673,6 +51989,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45712,27 +52029,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_schema_version_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_schema_version(args.schemaVersion,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_version_args, SchemaVersion> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_version_args, SchemaVersion, get_schema_version_result> {
       public get_schema_version() {
         super("get_schema_version");
       }
 
+      @Override
+      public get_schema_version_result getEmptyResultInstance() {
+        return new get_schema_version_result();
+      }
+
+      @Override
       public get_schema_version_args getEmptyArgsInstance() {
         return new get_schema_version_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<SchemaVersion> 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<SchemaVersion>() { 
+          @Override
           public void onComplete(SchemaVersion o) {
             get_schema_version_result result = new get_schema_version_result();
             result.success = o;
@@ -45746,6 +52073,7 @@ public void onComplete(SchemaVersion o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45781,27 +52109,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schema_version_args args, org.apache.thrift.async.AsyncMethodCallback<SchemaVersion> resultHandler) throws org.apache.thrift.TException {
         iface.get_schema_version(args.schemaVersion,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_latest_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_latest_version_args, SchemaVersion> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_latest_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_latest_version_args, SchemaVersion, get_schema_latest_version_result> {
       public get_schema_latest_version() {
         super("get_schema_latest_version");
       }
 
+      @Override
+      public get_schema_latest_version_result getEmptyResultInstance() {
+        return new get_schema_latest_version_result();
+      }
+
+      @Override
       public get_schema_latest_version_args getEmptyArgsInstance() {
         return new get_schema_latest_version_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<SchemaVersion> 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<SchemaVersion>() { 
+          @Override
           public void onComplete(SchemaVersion o) {
             get_schema_latest_version_result result = new get_schema_latest_version_result();
             result.success = o;
@@ -45815,6 +52153,7 @@ public void onComplete(SchemaVersion o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45850,27 +52189,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schema_latest_version_args args, org.apache.thrift.async.AsyncMethodCallback<SchemaVersion> resultHandler) throws org.apache.thrift.TException {
         iface.get_schema_latest_version(args.schemaName,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_all_versions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_all_versions_args, java.util.List<SchemaVersion>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_all_versions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schema_all_versions_args, java.util.List<SchemaVersion>, get_schema_all_versions_result> {
       public get_schema_all_versions() {
         super("get_schema_all_versions");
       }
 
+      @Override
+      public get_schema_all_versions_result getEmptyResultInstance() {
+        return new get_schema_all_versions_result();
+      }
+
+      @Override
       public get_schema_all_versions_args getEmptyArgsInstance() {
         return new get_schema_all_versions_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<SchemaVersion>> 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<java.util.List<SchemaVersion>>() { 
+          @Override
           public void onComplete(java.util.List<SchemaVersion> o) {
             get_schema_all_versions_result result = new get_schema_all_versions_result();
             result.success = o;
@@ -45884,6 +52233,7 @@ public void onComplete(java.util.List<SchemaVersion> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45919,27 +52269,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schema_all_versions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<SchemaVersion>> resultHandler) throws org.apache.thrift.TException {
         iface.get_schema_all_versions(args.schemaName,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_schema_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_schema_version_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_schema_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_schema_version_args, Void, drop_schema_version_result> {
       public drop_schema_version() {
         super("drop_schema_version");
       }
 
+      @Override
+      public drop_schema_version_result getEmptyResultInstance() {
+        return new drop_schema_version_result();
+      }
+
+      @Override
       public drop_schema_version_args getEmptyArgsInstance() {
         return new drop_schema_version_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_schema_version_result result = new drop_schema_version_result();
             try {
@@ -45952,6 +52312,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -45987,27 +52348,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_schema_version_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_schema_version(args.schemaVersion,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schemas_by_cols<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schemas_by_cols_args, FindSchemasByColsResp> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schemas_by_cols<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_schemas_by_cols_args, FindSchemasByColsResp, get_schemas_by_cols_result> {
       public get_schemas_by_cols() {
         super("get_schemas_by_cols");
       }
 
+      @Override
+      public get_schemas_by_cols_result getEmptyResultInstance() {
+        return new get_schemas_by_cols_result();
+      }
+
+      @Override
       public get_schemas_by_cols_args getEmptyArgsInstance() {
         return new get_schemas_by_cols_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<FindSchemasByColsResp> 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<FindSchemasByColsResp>() { 
+          @Override
           public void onComplete(FindSchemasByColsResp o) {
             get_schemas_by_cols_result result = new get_schemas_by_cols_result();
             result.success = o;
@@ -46021,6 +52392,7 @@ public void onComplete(FindSchemasByColsResp o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46052,27 +52424,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_schemas_by_cols_args args, org.apache.thrift.async.AsyncMethodCallback<FindSchemasByColsResp> resultHandler) throws org.apache.thrift.TException {
         iface.get_schemas_by_cols(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class map_schema_version_to_serde<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, map_schema_version_to_serde_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class map_schema_version_to_serde<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, map_schema_version_to_serde_args, Void, map_schema_version_to_serde_result> {
       public map_schema_version_to_serde() {
         super("map_schema_version_to_serde");
       }
 
+      @Override
+      public map_schema_version_to_serde_result getEmptyResultInstance() {
+        return new map_schema_version_to_serde_result();
+      }
+
+      @Override
       public map_schema_version_to_serde_args getEmptyArgsInstance() {
         return new map_schema_version_to_serde_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             map_schema_version_to_serde_result result = new map_schema_version_to_serde_result();
             try {
@@ -46085,6 +52467,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46120,27 +52503,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, map_schema_version_to_serde_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.map_schema_version_to_serde(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_schema_version_state<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_schema_version_state_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_schema_version_state<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, set_schema_version_state_args, Void, set_schema_version_state_result> {
       public set_schema_version_state() {
         super("set_schema_version_state");
       }
 
+      @Override
+      public set_schema_version_state_result getEmptyResultInstance() {
+        return new set_schema_version_state_result();
+      }
+
+      @Override
       public set_schema_version_state_args getEmptyArgsInstance() {
         return new set_schema_version_state_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             set_schema_version_state_result result = new set_schema_version_state_result();
             try {
@@ -46153,6 +52546,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46192,27 +52586,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, set_schema_version_state_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.set_schema_version_state(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_serde<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_serde_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_serde<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_serde_args, Void, add_serde_result> {
       public add_serde() {
         super("add_serde");
       }
 
+      @Override
+      public add_serde_result getEmptyResultInstance() {
+        return new add_serde_result();
+      }
+
+      @Override
       public add_serde_args getEmptyArgsInstance() {
         return new add_serde_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_serde_result result = new add_serde_result();
             try {
@@ -46225,6 +52629,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46260,27 +52665,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_serde_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_serde(args.serde,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_serde<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_serde_args, SerDeInfo> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_serde<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_serde_args, SerDeInfo, get_serde_result> {
       public get_serde() {
         super("get_serde");
       }
 
+      @Override
+      public get_serde_result getEmptyResultInstance() {
+        return new get_serde_result();
+      }
+
+      @Override
       public get_serde_args getEmptyArgsInstance() {
         return new get_serde_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<SerDeInfo> 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<SerDeInfo>() { 
+          @Override
           public void onComplete(SerDeInfo o) {
             get_serde_result result = new get_serde_result();
             result.success = o;
@@ -46294,6 +52709,7 @@ public void onComplete(SerDeInfo o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46329,27 +52745,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_serde_args args, org.apache.thrift.async.AsyncMethodCallback<SerDeInfo> resultHandler) throws org.apache.thrift.TException {
         iface.get_serde(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_lock_materialization_rebuild_args, LockResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_lock_materialization_rebuild_args, LockResponse, get_lock_materialization_rebuild_result> {
       public get_lock_materialization_rebuild() {
         super("get_lock_materialization_rebuild");
       }
 
+      @Override
+      public get_lock_materialization_rebuild_result getEmptyResultInstance() {
+        return new get_lock_materialization_rebuild_result();
+      }
+
+      @Override
       public get_lock_materialization_rebuild_args getEmptyArgsInstance() {
         return new get_lock_materialization_rebuild_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<LockResponse> 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<LockResponse>() { 
+          @Override
           public void onComplete(LockResponse o) {
             get_lock_materialization_rebuild_result result = new get_lock_materialization_rebuild_result();
             result.success = o;
@@ -46363,6 +52789,7 @@ public void onComplete(LockResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46390,27 +52817,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_lock_materialization_rebuild_args args, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_lock_materialization_rebuild(args.dbName, args.tableName, args.txnId,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_lock_materialization_rebuild_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_lock_materialization_rebuild_args, java.lang.Boolean, heartbeat_lock_materialization_rebuild_result> {
       public heartbeat_lock_materialization_rebuild() {
         super("heartbeat_lock_materialization_rebuild");
       }
 
+      @Override
+      public heartbeat_lock_materialization_rebuild_result getEmptyResultInstance() {
+        return new heartbeat_lock_materialization_rebuild_result();
+      }
+
+      @Override
       public heartbeat_lock_materialization_rebuild_args getEmptyArgsInstance() {
         return new heartbeat_lock_materialization_rebuild_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             heartbeat_lock_materialization_rebuild_result result = new heartbeat_lock_materialization_rebuild_result();
             result.success = o;
@@ -46425,6 +52862,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46452,27 +52890,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, heartbeat_lock_materialization_rebuild_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.heartbeat_lock_materialization_rebuild(args.dbName, args.tableName, args.txnId,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_lock_materialization_rebuild_req_args, LockResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_lock_materialization_rebuild_req_args, LockResponse, get_lock_materialization_rebuild_req_result> {
       public get_lock_materialization_rebuild_req() {
         super("get_lock_materialization_rebuild_req");
       }
 
+      @Override
+      public get_lock_materialization_rebuild_req_result getEmptyResultInstance() {
+        return new get_lock_materialization_rebuild_req_result();
+      }
+
+      @Override
       public get_lock_materialization_rebuild_req_args getEmptyArgsInstance() {
         return new get_lock_materialization_rebuild_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<LockResponse> 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<LockResponse>() { 
+          @Override
           public void onComplete(LockResponse o) {
             get_lock_materialization_rebuild_req_result result = new get_lock_materialization_rebuild_req_result();
             result.success = o;
@@ -46486,6 +52934,7 @@ public void onComplete(LockResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46513,27 +52962,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_lock_materialization_rebuild_req_args args, org.apache.thrift.async.AsyncMethodCallback<LockResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_lock_materialization_rebuild_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_lock_materialization_rebuild_req_args, java.lang.Boolean> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, heartbeat_lock_materialization_rebuild_req_args, java.lang.Boolean, heartbeat_lock_materialization_rebuild_req_result> {
       public heartbeat_lock_materialization_rebuild_req() {
         super("heartbeat_lock_materialization_rebuild_req");
       }
 
+      @Override
+      public heartbeat_lock_materialization_rebuild_req_result getEmptyResultInstance() {
+        return new heartbeat_lock_materialization_rebuild_req_result();
+      }
+
+      @Override
       public heartbeat_lock_materialization_rebuild_req_args getEmptyArgsInstance() {
         return new heartbeat_lock_materialization_rebuild_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 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<java.lang.Boolean>() { 
+          @Override
           public void onComplete(java.lang.Boolean o) {
             heartbeat_lock_materialization_rebuild_req_result result = new heartbeat_lock_materialization_rebuild_req_result();
             result.success = o;
@@ -46548,6 +53007,7 @@ public void onComplete(java.lang.Boolean o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46575,27 +53035,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, heartbeat_lock_materialization_rebuild_req_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.heartbeat_lock_materialization_rebuild_req(args.req,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_runtime_stats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_runtime_stats_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_runtime_stats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_runtime_stats_args, Void, add_runtime_stats_result> {
       public add_runtime_stats() {
         super("add_runtime_stats");
       }
 
+      @Override
+      public add_runtime_stats_result getEmptyResultInstance() {
+        return new add_runtime_stats_result();
+      }
+
+      @Override
       public add_runtime_stats_args getEmptyArgsInstance() {
         return new add_runtime_stats_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_runtime_stats_result result = new add_runtime_stats_result();
             try {
@@ -46608,6 +53078,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46639,27 +53110,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_runtime_stats_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_runtime_stats(args.stat,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_runtime_stats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_runtime_stats_args, java.util.List<RuntimeStat>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_runtime_stats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_runtime_stats_args, java.util.List<RuntimeStat>, get_runtime_stats_result> {
       public get_runtime_stats() {
         super("get_runtime_stats");
       }
 
+      @Override
+      public get_runtime_stats_result getEmptyResultInstance() {
+        return new get_runtime_stats_result();
+      }
+
+      @Override
       public get_runtime_stats_args getEmptyArgsInstance() {
         return new get_runtime_stats_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<RuntimeStat>> 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<java.util.List<RuntimeStat>>() { 
+          @Override
           public void onComplete(java.util.List<RuntimeStat> o) {
             get_runtime_stats_result result = new get_runtime_stats_result();
             result.success = o;
@@ -46673,6 +53154,7 @@ public void onComplete(java.util.List<RuntimeStat> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46704,27 +53186,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_runtime_stats_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<RuntimeStat>> resultHandler) throws org.apache.thrift.TException {
         iface.get_runtime_stats(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_specs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_with_specs_args, GetPartitionsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_specs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_partitions_with_specs_args, GetPartitionsResponse, get_partitions_with_specs_result> {
       public get_partitions_with_specs() {
         super("get_partitions_with_specs");
       }
 
+      @Override
+      public get_partitions_with_specs_result getEmptyResultInstance() {
+        return new get_partitions_with_specs_result();
+      }
+
+      @Override
       public get_partitions_with_specs_args getEmptyArgsInstance() {
         return new get_partitions_with_specs_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetPartitionsResponse> 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<GetPartitionsResponse>() { 
+          @Override
           public void onComplete(GetPartitionsResponse o) {
             get_partitions_with_specs_result result = new get_partitions_with_specs_result();
             result.success = o;
@@ -46738,6 +53230,7 @@ public void onComplete(GetPartitionsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46769,27 +53262,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_partitions_with_specs_args args, org.apache.thrift.async.AsyncMethodCallback<GetPartitionsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_partitions_with_specs(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_poll<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, scheduled_query_poll_args, ScheduledQueryPollResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_poll<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, scheduled_query_poll_args, ScheduledQueryPollResponse, scheduled_query_poll_result> {
       public scheduled_query_poll() {
         super("scheduled_query_poll");
       }
 
+      @Override
+      public scheduled_query_poll_result getEmptyResultInstance() {
+        return new scheduled_query_poll_result();
+      }
+
+      @Override
       public scheduled_query_poll_args getEmptyArgsInstance() {
         return new scheduled_query_poll_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ScheduledQueryPollResponse> 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<ScheduledQueryPollResponse>() { 
+          @Override
           public void onComplete(ScheduledQueryPollResponse o) {
             scheduled_query_poll_result result = new scheduled_query_poll_result();
             result.success = o;
@@ -46803,6 +53306,7 @@ public void onComplete(ScheduledQueryPollResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46834,27 +53338,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, scheduled_query_poll_args args, org.apache.thrift.async.AsyncMethodCallback<ScheduledQueryPollResponse> resultHandler) throws org.apache.thrift.TException {
         iface.scheduled_query_poll(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_maintenance<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, scheduled_query_maintenance_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_maintenance<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, scheduled_query_maintenance_args, Void, scheduled_query_maintenance_result> {
       public scheduled_query_maintenance() {
         super("scheduled_query_maintenance");
       }
 
+      @Override
+      public scheduled_query_maintenance_result getEmptyResultInstance() {
+        return new scheduled_query_maintenance_result();
+      }
+
+      @Override
       public scheduled_query_maintenance_args getEmptyArgsInstance() {
         return new scheduled_query_maintenance_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             scheduled_query_maintenance_result result = new scheduled_query_maintenance_result();
             try {
@@ -46867,6 +53381,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46910,27 +53425,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, scheduled_query_maintenance_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.scheduled_query_maintenance(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_progress<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, scheduled_query_progress_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_progress<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, scheduled_query_progress_args, Void, scheduled_query_progress_result> {
       public scheduled_query_progress() {
         super("scheduled_query_progress");
       }
 
+      @Override
+      public scheduled_query_progress_result getEmptyResultInstance() {
+        return new scheduled_query_progress_result();
+      }
+
+      @Override
       public scheduled_query_progress_args getEmptyArgsInstance() {
         return new scheduled_query_progress_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             scheduled_query_progress_result result = new scheduled_query_progress_result();
             try {
@@ -46943,6 +53468,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -46978,27 +53504,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, scheduled_query_progress_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.scheduled_query_progress(args.info,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_scheduled_query<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_scheduled_query_args, ScheduledQuery> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_scheduled_query<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_scheduled_query_args, ScheduledQuery, get_scheduled_query_result> {
       public get_scheduled_query() {
         super("get_scheduled_query");
       }
 
+      @Override
+      public get_scheduled_query_result getEmptyResultInstance() {
+        return new get_scheduled_query_result();
+      }
+
+      @Override
       public get_scheduled_query_args getEmptyArgsInstance() {
         return new get_scheduled_query_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ScheduledQuery> 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<ScheduledQuery>() { 
+          @Override
           public void onComplete(ScheduledQuery o) {
             get_scheduled_query_result result = new get_scheduled_query_result();
             result.success = o;
@@ -47012,6 +53548,7 @@ public void onComplete(ScheduledQuery o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47047,27 +53584,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_scheduled_query_args args, org.apache.thrift.async.AsyncMethodCallback<ScheduledQuery> resultHandler) throws org.apache.thrift.TException {
         iface.get_scheduled_query(args.scheduleKey,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_replication_metrics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_replication_metrics_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_replication_metrics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_replication_metrics_args, Void, add_replication_metrics_result> {
       public add_replication_metrics() {
         super("add_replication_metrics");
       }
 
+      @Override
+      public add_replication_metrics_result getEmptyResultInstance() {
+        return new add_replication_metrics_result();
+      }
+
+      @Override
       public add_replication_metrics_args getEmptyArgsInstance() {
         return new add_replication_metrics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_replication_metrics_result result = new add_replication_metrics_result();
             try {
@@ -47080,6 +53627,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47111,27 +53659,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_replication_metrics_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_replication_metrics(args.replicationMetricList,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replication_metrics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_replication_metrics_args, ReplicationMetricList> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replication_metrics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_replication_metrics_args, ReplicationMetricList, get_replication_metrics_result> {
       public get_replication_metrics() {
         super("get_replication_metrics");
       }
 
+      @Override
+      public get_replication_metrics_result getEmptyResultInstance() {
+        return new get_replication_metrics_result();
+      }
+
+      @Override
       public get_replication_metrics_args getEmptyArgsInstance() {
         return new get_replication_metrics_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ReplicationMetricList> 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<ReplicationMetricList>() { 
+          @Override
           public void onComplete(ReplicationMetricList o) {
             get_replication_metrics_result result = new get_replication_metrics_result();
             result.success = o;
@@ -47145,6 +53703,7 @@ public void onComplete(ReplicationMetricList o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47176,27 +53735,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_replication_metrics_args args, org.apache.thrift.async.AsyncMethodCallback<ReplicationMetricList> resultHandler) throws org.apache.thrift.TException {
         iface.get_replication_metrics(args.rqst,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_open_txns_req_args, GetOpenTxnsResponse> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_req<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_open_txns_req_args, GetOpenTxnsResponse, get_open_txns_req_result> {
       public get_open_txns_req() {
         super("get_open_txns_req");
       }
 
+      @Override
+      public get_open_txns_req_result getEmptyResultInstance() {
+        return new get_open_txns_req_result();
+      }
+
+      @Override
       public get_open_txns_req_args getEmptyArgsInstance() {
         return new get_open_txns_req_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsResponse> 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<GetOpenTxnsResponse>() { 
+          @Override
           public void onComplete(GetOpenTxnsResponse o) {
             get_open_txns_req_result result = new get_open_txns_req_result();
             result.success = o;
@@ -47210,6 +53779,7 @@ public void onComplete(GetOpenTxnsResponse o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47237,27 +53807,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_open_txns_req_args args, org.apache.thrift.async.AsyncMethodCallback<GetOpenTxnsResponse> resultHandler) throws org.apache.thrift.TException {
         iface.get_open_txns_req(args.getOpenTxnsRequest,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_stored_procedure_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, create_stored_procedure_args, Void, create_stored_procedure_result> {
       public create_stored_procedure() {
         super("create_stored_procedure");
       }
 
+      @Override
+      public create_stored_procedure_result getEmptyResultInstance() {
+        return new create_stored_procedure_result();
+      }
+
+      @Override
       public create_stored_procedure_args getEmptyArgsInstance() {
         return new create_stored_procedure_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             create_stored_procedure_result result = new create_stored_procedure_result();
             try {
@@ -47270,6 +53850,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47305,27 +53886,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, create_stored_procedure_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.create_stored_procedure(args.proc,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_stored_procedure_args, StoredProcedure> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_stored_procedure_args, StoredProcedure, get_stored_procedure_result> {
       public get_stored_procedure() {
         super("get_stored_procedure");
       }
 
+      @Override
+      public get_stored_procedure_result getEmptyResultInstance() {
+        return new get_stored_procedure_result();
+      }
+
+      @Override
       public get_stored_procedure_args getEmptyArgsInstance() {
         return new get_stored_procedure_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<StoredProcedure> 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<StoredProcedure>() { 
+          @Override
           public void onComplete(StoredProcedure o) {
             get_stored_procedure_result result = new get_stored_procedure_result();
             result.success = o;
@@ -47339,6 +53930,7 @@ public void onComplete(StoredProcedure o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47374,27 +53966,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_stored_procedure_args args, org.apache.thrift.async.AsyncMethodCallback<StoredProcedure> resultHandler) throws org.apache.thrift.TException {
         iface.get_stored_procedure(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_stored_procedure_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_stored_procedure_args, Void, drop_stored_procedure_result> {
       public drop_stored_procedure() {
         super("drop_stored_procedure");
       }
 
+      @Override
+      public drop_stored_procedure_result getEmptyResultInstance() {
+        return new drop_stored_procedure_result();
+      }
+
+      @Override
       public drop_stored_procedure_args getEmptyArgsInstance() {
         return new drop_stored_procedure_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_stored_procedure_result result = new drop_stored_procedure_result();
             try {
@@ -47407,6 +54009,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47438,27 +54041,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_stored_procedure_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_stored_procedure(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_stored_procedures_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_stored_procedures_args, java.util.List<java.lang.String>, get_all_stored_procedures_result> {
       public get_all_stored_procedures() {
         super("get_all_stored_procedures");
       }
 
+      @Override
+      public get_all_stored_procedures_result getEmptyResultInstance() {
+        return new get_all_stored_procedures_result();
+      }
+
+      @Override
       public get_all_stored_procedures_args getEmptyArgsInstance() {
         return new get_all_stored_procedures_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_all_stored_procedures_result result = new get_all_stored_procedures_result();
             result.success = o;
@@ -47472,6 +54085,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47503,27 +54117,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_stored_procedures_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_stored_procedures(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_package_args, Package> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, find_package_args, Package, find_package_result> {
       public find_package() {
         super("find_package");
       }
 
+      @Override
+      public find_package_result getEmptyResultInstance() {
+        return new find_package_result();
+      }
+
+      @Override
       public find_package_args getEmptyArgsInstance() {
         return new find_package_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Package> 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<Package>() { 
+          @Override
           public void onComplete(Package o) {
             find_package_result result = new find_package_result();
             result.success = o;
@@ -47537,6 +54161,7 @@ public void onComplete(Package o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47572,27 +54197,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, find_package_args args, org.apache.thrift.async.AsyncMethodCallback<Package> resultHandler) throws org.apache.thrift.TException {
         iface.find_package(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_package_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, add_package_args, Void, add_package_result> {
       public add_package() {
         super("add_package");
       }
 
+      @Override
+      public add_package_result getEmptyResultInstance() {
+        return new add_package_result();
+      }
+
+      @Override
       public add_package_args getEmptyArgsInstance() {
         return new add_package_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             add_package_result result = new add_package_result();
             try {
@@ -47605,6 +54240,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47636,27 +54272,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, add_package_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.add_package(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_packages_args, java.util.List<java.lang.String>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_packages_args, java.util.List<java.lang.String>, get_all_packages_result> {
       public get_all_packages() {
         super("get_all_packages");
       }
 
+      @Override
+      public get_all_packages_result getEmptyResultInstance() {
+        return new get_all_packages_result();
+      }
+
+      @Override
       public get_all_packages_args getEmptyArgsInstance() {
         return new get_all_packages_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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<java.util.List<java.lang.String>>() { 
+          @Override
           public void onComplete(java.util.List<java.lang.String> o) {
             get_all_packages_result result = new get_all_packages_result();
             result.success = o;
@@ -47670,6 +54316,7 @@ public void onComplete(java.util.List<java.lang.String> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47701,27 +54348,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_packages_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_packages(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_package_args, Void> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, drop_package_args, Void, drop_package_result> {
       public drop_package() {
         super("drop_package");
       }
 
+      @Override
+      public drop_package_result getEmptyResultInstance() {
+        return new drop_package_result();
+      }
+
+      @Override
       public drop_package_args getEmptyArgsInstance() {
         return new drop_package_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<Void> 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<Void>() { 
+          @Override
           public void onComplete(Void o) {
             drop_package_result result = new drop_package_result();
             try {
@@ -47734,6 +54391,7 @@ public void onComplete(Void o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47765,27 +54423,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, drop_package_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.drop_package(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_write_event_info_args, java.util.List<WriteEventInfo>> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_all_write_event_info_args, java.util.List<WriteEventInfo>, get_all_write_event_info_result> {
       public get_all_write_event_info() {
         super("get_all_write_event_info");
       }
 
+      @Override
+      public get_all_write_event_info_result getEmptyResultInstance() {
+        return new get_all_write_event_info_result();
+      }
+
+      @Override
       public get_all_write_event_info_args getEmptyArgsInstance() {
         return new get_all_write_event_info_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<java.util.List<WriteEventInfo>> 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<java.util.List<WriteEventInfo>>() { 
+          @Override
           public void onComplete(java.util.List<WriteEventInfo> o) {
             get_all_write_event_info_result result = new get_all_write_event_info_result();
             result.success = o;
@@ -47799,6 +54467,7 @@ public void onComplete(java.util.List<WriteEventInfo> o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47830,27 +54499,37 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_all_write_event_info_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<WriteEventInfo>> resultHandler) throws org.apache.thrift.TException {
         iface.get_all_write_event_info(args.request,resultHandler);
       }
     }
 
-    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_replayed_txns_for_policy_args, ReplayedTxnsForPolicyResult> {
+    @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_replayed_txns_for_policy_args, ReplayedTxnsForPolicyResult, get_replayed_txns_for_policy_result> {
       public get_replayed_txns_for_policy() {
         super("get_replayed_txns_for_policy");
       }
 
+      @Override
+      public get_replayed_txns_for_policy_result getEmptyResultInstance() {
+        return new get_replayed_txns_for_policy_result();
+      }
+
+      @Override
       public get_replayed_txns_for_policy_args getEmptyArgsInstance() {
         return new get_replayed_txns_for_policy_args();
       }
 
+      @Override
       public org.apache.thrift.async.AsyncMethodCallback<ReplayedTxnsForPolicyResult> 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<ReplayedTxnsForPolicyResult>() { 
+          @Override
           public void onComplete(ReplayedTxnsForPolicyResult o) {
             get_replayed_txns_for_policy_result result = new get_replayed_txns_for_policy_result();
             result.success = o;
@@ -47864,6 +54543,7 @@ public void onComplete(ReplayedTxnsForPolicyResult o) {
               onError(e);
             }
           }
+          @Override
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
@@ -47895,10 +54575,12 @@ public void onError(java.lang.Exception e) {
         };
       }
 
-      protected boolean isOneway() {
+      @Override
+      public boolean isOneway() {
         return false;
       }
 
+      @Override
       public void start(I iface, get_replayed_txns_for_policy_args args, org.apache.thrift.async.AsyncMethodCallback<ReplayedTxnsForPolicyResult> resultHandler) throws org.apache.thrift.TException {
         iface.get_replayed_txns_for_policy(args.policyName,resultHandler);
       }
@@ -47906,6 +54588,7 @@ public void start(I iface, get_replayed_txns_for_policy_args args, org.apache.th
 
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase<abort_Compactions_args, abort_Compactions_args._Fields>, java.io.Serializable, Cloneable, Comparable<abort_Compactions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_args");
 
@@ -47967,10 +54650,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -48005,6 +54690,7 @@ public abort_Compactions_args(abort_Compactions_args other) {
       }
     }
 
+    @Override
     public abort_Compactions_args deepCopy() {
       return new abort_Compactions_args(this);
     }
@@ -48038,6 +54724,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -48052,6 +54739,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -48062,6 +54750,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -48132,14 +54821,17 @@ public int compareTo(abort_Compactions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -48185,6 +54877,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class abort_Compactions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_Compactions_argsStandardScheme getScheme() {
         return new abort_Compactions_argsStandardScheme();
       }
@@ -48192,34 +54885,41 @@ public abort_Compactions_argsStandardScheme getScheme() {
 
     private static class abort_Compactions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<abort_Compactions_args> {
 
+      @Override
       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;
-          }
-          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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -48236,6 +54936,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_
     }
 
     private static class abort_Compactions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_Compactions_argsTupleScheme getScheme() {
         return new abort_Compactions_argsTupleScheme();
       }
@@ -48258,12 +54959,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_a
 
       @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);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -48273,6 +54979,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_result implements org.apache.thrift.TBase<abort_Compactions_result, abort_Compactions_result._Fields>, java.io.Serializable, Cloneable, Comparable<abort_Compactions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_result");
 
@@ -48334,10 +55041,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -48372,6 +55081,7 @@ public abort_Compactions_result(abort_Compactions_result other) {
       }
     }
 
+    @Override
     public abort_Compactions_result deepCopy() {
       return new abort_Compactions_result(this);
     }
@@ -48405,6 +55115,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -48419,6 +55130,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -48429,6 +55141,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -48499,10 +55212,12 @@ public int compareTo(abort_Compactions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -48552,6 +55267,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class abort_Compactions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_Compactions_resultStandardScheme getScheme() {
         return new abort_Compactions_resultStandardScheme();
       }
@@ -48559,34 +55275,41 @@ public abort_Compactions_resultStandardScheme getScheme() {
 
     private static class abort_Compactions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<abort_Compactions_result> {
 
+      @Override
       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)
-        {
-          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 AbortCompactResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AbortCompactResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -48603,6 +55326,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_
     }
 
     private static class abort_Compactions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_Compactions_resultTupleScheme getScheme() {
         return new abort_Compactions_resultTupleScheme();
       }
@@ -48625,12 +55349,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_r
 
       @Override
       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.success = new AbortCompactResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -48640,6 +55369,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_args implements org.apache.thrift.TBase<getMetaConf_args, getMetaConf_args._Fields>, java.io.Serializable, Cloneable, Comparable<getMetaConf_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_args");
 
@@ -48701,10 +55431,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -48739,6 +55471,7 @@ public getMetaConf_args(getMetaConf_args other) {
       }
     }
 
+    @Override
     public getMetaConf_args deepCopy() {
       return new getMetaConf_args(this);
     }
@@ -48772,6 +55505,7 @@ public void setKeyIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case KEY:
@@ -48786,6 +55520,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case KEY:
@@ -48796,6 +55531,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -48866,14 +55602,17 @@ public int compareTo(getMetaConf_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -48916,6 +55655,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class getMetaConf_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public getMetaConf_argsStandardScheme getScheme() {
         return new getMetaConf_argsStandardScheme();
       }
@@ -48923,33 +55663,40 @@ public getMetaConf_argsStandardScheme getScheme() {
 
     private static class getMetaConf_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getMetaConf_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // KEY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.key = iprot.readString();
-                struct.setKeyIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -48966,6 +55713,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_args s
     }
 
     private static class getMetaConf_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public getMetaConf_argsTupleScheme getScheme() {
         return new getMetaConf_argsTupleScheme();
       }
@@ -48988,11 +55736,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args st
 
       @Override
       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(1);
-        if (incoming.get(0)) {
-          struct.key = iprot.readString();
-          struct.setKeyIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -49002,6 +55755,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_result implements org.apache.thrift.TBase<getMetaConf_result, getMetaConf_result._Fields>, java.io.Serializable, Cloneable, Comparable<getMetaConf_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_result");
 
@@ -49068,10 +55822,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -49113,6 +55869,7 @@ public getMetaConf_result(getMetaConf_result other) {
       }
     }
 
+    @Override
     public getMetaConf_result deepCopy() {
       return new getMetaConf_result(this);
     }
@@ -49171,6 +55928,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -49193,6 +55951,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -49206,6 +55965,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -49301,10 +56061,12 @@ public int compareTo(getMetaConf_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -49359,6 +56121,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class getMetaConf_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public getMetaConf_resultStandardScheme getScheme() {
         return new getMetaConf_resultStandardScheme();
       }
@@ -49366,42 +56129,49 @@ public getMetaConf_resultStandardScheme getScheme() {
 
     private static class getMetaConf_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getMetaConf_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, getMetaConf_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.STRING) {
-                struct.success = iprot.readString();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -49423,6 +56193,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_result
     }
 
     private static class getMetaConf_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public getMetaConf_resultTupleScheme getScheme() {
         return new getMetaConf_resultTupleScheme();
       }
@@ -49451,16 +56222,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getMetaConf_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getMetaConf_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.success = iprot.readString();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -49470,6 +56246,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class setMetaConf_args implements org.apache.thrift.TBase<setMetaConf_args, setMetaConf_args._Fields>, java.io.Serializable, Cloneable, Comparable<setMetaConf_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setMetaConf_args");
 
@@ -49536,10 +56313,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -49581,6 +56360,7 @@ public setMetaConf_args(setMetaConf_args other) {
       }
     }
 
+    @Override
     public setMetaConf_args deepCopy() {
       return new setMetaConf_args(this);
     }
@@ -49639,6 +56419,7 @@ public void setValueIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case KEY:
@@ -49661,6 +56442,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case KEY:
@@ -49674,6 +56456,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -49769,14 +56552,17 @@ public int compareTo(setMetaConf_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -49827,6 +56613,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class setMetaConf_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public setMetaConf_argsStandardScheme getScheme() {
         return new setMetaConf_argsStandardScheme();
       }
@@ -49834,41 +56621,48 @@ public setMetaConf_argsStandardScheme getScheme() {
 
     private static class setMetaConf_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setMetaConf_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, setMetaConf_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;
-          }
-          switch (schemeField.id) {
-            case 1: // KEY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.key = iprot.readString();
-                struct.setKeyIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // VALUE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.value = iprot.readString();
-                struct.setValueIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // VALUE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.value = iprot.readString();
+                  struct.setValueIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, setMetaConf_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -49890,6 +56684,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setMetaConf_args s
     }
 
     private static class setMetaConf_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public setMetaConf_argsTupleScheme getScheme() {
         return new setMetaConf_argsTupleScheme();
       }
@@ -49918,15 +56713,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setMetaConf_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setMetaConf_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);
-        if (incoming.get(0)) {
-          struct.key = iprot.readString();
-          struct.setKeyIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.value = iprot.readString();
-          struct.setValueIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.key = iprot.readString();
+            struct.setKeyIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.value = iprot.readString();
+            struct.setValueIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -49936,6 +56736,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class setMetaConf_result implements org.apache.thrift.TBase<setMetaConf_result, setMetaConf_result._Fields>, java.io.Serializable, Cloneable, Comparable<setMetaConf_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setMetaConf_result");
 
@@ -49997,10 +56798,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -50035,6 +56838,7 @@ public setMetaConf_result(setMetaConf_result other) {
       }
     }
 
+    @Override
     public setMetaConf_result deepCopy() {
       return new setMetaConf_result(this);
     }
@@ -50068,6 +56872,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -50082,6 +56887,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -50092,6 +56898,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -50162,10 +56969,12 @@ public int compareTo(setMetaConf_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -50212,6 +57021,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class setMetaConf_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public setMetaConf_resultStandardScheme getScheme() {
         return new setMetaConf_resultStandardScheme();
       }
@@ -50219,34 +57029,41 @@ public setMetaConf_resultStandardScheme getScheme() {
 
     private static class setMetaConf_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setMetaConf_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, setMetaConf_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, setMetaConf_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -50263,6 +57080,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setMetaConf_result
     }
 
     private static class setMetaConf_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public setMetaConf_resultTupleScheme getScheme() {
         return new setMetaConf_resultTupleScheme();
       }
@@ -50285,12 +57103,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setMetaConf_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setMetaConf_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -50300,6 +57123,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_catalog_args implements org.apache.thrift.TBase<create_catalog_args, create_catalog_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_catalog_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_catalog_args");
 
@@ -50361,10 +57185,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -50399,6 +57225,7 @@ public create_catalog_args(create_catalog_args other) {
       }
     }
 
+    @Override
     public create_catalog_args deepCopy() {
       return new create_catalog_args(this);
     }
@@ -50432,6 +57259,7 @@ public void setCatalogIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CATALOG:
@@ -50446,6 +57274,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CATALOG:
@@ -50456,6 +57285,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -50526,14 +57356,17 @@ public int compareTo(create_catalog_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -50579,6 +57412,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_catalog_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_catalog_argsStandardScheme getScheme() {
         return new create_catalog_argsStandardScheme();
       }
@@ -50586,34 +57420,41 @@ public create_catalog_argsStandardScheme getScheme() {
 
     private static class create_catalog_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_catalog_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_catalog_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CATALOG
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.catalog = new CreateCatalogRequest();
-                struct.catalog.read(iprot);
-                struct.setCatalogIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CATALOG
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.catalog = new CreateCatalogRequest();
+                  struct.catalog.read(iprot);
+                  struct.setCatalogIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_catalog_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -50630,6 +57471,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_catalog_arg
     }
 
     private static class create_catalog_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_catalog_argsTupleScheme getScheme() {
         return new create_catalog_argsTupleScheme();
       }
@@ -50652,12 +57494,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_catalog_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_catalog_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.catalog = new CreateCatalogRequest();
-          struct.catalog.read(iprot);
-          struct.setCatalogIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.catalog = new CreateCatalogRequest();
+            struct.catalog.read(iprot);
+            struct.setCatalogIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -50667,6 +57514,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_catalog_result implements org.apache.thrift.TBase<create_catalog_result, create_catalog_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_catalog_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_catalog_result");
 
@@ -50738,10 +57586,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -50790,6 +57640,7 @@ public create_catalog_result(create_catalog_result other) {
       }
     }
 
+    @Override
     public create_catalog_result deepCopy() {
       return new create_catalog_result(this);
     }
@@ -50873,6 +57724,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -50903,6 +57755,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -50919,6 +57772,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -51039,10 +57893,12 @@ public int compareTo(create_catalog_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -51105,6 +57961,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_catalog_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_catalog_resultStandardScheme getScheme() {
         return new create_catalog_resultStandardScheme();
       }
@@ -51112,52 +57969,59 @@ public create_catalog_resultStandardScheme getScheme() {
 
     private static class create_catalog_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_catalog_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_catalog_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_catalog_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -51184,6 +58048,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_catalog_res
     }
 
     private static class create_catalog_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_catalog_resultTupleScheme getScheme() {
         return new create_catalog_resultTupleScheme();
       }
@@ -51218,22 +58083,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_catalog_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_catalog_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -51243,6 +58113,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_catalog_args implements org.apache.thrift.TBase<alter_catalog_args, alter_catalog_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_catalog_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_catalog_args");
 
@@ -51304,10 +58175,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -51342,6 +58215,7 @@ public alter_catalog_args(alter_catalog_args other) {
       }
     }
 
+    @Override
     public alter_catalog_args deepCopy() {
       return new alter_catalog_args(this);
     }
@@ -51375,6 +58249,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -51389,6 +58264,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -51399,6 +58275,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -51469,14 +58346,17 @@ public int compareTo(alter_catalog_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -51522,6 +58402,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_catalog_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_catalog_argsStandardScheme getScheme() {
         return new alter_catalog_argsStandardScheme();
       }
@@ -51529,34 +58410,41 @@ public alter_catalog_argsStandardScheme getScheme() {
 
     private static class alter_catalog_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_catalog_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_catalog_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new AlterCatalogRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new AlterCatalogRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_catalog_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -51573,6 +58461,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_catalog_args
     }
 
     private static class alter_catalog_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_catalog_argsTupleScheme getScheme() {
         return new alter_catalog_argsTupleScheme();
       }
@@ -51595,12 +58484,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_catalog_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_catalog_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 AlterCatalogRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AlterCatalogRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -51610,6 +58504,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_catalog_result implements org.apache.thrift.TBase<alter_catalog_result, alter_catalog_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_catalog_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_catalog_result");
 
@@ -51681,10 +58576,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -51733,6 +58630,7 @@ public alter_catalog_result(alter_catalog_result other) {
       }
     }
 
+    @Override
     public alter_catalog_result deepCopy() {
       return new alter_catalog_result(this);
     }
@@ -51816,6 +58714,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -51846,6 +58745,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -51862,6 +58762,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -51982,10 +58883,12 @@ public int compareTo(alter_catalog_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -52048,6 +58951,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_catalog_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_catalog_resultStandardScheme getScheme() {
         return new alter_catalog_resultStandardScheme();
       }
@@ -52055,52 +58959,59 @@ public alter_catalog_resultStandardScheme getScheme() {
 
     private static class alter_catalog_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_catalog_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_catalog_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o2 = new InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_catalog_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -52127,6 +59038,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_catalog_resu
     }
 
     private static class alter_catalog_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_catalog_resultTupleScheme getScheme() {
         return new alter_catalog_resultTupleScheme();
       }
@@ -52161,22 +59073,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_catalog_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_catalog_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -52186,6 +59103,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalog_args implements org.apache.thrift.TBase<get_catalog_args, get_catalog_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_catalog_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_catalog_args");
 
@@ -52247,10 +59165,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -52285,6 +59205,7 @@ public get_catalog_args(get_catalog_args other) {
       }
     }
 
+    @Override
     public get_catalog_args deepCopy() {
       return new get_catalog_args(this);
     }
@@ -52318,6 +59239,7 @@ public void setCatNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CAT_NAME:
@@ -52332,6 +59254,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CAT_NAME:
@@ -52342,6 +59265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -52412,14 +59336,17 @@ public int compareTo(get_catalog_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -52465,6 +59392,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_catalog_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalog_argsStandardScheme getScheme() {
         return new get_catalog_argsStandardScheme();
       }
@@ -52472,34 +59400,41 @@ public get_catalog_argsStandardScheme getScheme() {
 
     private static class get_catalog_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_catalog_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_catalog_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CAT_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.catName = new GetCatalogRequest();
-                struct.catName.read(iprot);
-                struct.setCatNameIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CAT_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.catName = new GetCatalogRequest();
+                  struct.catName.read(iprot);
+                  struct.setCatNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalog_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -52516,6 +59451,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalog_args s
     }
 
     private static class get_catalog_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalog_argsTupleScheme getScheme() {
         return new get_catalog_argsTupleScheme();
       }
@@ -52538,12 +59474,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_catalog_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_catalog_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.catName = new GetCatalogRequest();
-          struct.catName.read(iprot);
-          struct.setCatNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.catName = new GetCatalogRequest();
+            struct.catName.read(iprot);
+            struct.setCatNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -52553,6 +59494,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalog_result implements org.apache.thrift.TBase<get_catalog_result, get_catalog_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_catalog_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_catalog_result");
 
@@ -52624,10 +59566,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -52676,6 +59620,7 @@ public get_catalog_result(get_catalog_result other) {
       }
     }
 
+    @Override
     public get_catalog_result deepCopy() {
       return new get_catalog_result(this);
     }
@@ -52759,6 +59704,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -52789,6 +59735,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -52805,6 +59752,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -52925,10 +59873,12 @@ public int compareTo(get_catalog_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -52994,6 +59944,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_catalog_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalog_resultStandardScheme getScheme() {
         return new get_catalog_resultStandardScheme();
       }
@@ -53001,52 +59952,59 @@ public get_catalog_resultStandardScheme getScheme() {
 
     private static class get_catalog_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_catalog_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_catalog_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 GetCatalogResponse();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetCatalogResponse();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalog_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -53073,6 +60031,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalog_result
     }
 
     private static class get_catalog_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalog_resultTupleScheme getScheme() {
         return new get_catalog_resultTupleScheme();
       }
@@ -53107,22 +60066,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_catalog_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_catalog_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 GetCatalogResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetCatalogResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -53132,6 +60096,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalogs_args implements org.apache.thrift.TBase<get_catalogs_args, get_catalogs_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_catalogs_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_catalogs_args");
 
@@ -53189,10 +60154,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -53213,6 +60180,7 @@ public get_catalogs_args() {
     public get_catalogs_args(get_catalogs_args other) {
     }
 
+    @Override
     public get_catalogs_args deepCopy() {
       return new get_catalogs_args(this);
     }
@@ -53221,12 +60189,14 @@ public get_catalogs_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -53234,6 +60204,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -53279,14 +60250,17 @@ public int compareTo(get_catalogs_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -53322,6 +60296,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_catalogs_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalogs_argsStandardScheme getScheme() {
         return new get_catalogs_argsStandardScheme();
       }
@@ -53329,25 +60304,32 @@ public get_catalogs_argsStandardScheme getScheme() {
 
     private static class get_catalogs_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_catalogs_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_catalogs_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalogs_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -53359,6 +60341,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalogs_args
     }
 
     private static class get_catalogs_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalogs_argsTupleScheme getScheme() {
         return new get_catalogs_argsTupleScheme();
       }
@@ -53373,7 +60356,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_catalogs_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_catalogs_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -53382,6 +60370,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_catalogs_result implements org.apache.thrift.TBase<get_catalogs_result, get_catalogs_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_catalogs_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_catalogs_result");
 
@@ -53448,10 +60437,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -53493,6 +60484,7 @@ public get_catalogs_result(get_catalogs_result other) {
       }
     }
 
+    @Override
     public get_catalogs_result deepCopy() {
       return new get_catalogs_result(this);
     }
@@ -53551,6 +60543,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -53573,6 +60566,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -53586,6 +60580,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -53681,10 +60676,12 @@ public int compareTo(get_catalogs_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -53742,6 +60739,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_catalogs_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalogs_resultStandardScheme getScheme() {
         return new get_catalogs_resultStandardScheme();
       }
@@ -53749,43 +60747,50 @@ public get_catalogs_resultStandardScheme getScheme() {
 
     private static class get_catalogs_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_catalogs_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_catalogs_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 GetCatalogsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetCatalogsResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalogs_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -53807,6 +60812,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_catalogs_resul
     }
 
     private static class get_catalogs_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_catalogs_resultTupleScheme getScheme() {
         return new get_catalogs_resultTupleScheme();
       }
@@ -53835,17 +60841,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_catalogs_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_catalogs_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.success = new GetCatalogsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetCatalogsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -53855,6 +60866,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_catalog_args implements org.apache.thrift.TBase<drop_catalog_args, drop_catalog_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_catalog_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_catalog_args");
 
@@ -53916,10 +60928,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -53954,6 +60968,7 @@ public drop_catalog_args(drop_catalog_args other) {
       }
     }
 
+    @Override
     public drop_catalog_args deepCopy() {
       return new drop_catalog_args(this);
     }
@@ -53987,6 +61002,7 @@ public void setCatNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CAT_NAME:
@@ -54001,6 +61017,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CAT_NAME:
@@ -54011,6 +61028,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -54081,14 +61099,17 @@ public int compareTo(drop_catalog_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -54134,6 +61155,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_catalog_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_catalog_argsStandardScheme getScheme() {
         return new drop_catalog_argsStandardScheme();
       }
@@ -54141,34 +61163,41 @@ public drop_catalog_argsStandardScheme getScheme() {
 
     private static class drop_catalog_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_catalog_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_catalog_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CAT_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.catName = new DropCatalogRequest();
-                struct.catName.read(iprot);
-                struct.setCatNameIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CAT_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.catName = new DropCatalogRequest();
+                  struct.catName.read(iprot);
+                  struct.setCatNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_catalog_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -54185,6 +61214,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_catalog_args
     }
 
     private static class drop_catalog_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_catalog_argsTupleScheme getScheme() {
         return new drop_catalog_argsTupleScheme();
       }
@@ -54207,12 +61237,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_catalog_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_catalog_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.catName = new DropCatalogRequest();
-          struct.catName.read(iprot);
-          struct.setCatNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.catName = new DropCatalogRequest();
+            struct.catName.read(iprot);
+            struct.setCatNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -54222,6 +61257,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_catalog_result implements org.apache.thrift.TBase<drop_catalog_result, drop_catalog_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_catalog_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_catalog_result");
 
@@ -54293,10 +61329,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -54345,6 +61383,7 @@ public drop_catalog_result(drop_catalog_result other) {
       }
     }
 
+    @Override
     public drop_catalog_result deepCopy() {
       return new drop_catalog_result(this);
     }
@@ -54428,6 +61467,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -54458,6 +61498,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -54474,6 +61515,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -54594,10 +61636,12 @@ public int compareTo(drop_catalog_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -54660,6 +61704,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_catalog_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_catalog_resultStandardScheme getScheme() {
         return new drop_catalog_resultStandardScheme();
       }
@@ -54667,52 +61712,59 @@ public drop_catalog_resultStandardScheme getScheme() {
 
     private static class drop_catalog_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_catalog_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_catalog_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o2 = new InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_catalog_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -54739,6 +61791,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_catalog_resul
     }
 
     private static class drop_catalog_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_catalog_resultTupleScheme getScheme() {
         return new drop_catalog_resultTupleScheme();
       }
@@ -54773,22 +61826,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_catalog_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_catalog_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -54798,6 +61856,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_args implements org.apache.thrift.TBase<create_database_args, create_database_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_database_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_database_args");
 
@@ -54859,10 +61918,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -54897,6 +61958,7 @@ public create_database_args(create_database_args other) {
       }
     }
 
+    @Override
     public create_database_args deepCopy() {
       return new create_database_args(this);
     }
@@ -54930,6 +61992,7 @@ public void setDatabaseIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DATABASE:
@@ -54944,6 +62007,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DATABASE:
@@ -54954,6 +62018,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -55024,14 +62089,17 @@ public int compareTo(create_database_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -55077,6 +62145,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_database_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_argsStandardScheme getScheme() {
         return new create_database_argsStandardScheme();
       }
@@ -55084,34 +62153,41 @@ public create_database_argsStandardScheme getScheme() {
 
     private static class create_database_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_database_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_database_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DATABASE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.database = new Database();
-                struct.database.read(iprot);
-                struct.setDatabaseIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // DATABASE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.database = new Database();
+                  struct.database.read(iprot);
+                  struct.setDatabaseIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -55128,6 +62204,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_ar
     }
 
     private static class create_database_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_argsTupleScheme getScheme() {
         return new create_database_argsTupleScheme();
       }
@@ -55150,12 +62227,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_database_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_database_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.database = new Database();
-          struct.database.read(iprot);
-          struct.setDatabaseIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.database = new Database();
+            struct.database.read(iprot);
+            struct.setDatabaseIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -55165,6 +62247,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_result implements org.apache.thrift.TBase<create_database_result, create_database_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_database_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_database_result");
 
@@ -55236,10 +62319,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -55288,6 +62373,7 @@ public create_database_result(create_database_result other) {
       }
     }
 
+    @Override
     public create_database_result deepCopy() {
       return new create_database_result(this);
     }
@@ -55371,6 +62457,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -55401,6 +62488,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -55417,6 +62505,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -55537,10 +62626,12 @@ public int compareTo(create_database_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -55603,6 +62694,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_database_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_resultStandardScheme getScheme() {
         return new create_database_resultStandardScheme();
       }
@@ -55610,52 +62702,59 @@ public create_database_resultStandardScheme getScheme() {
 
     private static class create_database_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_database_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_database_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -55682,6 +62781,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_re
     }
 
     private static class create_database_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_resultTupleScheme getScheme() {
         return new create_database_resultTupleScheme();
       }
@@ -55716,22 +62816,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_database_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_database_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -55741,6 +62846,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_req_args implements org.apache.thrift.TBase<create_database_req_args, create_database_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_database_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_database_req_args");
 
@@ -55802,10 +62908,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -55840,6 +62948,7 @@ public create_database_req_args(create_database_req_args other) {
       }
     }
 
+    @Override
     public create_database_req_args deepCopy() {
       return new create_database_req_args(this);
     }
@@ -55873,6 +62982,7 @@ public void setCreateDatabaseRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CREATE_DATABASE_REQUEST:
@@ -55887,6 +62997,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CREATE_DATABASE_REQUEST:
@@ -55897,6 +63008,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -55967,14 +63079,17 @@ public int compareTo(create_database_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -56020,6 +63135,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_database_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_req_argsStandardScheme getScheme() {
         return new create_database_req_argsStandardScheme();
       }
@@ -56027,34 +63143,41 @@ public create_database_req_argsStandardScheme getScheme() {
 
     private static class create_database_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_database_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_database_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CREATE_DATABASE_REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.createDatabaseRequest = new CreateDatabaseRequest();
-                struct.createDatabaseRequest.read(iprot);
-                struct.setCreateDatabaseRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CREATE_DATABASE_REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.createDatabaseRequest = new CreateDatabaseRequest();
+                  struct.createDatabaseRequest.read(iprot);
+                  struct.setCreateDatabaseRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -56071,6 +63194,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_re
     }
 
     private static class create_database_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_req_argsTupleScheme getScheme() {
         return new create_database_req_argsTupleScheme();
       }
@@ -56093,12 +63217,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_database_req
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_database_req_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.createDatabaseRequest = new CreateDatabaseRequest();
-          struct.createDatabaseRequest.read(iprot);
-          struct.setCreateDatabaseRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.createDatabaseRequest = new CreateDatabaseRequest();
+            struct.createDatabaseRequest.read(iprot);
+            struct.setCreateDatabaseRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -56108,6 +63237,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_database_req_result implements org.apache.thrift.TBase<create_database_req_result, create_database_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_database_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_database_req_result");
 
@@ -56179,10 +63309,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -56231,6 +63363,7 @@ public create_database_req_result(create_database_req_result other) {
       }
     }
 
+    @Override
     public create_database_req_result deepCopy() {
       return new create_database_req_result(this);
     }
@@ -56314,6 +63447,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -56344,6 +63478,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -56360,6 +63495,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -56480,10 +63616,12 @@ public int compareTo(create_database_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -56546,6 +63684,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_database_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_req_resultStandardScheme getScheme() {
         return new create_database_req_resultStandardScheme();
       }
@@ -56553,52 +63692,59 @@ public create_database_req_resultStandardScheme getScheme() {
 
     private static class create_database_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_database_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_database_req_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -56625,6 +63771,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_database_re
     }
 
     private static class create_database_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_database_req_resultTupleScheme getScheme() {
         return new create_database_req_resultTupleScheme();
       }
@@ -56659,22 +63806,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_database_req
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_database_req_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -56684,6 +63836,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_args implements org.apache.thrift.TBase<get_database_args, get_database_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_database_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_database_args");
 
@@ -56745,10 +63898,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -56783,6 +63938,7 @@ public get_database_args(get_database_args other) {
       }
     }
 
+    @Override
     public get_database_args deepCopy() {
       return new get_database_args(this);
     }
@@ -56816,6 +63972,7 @@ public void setNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -56830,6 +63987,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -56840,6 +63998,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -56910,14 +64069,17 @@ public int compareTo(get_database_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -56960,6 +64122,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_database_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_argsStandardScheme getScheme() {
         return new get_database_argsStandardScheme();
       }
@@ -56967,33 +64130,40 @@ public get_database_argsStandardScheme getScheme() {
 
     private static class get_database_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_database_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_database_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -57010,6 +64180,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_args
     }
 
     private static class get_database_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_argsTupleScheme getScheme() {
         return new get_database_argsTupleScheme();
       }
@@ -57032,11 +64203,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_database_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_database_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.name = iprot.readString();
-          struct.setNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -57046,6 +64222,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_result implements org.apache.thrift.TBase<get_database_result, get_database_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_database_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_database_result");
 
@@ -57117,10 +64294,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -57169,6 +64348,7 @@ public get_database_result(get_database_result other) {
       }
     }
 
+    @Override
     public get_database_result deepCopy() {
       return new get_database_result(this);
     }
@@ -57252,6 +64432,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -57282,6 +64463,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -57298,6 +64480,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -57418,10 +64601,12 @@ public int compareTo(get_database_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -57487,6 +64672,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_database_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_resultStandardScheme getScheme() {
         return new get_database_resultStandardScheme();
       }
@@ -57494,52 +64680,59 @@ public get_database_resultStandardScheme getScheme() {
 
     private static class get_database_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_database_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_database_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 Database();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Database();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -57566,6 +64759,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_resul
     }
 
     private static class get_database_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_resultTupleScheme getScheme() {
         return new get_database_resultTupleScheme();
       }
@@ -57600,22 +64794,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_database_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_database_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 Database();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 Database();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -57625,6 +64824,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_req_args implements org.apache.thrift.TBase<get_database_req_args, get_database_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_database_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_database_req_args");
 
@@ -57686,10 +64886,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -57724,6 +64926,7 @@ public get_database_req_args(get_database_req_args other) {
       }
     }
 
+    @Override
     public get_database_req_args deepCopy() {
       return new get_database_req_args(this);
     }
@@ -57757,6 +64960,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -57771,6 +64975,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -57781,6 +64986,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -57851,14 +65057,17 @@ public int compareTo(get_database_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -57904,6 +65113,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_database_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_req_argsStandardScheme getScheme() {
         return new get_database_req_argsStandardScheme();
       }
@@ -57911,34 +65121,41 @@ public get_database_req_argsStandardScheme getScheme() {
 
     private static class get_database_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_database_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_database_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetDatabaseRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetDatabaseRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -57955,6 +65172,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_req_a
     }
 
     private static class get_database_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_req_argsTupleScheme getScheme() {
         return new get_database_req_argsTupleScheme();
       }
@@ -57977,12 +65195,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_database_req_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_database_req_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 GetDatabaseRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetDatabaseRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -57992,6 +65215,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_database_req_result implements org.apache.thrift.TBase<get_database_req_result, get_database_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_database_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_database_req_result");
 
@@ -58063,10 +65287,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -58115,6 +65341,7 @@ public get_database_req_result(get_database_req_result other) {
       }
     }
 
+    @Override
     public get_database_req_result deepCopy() {
       return new get_database_req_result(this);
     }
@@ -58198,6 +65425,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -58228,6 +65456,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -58244,6 +65473,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -58364,10 +65594,12 @@ public int compareTo(get_database_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -58433,6 +65665,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_database_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_req_resultStandardScheme getScheme() {
         return new get_database_req_resultStandardScheme();
       }
@@ -58440,52 +65673,59 @@ public get_database_req_resultStandardScheme getScheme() {
 
     private static class get_database_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_database_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_database_req_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 Database();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Database();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -58512,6 +65752,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_database_req_r
     }
 
     private static class get_database_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_database_req_resultTupleScheme getScheme() {
         return new get_database_req_resultTupleScheme();
       }
@@ -58546,22 +65787,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_database_req_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_database_req_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 Database();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 Database();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -58571,6 +65817,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_args implements org.apache.thrift.TBase<drop_database_args, drop_database_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_database_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_database_args");
 
@@ -58642,10 +65889,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -58696,6 +65945,7 @@ public drop_database_args(drop_database_args other) {
       this.cascade = other.cascade;
     }
 
+    @Override
     public drop_database_args deepCopy() {
       return new drop_database_args(this);
     }
@@ -58777,6 +66027,7 @@ public void setCascadeIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CASCADE_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -58807,6 +66058,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -58823,6 +66075,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -58939,14 +66192,17 @@ public int compareTo(drop_database_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -58999,6 +66255,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_database_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_argsStandardScheme getScheme() {
         return new drop_database_argsStandardScheme();
       }
@@ -59006,49 +66263,56 @@ public drop_database_argsStandardScheme getScheme() {
 
     private static class drop_database_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_database_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_database_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // CASCADE
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.cascade = iprot.readBool();
-                struct.setCascadeIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // CASCADE
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.cascade = iprot.readBool();
+                  struct.setCascadeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -59071,6 +66335,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_args
     }
 
     private static class drop_database_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_argsTupleScheme getScheme() {
         return new drop_database_argsTupleScheme();
       }
@@ -59105,19 +66370,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_database_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_database_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);
-        if (incoming.get(0)) {
-          struct.name = iprot.readString();
-          struct.setNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.cascade = iprot.readBool();
-          struct.setCascadeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.cascade = iprot.readBool();
+            struct.setCascadeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -59127,6 +66397,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_result implements org.apache.thrift.TBase<drop_database_result, drop_database_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_database_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_database_result");
 
@@ -59198,10 +66469,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -59250,6 +66523,7 @@ public drop_database_result(drop_database_result other) {
       }
     }
 
+    @Override
     public drop_database_result deepCopy() {
       return new drop_database_result(this);
     }
@@ -59333,6 +66607,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -59363,6 +66638,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -59379,6 +66655,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -59499,10 +66776,12 @@ public int compareTo(drop_database_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -59565,6 +66844,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_database_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_resultStandardScheme getScheme() {
         return new drop_database_resultStandardScheme();
       }
@@ -59572,52 +66852,59 @@ public drop_database_resultStandardScheme getScheme() {
 
     private static class drop_database_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_database_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_database_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o2 = new InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -59644,6 +66931,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_resu
     }
 
     private static class drop_database_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_resultTupleScheme getScheme() {
         return new drop_database_resultTupleScheme();
       }
@@ -59678,22 +66966,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_database_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_database_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -59703,6 +66996,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_req_args implements org.apache.thrift.TBase<drop_database_req_args, drop_database_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_database_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_database_req_args");
 
@@ -59764,10 +67058,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -59802,6 +67098,7 @@ public drop_database_req_args(drop_database_req_args other) {
       }
     }
 
+    @Override
     public drop_database_req_args deepCopy() {
       return new drop_database_req_args(this);
     }
@@ -59835,6 +67132,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -59849,6 +67147,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -59859,6 +67158,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -59929,14 +67229,17 @@ public int compareTo(drop_database_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -59982,6 +67285,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_database_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_req_argsStandardScheme getScheme() {
         return new drop_database_req_argsStandardScheme();
       }
@@ -59989,34 +67293,41 @@ public drop_database_req_argsStandardScheme getScheme() {
 
     private static class drop_database_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_database_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_database_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new DropDatabaseRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new DropDatabaseRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -60033,6 +67344,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_req_
     }
 
     private static class drop_database_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_req_argsTupleScheme getScheme() {
         return new drop_database_req_argsTupleScheme();
       }
@@ -60055,12 +67367,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_database_req_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_database_req_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.req = new DropDatabaseRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new DropDatabaseRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -60070,6 +67387,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_database_req_result implements org.apache.thrift.TBase<drop_database_req_result, drop_database_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_database_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_database_req_result");
 
@@ -60146,10 +67464,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -60205,6 +67525,7 @@ public drop_database_req_result(drop_database_req_result other) {
       }
     }
 
+    @Override
     public drop_database_req_result deepCopy() {
       return new drop_database_req_result(this);
     }
@@ -60313,6 +67634,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -60351,6 +67673,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -60370,6 +67693,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -60515,10 +67839,12 @@ public int compareTo(drop_database_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -60592,6 +67918,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_database_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_req_resultStandardScheme getScheme() {
         return new drop_database_req_resultStandardScheme();
       }
@@ -60599,61 +67926,68 @@ public drop_database_req_resultStandardScheme getScheme() {
 
     private static class drop_database_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_database_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_database_req_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 AsyncOperationResp();
-                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 NoSuchObjectException();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AsyncOperationResp();
+                  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 NoSuchObjectException();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -60685,6 +68019,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_database_req_
     }
 
     private static class drop_database_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_database_req_resultTupleScheme getScheme() {
         return new drop_database_req_resultTupleScheme();
       }
@@ -60725,27 +68060,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_database_req_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_database_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new AsyncOperationResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new AsyncOperationResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -60755,6 +68095,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_args implements org.apache.thrift.TBase<get_databases_args, get_databases_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_databases_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_databases_args");
 
@@ -60816,10 +68157,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -60854,6 +68197,7 @@ public get_databases_args(get_databases_args other) {
       }
     }
 
+    @Override
     public get_databases_args deepCopy() {
       return new get_databases_args(this);
     }
@@ -60887,6 +68231,7 @@ public void setPatternIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PATTERN:
@@ -60901,6 +68246,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PATTERN:
@@ -60911,6 +68257,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -60981,14 +68328,17 @@ public int compareTo(get_databases_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -61031,6 +68381,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_databases_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_argsStandardScheme getScheme() {
         return new get_databases_argsStandardScheme();
       }
@@ -61038,33 +68389,40 @@ public get_databases_argsStandardScheme getScheme() {
 
     private static class get_databases_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_databases_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_databases_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PATTERN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.pattern = iprot.readString();
-                struct.setPatternIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // PATTERN
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.pattern = iprot.readString();
+                  struct.setPatternIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -61081,6 +68439,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_args
     }
 
     private static class get_databases_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_argsTupleScheme getScheme() {
         return new get_databases_argsTupleScheme();
       }
@@ -61103,11 +68462,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_databases_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_databases_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.pattern = iprot.readString();
-          struct.setPatternIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.pattern = iprot.readString();
+            struct.setPatternIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -61117,6 +68481,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_result implements org.apache.thrift.TBase<get_databases_result, get_databases_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_databases_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_databases_result");
 
@@ -61183,10 +68548,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -61230,6 +68597,7 @@ public get_databases_result(get_databases_result other) {
       }
     }
 
+    @Override
     public get_databases_result deepCopy() {
       return new get_databases_result(this);
     }
@@ -61304,6 +68672,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -61326,6 +68695,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -61339,6 +68709,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -61434,10 +68805,12 @@ public int compareTo(get_databases_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -61492,6 +68865,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_databases_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_resultStandardScheme getScheme() {
         return new get_databases_resultStandardScheme();
       }
@@ -61499,52 +68873,59 @@ public get_databases_resultStandardScheme getScheme() {
 
     private static class get_databases_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_databases_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_databases_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1646 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1646.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1647;
-                  for (int _i1648 = 0; _i1648 < _list1646.size; ++_i1648)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1647 = iprot.readString();
-                    struct.success.add(_elem1647);
+                    org.apache.thrift.protocol.TList _list1646 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1646.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1647;
+                    for (int _i1648 = 0; _i1648 < _list1646.size; ++_i1648)
+                    {
+                      _elem1647 = iprot.readString();
+                      struct.success.add(_elem1647);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -61573,6 +68954,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_resu
     }
 
     private static class get_databases_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_resultTupleScheme getScheme() {
         return new get_databases_resultTupleScheme();
       }
@@ -61607,25 +68989,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_databases_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_databases_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1651 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1651.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1652;
-            for (int _i1653 = 0; _i1653 < _list1651.size; ++_i1653)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1652 = iprot.readString();
-              struct.success.add(_elem1652);
+              org.apache.thrift.protocol.TList _list1651 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1651.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1652;
+              for (int _i1653 = 0; _i1653 < _list1651.size; ++_i1653)
+              {
+                _elem1652 = iprot.readString();
+                struct.success.add(_elem1652);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -61635,6 +69022,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_databases_args implements org.apache.thrift.TBase<get_all_databases_args, get_all_databases_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_databases_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_databases_args");
 
@@ -61692,10 +69080,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -61716,6 +69106,7 @@ public get_all_databases_args() {
     public get_all_databases_args(get_all_databases_args other) {
     }
 
+    @Override
     public get_all_databases_args deepCopy() {
       return new get_all_databases_args(this);
     }
@@ -61724,12 +69115,14 @@ public get_all_databases_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -61737,6 +69130,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -61782,14 +69176,17 @@ public int compareTo(get_all_databases_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -61825,6 +69222,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_databases_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_databases_argsStandardScheme getScheme() {
         return new get_all_databases_argsStandardScheme();
       }
@@ -61832,25 +69230,32 @@ public get_all_databases_argsStandardScheme getScheme() {
 
     private static class get_all_databases_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_databases_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_databases_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_databases_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -61862,6 +69267,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_databases_
     }
 
     private static class get_all_databases_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_databases_argsTupleScheme getScheme() {
         return new get_all_databases_argsTupleScheme();
       }
@@ -61876,7 +69282,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_databases_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_databases_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -61885,6 +69296,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_databases_result implements org.apache.thrift.TBase<get_all_databases_result, get_all_databases_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_databases_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_databases_result");
 
@@ -61951,10 +69363,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -61998,6 +69412,7 @@ public get_all_databases_result(get_all_databases_result other) {
       }
     }
 
+    @Override
     public get_all_databases_result deepCopy() {
       return new get_all_databases_result(this);
     }
@@ -62072,6 +69487,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -62094,6 +69510,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -62107,6 +69524,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -62202,10 +69620,12 @@ public int compareTo(get_all_databases_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -62260,6 +69680,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_databases_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_databases_resultStandardScheme getScheme() {
         return new get_all_databases_resultStandardScheme();
       }
@@ -62267,52 +69688,59 @@ public get_all_databases_resultStandardScheme getScheme() {
 
     private static class get_all_databases_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_databases_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_databases_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1654 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1654.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1655;
-                  for (int _i1656 = 0; _i1656 < _list1654.size; ++_i1656)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1655 = iprot.readString();
-                    struct.success.add(_elem1655);
+                    org.apache.thrift.protocol.TList _list1654 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1654.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1655;
+                    for (int _i1656 = 0; _i1656 < _list1654.size; ++_i1656)
+                    {
+                      _elem1655 = iprot.readString();
+                      struct.success.add(_elem1655);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_databases_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -62341,6 +69769,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_databases_
     }
 
     private static class get_all_databases_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_databases_resultTupleScheme getScheme() {
         return new get_all_databases_resultTupleScheme();
       }
@@ -62375,25 +69804,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_databases_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_databases_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1659 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1659.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1660;
-            for (int _i1661 = 0; _i1661 < _list1659.size; ++_i1661)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1660 = iprot.readString();
-              struct.success.add(_elem1660);
+              org.apache.thrift.protocol.TList _list1659 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1659.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1660;
+              for (int _i1661 = 0; _i1661 < _list1659.size; ++_i1661)
+              {
+                _elem1660 = iprot.readString();
+                struct.success.add(_elem1660);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -62403,6 +69837,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_req_args implements org.apache.thrift.TBase<get_databases_req_args, get_databases_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_databases_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_databases_req_args");
 
@@ -62464,10 +69899,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -62502,6 +69939,7 @@ public get_databases_req_args(get_databases_req_args other) {
       }
     }
 
+    @Override
     public get_databases_req_args deepCopy() {
       return new get_databases_req_args(this);
     }
@@ -62535,6 +69973,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -62549,6 +69988,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -62559,6 +69999,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -62629,14 +70070,17 @@ public int compareTo(get_databases_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -62682,6 +70126,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_databases_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_req_argsStandardScheme getScheme() {
         return new get_databases_req_argsStandardScheme();
       }
@@ -62689,34 +70134,41 @@ public get_databases_req_argsStandardScheme getScheme() {
 
     private static class get_databases_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_databases_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_databases_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetDatabaseObjectsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetDatabaseObjectsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -62733,6 +70185,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_req_
     }
 
     private static class get_databases_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_req_argsTupleScheme getScheme() {
         return new get_databases_req_argsTupleScheme();
       }
@@ -62755,12 +70208,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_databases_req_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_databases_req_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 GetDatabaseObjectsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetDatabaseObjectsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -62770,6 +70228,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_databases_req_result implements org.apache.thrift.TBase<get_databases_req_result, get_databases_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_databases_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_databases_req_result");
 
@@ -62836,10 +70295,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -62881,6 +70342,7 @@ public get_databases_req_result(get_databases_req_result other) {
       }
     }
 
+    @Override
     public get_databases_req_result deepCopy() {
       return new get_databases_req_result(this);
     }
@@ -62939,6 +70401,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -62961,6 +70424,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -62974,6 +70438,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -63069,10 +70534,12 @@ public int compareTo(get_databases_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -63130,6 +70597,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_databases_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_req_resultStandardScheme getScheme() {
         return new get_databases_req_resultStandardScheme();
       }
@@ -63137,43 +70605,50 @@ public get_databases_req_resultStandardScheme getScheme() {
 
     private static class get_databases_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_databases_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_databases_req_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 GetDatabaseObjectsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetDatabaseObjectsResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -63195,6 +70670,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_databases_req_
     }
 
     private static class get_databases_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_databases_req_resultTupleScheme getScheme() {
         return new get_databases_req_resultTupleScheme();
       }
@@ -63223,17 +70699,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_databases_req_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_databases_req_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.success = new GetDatabaseObjectsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetDatabaseObjectsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -63243,6 +70724,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_args implements org.apache.thrift.TBase<alter_database_args, alter_database_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_database_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_database_args");
 
@@ -63309,10 +70791,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -63354,6 +70838,7 @@ public alter_database_args(alter_database_args other) {
       }
     }
 
+    @Override
     public alter_database_args deepCopy() {
       return new alter_database_args(this);
     }
@@ -63412,6 +70897,7 @@ public void setDbIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -63434,6 +70920,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -63447,6 +70934,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -63542,14 +71030,17 @@ public int compareTo(alter_database_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -63603,6 +71094,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_database_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_argsStandardScheme getScheme() {
         return new alter_database_argsStandardScheme();
       }
@@ -63610,42 +71102,49 @@ public alter_database_argsStandardScheme getScheme() {
 
     private static class alter_database_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_database_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_database_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;
-          }
-          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);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // DB
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.db = new Database();
-                struct.db.read(iprot);
-                struct.setDbIsSet(true);
-              } else { 
+            }
+            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: // DB
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.db = new Database();
+                  struct.db.read(iprot);
+                  struct.setDbIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -63667,6 +71166,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_arg
     }
 
     private static class alter_database_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_argsTupleScheme getScheme() {
         return new alter_database_argsTupleScheme();
       }
@@ -63695,16 +71195,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_database_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_database_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);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.db = new Database();
-          struct.db.read(iprot);
-          struct.setDbIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+          if (incoming.get(1)) {
+            struct.db = new Database();
+            struct.db.read(iprot);
+            struct.setDbIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -63714,6 +71219,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_result implements org.apache.thrift.TBase<alter_database_result, alter_database_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_database_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_database_result");
 
@@ -63780,10 +71286,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -63825,6 +71333,7 @@ public alter_database_result(alter_database_result other) {
       }
     }
 
+    @Override
     public alter_database_result deepCopy() {
       return new alter_database_result(this);
     }
@@ -63883,6 +71392,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -63905,6 +71415,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -63918,6 +71429,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -64013,10 +71525,12 @@ public int compareTo(alter_database_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -64071,6 +71585,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_database_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_resultStandardScheme getScheme() {
         return new alter_database_resultStandardScheme();
       }
@@ -64078,43 +71593,50 @@ public alter_database_resultStandardScheme getScheme() {
 
     private static class alter_database_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_database_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_database_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 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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -64136,6 +71658,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_res
     }
 
     private static class alter_database_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_resultTupleScheme getScheme() {
         return new alter_database_resultTupleScheme();
       }
@@ -64164,17 +71687,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_database_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_database_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -64184,6 +71712,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_req_args implements org.apache.thrift.TBase<alter_database_req_args, alter_database_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_database_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_database_req_args");
 
@@ -64245,10 +71774,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -64283,6 +71814,7 @@ public alter_database_req_args(alter_database_req_args other) {
       }
     }
 
+    @Override
     public alter_database_req_args deepCopy() {
       return new alter_database_req_args(this);
     }
@@ -64316,6 +71848,7 @@ public void setAlterDbReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ALTER_DB_REQ:
@@ -64330,6 +71863,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ALTER_DB_REQ:
@@ -64340,6 +71874,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -64410,14 +71945,17 @@ public int compareTo(alter_database_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -64463,6 +72001,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_database_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_req_argsStandardScheme getScheme() {
         return new alter_database_req_argsStandardScheme();
       }
@@ -64470,34 +72009,41 @@ public alter_database_req_argsStandardScheme getScheme() {
 
     private static class alter_database_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_database_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_database_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // ALTER_DB_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.alterDbReq = new AlterDatabaseRequest();
-                struct.alterDbReq.read(iprot);
-                struct.setAlterDbReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // ALTER_DB_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.alterDbReq = new AlterDatabaseRequest();
+                  struct.alterDbReq.read(iprot);
+                  struct.setAlterDbReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -64514,6 +72060,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_req
     }
 
     private static class alter_database_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_req_argsTupleScheme getScheme() {
         return new alter_database_req_argsTupleScheme();
       }
@@ -64536,12 +72083,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_database_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_database_req_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.alterDbReq = new AlterDatabaseRequest();
-          struct.alterDbReq.read(iprot);
-          struct.setAlterDbReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.alterDbReq = new AlterDatabaseRequest();
+            struct.alterDbReq.read(iprot);
+            struct.setAlterDbReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -64551,6 +72103,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_database_req_result implements org.apache.thrift.TBase<alter_database_req_result, alter_database_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_database_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_database_req_result");
 
@@ -64617,10 +72170,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -64662,6 +72217,7 @@ public alter_database_req_result(alter_database_req_result other) {
       }
     }
 
+    @Override
     public alter_database_req_result deepCopy() {
       return new alter_database_req_result(this);
     }
@@ -64720,6 +72276,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -64742,6 +72299,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -64755,6 +72313,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -64850,10 +72409,12 @@ public int compareTo(alter_database_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -64908,6 +72469,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_database_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_req_resultStandardScheme getScheme() {
         return new alter_database_req_resultStandardScheme();
       }
@@ -64915,43 +72477,50 @@ public alter_database_req_resultStandardScheme getScheme() {
 
     private static class alter_database_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_database_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_database_req_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 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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -64973,6 +72542,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_database_req
     }
 
     private static class alter_database_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_database_req_resultTupleScheme getScheme() {
         return new alter_database_req_resultTupleScheme();
       }
@@ -65001,17 +72571,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_database_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_database_req_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -65021,6 +72596,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_dataconnector_req_args implements org.apache.thrift.TBase<create_dataconnector_req_args, create_dataconnector_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_dataconnector_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_dataconnector_req_args");
 
@@ -65082,10 +72658,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -65120,6 +72698,7 @@ public create_dataconnector_req_args(create_dataconnector_req_args other) {
       }
     }
 
+    @Override
     public create_dataconnector_req_args deepCopy() {
       return new create_dataconnector_req_args(this);
     }
@@ -65153,6 +72732,7 @@ public void setConnectorReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CONNECTOR_REQ:
@@ -65167,6 +72747,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CONNECTOR_REQ:
@@ -65177,6 +72758,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -65247,14 +72829,17 @@ public int compareTo(create_dataconnector_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -65300,6 +72885,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_dataconnector_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_dataconnector_req_argsStandardScheme getScheme() {
         return new create_dataconnector_req_argsStandardScheme();
       }
@@ -65307,34 +72893,41 @@ public create_dataconnector_req_argsStandardScheme getScheme() {
 
     private static class create_dataconnector_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_dataconnector_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_dataconnector_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CONNECTOR_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.connectorReq = new CreateDataConnectorRequest();
-                struct.connectorReq.read(iprot);
-                struct.setConnectorReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CONNECTOR_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.connectorReq = new CreateDataConnectorRequest();
+                  struct.connectorReq.read(iprot);
+                  struct.setConnectorReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_dataconnector_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -65351,6 +72944,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_dataconnect
     }
 
     private static class create_dataconnector_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_dataconnector_req_argsTupleScheme getScheme() {
         return new create_dataconnector_req_argsTupleScheme();
       }
@@ -65373,12 +72967,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_dataconnecto
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_dataconnector_req_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.connectorReq = new CreateDataConnectorRequest();
-          struct.connectorReq.read(iprot);
-          struct.setConnectorReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.connectorReq = new CreateDataConnectorRequest();
+            struct.connectorReq.read(iprot);
+            struct.setConnectorReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -65388,6 +72987,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_dataconnector_req_result implements org.apache.thrift.TBase<create_dataconnector_req_result, create_dataconnector_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_dataconnector_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_dataconnector_req_result");
 
@@ -65459,10 +73059,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -65511,6 +73113,7 @@ public create_dataconnector_req_result(create_dataconnector_req_result other) {
       }
     }
 
+    @Override
     public create_dataconnector_req_result deepCopy() {
       return new create_dataconnector_req_result(this);
     }
@@ -65594,6 +73197,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -65624,6 +73228,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -65640,6 +73245,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -65760,10 +73366,12 @@ public int compareTo(create_dataconnector_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -65826,6 +73434,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_dataconnector_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_dataconnector_req_resultStandardScheme getScheme() {
         return new create_dataconnector_req_resultStandardScheme();
       }
@@ -65833,52 +73442,59 @@ public create_dataconnector_req_resultStandardScheme getScheme() {
 
     private static class create_dataconnector_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_dataconnector_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_dataconnector_req_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_dataconnector_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -65905,6 +73521,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_dataconnect
     }
 
     private static class create_dataconnector_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_dataconnector_req_resultTupleScheme getScheme() {
         return new create_dataconnector_req_resultTupleScheme();
       }
@@ -65939,22 +73556,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_dataconnecto
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_dataconnector_req_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -65964,6 +73586,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnector_req_args implements org.apache.thrift.TBase<get_dataconnector_req_args, get_dataconnector_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_dataconnector_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_dataconnector_req_args");
 
@@ -66025,10 +73648,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -66063,6 +73688,7 @@ public get_dataconnector_req_args(get_dataconnector_req_args other) {
       }
     }
 
+    @Override
     public get_dataconnector_req_args deepCopy() {
       return new get_dataconnector_req_args(this);
     }
@@ -66096,6 +73722,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -66110,6 +73737,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -66120,6 +73748,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -66190,14 +73819,17 @@ public int compareTo(get_dataconnector_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -66243,6 +73875,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_dataconnector_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnector_req_argsStandardScheme getScheme() {
         return new get_dataconnector_req_argsStandardScheme();
       }
@@ -66250,34 +73883,41 @@ public get_dataconnector_req_argsStandardScheme getScheme() {
 
     private static class get_dataconnector_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_dataconnector_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_dataconnector_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetDataConnectorRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetDataConnectorRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnector_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -66294,6 +73934,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnector_
     }
 
     private static class get_dataconnector_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnector_req_argsTupleScheme getScheme() {
         return new get_dataconnector_req_argsTupleScheme();
       }
@@ -66316,12 +73957,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_dataconnector_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_dataconnector_req_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 GetDataConnectorRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetDataConnectorRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -66331,6 +73977,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnector_req_result implements org.apache.thrift.TBase<get_dataconnector_req_result, get_dataconnector_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_dataconnector_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_dataconnector_req_result");
 
@@ -66402,10 +74049,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -66454,6 +74103,7 @@ public get_dataconnector_req_result(get_dataconnector_req_result other) {
       }
     }
 
+    @Override
     public get_dataconnector_req_result deepCopy() {
       return new get_dataconnector_req_result(this);
     }
@@ -66537,6 +74187,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -66567,6 +74218,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -66583,6 +74235,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -66703,10 +74356,12 @@ public int compareTo(get_dataconnector_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -66772,6 +74427,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_dataconnector_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnector_req_resultStandardScheme getScheme() {
         return new get_dataconnector_req_resultStandardScheme();
       }
@@ -66779,52 +74435,59 @@ public get_dataconnector_req_resultStandardScheme getScheme() {
 
     private static class get_dataconnector_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_dataconnector_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_dataconnector_req_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 DataConnector();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 DataConnector();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnector_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -66851,6 +74514,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnector_
     }
 
     private static class get_dataconnector_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnector_req_resultTupleScheme getScheme() {
         return new get_dataconnector_req_resultTupleScheme();
       }
@@ -66885,22 +74549,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_dataconnector_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_dataconnector_req_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 DataConnector();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 DataConnector();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -66910,6 +74579,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_dataconnector_req_args implements org.apache.thrift.TBase<drop_dataconnector_req_args, drop_dataconnector_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_dataconnector_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_dataconnector_req_args");
 
@@ -66971,10 +74641,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -67009,6 +74681,7 @@ public drop_dataconnector_req_args(drop_dataconnector_req_args other) {
       }
     }
 
+    @Override
     public drop_dataconnector_req_args deepCopy() {
       return new drop_dataconnector_req_args(this);
     }
@@ -67042,6 +74715,7 @@ public void setDropDcReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DROP_DC_REQ:
@@ -67056,6 +74730,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DROP_DC_REQ:
@@ -67066,6 +74741,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -67136,14 +74812,17 @@ public int compareTo(drop_dataconnector_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -67189,6 +74868,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_dataconnector_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_dataconnector_req_argsStandardScheme getScheme() {
         return new drop_dataconnector_req_argsStandardScheme();
       }
@@ -67196,34 +74876,41 @@ public drop_dataconnector_req_argsStandardScheme getScheme() {
 
     private static class drop_dataconnector_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_dataconnector_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_dataconnector_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DROP_DC_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.dropDcReq = new DropDataConnectorRequest();
-                struct.dropDcReq.read(iprot);
-                struct.setDropDcReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // DROP_DC_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.dropDcReq = new DropDataConnectorRequest();
+                  struct.dropDcReq.read(iprot);
+                  struct.setDropDcReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_dataconnector_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -67240,6 +74927,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_dataconnector
     }
 
     private static class drop_dataconnector_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_dataconnector_req_argsTupleScheme getScheme() {
         return new drop_dataconnector_req_argsTupleScheme();
       }
@@ -67262,12 +74950,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_dataconnector_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_dataconnector_req_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.dropDcReq = new DropDataConnectorRequest();
-          struct.dropDcReq.read(iprot);
-          struct.setDropDcReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.dropDcReq = new DropDataConnectorRequest();
+            struct.dropDcReq.read(iprot);
+            struct.setDropDcReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -67277,6 +74970,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_dataconnector_req_result implements org.apache.thrift.TBase<drop_dataconnector_req_result, drop_dataconnector_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_dataconnector_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_dataconnector_req_result");
 
@@ -67348,10 +75042,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -67400,6 +75096,7 @@ public drop_dataconnector_req_result(drop_dataconnector_req_result other) {
       }
     }
 
+    @Override
     public drop_dataconnector_req_result deepCopy() {
       return new drop_dataconnector_req_result(this);
     }
@@ -67483,6 +75180,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -67513,6 +75211,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -67529,6 +75228,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -67649,10 +75349,12 @@ public int compareTo(drop_dataconnector_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -67715,6 +75417,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_dataconnector_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_dataconnector_req_resultStandardScheme getScheme() {
         return new drop_dataconnector_req_resultStandardScheme();
       }
@@ -67722,52 +75425,59 @@ public drop_dataconnector_req_resultStandardScheme getScheme() {
 
     private static class drop_dataconnector_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_dataconnector_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_dataconnector_req_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o2 = new InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_dataconnector_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -67794,6 +75504,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_dataconnector
     }
 
     private static class drop_dataconnector_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_dataconnector_req_resultTupleScheme getScheme() {
         return new drop_dataconnector_req_resultTupleScheme();
       }
@@ -67828,22 +75539,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_dataconnector_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_dataconnector_req_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -67853,6 +75569,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnectors_args implements org.apache.thrift.TBase<get_dataconnectors_args, get_dataconnectors_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_dataconnectors_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_dataconnectors_args");
 
@@ -67910,10 +75627,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -67934,6 +75653,7 @@ public get_dataconnectors_args() {
     public get_dataconnectors_args(get_dataconnectors_args other) {
     }
 
+    @Override
     public get_dataconnectors_args deepCopy() {
       return new get_dataconnectors_args(this);
     }
@@ -67942,12 +75662,14 @@ public get_dataconnectors_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -67955,6 +75677,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -68000,14 +75723,17 @@ public int compareTo(get_dataconnectors_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -68043,6 +75769,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_dataconnectors_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnectors_argsStandardScheme getScheme() {
         return new get_dataconnectors_argsStandardScheme();
       }
@@ -68050,25 +75777,32 @@ public get_dataconnectors_argsStandardScheme getScheme() {
 
     private static class get_dataconnectors_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_dataconnectors_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_dataconnectors_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnectors_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -68080,6 +75814,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnectors
     }
 
     private static class get_dataconnectors_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnectors_argsTupleScheme getScheme() {
         return new get_dataconnectors_argsTupleScheme();
       }
@@ -68094,7 +75829,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_dataconnectors_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_dataconnectors_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -68103,6 +75843,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_dataconnectors_result implements org.apache.thrift.TBase<get_dataconnectors_result, get_dataconnectors_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_dataconnectors_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_dataconnectors_result");
 
@@ -68169,10 +75910,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -68216,6 +75959,7 @@ public get_dataconnectors_result(get_dataconnectors_result other) {
       }
     }
 
+    @Override
     public get_dataconnectors_result deepCopy() {
       return new get_dataconnectors_result(this);
     }
@@ -68290,6 +76034,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -68312,6 +76057,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -68325,6 +76071,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -68420,10 +76167,12 @@ public int compareTo(get_dataconnectors_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -68478,6 +76227,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_dataconnectors_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnectors_resultStandardScheme getScheme() {
         return new get_dataconnectors_resultStandardScheme();
       }
@@ -68485,52 +76235,59 @@ public get_dataconnectors_resultStandardScheme getScheme() {
 
     private static class get_dataconnectors_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_dataconnectors_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_dataconnectors_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1662 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1662.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1663;
-                  for (int _i1664 = 0; _i1664 < _list1662.size; ++_i1664)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1663 = iprot.readString();
-                    struct.success.add(_elem1663);
+                    org.apache.thrift.protocol.TList _list1662 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1662.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1663;
+                    for (int _i1664 = 0; _i1664 < _list1662.size; ++_i1664)
+                    {
+                      _elem1663 = iprot.readString();
+                      struct.success.add(_elem1663);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnectors_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -68559,6 +76316,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_dataconnectors
     }
 
     private static class get_dataconnectors_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_dataconnectors_resultTupleScheme getScheme() {
         return new get_dataconnectors_resultTupleScheme();
       }
@@ -68593,25 +76351,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_dataconnectors_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_dataconnectors_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1667 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1667.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1668;
-            for (int _i1669 = 0; _i1669 < _list1667.size; ++_i1669)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1668 = iprot.readString();
-              struct.success.add(_elem1668);
+              org.apache.thrift.protocol.TList _list1667 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1667.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1668;
+              for (int _i1669 = 0; _i1669 < _list1667.size; ++_i1669)
+              {
+                _elem1668 = iprot.readString();
+                struct.success.add(_elem1668);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -68621,6 +76384,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_dataconnector_req_args implements org.apache.thrift.TBase<alter_dataconnector_req_args, alter_dataconnector_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_dataconnector_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_dataconnector_req_args");
 
@@ -68682,10 +76446,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -68720,6 +76486,7 @@ public alter_dataconnector_req_args(alter_dataconnector_req_args other) {
       }
     }
 
+    @Override
     public alter_dataconnector_req_args deepCopy() {
       return new alter_dataconnector_req_args(this);
     }
@@ -68753,6 +76520,7 @@ public void setAlterReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ALTER_REQ:
@@ -68767,6 +76535,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ALTER_REQ:
@@ -68777,6 +76546,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -68847,14 +76617,17 @@ public int compareTo(alter_dataconnector_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -68900,6 +76673,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_dataconnector_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_dataconnector_req_argsStandardScheme getScheme() {
         return new alter_dataconnector_req_argsStandardScheme();
       }
@@ -68907,34 +76681,41 @@ public alter_dataconnector_req_argsStandardScheme getScheme() {
 
     private static class alter_dataconnector_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_dataconnector_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_dataconnector_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // ALTER_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.alterReq = new AlterDataConnectorRequest();
-                struct.alterReq.read(iprot);
-                struct.setAlterReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // ALTER_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.alterReq = new AlterDataConnectorRequest();
+                  struct.alterReq.read(iprot);
+                  struct.setAlterReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_dataconnector_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -68951,6 +76732,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_dataconnecto
     }
 
     private static class alter_dataconnector_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_dataconnector_req_argsTupleScheme getScheme() {
         return new alter_dataconnector_req_argsTupleScheme();
       }
@@ -68973,12 +76755,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_dataconnector
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_dataconnector_req_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.alterReq = new AlterDataConnectorRequest();
-          struct.alterReq.read(iprot);
-          struct.setAlterReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.alterReq = new AlterDataConnectorRequest();
+            struct.alterReq.read(iprot);
+            struct.setAlterReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -68988,6 +76775,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_dataconnector_req_result implements org.apache.thrift.TBase<alter_dataconnector_req_result, alter_dataconnector_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_dataconnector_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_dataconnector_req_result");
 
@@ -69054,10 +76842,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -69099,6 +76889,7 @@ public alter_dataconnector_req_result(alter_dataconnector_req_result other) {
       }
     }
 
+    @Override
     public alter_dataconnector_req_result deepCopy() {
       return new alter_dataconnector_req_result(this);
     }
@@ -69157,6 +76948,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -69179,6 +76971,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -69192,6 +76985,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -69287,10 +77081,12 @@ public int compareTo(alter_dataconnector_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -69345,6 +77141,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_dataconnector_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_dataconnector_req_resultStandardScheme getScheme() {
         return new alter_dataconnector_req_resultStandardScheme();
       }
@@ -69352,43 +77149,50 @@ public alter_dataconnector_req_resultStandardScheme getScheme() {
 
     private static class alter_dataconnector_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_dataconnector_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_dataconnector_req_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 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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_dataconnector_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -69410,6 +77214,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_dataconnecto
     }
 
     private static class alter_dataconnector_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_dataconnector_req_resultTupleScheme getScheme() {
         return new alter_dataconnector_req_resultTupleScheme();
       }
@@ -69438,17 +77243,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_dataconnector
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_dataconnector_req_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -69458,6 +77268,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_args implements org.apache.thrift.TBase<get_type_args, get_type_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_type_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_type_args");
 
@@ -69519,10 +77330,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -69557,6 +77370,7 @@ public get_type_args(get_type_args other) {
       }
     }
 
+    @Override
     public get_type_args deepCopy() {
       return new get_type_args(this);
     }
@@ -69590,6 +77404,7 @@ public void setNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -69604,6 +77419,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -69614,6 +77430,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -69684,14 +77501,17 @@ public int compareTo(get_type_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -69734,6 +77554,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_type_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_argsStandardScheme getScheme() {
         return new get_type_argsStandardScheme();
       }
@@ -69741,33 +77562,40 @@ public get_type_argsStandardScheme getScheme() {
 
     private static class get_type_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_type_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_type_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -69784,6 +77612,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_args stru
     }
 
     private static class get_type_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_argsTupleScheme getScheme() {
         return new get_type_argsTupleScheme();
       }
@@ -69806,11 +77635,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_type_args struc
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_type_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.name = iprot.readString();
-          struct.setNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -69820,6 +77654,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_result implements org.apache.thrift.TBase<get_type_result, get_type_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_type_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_type_result");
 
@@ -69891,10 +77726,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -69943,6 +77780,7 @@ public get_type_result(get_type_result other) {
       }
     }
 
+    @Override
     public get_type_result deepCopy() {
       return new get_type_result(this);
     }
@@ -70026,6 +77864,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -70056,6 +77895,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -70072,6 +77912,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -70192,10 +78033,12 @@ public int compareTo(get_type_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -70261,6 +78104,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_type_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_resultStandardScheme getScheme() {
         return new get_type_resultStandardScheme();
       }
@@ -70268,52 +78112,59 @@ public get_type_resultStandardScheme getScheme() {
 
     private static class get_type_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_type_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_type_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 Type();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Type();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -70340,6 +78191,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_result st
     }
 
     private static class get_type_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_resultTupleScheme getScheme() {
         return new get_type_resultTupleScheme();
       }
@@ -70374,22 +78226,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_type_result str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_type_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 Type();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 Type();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -70399,6 +78256,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_type_args implements org.apache.thrift.TBase<create_type_args, create_type_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_type_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_type_args");
 
@@ -70460,10 +78318,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -70498,6 +78358,7 @@ public create_type_args(create_type_args other) {
       }
     }
 
+    @Override
     public create_type_args deepCopy() {
       return new create_type_args(this);
     }
@@ -70531,6 +78392,7 @@ public void setTypeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TYPE:
@@ -70545,6 +78407,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TYPE:
@@ -70555,6 +78418,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -70625,14 +78489,17 @@ public int compareTo(create_type_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -70678,6 +78545,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_type_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_type_argsStandardScheme getScheme() {
         return new create_type_argsStandardScheme();
       }
@@ -70685,34 +78553,41 @@ public create_type_argsStandardScheme getScheme() {
 
     private static class create_type_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_type_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_type_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.type = new Type();
-                struct.type.read(iprot);
-                struct.setTypeIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.type = new Type();
+                  struct.type.read(iprot);
+                  struct.setTypeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_type_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -70729,6 +78604,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_type_args s
     }
 
     private static class create_type_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_type_argsTupleScheme getScheme() {
         return new create_type_argsTupleScheme();
       }
@@ -70751,12 +78627,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_type_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_type_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.type = new Type();
-          struct.type.read(iprot);
-          struct.setTypeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.type = new Type();
+            struct.type.read(iprot);
+            struct.setTypeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -70766,6 +78647,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_type_result implements org.apache.thrift.TBase<create_type_result, create_type_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_type_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_type_result");
 
@@ -70842,10 +78724,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -70903,6 +78787,7 @@ public create_type_result(create_type_result other) {
       }
     }
 
+    @Override
     public create_type_result deepCopy() {
       return new create_type_result(this);
     }
@@ -71010,6 +78895,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -71048,6 +78934,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -71067,6 +78954,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -71210,10 +79098,12 @@ public int compareTo(create_type_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -71282,6 +79172,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_type_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_type_resultStandardScheme getScheme() {
         return new create_type_resultStandardScheme();
       }
@@ -71289,60 +79180,67 @@ public create_type_resultStandardScheme getScheme() {
 
     private static class create_type_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_type_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_type_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_type_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -71374,6 +79272,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_type_result
     }
 
     private static class create_type_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_type_resultTupleScheme getScheme() {
         return new create_type_resultTupleScheme();
       }
@@ -71414,26 +79313,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_type_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_type_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(4);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -71443,6 +79347,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_type_args implements org.apache.thrift.TBase<drop_type_args, drop_type_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_type_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_type_args");
 
@@ -71504,10 +79409,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -71542,6 +79449,7 @@ public drop_type_args(drop_type_args other) {
       }
     }
 
+    @Override
     public drop_type_args deepCopy() {
       return new drop_type_args(this);
     }
@@ -71575,6 +79483,7 @@ public void setTypeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TYPE:
@@ -71589,6 +79498,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TYPE:
@@ -71599,6 +79509,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -71669,14 +79580,17 @@ public int compareTo(drop_type_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -71719,6 +79633,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_type_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_type_argsStandardScheme getScheme() {
         return new drop_type_argsStandardScheme();
       }
@@ -71726,33 +79641,40 @@ public drop_type_argsStandardScheme getScheme() {
 
     private static class drop_type_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_type_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_type_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.type = iprot.readString();
-                struct.setTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.type = iprot.readString();
+                  struct.setTypeIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_type_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -71769,6 +79691,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_type_args str
     }
 
     private static class drop_type_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_type_argsTupleScheme getScheme() {
         return new drop_type_argsTupleScheme();
       }
@@ -71791,11 +79714,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_type_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_type_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.type = iprot.readString();
-          struct.setTypeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.type = iprot.readString();
+            struct.setTypeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -71805,6 +79733,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_type_result implements org.apache.thrift.TBase<drop_type_result, drop_type_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_type_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_type_result");
 
@@ -71876,10 +79805,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -71930,6 +79861,7 @@ public drop_type_result(drop_type_result other) {
       }
     }
 
+    @Override
     public drop_type_result deepCopy() {
       return new drop_type_result(this);
     }
@@ -72012,6 +79944,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -72042,6 +79975,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -72058,6 +79992,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -72176,10 +80111,12 @@ public int compareTo(drop_type_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -72240,6 +80177,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_type_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_type_resultStandardScheme getScheme() {
         return new drop_type_resultStandardScheme();
       }
@@ -72247,51 +80185,58 @@ public drop_type_resultStandardScheme getScheme() {
 
     private static class drop_type_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_type_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_type_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.BOOL) {
-                struct.success = iprot.readBool();
-                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);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_type_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -72318,6 +80263,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_type_result s
     }
 
     private static class drop_type_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_type_resultTupleScheme getScheme() {
         return new drop_type_resultTupleScheme();
       }
@@ -72352,21 +80298,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_type_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_type_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 = iprot.readBool();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -72376,6 +80327,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_all_args implements org.apache.thrift.TBase<get_type_all_args, get_type_all_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_type_all_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_type_all_args");
 
@@ -72437,10 +80389,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -72475,6 +80429,7 @@ public get_type_all_args(get_type_all_args other) {
       }
     }
 
+    @Override
     public get_type_all_args deepCopy() {
       return new get_type_all_args(this);
     }
@@ -72508,6 +80463,7 @@ public void setNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -72522,6 +80478,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -72532,6 +80489,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -72602,14 +80560,17 @@ public int compareTo(get_type_all_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -72652,6 +80613,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_type_all_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_all_argsStandardScheme getScheme() {
         return new get_type_all_argsStandardScheme();
       }
@@ -72659,33 +80621,40 @@ public get_type_all_argsStandardScheme getScheme() {
 
     private static class get_type_all_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_type_all_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_type_all_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_all_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -72702,6 +80671,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_all_args
     }
 
     private static class get_type_all_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_all_argsTupleScheme getScheme() {
         return new get_type_all_argsTupleScheme();
       }
@@ -72724,11 +80694,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_type_all_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_type_all_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.name = iprot.readString();
-          struct.setNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -72738,6 +80713,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_type_all_result implements org.apache.thrift.TBase<get_type_all_result, get_type_all_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_type_all_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_type_all_result");
 
@@ -72804,10 +80780,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -72863,6 +80841,7 @@ public get_type_all_result(get_type_all_result other) {
       }
     }
 
+    @Override
     public get_type_all_result deepCopy() {
       return new get_type_all_result(this);
     }
@@ -72932,6 +80911,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -72954,6 +80934,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -72967,6 +80948,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -73062,10 +81044,12 @@ public int compareTo(get_type_all_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -73120,6 +81104,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_type_all_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_all_resultStandardScheme getScheme() {
         return new get_type_all_resultStandardScheme();
       }
@@ -73127,55 +81112,62 @@ public get_type_all_resultStandardScheme getScheme() {
 
     private static class get_type_all_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_type_all_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_type_all_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.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map1670 = iprot.readMapBegin();
-                  struct.success = new java.util.HashMap<java.lang.String,Type>(2*_map1670.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key1671;
-                  @org.apache.thrift.annotation.Nullable Type _val1672;
-                  for (int _i1673 = 0; _i1673 < _map1670.size; ++_i1673)
+        iprot.incrementRecursionDepth();
+        try {
+          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.MAP) {
                   {
-                    _key1671 = iprot.readString();
-                    _val1672 = new Type();
-                    _val1672.read(iprot);
-                    struct.success.put(_key1671, _val1672);
+                    org.apache.thrift.protocol.TMap _map1670 = iprot.readMapBegin();
+                    struct.success = new java.util.HashMap<java.lang.String,Type>(2*_map1670.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key1671;
+                    @org.apache.thrift.annotation.Nullable Type _val1672;
+                    for (int _i1673 = 0; _i1673 < _map1670.size; ++_i1673)
+                    {
+                      _key1671 = iprot.readString();
+                      _val1672 = new Type();
+                      _val1672.read(iprot);
+                      struct.success.put(_key1671, _val1672);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+                break;
+              case 1: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_all_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -73205,6 +81197,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_type_all_resul
     }
 
     private static class get_type_all_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_type_all_resultTupleScheme getScheme() {
         return new get_type_all_resultTupleScheme();
       }
@@ -73240,28 +81233,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_type_all_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_type_all_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TMap _map1676 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
-            struct.success = new java.util.HashMap<java.lang.String,Type>(2*_map1676.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key1677;
-            @org.apache.thrift.annotation.Nullable Type _val1678;
-            for (int _i1679 = 0; _i1679 < _map1676.size; ++_i1679)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _key1677 = iprot.readString();
-              _val1678 = new Type();
-              _val1678.read(iprot);
-              struct.success.put(_key1677, _val1678);
+              org.apache.thrift.protocol.TMap _map1676 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+              struct.success = new java.util.HashMap<java.lang.String,Type>(2*_map1676.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key1677;
+              @org.apache.thrift.annotation.Nullable Type _val1678;
+              for (int _i1679 = 0; _i1679 < _map1676.size; ++_i1679)
+              {
+                _key1677 = iprot.readString();
+                _val1678 = new Type();
+                _val1678.read(iprot);
+                struct.success.put(_key1677, _val1678);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -73271,6 +81269,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_args implements org.apache.thrift.TBase<get_fields_args, get_fields_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_fields_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_fields_args");
 
@@ -73337,10 +81336,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -73382,6 +81383,7 @@ public get_fields_args(get_fields_args other) {
       }
     }
 
+    @Override
     public get_fields_args deepCopy() {
       return new get_fields_args(this);
     }
@@ -73440,6 +81442,7 @@ public void setTable_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -73462,6 +81465,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -73475,6 +81479,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -73570,14 +81575,17 @@ public int compareTo(get_fields_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -73628,6 +81636,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_fields_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_argsStandardScheme getScheme() {
         return new get_fields_argsStandardScheme();
       }
@@ -73635,41 +81644,48 @@ public get_fields_argsStandardScheme getScheme() {
 
     private static class get_fields_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_fields_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_fields_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.table_name = iprot.readString();
-                struct.setTable_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.table_name = iprot.readString();
+                  struct.setTable_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -73691,6 +81707,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_args st
     }
 
     private static class get_fields_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_argsTupleScheme getScheme() {
         return new get_fields_argsTupleScheme();
       }
@@ -73719,15 +81736,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_fields_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_fields_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.table_name = iprot.readString();
-          struct.setTable_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.table_name = iprot.readString();
+            struct.setTable_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -73737,6 +81759,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_result implements org.apache.thrift.TBase<get_fields_result, get_fields_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_fields_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_fields_result");
 
@@ -73813,10 +81836,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -73877,6 +81902,7 @@ public get_fields_result(get_fields_result other) {
       }
     }
 
+    @Override
     public get_fields_result deepCopy() {
       return new get_fields_result(this);
     }
@@ -74001,6 +82027,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -74039,6 +82066,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -74058,6 +82086,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -74203,10 +82232,12 @@ public int compareTo(get_fields_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -74277,6 +82308,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_fields_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_resultStandardScheme getScheme() {
         return new get_fields_resultStandardScheme();
       }
@@ -74284,71 +82316,78 @@ public get_fields_resultStandardScheme getScheme() {
 
     private static class get_fields_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_fields_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_fields_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1680 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<FieldSchema>(_list1680.size);
-                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1681;
-                  for (int _i1682 = 0; _i1682 < _list1680.size; ++_i1682)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1681 = new FieldSchema();
-                    _elem1681.read(iprot);
-                    struct.success.add(_elem1681);
+                    org.apache.thrift.protocol.TList _list1680 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<FieldSchema>(_list1680.size);
+                    @org.apache.thrift.annotation.Nullable FieldSchema _elem1681;
+                    for (int _i1682 = 0; _i1682 < _list1680.size; ++_i1682)
+                    {
+                      _elem1681 = new FieldSchema();
+                      _elem1681.read(iprot);
+                      struct.success.add(_elem1681);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 UnknownTableException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+                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 UnknownTableException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -74387,6 +82426,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_result
     }
 
     private static class get_fields_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_resultTupleScheme getScheme() {
         return new get_fields_resultTupleScheme();
       }
@@ -74433,36 +82473,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_fields_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_fields_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(4);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1685 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<FieldSchema>(_list1685.size);
-            @org.apache.thrift.annotation.Nullable FieldSchema _elem1686;
-            for (int _i1687 = 0; _i1687 < _list1685.size; ++_i1687)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
             {
-              _elem1686 = new FieldSchema();
-              _elem1686.read(iprot);
-              struct.success.add(_elem1686);
+              org.apache.thrift.protocol.TList _list1685 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<FieldSchema>(_list1685.size);
+              @org.apache.thrift.annotation.Nullable FieldSchema _elem1686;
+              for (int _i1687 = 0; _i1687 < _list1685.size; ++_i1687)
+              {
+                _elem1686 = new FieldSchema();
+                _elem1686.read(iprot);
+                struct.success.add(_elem1686);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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 UnknownTableException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new UnknownTableException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -74472,6 +82517,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_with_environment_context_args implements org.apache.thrift.TBase<get_fields_with_environment_context_args, get_fields_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_fields_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_fields_with_environment_context_args");
 
@@ -74543,10 +82589,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -74595,6 +82643,7 @@ public get_fields_with_environment_context_args(get_fields_with_environment_cont
       }
     }
 
+    @Override
     public get_fields_with_environment_context_args deepCopy() {
       return new get_fields_with_environment_context_args(this);
     }
@@ -74678,6 +82727,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -74708,6 +82758,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -74724,6 +82775,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -74844,14 +82896,17 @@ public int compareTo(get_fields_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -74913,6 +82968,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_fields_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_with_environment_context_argsStandardScheme getScheme() {
         return new get_fields_with_environment_context_argsStandardScheme();
       }
@@ -74920,50 +82976,57 @@ public get_fields_with_environment_context_argsStandardScheme getScheme() {
 
     private static class get_fields_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_fields_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_fields_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.table_name = iprot.readString();
-                struct.setTable_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.table_name = iprot.readString();
+                  struct.setTable_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -74990,6 +83053,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_with_en
     }
 
     private static class get_fields_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_with_environment_context_argsTupleScheme getScheme() {
         return new get_fields_with_environment_context_argsTupleScheme();
       }
@@ -75024,20 +83088,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_fields_with_env
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_fields_with_environment_context_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.table_name = iprot.readString();
-          struct.setTable_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.table_name = iprot.readString();
+            struct.setTable_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -75047,6 +83116,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_with_environment_context_result implements org.apache.thrift.TBase<get_fields_with_environment_context_result, get_fields_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_fields_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_fields_with_environment_context_result");
 
@@ -75123,10 +83193,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -75187,6 +83259,7 @@ public get_fields_with_environment_context_result(get_fields_with_environment_co
       }
     }
 
+    @Override
     public get_fields_with_environment_context_result deepCopy() {
       return new get_fields_with_environment_context_result(this);
     }
@@ -75311,6 +83384,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -75349,6 +83423,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -75368,6 +83443,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -75513,10 +83589,12 @@ public int compareTo(get_fields_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -75587,6 +83665,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_fields_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_with_environment_context_resultStandardScheme getScheme() {
         return new get_fields_with_environment_context_resultStandardScheme();
       }
@@ -75594,71 +83673,78 @@ public get_fields_with_environment_context_resultStandardScheme getScheme() {
 
     private static class get_fields_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_fields_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_fields_with_environment_context_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1688 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<FieldSchema>(_list1688.size);
-                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1689;
-                  for (int _i1690 = 0; _i1690 < _list1688.size; ++_i1690)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1689 = new FieldSchema();
-                    _elem1689.read(iprot);
-                    struct.success.add(_elem1689);
+                    org.apache.thrift.protocol.TList _list1688 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<FieldSchema>(_list1688.size);
+                    @org.apache.thrift.annotation.Nullable FieldSchema _elem1689;
+                    for (int _i1690 = 0; _i1690 < _list1688.size; ++_i1690)
+                    {
+                      _elem1689 = new FieldSchema();
+                      _elem1689.read(iprot);
+                      struct.success.add(_elem1689);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 UnknownTableException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+                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 UnknownTableException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -75697,6 +83783,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_with_en
     }
 
     private static class get_fields_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_with_environment_context_resultTupleScheme getScheme() {
         return new get_fields_with_environment_context_resultTupleScheme();
       }
@@ -75743,36 +83830,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_fields_with_env
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_fields_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1693 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<FieldSchema>(_list1693.size);
-            @org.apache.thrift.annotation.Nullable FieldSchema _elem1694;
-            for (int _i1695 = 0; _i1695 < _list1693.size; ++_i1695)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
             {
-              _elem1694 = new FieldSchema();
-              _elem1694.read(iprot);
-              struct.success.add(_elem1694);
+              org.apache.thrift.protocol.TList _list1693 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<FieldSchema>(_list1693.size);
+              @org.apache.thrift.annotation.Nullable FieldSchema _elem1694;
+              for (int _i1695 = 0; _i1695 < _list1693.size; ++_i1695)
+              {
+                _elem1694 = new FieldSchema();
+                _elem1694.read(iprot);
+                struct.success.add(_elem1694);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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 UnknownTableException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new UnknownTableException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -75782,6 +83874,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_req_args implements org.apache.thrift.TBase<get_fields_req_args, get_fields_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_fields_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_fields_req_args");
 
@@ -75843,10 +83936,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -75881,6 +83976,7 @@ public get_fields_req_args(get_fields_req_args other) {
       }
     }
 
+    @Override
     public get_fields_req_args deepCopy() {
       return new get_fields_req_args(this);
     }
@@ -75914,6 +84010,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -75928,6 +84025,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -75938,6 +84036,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -76008,14 +84107,17 @@ public int compareTo(get_fields_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -76061,6 +84163,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_fields_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_req_argsStandardScheme getScheme() {
         return new get_fields_req_argsStandardScheme();
       }
@@ -76068,34 +84171,41 @@ public get_fields_req_argsStandardScheme getScheme() {
 
     private static class get_fields_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_fields_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_fields_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetFieldsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetFieldsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -76112,6 +84222,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_req_arg
     }
 
     private static class get_fields_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_req_argsTupleScheme getScheme() {
         return new get_fields_req_argsTupleScheme();
       }
@@ -76134,12 +84245,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_fields_req_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_fields_req_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.req = new GetFieldsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetFieldsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -76149,6 +84265,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_fields_req_result implements org.apache.thrift.TBase<get_fields_req_result, get_fields_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_fields_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_fields_req_result");
 
@@ -76225,10 +84342,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -76284,6 +84403,7 @@ public get_fields_req_result(get_fields_req_result other) {
       }
     }
 
+    @Override
     public get_fields_req_result deepCopy() {
       return new get_fields_req_result(this);
     }
@@ -76392,6 +84512,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -76430,6 +84551,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -76449,6 +84571,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -76594,10 +84717,12 @@ public int compareTo(get_fields_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -76671,6 +84796,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_fields_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_req_resultStandardScheme getScheme() {
         return new get_fields_req_resultStandardScheme();
       }
@@ -76678,61 +84804,68 @@ public get_fields_req_resultStandardScheme getScheme() {
 
     private static class get_fields_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_fields_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_fields_req_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 GetFieldsResponse();
-                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 UnknownTableException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetFieldsResponse();
+                  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 UnknownTableException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -76764,6 +84897,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_fields_req_res
     }
 
     private static class get_fields_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_fields_req_resultTupleScheme getScheme() {
         return new get_fields_req_resultTupleScheme();
       }
@@ -76804,27 +84938,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_fields_req_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_fields_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new GetFieldsResponse();
-          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 UnknownTableException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new GetFieldsResponse();
+            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 UnknownTableException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -76834,6 +84973,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_args implements org.apache.thrift.TBase<get_schema_args, get_schema_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_args");
 
@@ -76900,10 +85040,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -76945,6 +85087,7 @@ public get_schema_args(get_schema_args other) {
       }
     }
 
+    @Override
     public get_schema_args deepCopy() {
       return new get_schema_args(this);
     }
@@ -77003,6 +85146,7 @@ public void setTable_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -77025,6 +85169,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -77038,6 +85183,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -77133,14 +85279,17 @@ public int compareTo(get_schema_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -77191,6 +85340,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_argsStandardScheme getScheme() {
         return new get_schema_argsStandardScheme();
       }
@@ -77198,41 +85348,48 @@ public get_schema_argsStandardScheme getScheme() {
 
     private static class get_schema_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.table_name = iprot.readString();
-                struct.setTable_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.table_name = iprot.readString();
+                  struct.setTable_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -77254,6 +85411,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_args st
     }
 
     private static class get_schema_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_argsTupleScheme getScheme() {
         return new get_schema_argsTupleScheme();
       }
@@ -77282,15 +85440,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.table_name = iprot.readString();
-          struct.setTable_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.table_name = iprot.readString();
+            struct.setTable_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -77300,6 +85463,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_result implements org.apache.thrift.TBase<get_schema_result, get_schema_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_result");
 
@@ -77376,10 +85540,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -77440,6 +85606,7 @@ public get_schema_result(get_schema_result other) {
       }
     }
 
+    @Override
     public get_schema_result deepCopy() {
       return new get_schema_result(this);
     }
@@ -77564,6 +85731,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -77602,6 +85770,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -77621,6 +85790,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -77766,10 +85936,12 @@ public int compareTo(get_schema_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -77840,6 +86012,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_resultStandardScheme getScheme() {
         return new get_schema_resultStandardScheme();
       }
@@ -77847,71 +86020,78 @@ public get_schema_resultStandardScheme getScheme() {
 
     private static class get_schema_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1696 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<FieldSchema>(_list1696.size);
-                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1697;
-                  for (int _i1698 = 0; _i1698 < _list1696.size; ++_i1698)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1697 = new FieldSchema();
-                    _elem1697.read(iprot);
-                    struct.success.add(_elem1697);
+                    org.apache.thrift.protocol.TList _list1696 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<FieldSchema>(_list1696.size);
+                    @org.apache.thrift.annotation.Nullable FieldSchema _elem1697;
+                    for (int _i1698 = 0; _i1698 < _list1696.size; ++_i1698)
+                    {
+                      _elem1697 = new FieldSchema();
+                      _elem1697.read(iprot);
+                      struct.success.add(_elem1697);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 UnknownTableException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+                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 UnknownTableException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -77950,6 +86130,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_result
     }
 
     private static class get_schema_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_resultTupleScheme getScheme() {
         return new get_schema_resultTupleScheme();
       }
@@ -77996,36 +86177,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_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(4);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1701 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<FieldSchema>(_list1701.size);
-            @org.apache.thrift.annotation.Nullable FieldSchema _elem1702;
-            for (int _i1703 = 0; _i1703 < _list1701.size; ++_i1703)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
             {
-              _elem1702 = new FieldSchema();
-              _elem1702.read(iprot);
-              struct.success.add(_elem1702);
+              org.apache.thrift.protocol.TList _list1701 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<FieldSchema>(_list1701.size);
+              @org.apache.thrift.annotation.Nullable FieldSchema _elem1702;
+              for (int _i1703 = 0; _i1703 < _list1701.size; ++_i1703)
+              {
+                _elem1702 = new FieldSchema();
+                _elem1702.read(iprot);
+                struct.success.add(_elem1702);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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 UnknownTableException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new UnknownTableException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -78035,6 +86221,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_with_environment_context_args implements org.apache.thrift.TBase<get_schema_with_environment_context_args, get_schema_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_with_environment_context_args");
 
@@ -78106,10 +86293,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -78158,6 +86347,7 @@ public get_schema_with_environment_context_args(get_schema_with_environment_cont
       }
     }
 
+    @Override
     public get_schema_with_environment_context_args deepCopy() {
       return new get_schema_with_environment_context_args(this);
     }
@@ -78241,6 +86431,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -78271,6 +86462,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -78287,6 +86479,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -78407,14 +86600,17 @@ public int compareTo(get_schema_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -78476,6 +86672,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_with_environment_context_argsStandardScheme getScheme() {
         return new get_schema_with_environment_context_argsStandardScheme();
       }
@@ -78483,50 +86680,57 @@ public get_schema_with_environment_context_argsStandardScheme getScheme() {
 
     private static class get_schema_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.table_name = iprot.readString();
-                struct.setTable_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.table_name = iprot.readString();
+                  struct.setTable_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -78553,6 +86757,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_with_en
     }
 
     private static class get_schema_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_with_environment_context_argsTupleScheme getScheme() {
         return new get_schema_with_environment_context_argsTupleScheme();
       }
@@ -78587,20 +86792,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_with_env
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_with_environment_context_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.table_name = iprot.readString();
-          struct.setTable_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.table_name = iprot.readString();
+            struct.setTable_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -78610,6 +86820,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_with_environment_context_result implements org.apache.thrift.TBase<get_schema_with_environment_context_result, get_schema_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_with_environment_context_result");
 
@@ -78686,10 +86897,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -78750,6 +86963,7 @@ public get_schema_with_environment_context_result(get_schema_with_environment_co
       }
     }
 
+    @Override
     public get_schema_with_environment_context_result deepCopy() {
       return new get_schema_with_environment_context_result(this);
     }
@@ -78874,6 +87088,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -78912,6 +87127,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -78931,6 +87147,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -79076,10 +87293,12 @@ public int compareTo(get_schema_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -79150,6 +87369,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_with_environment_context_resultStandardScheme getScheme() {
         return new get_schema_with_environment_context_resultStandardScheme();
       }
@@ -79157,71 +87377,78 @@ public get_schema_with_environment_context_resultStandardScheme getScheme() {
 
     private static class get_schema_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_with_environment_context_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1704 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<FieldSchema>(_list1704.size);
-                  @org.apache.thrift.annotation.Nullable FieldSchema _elem1705;
-                  for (int _i1706 = 0; _i1706 < _list1704.size; ++_i1706)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1705 = new FieldSchema();
-                    _elem1705.read(iprot);
-                    struct.success.add(_elem1705);
+                    org.apache.thrift.protocol.TList _list1704 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<FieldSchema>(_list1704.size);
+                    @org.apache.thrift.annotation.Nullable FieldSchema _elem1705;
+                    for (int _i1706 = 0; _i1706 < _list1704.size; ++_i1706)
+                    {
+                      _elem1705 = new FieldSchema();
+                      _elem1705.read(iprot);
+                      struct.success.add(_elem1705);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 UnknownTableException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+                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 UnknownTableException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -79260,6 +87487,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_with_en
     }
 
     private static class get_schema_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_with_environment_context_resultTupleScheme getScheme() {
         return new get_schema_with_environment_context_resultTupleScheme();
       }
@@ -79306,36 +87534,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_with_env
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1709 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<FieldSchema>(_list1709.size);
-            @org.apache.thrift.annotation.Nullable FieldSchema _elem1710;
-            for (int _i1711 = 0; _i1711 < _list1709.size; ++_i1711)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
             {
-              _elem1710 = new FieldSchema();
-              _elem1710.read(iprot);
-              struct.success.add(_elem1710);
+              org.apache.thrift.protocol.TList _list1709 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<FieldSchema>(_list1709.size);
+              @org.apache.thrift.annotation.Nullable FieldSchema _elem1710;
+              for (int _i1711 = 0; _i1711 < _list1709.size; ++_i1711)
+              {
+                _elem1710 = new FieldSchema();
+                _elem1710.read(iprot);
+                struct.success.add(_elem1710);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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 UnknownTableException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new UnknownTableException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -79345,6 +87578,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_req_args implements org.apache.thrift.TBase<get_schema_req_args, get_schema_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_req_args");
 
@@ -79406,10 +87640,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -79444,6 +87680,7 @@ public get_schema_req_args(get_schema_req_args other) {
       }
     }
 
+    @Override
     public get_schema_req_args deepCopy() {
       return new get_schema_req_args(this);
     }
@@ -79477,6 +87714,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -79491,6 +87729,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -79501,6 +87740,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -79571,14 +87811,17 @@ public int compareTo(get_schema_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -79624,6 +87867,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_req_argsStandardScheme getScheme() {
         return new get_schema_req_argsStandardScheme();
       }
@@ -79631,34 +87875,41 @@ public get_schema_req_argsStandardScheme getScheme() {
 
     private static class get_schema_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetSchemaRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetSchemaRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -79675,6 +87926,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_req_arg
     }
 
     private static class get_schema_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_req_argsTupleScheme getScheme() {
         return new get_schema_req_argsTupleScheme();
       }
@@ -79697,12 +87949,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_req_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_req_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.req = new GetSchemaRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetSchemaRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -79712,6 +87969,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_req_result implements org.apache.thrift.TBase<get_schema_req_result, get_schema_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_req_result");
 
@@ -79788,10 +88046,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -79847,6 +88107,7 @@ public get_schema_req_result(get_schema_req_result other) {
       }
     }
 
+    @Override
     public get_schema_req_result deepCopy() {
       return new get_schema_req_result(this);
     }
@@ -79955,6 +88216,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -79993,6 +88255,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -80012,6 +88275,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -80157,10 +88421,12 @@ public int compareTo(get_schema_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -80234,6 +88500,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_req_resultStandardScheme getScheme() {
         return new get_schema_req_resultStandardScheme();
       }
@@ -80241,61 +88508,68 @@ public get_schema_req_resultStandardScheme getScheme() {
 
     private static class get_schema_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_req_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 GetSchemaResponse();
-                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 UnknownTableException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetSchemaResponse();
+                  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 UnknownTableException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -80327,6 +88601,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_req_res
     }
 
     private static class get_schema_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_req_resultTupleScheme getScheme() {
         return new get_schema_req_resultTupleScheme();
       }
@@ -80367,27 +88642,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_req_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new GetSchemaResponse();
-          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 UnknownTableException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new GetSchemaResponse();
+            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 UnknownTableException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -80397,6 +88677,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_args implements org.apache.thrift.TBase<create_table_args, create_table_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_args");
 
@@ -80458,10 +88739,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -80496,6 +88779,7 @@ public create_table_args(create_table_args other) {
       }
     }
 
+    @Override
     public create_table_args deepCopy() {
       return new create_table_args(this);
     }
@@ -80529,6 +88813,7 @@ public void setTblIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TBL:
@@ -80543,6 +88828,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TBL:
@@ -80553,6 +88839,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -80623,14 +88910,17 @@ public int compareTo(create_table_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -80676,6 +88966,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_argsStandardScheme getScheme() {
         return new create_table_argsStandardScheme();
       }
@@ -80683,34 +88974,41 @@ public create_table_argsStandardScheme getScheme() {
 
     private static class create_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TBL
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tbl = new Table();
-                struct.tbl.read(iprot);
-                struct.setTblIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // TBL
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.tbl = new Table();
+                  struct.tbl.read(iprot);
+                  struct.setTblIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -80727,6 +89025,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_args
     }
 
     private static class create_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_argsTupleScheme getScheme() {
         return new create_table_argsTupleScheme();
       }
@@ -80749,12 +89048,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.tbl = new Table();
-          struct.tbl.read(iprot);
-          struct.setTblIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.tbl = new Table();
+            struct.tbl.read(iprot);
+            struct.setTblIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -80764,6 +89068,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_result implements org.apache.thrift.TBase<create_table_result, create_table_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_result");
 
@@ -80840,10 +89145,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -80899,6 +89206,7 @@ public create_table_result(create_table_result other) {
       }
     }
 
+    @Override
     public create_table_result deepCopy() {
       return new create_table_result(this);
     }
@@ -81007,6 +89315,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -81045,6 +89354,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -81064,6 +89374,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -81209,10 +89520,12 @@ public int compareTo(create_table_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -81283,6 +89596,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_resultStandardScheme getScheme() {
         return new create_table_resultStandardScheme();
       }
@@ -81290,61 +89604,68 @@ public create_table_resultStandardScheme getScheme() {
 
     private static class create_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new NoSuchObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new NoSuchObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -81376,6 +89697,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_resul
     }
 
     private static class create_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_resultTupleScheme getScheme() {
         return new create_table_resultTupleScheme();
       }
@@ -81416,27 +89738,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
-        if (incoming.get(0)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new NoSuchObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new NoSuchObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -81446,6 +89773,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_environment_context_args implements org.apache.thrift.TBase<create_table_with_environment_context_args, create_table_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_with_environment_context_args");
 
@@ -81512,10 +89840,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -81557,6 +89887,7 @@ public create_table_with_environment_context_args(create_table_with_environment_
       }
     }
 
+    @Override
     public create_table_with_environment_context_args deepCopy() {
       return new create_table_with_environment_context_args(this);
     }
@@ -81615,6 +89946,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TBL:
@@ -81637,6 +89969,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TBL:
@@ -81650,6 +89983,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -81745,14 +90079,17 @@ public int compareTo(create_table_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -81809,6 +90146,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_environment_context_argsStandardScheme getScheme() {
         return new create_table_with_environment_context_argsStandardScheme();
       }
@@ -81816,43 +90154,50 @@ public create_table_with_environment_context_argsStandardScheme getScheme() {
 
     private static class create_table_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TBL
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tbl = new Table();
-                struct.tbl.read(iprot);
-                struct.setTblIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // TBL
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.tbl = new Table();
+                  struct.tbl.read(iprot);
+                  struct.setTblIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -81874,6 +90219,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_
     }
 
     private static class create_table_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_environment_context_argsTupleScheme getScheme() {
         return new create_table_with_environment_context_argsTupleScheme();
       }
@@ -81902,17 +90248,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_with_e
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_with_environment_context_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);
-        if (incoming.get(0)) {
-          struct.tbl = new Table();
-          struct.tbl.read(iprot);
-          struct.setTblIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.tbl = new Table();
+            struct.tbl.read(iprot);
+            struct.setTblIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -81922,6 +90273,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_environment_context_result implements org.apache.thrift.TBase<create_table_with_environment_context_result, create_table_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_with_environment_context_result");
 
@@ -81998,10 +90350,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -82057,6 +90411,7 @@ public create_table_with_environment_context_result(create_table_with_environmen
       }
     }
 
+    @Override
     public create_table_with_environment_context_result deepCopy() {
       return new create_table_with_environment_context_result(this);
     }
@@ -82165,6 +90520,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -82203,6 +90559,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -82222,6 +90579,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -82367,10 +90725,12 @@ public int compareTo(create_table_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -82441,6 +90801,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_environment_context_resultStandardScheme getScheme() {
         return new create_table_with_environment_context_resultStandardScheme();
       }
@@ -82448,61 +90809,68 @@ public create_table_with_environment_context_resultStandardScheme getScheme() {
 
     private static class create_table_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_with_environment_context_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new NoSuchObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new NoSuchObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -82534,6 +90902,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_
     }
 
     private static class create_table_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_environment_context_resultTupleScheme getScheme() {
         return new create_table_with_environment_context_resultTupleScheme();
       }
@@ -82574,27 +90943,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_with_e
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new NoSuchObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new NoSuchObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -82604,6 +90978,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_constraints_args implements org.apache.thrift.TBase<create_table_with_constraints_args, create_table_with_constraints_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_with_constraints_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_with_constraints_args");
 
@@ -82695,10 +91070,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -82805,6 +91182,7 @@ public create_table_with_constraints_args(create_table_with_constraints_args oth
       }
     }
 
+    @Override
     public create_table_with_constraints_args deepCopy() {
       return new create_table_with_constraints_args(this);
     }
@@ -83084,6 +91462,7 @@ public void setCheckConstraintsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TBL:
@@ -83146,6 +91525,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TBL:
@@ -83174,6 +91554,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -83394,14 +91775,17 @@ public int compareTo(create_table_with_constraints_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -83495,6 +91879,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_with_constraints_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_constraints_argsStandardScheme getScheme() {
         return new create_table_with_constraints_argsStandardScheme();
       }
@@ -83502,148 +91887,155 @@ public create_table_with_constraints_argsStandardScheme getScheme() {
 
     private static class create_table_with_constraints_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_with_constraints_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_with_constraints_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TBL
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tbl = new Table();
-                struct.tbl.read(iprot);
-                struct.setTblIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // PRIMARY_KEYS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1712 = iprot.readListBegin();
-                  struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1712.size);
-                  @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1713;
-                  for (int _i1714 = 0; _i1714 < _list1712.size; ++_i1714)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // TBL
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.tbl = new Table();
+                  struct.tbl.read(iprot);
+                  struct.setTblIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PRIMARY_KEYS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1713 = new SQLPrimaryKey();
-                    _elem1713.read(iprot);
-                    struct.primaryKeys.add(_elem1713);
+                    org.apache.thrift.protocol.TList _list1712 = iprot.readListBegin();
+                    struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1712.size);
+                    @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1713;
+                    for (int _i1714 = 0; _i1714 < _list1712.size; ++_i1714)
+                    {
+                      _elem1713 = new SQLPrimaryKey();
+                      _elem1713.read(iprot);
+                      struct.primaryKeys.add(_elem1713);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPrimaryKeysIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPrimaryKeysIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // FOREIGN_KEYS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1715 = iprot.readListBegin();
-                  struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1715.size);
-                  @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1716;
-                  for (int _i1717 = 0; _i1717 < _list1715.size; ++_i1717)
+                break;
+              case 3: // FOREIGN_KEYS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1716 = new SQLForeignKey();
-                    _elem1716.read(iprot);
-                    struct.foreignKeys.add(_elem1716);
+                    org.apache.thrift.protocol.TList _list1715 = iprot.readListBegin();
+                    struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1715.size);
+                    @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1716;
+                    for (int _i1717 = 0; _i1717 < _list1715.size; ++_i1717)
+                    {
+                      _elem1716 = new SQLForeignKey();
+                      _elem1716.read(iprot);
+                      struct.foreignKeys.add(_elem1716);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setForeignKeysIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setForeignKeysIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // UNIQUE_CONSTRAINTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1718 = iprot.readListBegin();
-                  struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1718.size);
-                  @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1719;
-                  for (int _i1720 = 0; _i1720 < _list1718.size; ++_i1720)
+                break;
+              case 4: // UNIQUE_CONSTRAINTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1719 = new SQLUniqueConstraint();
-                    _elem1719.read(iprot);
-                    struct.uniqueConstraints.add(_elem1719);
+                    org.apache.thrift.protocol.TList _list1718 = iprot.readListBegin();
+                    struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1718.size);
+                    @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1719;
+                    for (int _i1720 = 0; _i1720 < _list1718.size; ++_i1720)
+                    {
+                      _elem1719 = new SQLUniqueConstraint();
+                      _elem1719.read(iprot);
+                      struct.uniqueConstraints.add(_elem1719);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setUniqueConstraintsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setUniqueConstraintsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // NOT_NULL_CONSTRAINTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1721 = iprot.readListBegin();
-                  struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1721.size);
-                  @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1722;
-                  for (int _i1723 = 0; _i1723 < _list1721.size; ++_i1723)
+                break;
+              case 5: // NOT_NULL_CONSTRAINTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1722 = new SQLNotNullConstraint();
-                    _elem1722.read(iprot);
-                    struct.notNullConstraints.add(_elem1722);
+                    org.apache.thrift.protocol.TList _list1721 = iprot.readListBegin();
+                    struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1721.size);
+                    @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1722;
+                    for (int _i1723 = 0; _i1723 < _list1721.size; ++_i1723)
+                    {
+                      _elem1722 = new SQLNotNullConstraint();
+                      _elem1722.read(iprot);
+                      struct.notNullConstraints.add(_elem1722);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setNotNullConstraintsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setNotNullConstraintsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 6: // DEFAULT_CONSTRAINTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1724 = iprot.readListBegin();
-                  struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1724.size);
-                  @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1725;
-                  for (int _i1726 = 0; _i1726 < _list1724.size; ++_i1726)
+                break;
+              case 6: // DEFAULT_CONSTRAINTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1725 = new SQLDefaultConstraint();
-                    _elem1725.read(iprot);
-                    struct.defaultConstraints.add(_elem1725);
+                    org.apache.thrift.protocol.TList _list1724 = iprot.readListBegin();
+                    struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1724.size);
+                    @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1725;
+                    for (int _i1726 = 0; _i1726 < _list1724.size; ++_i1726)
+                    {
+                      _elem1725 = new SQLDefaultConstraint();
+                      _elem1725.read(iprot);
+                      struct.defaultConstraints.add(_elem1725);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setDefaultConstraintsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setDefaultConstraintsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 7: // CHECK_CONSTRAINTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1727 = iprot.readListBegin();
-                  struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1727.size);
-                  @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1728;
-                  for (int _i1729 = 0; _i1729 < _list1727.size; ++_i1729)
+                break;
+              case 7: // CHECK_CONSTRAINTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1728 = new SQLCheckConstraint();
-                    _elem1728.read(iprot);
-                    struct.checkConstraints.add(_elem1728);
+                    org.apache.thrift.protocol.TList _list1727 = iprot.readListBegin();
+                    struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1727.size);
+                    @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1728;
+                    for (int _i1729 = 0; _i1729 < _list1727.size; ++_i1729)
+                    {
+                      _elem1728 = new SQLCheckConstraint();
+                      _elem1728.read(iprot);
+                      struct.checkConstraints.add(_elem1728);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setCheckConstraintsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setCheckConstraintsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_constraints_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -83732,6 +92124,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_
     }
 
     private static class create_table_with_constraints_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_constraints_argsTupleScheme getScheme() {
         return new create_table_with_constraints_argsTupleScheme();
       }
@@ -83826,96 +92219,101 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_with_c
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_with_constraints_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(7);
-        if (incoming.get(0)) {
-          struct.tbl = new Table();
-          struct.tbl.read(iprot);
-          struct.setTblIsSet(true);
-        }
-        if (incoming.get(1)) {
-          {
-            org.apache.thrift.protocol.TList _list1742 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1742.size);
-            @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1743;
-            for (int _i1744 = 0; _i1744 < _list1742.size; ++_i1744)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(7);
+          if (incoming.get(0)) {
+            struct.tbl = new Table();
+            struct.tbl.read(iprot);
+            struct.setTblIsSet(true);
+          }
+          if (incoming.get(1)) {
             {
-              _elem1743 = new SQLPrimaryKey();
-              _elem1743.read(iprot);
-              struct.primaryKeys.add(_elem1743);
+              org.apache.thrift.protocol.TList _list1742 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1742.size);
+              @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1743;
+              for (int _i1744 = 0; _i1744 < _list1742.size; ++_i1744)
+              {
+                _elem1743 = new SQLPrimaryKey();
+                _elem1743.read(iprot);
+                struct.primaryKeys.add(_elem1743);
+              }
             }
+            struct.setPrimaryKeysIsSet(true);
           }
-          struct.setPrimaryKeysIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1745 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1745.size);
-            @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1746;
-            for (int _i1747 = 0; _i1747 < _list1745.size; ++_i1747)
+          if (incoming.get(2)) {
             {
-              _elem1746 = new SQLForeignKey();
-              _elem1746.read(iprot);
-              struct.foreignKeys.add(_elem1746);
+              org.apache.thrift.protocol.TList _list1745 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1745.size);
+              @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1746;
+              for (int _i1747 = 0; _i1747 < _list1745.size; ++_i1747)
+              {
+                _elem1746 = new SQLForeignKey();
+                _elem1746.read(iprot);
+                struct.foreignKeys.add(_elem1746);
+              }
             }
+            struct.setForeignKeysIsSet(true);
           }
-          struct.setForeignKeysIsSet(true);
-        }
-        if (incoming.get(3)) {
-          {
-            org.apache.thrift.protocol.TList _list1748 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1748.size);
-            @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1749;
-            for (int _i1750 = 0; _i1750 < _list1748.size; ++_i1750)
+          if (incoming.get(3)) {
             {
-              _elem1749 = new SQLUniqueConstraint();
-              _elem1749.read(iprot);
-              struct.uniqueConstraints.add(_elem1749);
+              org.apache.thrift.protocol.TList _list1748 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1748.size);
+              @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1749;
+              for (int _i1750 = 0; _i1750 < _list1748.size; ++_i1750)
+              {
+                _elem1749 = new SQLUniqueConstraint();
+                _elem1749.read(iprot);
+                struct.uniqueConstraints.add(_elem1749);
+              }
             }
+            struct.setUniqueConstraintsIsSet(true);
           }
-          struct.setUniqueConstraintsIsSet(true);
-        }
-        if (incoming.get(4)) {
-          {
-            org.apache.thrift.protocol.TList _list1751 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1751.size);
-            @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1752;
-            for (int _i1753 = 0; _i1753 < _list1751.size; ++_i1753)
+          if (incoming.get(4)) {
             {
-              _elem1752 = new SQLNotNullConstraint();
-              _elem1752.read(iprot);
-              struct.notNullConstraints.add(_elem1752);
+              org.apache.thrift.protocol.TList _list1751 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1751.size);
+              @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1752;
+              for (int _i1753 = 0; _i1753 < _list1751.size; ++_i1753)
+              {
+                _elem1752 = new SQLNotNullConstraint();
+                _elem1752.read(iprot);
+                struct.notNullConstraints.add(_elem1752);
+              }
             }
+            struct.setNotNullConstraintsIsSet(true);
           }
-          struct.setNotNullConstraintsIsSet(true);
-        }
-        if (incoming.get(5)) {
-          {
-            org.apache.thrift.protocol.TList _list1754 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1754.size);
-            @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1755;
-            for (int _i1756 = 0; _i1756 < _list1754.size; ++_i1756)
+          if (incoming.get(5)) {
             {
-              _elem1755 = new SQLDefaultConstraint();
-              _elem1755.read(iprot);
-              struct.defaultConstraints.add(_elem1755);
+              org.apache.thrift.protocol.TList _list1754 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1754.size);
+              @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1755;
+              for (int _i1756 = 0; _i1756 < _list1754.size; ++_i1756)
+              {
+                _elem1755 = new SQLDefaultConstraint();
+                _elem1755.read(iprot);
+                struct.defaultConstraints.add(_elem1755);
+              }
             }
+            struct.setDefaultConstraintsIsSet(true);
           }
-          struct.setDefaultConstraintsIsSet(true);
-        }
-        if (incoming.get(6)) {
-          {
-            org.apache.thrift.protocol.TList _list1757 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1757.size);
-            @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1758;
-            for (int _i1759 = 0; _i1759 < _list1757.size; ++_i1759)
+          if (incoming.get(6)) {
             {
-              _elem1758 = new SQLCheckConstraint();
-              _elem1758.read(iprot);
-              struct.checkConstraints.add(_elem1758);
+              org.apache.thrift.protocol.TList _list1757 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1757.size);
+              @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1758;
+              for (int _i1759 = 0; _i1759 < _list1757.size; ++_i1759)
+              {
+                _elem1758 = new SQLCheckConstraint();
+                _elem1758.read(iprot);
+                struct.checkConstraints.add(_elem1758);
+              }
             }
+            struct.setCheckConstraintsIsSet(true);
           }
-          struct.setCheckConstraintsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -83925,6 +92323,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_with_constraints_result implements org.apache.thrift.TBase<create_table_with_constraints_result, create_table_with_constraints_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_with_constraints_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_with_constraints_result");
 
@@ -84001,10 +92400,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -84060,6 +92461,7 @@ public create_table_with_constraints_result(create_table_with_constraints_result
       }
     }
 
+    @Override
     public create_table_with_constraints_result deepCopy() {
       return new create_table_with_constraints_result(this);
     }
@@ -84168,6 +92570,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -84206,6 +92609,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -84225,6 +92629,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -84370,10 +92775,12 @@ public int compareTo(create_table_with_constraints_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -84444,6 +92851,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_with_constraints_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_constraints_resultStandardScheme getScheme() {
         return new create_table_with_constraints_resultStandardScheme();
       }
@@ -84451,61 +92859,68 @@ public create_table_with_constraints_resultStandardScheme getScheme() {
 
     private static class create_table_with_constraints_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_with_constraints_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_with_constraints_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new NoSuchObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new NoSuchObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_constraints_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -84537,6 +92952,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_with_
     }
 
     private static class create_table_with_constraints_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_with_constraints_resultTupleScheme getScheme() {
         return new create_table_with_constraints_resultTupleScheme();
       }
@@ -84577,27 +92993,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_with_c
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_with_constraints_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(4);
-        if (incoming.get(0)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new NoSuchObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new NoSuchObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -84607,6 +93028,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_req_args implements org.apache.thrift.TBase<create_table_req_args, create_table_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_req_args");
 
@@ -84668,10 +93090,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -84706,6 +93130,7 @@ public create_table_req_args(create_table_req_args other) {
       }
     }
 
+    @Override
     public create_table_req_args deepCopy() {
       return new create_table_req_args(this);
     }
@@ -84739,6 +93164,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -84753,6 +93179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -84763,6 +93190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -84833,14 +93261,17 @@ public int compareTo(create_table_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -84886,6 +93317,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_req_argsStandardScheme getScheme() {
         return new create_table_req_argsStandardScheme();
       }
@@ -84893,34 +93325,41 @@ public create_table_req_argsStandardScheme getScheme() {
 
     private static class create_table_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new CreateTableRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new CreateTableRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -84937,6 +93376,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_req_a
     }
 
     private static class create_table_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_req_argsTupleScheme getScheme() {
         return new create_table_req_argsTupleScheme();
       }
@@ -84959,12 +93399,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_req_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_req_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 CreateTableRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CreateTableRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -84974,6 +93419,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_table_req_result implements org.apache.thrift.TBase<create_table_req_result, create_table_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_table_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_table_req_result");
 
@@ -85050,10 +93496,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -85109,6 +93557,7 @@ public create_table_req_result(create_table_req_result other) {
       }
     }
 
+    @Override
     public create_table_req_result deepCopy() {
       return new create_table_req_result(this);
     }
@@ -85217,6 +93666,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -85255,6 +93705,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -85274,6 +93725,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -85419,10 +93871,12 @@ public int compareTo(create_table_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -85493,6 +93947,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_table_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_req_resultStandardScheme getScheme() {
         return new create_table_req_resultStandardScheme();
       }
@@ -85500,61 +93955,68 @@ public create_table_req_resultStandardScheme getScheme() {
 
     private static class create_table_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_table_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_table_req_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new NoSuchObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new NoSuchObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -85586,6 +94048,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_table_req_r
     }
 
     private static class create_table_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_table_req_resultTupleScheme getScheme() {
         return new create_table_req_resultTupleScheme();
       }
@@ -85626,27 +94089,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_table_req_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_table_req_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(4);
-        if (incoming.get(0)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new NoSuchObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new NoSuchObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -85656,6 +94124,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_constraint_args implements org.apache.thrift.TBase<drop_constraint_args, drop_constraint_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_constraint_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_constraint_args");
 
@@ -85717,10 +94186,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -85755,6 +94226,7 @@ public drop_constraint_args(drop_constraint_args other) {
       }
     }
 
+    @Override
     public drop_constraint_args deepCopy() {
       return new drop_constraint_args(this);
     }
@@ -85788,6 +94260,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -85802,6 +94275,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -85812,6 +94286,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -85882,14 +94357,17 @@ public int compareTo(drop_constraint_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -85935,6 +94413,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_constraint_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_constraint_argsStandardScheme getScheme() {
         return new drop_constraint_argsStandardScheme();
       }
@@ -85942,34 +94421,41 @@ public drop_constraint_argsStandardScheme getScheme() {
 
     private static class drop_constraint_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_constraint_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_constraint_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new DropConstraintRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new DropConstraintRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_constraint_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -85986,6 +94472,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_constraint_ar
     }
 
     private static class drop_constraint_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_constraint_argsTupleScheme getScheme() {
         return new drop_constraint_argsTupleScheme();
       }
@@ -86008,12 +94495,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_constraint_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_constraint_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.req = new DropConstraintRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new DropConstraintRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -86023,6 +94515,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_constraint_result implements org.apache.thrift.TBase<drop_constraint_result, drop_constraint_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_constraint_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_constraint_result");
 
@@ -86089,10 +94582,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -86134,6 +94629,7 @@ public drop_constraint_result(drop_constraint_result other) {
       }
     }
 
+    @Override
     public drop_constraint_result deepCopy() {
       return new drop_constraint_result(this);
     }
@@ -86192,6 +94688,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -86214,6 +94711,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -86227,6 +94725,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -86322,10 +94821,12 @@ public int compareTo(drop_constraint_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -86380,6 +94881,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_constraint_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_constraint_resultStandardScheme getScheme() {
         return new drop_constraint_resultStandardScheme();
       }
@@ -86387,43 +94889,50 @@ public drop_constraint_resultStandardScheme getScheme() {
 
     private static class drop_constraint_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_constraint_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_constraint_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 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: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_constraint_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -86445,6 +94954,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_constraint_re
     }
 
     private static class drop_constraint_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_constraint_resultTupleScheme getScheme() {
         return new drop_constraint_resultTupleScheme();
       }
@@ -86473,17 +94983,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_constraint_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_constraint_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -86493,6 +95008,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_primary_key_args implements org.apache.thrift.TBase<add_primary_key_args, add_primary_key_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_primary_key_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_primary_key_args");
 
@@ -86554,10 +95070,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -86592,6 +95110,7 @@ public add_primary_key_args(add_primary_key_args other) {
       }
     }
 
+    @Override
     public add_primary_key_args deepCopy() {
       return new add_primary_key_args(this);
     }
@@ -86625,6 +95144,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -86639,6 +95159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -86649,6 +95170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -86719,14 +95241,17 @@ public int compareTo(add_primary_key_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -86772,6 +95297,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_primary_key_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_primary_key_argsStandardScheme getScheme() {
         return new add_primary_key_argsStandardScheme();
       }
@@ -86779,34 +95305,41 @@ public add_primary_key_argsStandardScheme getScheme() {
 
     private static class add_primary_key_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_primary_key_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_primary_key_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AddPrimaryKeyRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AddPrimaryKeyRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_primary_key_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -86823,6 +95356,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_primary_key_ar
     }
 
     private static class add_primary_key_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_primary_key_argsTupleScheme getScheme() {
         return new add_primary_key_argsTupleScheme();
       }
@@ -86845,12 +95379,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_primary_key_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_primary_key_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.req = new AddPrimaryKeyRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AddPrimaryKeyRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -86860,6 +95399,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_primary_key_result implements org.apache.thrift.TBase<add_primary_key_result, add_primary_key_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_primary_key_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_primary_key_result");
 
@@ -86926,10 +95466,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -86971,6 +95513,7 @@ public add_primary_key_result(add_primary_key_result other) {
       }
     }
 
+    @Override
     public add_primary_key_result deepCopy() {
       return new add_primary_key_result(this);
     }
@@ -87029,6 +95572,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -87051,6 +95595,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -87064,6 +95609,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -87159,10 +95705,12 @@ public int compareTo(add_primary_key_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -87217,6 +95765,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_primary_key_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_primary_key_resultStandardScheme getScheme() {
         return new add_primary_key_resultStandardScheme();
       }
@@ -87224,43 +95773,50 @@ public add_primary_key_resultStandardScheme getScheme() {
 
     private static class add_primary_key_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_primary_key_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_primary_key_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_primary_key_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -87282,6 +95838,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_primary_key_re
     }
 
     private static class add_primary_key_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_primary_key_resultTupleScheme getScheme() {
         return new add_primary_key_resultTupleScheme();
       }
@@ -87310,17 +95867,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_primary_key_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_primary_key_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -87330,6 +95892,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_foreign_key_args implements org.apache.thrift.TBase<add_foreign_key_args, add_foreign_key_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_foreign_key_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_foreign_key_args");
 
@@ -87391,10 +95954,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -87429,6 +95994,7 @@ public add_foreign_key_args(add_foreign_key_args other) {
       }
     }
 
+    @Override
     public add_foreign_key_args deepCopy() {
       return new add_foreign_key_args(this);
     }
@@ -87462,6 +96028,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -87476,6 +96043,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -87486,6 +96054,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -87556,14 +96125,17 @@ public int compareTo(add_foreign_key_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -87609,6 +96181,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_foreign_key_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_foreign_key_argsStandardScheme getScheme() {
         return new add_foreign_key_argsStandardScheme();
       }
@@ -87616,34 +96189,41 @@ public add_foreign_key_argsStandardScheme getScheme() {
 
     private static class add_foreign_key_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_foreign_key_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_foreign_key_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AddForeignKeyRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AddForeignKeyRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_foreign_key_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -87660,6 +96240,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_foreign_key_ar
     }
 
     private static class add_foreign_key_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_foreign_key_argsTupleScheme getScheme() {
         return new add_foreign_key_argsTupleScheme();
       }
@@ -87682,12 +96263,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_foreign_key_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_foreign_key_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.req = new AddForeignKeyRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AddForeignKeyRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -87697,6 +96283,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_foreign_key_result implements org.apache.thrift.TBase<add_foreign_key_result, add_foreign_key_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_foreign_key_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_foreign_key_result");
 
@@ -87763,10 +96350,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -87808,6 +96397,7 @@ public add_foreign_key_result(add_foreign_key_result other) {
       }
     }
 
+    @Override
     public add_foreign_key_result deepCopy() {
       return new add_foreign_key_result(this);
     }
@@ -87866,6 +96456,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -87888,6 +96479,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -87901,6 +96493,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -87996,10 +96589,12 @@ public int compareTo(add_foreign_key_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -88054,6 +96649,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_foreign_key_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_foreign_key_resultStandardScheme getScheme() {
         return new add_foreign_key_resultStandardScheme();
       }
@@ -88061,43 +96657,50 @@ public add_foreign_key_resultStandardScheme getScheme() {
 
     private static class add_foreign_key_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_foreign_key_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_foreign_key_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_foreign_key_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -88119,6 +96722,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_foreign_key_re
     }
 
     private static class add_foreign_key_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_foreign_key_resultTupleScheme getScheme() {
         return new add_foreign_key_resultTupleScheme();
       }
@@ -88147,17 +96751,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_foreign_key_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_foreign_key_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -88167,6 +96776,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_unique_constraint_args implements org.apache.thrift.TBase<add_unique_constraint_args, add_unique_constraint_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_unique_constraint_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_unique_constraint_args");
 
@@ -88228,10 +96838,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -88266,6 +96878,7 @@ public add_unique_constraint_args(add_unique_constraint_args other) {
       }
     }
 
+    @Override
     public add_unique_constraint_args deepCopy() {
       return new add_unique_constraint_args(this);
     }
@@ -88299,6 +96912,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -88313,6 +96927,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -88323,6 +96938,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -88393,14 +97009,17 @@ public int compareTo(add_unique_constraint_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -88446,6 +97065,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_unique_constraint_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_unique_constraint_argsStandardScheme getScheme() {
         return new add_unique_constraint_argsStandardScheme();
       }
@@ -88453,34 +97073,41 @@ public add_unique_constraint_argsStandardScheme getScheme() {
 
     private static class add_unique_constraint_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_unique_constraint_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_unique_constraint_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AddUniqueConstraintRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AddUniqueConstraintRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_unique_constraint_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -88497,6 +97124,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_unique_constra
     }
 
     private static class add_unique_constraint_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_unique_constraint_argsTupleScheme getScheme() {
         return new add_unique_constraint_argsTupleScheme();
       }
@@ -88519,12 +97147,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_unique_constrai
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_unique_constraint_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.req = new AddUniqueConstraintRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AddUniqueConstraintRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -88534,6 +97167,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_unique_constraint_result implements org.apache.thrift.TBase<add_unique_constraint_result, add_unique_constraint_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_unique_constraint_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_unique_constraint_result");
 
@@ -88600,10 +97234,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -88645,6 +97281,7 @@ public add_unique_constraint_result(add_unique_constraint_result other) {
       }
     }
 
+    @Override
     public add_unique_constraint_result deepCopy() {
       return new add_unique_constraint_result(this);
     }
@@ -88703,6 +97340,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -88725,6 +97363,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -88738,6 +97377,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -88833,10 +97473,12 @@ public int compareTo(add_unique_constraint_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -88891,6 +97533,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_unique_constraint_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_unique_constraint_resultStandardScheme getScheme() {
         return new add_unique_constraint_resultStandardScheme();
       }
@@ -88898,43 +97541,50 @@ public add_unique_constraint_resultStandardScheme getScheme() {
 
     private static class add_unique_constraint_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_unique_constraint_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_unique_constraint_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_unique_constraint_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -88956,6 +97606,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_unique_constra
     }
 
     private static class add_unique_constraint_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_unique_constraint_resultTupleScheme getScheme() {
         return new add_unique_constraint_resultTupleScheme();
       }
@@ -88984,17 +97635,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_unique_constrai
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_unique_constraint_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -89004,6 +97660,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_not_null_constraint_args implements org.apache.thrift.TBase<add_not_null_constraint_args, add_not_null_constraint_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_not_null_constraint_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_not_null_constraint_args");
 
@@ -89065,10 +97722,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -89103,6 +97762,7 @@ public add_not_null_constraint_args(add_not_null_constraint_args other) {
       }
     }
 
+    @Override
     public add_not_null_constraint_args deepCopy() {
       return new add_not_null_constraint_args(this);
     }
@@ -89136,6 +97796,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -89150,6 +97811,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -89160,6 +97822,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -89230,14 +97893,17 @@ public int compareTo(add_not_null_constraint_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -89283,6 +97949,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_not_null_constraint_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_not_null_constraint_argsStandardScheme getScheme() {
         return new add_not_null_constraint_argsStandardScheme();
       }
@@ -89290,34 +97957,41 @@ public add_not_null_constraint_argsStandardScheme getScheme() {
 
     private static class add_not_null_constraint_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_not_null_constraint_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_not_null_constraint_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AddNotNullConstraintRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AddNotNullConstraintRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_not_null_constraint_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -89334,6 +98008,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_not_null_const
     }
 
     private static class add_not_null_constraint_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_not_null_constraint_argsTupleScheme getScheme() {
         return new add_not_null_constraint_argsTupleScheme();
       }
@@ -89356,12 +98031,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_not_null_constr
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_not_null_constraint_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.req = new AddNotNullConstraintRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AddNotNullConstraintRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -89371,6 +98051,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_not_null_constraint_result implements org.apache.thrift.TBase<add_not_null_constraint_result, add_not_null_constraint_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_not_null_constraint_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_not_null_constraint_result");
 
@@ -89437,10 +98118,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -89482,6 +98165,7 @@ public add_not_null_constraint_result(add_not_null_constraint_result other) {
       }
     }
 
+    @Override
     public add_not_null_constraint_result deepCopy() {
       return new add_not_null_constraint_result(this);
     }
@@ -89540,6 +98224,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -89562,6 +98247,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -89575,6 +98261,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -89670,10 +98357,12 @@ public int compareTo(add_not_null_constraint_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -89728,6 +98417,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_not_null_constraint_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_not_null_constraint_resultStandardScheme getScheme() {
         return new add_not_null_constraint_resultStandardScheme();
       }
@@ -89735,43 +98425,50 @@ public add_not_null_constraint_resultStandardScheme getScheme() {
 
     private static class add_not_null_constraint_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_not_null_constraint_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_not_null_constraint_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_not_null_constraint_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -89793,6 +98490,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_not_null_const
     }
 
     private static class add_not_null_constraint_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_not_null_constraint_resultTupleScheme getScheme() {
         return new add_not_null_constraint_resultTupleScheme();
       }
@@ -89821,17 +98519,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_not_null_constr
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_not_null_constraint_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -89841,6 +98544,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_default_constraint_args implements org.apache.thrift.TBase<add_default_constraint_args, add_default_constraint_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_default_constraint_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_default_constraint_args");
 
@@ -89902,10 +98606,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -89940,6 +98646,7 @@ public add_default_constraint_args(add_default_constraint_args other) {
       }
     }
 
+    @Override
     public add_default_constraint_args deepCopy() {
       return new add_default_constraint_args(this);
     }
@@ -89973,6 +98680,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -89987,6 +98695,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -89997,6 +98706,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -90067,14 +98777,17 @@ public int compareTo(add_default_constraint_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -90120,6 +98833,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_default_constraint_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_default_constraint_argsStandardScheme getScheme() {
         return new add_default_constraint_argsStandardScheme();
       }
@@ -90127,34 +98841,41 @@ public add_default_constraint_argsStandardScheme getScheme() {
 
     private static class add_default_constraint_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_default_constraint_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_default_constraint_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AddDefaultConstraintRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AddDefaultConstraintRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_default_constraint_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -90171,6 +98892,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_default_constr
     }
 
     private static class add_default_constraint_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_default_constraint_argsTupleScheme getScheme() {
         return new add_default_constraint_argsTupleScheme();
       }
@@ -90193,12 +98915,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_default_constra
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_default_constraint_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.req = new AddDefaultConstraintRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AddDefaultConstraintRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -90208,6 +98935,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_default_constraint_result implements org.apache.thrift.TBase<add_default_constraint_result, add_default_constraint_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_default_constraint_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_default_constraint_result");
 
@@ -90274,10 +99002,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -90319,6 +99049,7 @@ public add_default_constraint_result(add_default_constraint_result other) {
       }
     }
 
+    @Override
     public add_default_constraint_result deepCopy() {
       return new add_default_constraint_result(this);
     }
@@ -90377,6 +99108,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -90399,6 +99131,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -90412,6 +99145,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -90507,10 +99241,12 @@ public int compareTo(add_default_constraint_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -90565,6 +99301,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_default_constraint_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_default_constraint_resultStandardScheme getScheme() {
         return new add_default_constraint_resultStandardScheme();
       }
@@ -90572,43 +99309,50 @@ public add_default_constraint_resultStandardScheme getScheme() {
 
     private static class add_default_constraint_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_default_constraint_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_default_constraint_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_default_constraint_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -90630,6 +99374,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_default_constr
     }
 
     private static class add_default_constraint_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_default_constraint_resultTupleScheme getScheme() {
         return new add_default_constraint_resultTupleScheme();
       }
@@ -90658,17 +99403,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_default_constra
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_default_constraint_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -90678,6 +99428,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_check_constraint_args implements org.apache.thrift.TBase<add_check_constraint_args, add_check_constraint_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_check_constraint_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_check_constraint_args");
 
@@ -90739,10 +99490,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -90777,6 +99530,7 @@ public add_check_constraint_args(add_check_constraint_args other) {
       }
     }
 
+    @Override
     public add_check_constraint_args deepCopy() {
       return new add_check_constraint_args(this);
     }
@@ -90810,6 +99564,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -90824,6 +99579,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -90834,6 +99590,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -90904,14 +99661,17 @@ public int compareTo(add_check_constraint_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -90957,6 +99717,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_check_constraint_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_check_constraint_argsStandardScheme getScheme() {
         return new add_check_constraint_argsStandardScheme();
       }
@@ -90964,34 +99725,41 @@ public add_check_constraint_argsStandardScheme getScheme() {
 
     private static class add_check_constraint_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_check_constraint_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_check_constraint_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AddCheckConstraintRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AddCheckConstraintRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_check_constraint_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -91008,6 +99776,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_check_constrai
     }
 
     private static class add_check_constraint_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_check_constraint_argsTupleScheme getScheme() {
         return new add_check_constraint_argsTupleScheme();
       }
@@ -91030,12 +99799,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_check_constrain
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_check_constraint_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.req = new AddCheckConstraintRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AddCheckConstraintRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -91045,6 +99819,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_check_constraint_result implements org.apache.thrift.TBase<add_check_constraint_result, add_check_constraint_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_check_constraint_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_check_constraint_result");
 
@@ -91111,10 +99886,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -91156,6 +99933,7 @@ public add_check_constraint_result(add_check_constraint_result other) {
       }
     }
 
+    @Override
     public add_check_constraint_result deepCopy() {
       return new add_check_constraint_result(this);
     }
@@ -91214,6 +99992,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -91236,6 +100015,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -91249,6 +100029,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -91344,10 +100125,12 @@ public int compareTo(add_check_constraint_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -91402,6 +100185,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_check_constraint_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_check_constraint_resultStandardScheme getScheme() {
         return new add_check_constraint_resultStandardScheme();
       }
@@ -91409,43 +100193,50 @@ public add_check_constraint_resultStandardScheme getScheme() {
 
     private static class add_check_constraint_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_check_constraint_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_check_constraint_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_check_constraint_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -91467,6 +100258,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_check_constrai
     }
 
     private static class add_check_constraint_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_check_constraint_resultTupleScheme getScheme() {
         return new add_check_constraint_resultTupleScheme();
       }
@@ -91495,17 +100287,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_check_constrain
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_check_constraint_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -91515,6 +100312,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class translate_table_dryrun_args implements org.apache.thrift.TBase<translate_table_dryrun_args, translate_table_dryrun_args._Fields>, java.io.Serializable, Cloneable, Comparable<translate_table_dryrun_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("translate_table_dryrun_args");
 
@@ -91576,10 +100374,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -91614,6 +100414,7 @@ public translate_table_dryrun_args(translate_table_dryrun_args other) {
       }
     }
 
+    @Override
     public translate_table_dryrun_args deepCopy() {
       return new translate_table_dryrun_args(this);
     }
@@ -91647,6 +100448,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -91661,6 +100463,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -91671,6 +100474,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -91741,14 +100545,17 @@ public int compareTo(translate_table_dryrun_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -91794,6 +100601,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class translate_table_dryrun_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public translate_table_dryrun_argsStandardScheme getScheme() {
         return new translate_table_dryrun_argsStandardScheme();
       }
@@ -91801,34 +100609,41 @@ public translate_table_dryrun_argsStandardScheme getScheme() {
 
     private static class translate_table_dryrun_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<translate_table_dryrun_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, translate_table_dryrun_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new CreateTableRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new CreateTableRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, translate_table_dryrun_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -91845,6 +100660,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, translate_table_dr
     }
 
     private static class translate_table_dryrun_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public translate_table_dryrun_argsTupleScheme getScheme() {
         return new translate_table_dryrun_argsTupleScheme();
       }
@@ -91867,12 +100683,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, translate_table_dry
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, translate_table_dryrun_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 CreateTableRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CreateTableRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -91882,6 +100703,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class translate_table_dryrun_result implements org.apache.thrift.TBase<translate_table_dryrun_result, translate_table_dryrun_result._Fields>, java.io.Serializable, Cloneable, Comparable<translate_table_dryrun_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("translate_table_dryrun_result");
 
@@ -91963,10 +100785,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -92029,6 +100853,7 @@ public translate_table_dryrun_result(translate_table_dryrun_result other) {
       }
     }
 
+    @Override
     public translate_table_dryrun_result deepCopy() {
       return new translate_table_dryrun_result(this);
     }
@@ -92162,6 +100987,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -92208,6 +101034,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -92230,6 +101057,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -92400,10 +101228,12 @@ public int compareTo(translate_table_dryrun_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -92485,6 +101315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class translate_table_dryrun_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public translate_table_dryrun_resultStandardScheme getScheme() {
         return new translate_table_dryrun_resultStandardScheme();
       }
@@ -92492,70 +101323,77 @@ public translate_table_dryrun_resultStandardScheme getScheme() {
 
     private static class translate_table_dryrun_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<translate_table_dryrun_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, translate_table_dryrun_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 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 AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new NoSuchObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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 AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new NoSuchObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, translate_table_dryrun_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -92592,6 +101430,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, translate_table_dr
     }
 
     private static class translate_table_dryrun_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public translate_table_dryrun_resultTupleScheme getScheme() {
         return new translate_table_dryrun_resultTupleScheme();
       }
@@ -92638,32 +101477,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, translate_table_dry
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, translate_table_dryrun_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(5);
-        if (incoming.get(0)) {
-          struct.success = new Table();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new NoSuchObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new Table();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new NoSuchObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -92673,6 +101517,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_args implements org.apache.thrift.TBase<drop_table_args, drop_table_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_table_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_table_args");
 
@@ -92744,10 +101589,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -92798,6 +101645,7 @@ public drop_table_args(drop_table_args other) {
       this.deleteData = other.deleteData;
     }
 
+    @Override
     public drop_table_args deepCopy() {
       return new drop_table_args(this);
     }
@@ -92880,6 +101728,7 @@ public void setDeleteDataIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DELETEDATA_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -92910,6 +101759,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -92926,6 +101776,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -93044,14 +101895,17 @@ public int compareTo(drop_table_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -93108,6 +101962,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_argsStandardScheme getScheme() {
         return new drop_table_argsStandardScheme();
       }
@@ -93115,49 +101970,56 @@ public drop_table_argsStandardScheme getScheme() {
 
     private static class drop_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_table_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_table_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;
-          }
-          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: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
+            }
+            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: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -93182,6 +102044,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_args st
     }
 
     private static class drop_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_argsTupleScheme getScheme() {
         return new drop_table_argsTupleScheme();
       }
@@ -93216,19 +102079,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_table_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_table_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.name = iprot.readString();
-          struct.setNameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -93238,6 +102106,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_result implements org.apache.thrift.TBase<drop_table_result, drop_table_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_table_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_table_result");
 
@@ -93304,10 +102173,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -93349,6 +102220,7 @@ public drop_table_result(drop_table_result other) {
       }
     }
 
+    @Override
     public drop_table_result deepCopy() {
       return new drop_table_result(this);
     }
@@ -93407,6 +102279,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -93429,6 +102302,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -93442,6 +102316,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -93537,10 +102412,12 @@ public int compareTo(drop_table_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -93595,6 +102472,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_resultStandardScheme getScheme() {
         return new drop_table_resultStandardScheme();
       }
@@ -93602,43 +102480,50 @@ public drop_table_resultStandardScheme getScheme() {
 
     private static class drop_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_table_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_table_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 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: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -93660,6 +102545,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_result
     }
 
     private static class drop_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_resultTupleScheme getScheme() {
         return new drop_table_resultTupleScheme();
       }
@@ -93688,17 +102574,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_table_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_table_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -93708,6 +102599,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_with_environment_context_args implements org.apache.thrift.TBase<drop_table_with_environment_context_args, drop_table_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_table_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_table_with_environment_context_args");
 
@@ -93784,10 +102676,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -93845,6 +102739,7 @@ public drop_table_with_environment_context_args(drop_table_with_environment_cont
       }
     }
 
+    @Override
     public drop_table_with_environment_context_args deepCopy() {
       return new drop_table_with_environment_context_args(this);
     }
@@ -93952,6 +102847,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -93990,6 +102886,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -94009,6 +102906,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -94152,14 +103050,17 @@ public int compareTo(drop_table_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -94227,6 +103128,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_table_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_with_environment_context_argsStandardScheme getScheme() {
         return new drop_table_with_environment_context_argsStandardScheme();
       }
@@ -94234,58 +103136,65 @@ public drop_table_with_environment_context_argsStandardScheme getScheme() {
 
     private static class drop_table_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_table_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_table_with_environment_context_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;
-          }
-          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: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            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: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -94315,6 +103224,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_with_en
     }
 
     private static class drop_table_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_with_environment_context_argsTupleScheme getScheme() {
         return new drop_table_with_environment_context_argsTupleScheme();
       }
@@ -94355,24 +103265,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_table_with_env
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_table_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.name = iprot.readString();
-          struct.setNameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -94382,6 +103297,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_with_environment_context_result implements org.apache.thrift.TBase<drop_table_with_environment_context_result, drop_table_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_table_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_table_with_environment_context_result");
 
@@ -94448,10 +103364,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -94493,6 +103411,7 @@ public drop_table_with_environment_context_result(drop_table_with_environment_co
       }
     }
 
+    @Override
     public drop_table_with_environment_context_result deepCopy() {
       return new drop_table_with_environment_context_result(this);
     }
@@ -94551,6 +103470,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -94573,6 +103493,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -94586,6 +103507,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -94681,10 +103603,12 @@ public int compareTo(drop_table_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -94739,6 +103663,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_table_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_with_environment_context_resultStandardScheme getScheme() {
         return new drop_table_with_environment_context_resultStandardScheme();
       }
@@ -94746,43 +103671,50 @@ public drop_table_with_environment_context_resultStandardScheme getScheme() {
 
     private static class drop_table_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_table_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_table_with_environment_context_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 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: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -94804,6 +103736,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_with_en
     }
 
     private static class drop_table_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_with_environment_context_resultTupleScheme getScheme() {
         return new drop_table_with_environment_context_resultTupleScheme();
       }
@@ -94832,17 +103765,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_table_with_env
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_table_with_environment_context_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -94852,6 +103790,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_req_args implements org.apache.thrift.TBase<drop_table_req_args, drop_table_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_table_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_table_req_args");
 
@@ -94913,10 +103852,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -94951,6 +103892,7 @@ public drop_table_req_args(drop_table_req_args other) {
       }
     }
 
+    @Override
     public drop_table_req_args deepCopy() {
       return new drop_table_req_args(this);
     }
@@ -94984,6 +103926,7 @@ public void setDropTableReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DROP_TABLE_REQ:
@@ -94998,6 +103941,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DROP_TABLE_REQ:
@@ -95008,6 +103952,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -95078,14 +104023,17 @@ public int compareTo(drop_table_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -95131,6 +104079,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_table_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_req_argsStandardScheme getScheme() {
         return new drop_table_req_argsStandardScheme();
       }
@@ -95138,34 +104087,41 @@ public drop_table_req_argsStandardScheme getScheme() {
 
     private static class drop_table_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_table_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_table_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DROP_TABLE_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.dropTableReq = new DropTableRequest();
-                struct.dropTableReq.read(iprot);
-                struct.setDropTableReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // DROP_TABLE_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.dropTableReq = new DropTableRequest();
+                  struct.dropTableReq.read(iprot);
+                  struct.setDropTableReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -95182,6 +104138,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_req_arg
     }
 
     private static class drop_table_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_req_argsTupleScheme getScheme() {
         return new drop_table_req_argsTupleScheme();
       }
@@ -95204,12 +104161,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_table_req_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_table_req_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.dropTableReq = new DropTableRequest();
-          struct.dropTableReq.read(iprot);
-          struct.setDropTableReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.dropTableReq = new DropTableRequest();
+            struct.dropTableReq.read(iprot);
+            struct.setDropTableReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -95219,6 +104181,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_table_req_result implements org.apache.thrift.TBase<drop_table_req_result, drop_table_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_table_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_table_req_result");
 
@@ -95290,10 +104253,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -95342,6 +104307,7 @@ public drop_table_req_result(drop_table_req_result other) {
       }
     }
 
+    @Override
     public drop_table_req_result deepCopy() {
       return new drop_table_req_result(this);
     }
@@ -95425,6 +104391,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -95455,6 +104422,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -95471,6 +104439,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -95591,10 +104560,12 @@ public int compareTo(drop_table_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -95660,6 +104631,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_table_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_req_resultStandardScheme getScheme() {
         return new drop_table_req_resultStandardScheme();
       }
@@ -95667,52 +104639,59 @@ public drop_table_req_resultStandardScheme getScheme() {
 
     private static class drop_table_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_table_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_table_req_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 AsyncOperationResp();
-                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 NoSuchObjectException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AsyncOperationResp();
+                  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 NoSuchObjectException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -95739,6 +104718,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_table_req_res
     }
 
     private static class drop_table_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_table_req_resultTupleScheme getScheme() {
         return new drop_table_req_resultTupleScheme();
       }
@@ -95773,22 +104753,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_table_req_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_table_req_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 AsyncOperationResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AsyncOperationResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -95798,6 +104783,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_args implements org.apache.thrift.TBase<truncate_table_args, truncate_table_args._Fields>, java.io.Serializable, Cloneable, Comparable<truncate_table_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("truncate_table_args");
 
@@ -95869,10 +104855,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -95923,6 +104911,7 @@ public truncate_table_args(truncate_table_args other) {
       }
     }
 
+    @Override
     public truncate_table_args deepCopy() {
       return new truncate_table_args(this);
     }
@@ -96022,6 +105011,7 @@ public void setPartNamesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -96052,6 +105042,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -96068,6 +105059,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -96188,14 +105180,17 @@ public int compareTo(truncate_table_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -96254,6 +105249,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class truncate_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_argsStandardScheme getScheme() {
         return new truncate_table_argsStandardScheme();
       }
@@ -96261,59 +105257,66 @@ public truncate_table_argsStandardScheme getScheme() {
 
     private static class truncate_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<truncate_table_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, truncate_table_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tableName = iprot.readString();
-                struct.setTableNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1760 = iprot.readListBegin();
-                  struct.partNames = new java.util.ArrayList<java.lang.String>(_list1760.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1761;
-                  for (int _i1762 = 0; _i1762 < _list1760.size; ++_i1762)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tableName = iprot.readString();
+                  struct.setTableNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1761 = iprot.readString();
-                    struct.partNames.add(_elem1761);
+                    org.apache.thrift.protocol.TList _list1760 = iprot.readListBegin();
+                    struct.partNames = new java.util.ArrayList<java.lang.String>(_list1760.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1761;
+                    for (int _i1762 = 0; _i1762 < _list1760.size; ++_i1762)
+                    {
+                      _elem1761 = iprot.readString();
+                      struct.partNames.add(_elem1761);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPartNamesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPartNamesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -96347,6 +105350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_arg
     }
 
     private static class truncate_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_argsTupleScheme getScheme() {
         return new truncate_table_argsTupleScheme();
       }
@@ -96387,28 +105391,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, truncate_table_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, truncate_table_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tableName = iprot.readString();
-          struct.setTableNameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1765 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.partNames = new java.util.ArrayList<java.lang.String>(_list1765.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1766;
-            for (int _i1767 = 0; _i1767 < _list1765.size; ++_i1767)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbName = iprot.readString();
+            struct.setDbNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tableName = iprot.readString();
+            struct.setTableNameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1766 = iprot.readString();
-              struct.partNames.add(_elem1766);
+              org.apache.thrift.protocol.TList _list1765 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.partNames = new java.util.ArrayList<java.lang.String>(_list1765.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1766;
+              for (int _i1767 = 0; _i1767 < _list1765.size; ++_i1767)
+              {
+                _elem1766 = iprot.readString();
+                struct.partNames.add(_elem1766);
+              }
             }
+            struct.setPartNamesIsSet(true);
           }
-          struct.setPartNamesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -96418,6 +105427,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_result implements org.apache.thrift.TBase<truncate_table_result, truncate_table_result._Fields>, java.io.Serializable, Cloneable, Comparable<truncate_table_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("truncate_table_result");
 
@@ -96479,10 +105489,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -96517,6 +105529,7 @@ public truncate_table_result(truncate_table_result other) {
       }
     }
 
+    @Override
     public truncate_table_result deepCopy() {
       return new truncate_table_result(this);
     }
@@ -96550,6 +105563,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -96564,6 +105578,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -96574,6 +105589,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -96644,10 +105660,12 @@ public int compareTo(truncate_table_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -96694,6 +105712,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class truncate_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_resultStandardScheme getScheme() {
         return new truncate_table_resultStandardScheme();
       }
@@ -96701,34 +105720,41 @@ public truncate_table_resultStandardScheme getScheme() {
 
     private static class truncate_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<truncate_table_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, truncate_table_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -96745,6 +105771,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_res
     }
 
     private static class truncate_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_resultTupleScheme getScheme() {
         return new truncate_table_resultTupleScheme();
       }
@@ -96767,12 +105794,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, truncate_table_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, truncate_table_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -96782,6 +105814,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_req_args implements org.apache.thrift.TBase<truncate_table_req_args, truncate_table_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<truncate_table_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("truncate_table_req_args");
 
@@ -96843,10 +105876,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -96881,6 +105916,7 @@ public truncate_table_req_args(truncate_table_req_args other) {
       }
     }
 
+    @Override
     public truncate_table_req_args deepCopy() {
       return new truncate_table_req_args(this);
     }
@@ -96914,6 +105950,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -96928,6 +105965,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -96938,6 +105976,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -97008,14 +106047,17 @@ public int compareTo(truncate_table_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -97061,6 +106103,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class truncate_table_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_req_argsStandardScheme getScheme() {
         return new truncate_table_req_argsStandardScheme();
       }
@@ -97068,34 +106111,41 @@ public truncate_table_req_argsStandardScheme getScheme() {
 
     private static class truncate_table_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<truncate_table_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, truncate_table_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new TruncateTableRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new TruncateTableRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -97112,6 +106162,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_req
     }
 
     private static class truncate_table_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_req_argsTupleScheme getScheme() {
         return new truncate_table_req_argsTupleScheme();
       }
@@ -97134,12 +106185,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, truncate_table_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, truncate_table_req_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.req = new TruncateTableRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new TruncateTableRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -97149,6 +106205,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class truncate_table_req_result implements org.apache.thrift.TBase<truncate_table_req_result, truncate_table_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<truncate_table_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("truncate_table_req_result");
 
@@ -97215,10 +106272,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -97260,6 +106319,7 @@ public truncate_table_req_result(truncate_table_req_result other) {
       }
     }
 
+    @Override
     public truncate_table_req_result deepCopy() {
       return new truncate_table_req_result(this);
     }
@@ -97318,6 +106378,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -97340,6 +106401,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -97353,6 +106415,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -97448,10 +106511,12 @@ public int compareTo(truncate_table_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -97509,6 +106574,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class truncate_table_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_req_resultStandardScheme getScheme() {
         return new truncate_table_req_resultStandardScheme();
       }
@@ -97516,43 +106582,50 @@ public truncate_table_req_resultStandardScheme getScheme() {
 
     private static class truncate_table_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<truncate_table_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, truncate_table_req_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 TruncateTableResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 TruncateTableResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -97574,6 +106647,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, truncate_table_req
     }
 
     private static class truncate_table_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public truncate_table_req_resultTupleScheme getScheme() {
         return new truncate_table_req_resultTupleScheme();
       }
@@ -97602,17 +106676,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, truncate_table_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, truncate_table_req_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.success = new TruncateTableResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new TruncateTableResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -97622,6 +106701,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_args implements org.apache.thrift.TBase<get_tables_args, get_tables_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_tables_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_tables_args");
 
@@ -97688,10 +106768,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -97733,6 +106815,7 @@ public get_tables_args(get_tables_args other) {
       }
     }
 
+    @Override
     public get_tables_args deepCopy() {
       return new get_tables_args(this);
     }
@@ -97791,6 +106874,7 @@ public void setPatternIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -97813,6 +106897,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -97826,6 +106911,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -97921,14 +107007,17 @@ public int compareTo(get_tables_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -97979,6 +107068,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_tables_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_argsStandardScheme getScheme() {
         return new get_tables_argsStandardScheme();
       }
@@ -97986,41 +107076,48 @@ public get_tables_argsStandardScheme getScheme() {
 
     private static class get_tables_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_tables_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_tables_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // PATTERN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.pattern = iprot.readString();
-                struct.setPatternIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PATTERN
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.pattern = iprot.readString();
+                  struct.setPatternIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -98042,6 +107139,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_args st
     }
 
     private static class get_tables_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_argsTupleScheme getScheme() {
         return new get_tables_argsTupleScheme();
       }
@@ -98070,15 +107168,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_tables_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_tables_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.pattern = iprot.readString();
-          struct.setPatternIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.pattern = iprot.readString();
+            struct.setPatternIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -98088,6 +107191,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_result implements org.apache.thrift.TBase<get_tables_result, get_tables_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_tables_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_tables_result");
 
@@ -98154,10 +107258,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -98201,6 +107307,7 @@ public get_tables_result(get_tables_result other) {
       }
     }
 
+    @Override
     public get_tables_result deepCopy() {
       return new get_tables_result(this);
     }
@@ -98275,6 +107382,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -98297,6 +107405,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -98310,6 +107419,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -98405,10 +107515,12 @@ public int compareTo(get_tables_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -98463,6 +107575,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_tables_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_resultStandardScheme getScheme() {
         return new get_tables_resultStandardScheme();
       }
@@ -98470,52 +107583,59 @@ public get_tables_resultStandardScheme getScheme() {
 
     private static class get_tables_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_tables_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_tables_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1768 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1768.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1769;
-                  for (int _i1770 = 0; _i1770 < _list1768.size; ++_i1770)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1769 = iprot.readString();
-                    struct.success.add(_elem1769);
+                    org.apache.thrift.protocol.TList _list1768 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1768.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1769;
+                    for (int _i1770 = 0; _i1770 < _list1768.size; ++_i1770)
+                    {
+                      _elem1769 = iprot.readString();
+                      struct.success.add(_elem1769);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -98544,6 +107664,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_result
     }
 
     private static class get_tables_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_resultTupleScheme getScheme() {
         return new get_tables_resultTupleScheme();
       }
@@ -98578,25 +107699,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_tables_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_tables_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1773 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1773.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1774;
-            for (int _i1775 = 0; _i1775 < _list1773.size; ++_i1775)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1774 = iprot.readString();
-              struct.success.add(_elem1774);
+              org.apache.thrift.protocol.TList _list1773 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1773.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1774;
+              for (int _i1775 = 0; _i1775 < _list1773.size; ++_i1775)
+              {
+                _elem1774 = iprot.readString();
+                struct.success.add(_elem1774);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -98606,6 +107732,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_by_type_args implements org.apache.thrift.TBase<get_tables_by_type_args, get_tables_by_type_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_tables_by_type_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_tables_by_type_args");
 
@@ -98677,10 +107804,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -98729,6 +107858,7 @@ public get_tables_by_type_args(get_tables_by_type_args other) {
       }
     }
 
+    @Override
     public get_tables_by_type_args deepCopy() {
       return new get_tables_by_type_args(this);
     }
@@ -98812,6 +107942,7 @@ public void setTableTypeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -98842,6 +107973,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -98858,6 +107990,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -98978,14 +108111,17 @@ public int compareTo(get_tables_by_type_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -99044,6 +108180,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_tables_by_type_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_by_type_argsStandardScheme getScheme() {
         return new get_tables_by_type_argsStandardScheme();
       }
@@ -99051,49 +108188,56 @@ public get_tables_by_type_argsStandardScheme getScheme() {
 
     private static class get_tables_by_type_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_tables_by_type_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_tables_by_type_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // PATTERN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.pattern = iprot.readString();
-                struct.setPatternIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // TABLE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tableType = iprot.readString();
-                struct.setTableTypeIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PATTERN
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.pattern = iprot.readString();
+                  struct.setPatternIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // TABLE_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tableType = iprot.readString();
+                  struct.setTableTypeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_by_type_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -99120,6 +108264,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_by_type
     }
 
     private static class get_tables_by_type_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_by_type_argsTupleScheme getScheme() {
         return new get_tables_by_type_argsTupleScheme();
       }
@@ -99154,19 +108299,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_tables_by_type_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_tables_by_type_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.pattern = iprot.readString();
-          struct.setPatternIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.tableType = iprot.readString();
-          struct.setTableTypeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.pattern = iprot.readString();
+            struct.setPatternIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.tableType = iprot.readString();
+            struct.setTableTypeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -99176,6 +108326,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_by_type_result implements org.apache.thrift.TBase<get_tables_by_type_result, get_tables_by_type_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_tables_by_type_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_tables_by_type_result");
 
@@ -99242,10 +108393,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -99289,6 +108442,7 @@ public get_tables_by_type_result(get_tables_by_type_result other) {
       }
     }
 
+    @Override
     public get_tables_by_type_result deepCopy() {
       return new get_tables_by_type_result(this);
     }
@@ -99363,6 +108517,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -99385,6 +108540,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -99398,6 +108554,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -99493,10 +108650,12 @@ public int compareTo(get_tables_by_type_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -99551,6 +108710,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_tables_by_type_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_by_type_resultStandardScheme getScheme() {
         return new get_tables_by_type_resultStandardScheme();
       }
@@ -99558,52 +108718,59 @@ public get_tables_by_type_resultStandardScheme getScheme() {
 
     private static class get_tables_by_type_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_tables_by_type_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_tables_by_type_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1776 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1776.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1777;
-                  for (int _i1778 = 0; _i1778 < _list1776.size; ++_i1778)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1777 = iprot.readString();
-                    struct.success.add(_elem1777);
+                    org.apache.thrift.protocol.TList _list1776 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1776.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1777;
+                    for (int _i1778 = 0; _i1778 < _list1776.size; ++_i1778)
+                    {
+                      _elem1777 = iprot.readString();
+                      struct.success.add(_elem1777);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_by_type_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -99632,6 +108799,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_by_type
     }
 
     private static class get_tables_by_type_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_by_type_resultTupleScheme getScheme() {
         return new get_tables_by_type_resultTupleScheme();
       }
@@ -99666,25 +108834,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_tables_by_type_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_tables_by_type_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1781 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1781.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1782;
-            for (int _i1783 = 0; _i1783 < _list1781.size; ++_i1783)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1782 = iprot.readString();
-              struct.success.add(_elem1782);
+              org.apache.thrift.protocol.TList _list1781 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1781.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1782;
+              for (int _i1783 = 0; _i1783 < _list1781.size; ++_i1783)
+              {
+                _elem1782 = iprot.readString();
+                struct.success.add(_elem1782);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -99694,6 +108867,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_materialized_view_objects_for_rewriting_args implements org.apache.thrift.TBase<get_all_materialized_view_objects_for_rewriting_args, get_all_materialized_view_objects_for_rewriting_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_materialized_view_objects_for_rewriting_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_materialized_view_objects_for_rewriting_args");
 
@@ -99751,10 +108925,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -99775,6 +108951,7 @@ public get_all_materialized_view_objects_for_rewriting_args() {
     public get_all_materialized_view_objects_for_rewriting_args(get_all_materialized_view_objects_for_rewriting_args other) {
     }
 
+    @Override
     public get_all_materialized_view_objects_for_rewriting_args deepCopy() {
       return new get_all_materialized_view_objects_for_rewriting_args(this);
     }
@@ -99783,12 +108960,14 @@ public get_all_materialized_view_objects_for_rewriting_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -99796,6 +108975,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -99841,14 +109021,17 @@ public int compareTo(get_all_materialized_view_objects_for_rewriting_args other)
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -99884,6 +109067,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_materialized_view_objects_for_rewriting_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_materialized_view_objects_for_rewriting_argsStandardScheme getScheme() {
         return new get_all_materialized_view_objects_for_rewriting_argsStandardScheme();
       }
@@ -99891,25 +109075,32 @@ public get_all_materialized_view_objects_for_rewriting_argsStandardScheme getSch
 
     private static class get_all_materialized_view_objects_for_rewriting_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_materialized_view_objects_for_rewriting_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_materialized_view_objects_for_rewriting_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_materialized_view_objects_for_rewriting_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -99921,6 +109112,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_materializ
     }
 
     private static class get_all_materialized_view_objects_for_rewriting_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_materialized_view_objects_for_rewriting_argsTupleScheme getScheme() {
         return new get_all_materialized_view_objects_for_rewriting_argsTupleScheme();
       }
@@ -99935,7 +109127,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_materialize
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_materialized_view_objects_for_rewriting_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -99944,6 +109141,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_materialized_view_objects_for_rewriting_result implements org.apache.thrift.TBase<get_all_materialized_view_objects_for_rewriting_result, get_all_materialized_view_objects_for_rewriting_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_materialized_view_objects_for_rewriting_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_materialized_view_objects_for_rewriting_result");
 
@@ -100010,10 +109208,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -100060,6 +109260,7 @@ public get_all_materialized_view_objects_for_rewriting_result(get_all_materializ
       }
     }
 
+    @Override
     public get_all_materialized_view_objects_for_rewriting_result deepCopy() {
       return new get_all_materialized_view_objects_for_rewriting_result(this);
     }
@@ -100134,6 +109335,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -100156,6 +109358,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -100169,6 +109372,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -100264,10 +109468,12 @@ public int compareTo(get_all_materialized_view_objects_for_rewriting_result othe
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -100322,6 +109528,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_materialized_view_objects_for_rewriting_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_materialized_view_objects_for_rewriting_resultStandardScheme getScheme() {
         return new get_all_materialized_view_objects_for_rewriting_resultStandardScheme();
       }
@@ -100329,53 +109536,60 @@ public get_all_materialized_view_objects_for_rewriting_resultStandardScheme getS
 
     private static class get_all_materialized_view_objects_for_rewriting_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_materialized_view_objects_for_rewriting_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_materialized_view_objects_for_rewriting_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1784 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Table>(_list1784.size);
-                  @org.apache.thrift.annotation.Nullable Table _elem1785;
-                  for (int _i1786 = 0; _i1786 < _list1784.size; ++_i1786)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1785 = new Table();
-                    _elem1785.read(iprot);
-                    struct.success.add(_elem1785);
+                    org.apache.thrift.protocol.TList _list1784 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Table>(_list1784.size);
+                    @org.apache.thrift.annotation.Nullable Table _elem1785;
+                    for (int _i1786 = 0; _i1786 < _list1784.size; ++_i1786)
+                    {
+                      _elem1785 = new Table();
+                      _elem1785.read(iprot);
+                      struct.success.add(_elem1785);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_materialized_view_objects_for_rewriting_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -100404,6 +109618,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_materializ
     }
 
     private static class get_all_materialized_view_objects_for_rewriting_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_materialized_view_objects_for_rewriting_resultTupleScheme getScheme() {
         return new get_all_materialized_view_objects_for_rewriting_resultTupleScheme();
       }
@@ -100438,26 +109653,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_materialize
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_materialized_view_objects_for_rewriting_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1789 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Table>(_list1789.size);
-            @org.apache.thrift.annotation.Nullable Table _elem1790;
-            for (int _i1791 = 0; _i1791 < _list1789.size; ++_i1791)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1790 = new Table();
-              _elem1790.read(iprot);
-              struct.success.add(_elem1790);
+              org.apache.thrift.protocol.TList _list1789 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Table>(_list1789.size);
+              @org.apache.thrift.annotation.Nullable Table _elem1790;
+              for (int _i1791 = 0; _i1791 < _list1789.size; ++_i1791)
+              {
+                _elem1790 = new Table();
+                _elem1790.read(iprot);
+                struct.success.add(_elem1790);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -100467,6 +109687,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialized_views_for_rewriting_args implements org.apache.thrift.TBase<get_materialized_views_for_rewriting_args, get_materialized_views_for_rewriting_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_materialized_views_for_rewriting_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_materialized_views_for_rewriting_args");
 
@@ -100528,10 +109749,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -100566,6 +109789,7 @@ public get_materialized_views_for_rewriting_args(get_materialized_views_for_rewr
       }
     }
 
+    @Override
     public get_materialized_views_for_rewriting_args deepCopy() {
       return new get_materialized_views_for_rewriting_args(this);
     }
@@ -100599,6 +109823,7 @@ public void setDb_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -100613,6 +109838,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -100623,6 +109849,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -100693,14 +109920,17 @@ public int compareTo(get_materialized_views_for_rewriting_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -100743,6 +109973,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_materialized_views_for_rewriting_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialized_views_for_rewriting_argsStandardScheme getScheme() {
         return new get_materialized_views_for_rewriting_argsStandardScheme();
       }
@@ -100750,33 +109981,40 @@ public get_materialized_views_for_rewriting_argsStandardScheme getScheme() {
 
     private static class get_materialized_views_for_rewriting_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_materialized_views_for_rewriting_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_materialized_views_for_rewriting_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_materialized_views_for_rewriting_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -100793,6 +110031,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_materialized_v
     }
 
     private static class get_materialized_views_for_rewriting_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialized_views_for_rewriting_argsTupleScheme getScheme() {
         return new get_materialized_views_for_rewriting_argsTupleScheme();
       }
@@ -100815,11 +110054,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_materialized_vi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_materialized_views_for_rewriting_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.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -100829,6 +110073,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialized_views_for_rewriting_result implements org.apache.thrift.TBase<get_materialized_views_for_rewriting_result, get_materialized_views_for_rewriting_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_materialized_views_for_rewriting_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_materialized_views_for_rewriting_result");
 
@@ -100895,10 +110140,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -100942,6 +110189,7 @@ public get_materialized_views_for_rewriting_result(get_materialized_views_for_re
       }
     }
 
+    @Override
     public get_materialized_views_for_rewriting_result deepCopy() {
       return new get_materialized_views_for_rewriting_result(this);
     }
@@ -101016,6 +110264,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -101038,6 +110287,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -101051,6 +110301,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -101146,10 +110397,12 @@ public int compareTo(get_materialized_views_for_rewriting_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -101204,6 +110457,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_materialized_views_for_rewriting_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialized_views_for_rewriting_resultStandardScheme getScheme() {
         return new get_materialized_views_for_rewriting_resultStandardScheme();
       }
@@ -101211,52 +110465,59 @@ public get_materialized_views_for_rewriting_resultStandardScheme getScheme() {
 
     private static class get_materialized_views_for_rewriting_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_materialized_views_for_rewriting_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_materialized_views_for_rewriting_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1792 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1792.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1793;
-                  for (int _i1794 = 0; _i1794 < _list1792.size; ++_i1794)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1793 = iprot.readString();
-                    struct.success.add(_elem1793);
+                    org.apache.thrift.protocol.TList _list1792 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1792.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1793;
+                    for (int _i1794 = 0; _i1794 < _list1792.size; ++_i1794)
+                    {
+                      _elem1793 = iprot.readString();
+                      struct.success.add(_elem1793);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_materialized_views_for_rewriting_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -101285,6 +110546,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_materialized_v
     }
 
     private static class get_materialized_views_for_rewriting_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialized_views_for_rewriting_resultTupleScheme getScheme() {
         return new get_materialized_views_for_rewriting_resultTupleScheme();
       }
@@ -101319,25 +110581,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_materialized_vi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_materialized_views_for_rewriting_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1797 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1797.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1798;
-            for (int _i1799 = 0; _i1799 < _list1797.size; ++_i1799)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1798 = iprot.readString();
-              struct.success.add(_elem1798);
+              org.apache.thrift.protocol.TList _list1797 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1797.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1798;
+              for (int _i1799 = 0; _i1799 < _list1797.size; ++_i1799)
+              {
+                _elem1798 = iprot.readString();
+                struct.success.add(_elem1798);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -101347,6 +110614,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_meta_args implements org.apache.thrift.TBase<get_table_meta_args, get_table_meta_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_meta_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_meta_args");
 
@@ -101418,10 +110686,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -101472,6 +110742,7 @@ public get_table_meta_args(get_table_meta_args other) {
       }
     }
 
+    @Override
     public get_table_meta_args deepCopy() {
       return new get_table_meta_args(this);
     }
@@ -101571,6 +110842,7 @@ public void setTbl_typesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_PATTERNS:
@@ -101601,6 +110873,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_PATTERNS:
@@ -101617,6 +110890,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -101737,14 +111011,17 @@ public int compareTo(get_table_meta_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -101803,6 +111080,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_meta_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_meta_argsStandardScheme getScheme() {
         return new get_table_meta_argsStandardScheme();
       }
@@ -101810,59 +111088,66 @@ public get_table_meta_argsStandardScheme getScheme() {
 
     private static class get_table_meta_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_meta_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_meta_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_PATTERNS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_patterns = iprot.readString();
-                struct.setDb_patternsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_PATTERNS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_patterns = iprot.readString();
-                struct.setTbl_patternsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // TBL_TYPES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1800 = iprot.readListBegin();
-                  struct.tbl_types = new java.util.ArrayList<java.lang.String>(_list1800.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1801;
-                  for (int _i1802 = 0; _i1802 < _list1800.size; ++_i1802)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_PATTERNS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_patterns = iprot.readString();
+                  struct.setDb_patternsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_PATTERNS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_patterns = iprot.readString();
+                  struct.setTbl_patternsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // TBL_TYPES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1801 = iprot.readString();
-                    struct.tbl_types.add(_elem1801);
+                    org.apache.thrift.protocol.TList _list1800 = iprot.readListBegin();
+                    struct.tbl_types = new java.util.ArrayList<java.lang.String>(_list1800.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1801;
+                    for (int _i1802 = 0; _i1802 < _list1800.size; ++_i1802)
+                    {
+                      _elem1801 = iprot.readString();
+                      struct.tbl_types.add(_elem1801);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setTbl_typesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setTbl_typesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_meta_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -101896,6 +111181,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_meta_arg
     }
 
     private static class get_table_meta_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_meta_argsTupleScheme getScheme() {
         return new get_table_meta_argsTupleScheme();
       }
@@ -101936,28 +111222,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_meta_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_meta_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);
-        if (incoming.get(0)) {
-          struct.db_patterns = iprot.readString();
-          struct.setDb_patternsIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_patterns = iprot.readString();
-          struct.setTbl_patternsIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1805 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.tbl_types = new java.util.ArrayList<java.lang.String>(_list1805.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1806;
-            for (int _i1807 = 0; _i1807 < _list1805.size; ++_i1807)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_patterns = iprot.readString();
+            struct.setDb_patternsIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_patterns = iprot.readString();
+            struct.setTbl_patternsIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1806 = iprot.readString();
-              struct.tbl_types.add(_elem1806);
+              org.apache.thrift.protocol.TList _list1805 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.tbl_types = new java.util.ArrayList<java.lang.String>(_list1805.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1806;
+              for (int _i1807 = 0; _i1807 < _list1805.size; ++_i1807)
+              {
+                _elem1806 = iprot.readString();
+                struct.tbl_types.add(_elem1806);
+              }
             }
+            struct.setTbl_typesIsSet(true);
           }
-          struct.setTbl_typesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -101967,6 +111258,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_meta_result implements org.apache.thrift.TBase<get_table_meta_result, get_table_meta_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_meta_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_meta_result");
 
@@ -102033,10 +111325,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -102083,6 +111377,7 @@ public get_table_meta_result(get_table_meta_result other) {
       }
     }
 
+    @Override
     public get_table_meta_result deepCopy() {
       return new get_table_meta_result(this);
     }
@@ -102157,6 +111452,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -102179,6 +111475,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -102192,6 +111489,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -102287,10 +111585,12 @@ public int compareTo(get_table_meta_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -102345,6 +111645,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_meta_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_meta_resultStandardScheme getScheme() {
         return new get_table_meta_resultStandardScheme();
       }
@@ -102352,53 +111653,60 @@ public get_table_meta_resultStandardScheme getScheme() {
 
     private static class get_table_meta_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_meta_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_meta_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1808 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<TableMeta>(_list1808.size);
-                  @org.apache.thrift.annotation.Nullable TableMeta _elem1809;
-                  for (int _i1810 = 0; _i1810 < _list1808.size; ++_i1810)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1809 = new TableMeta();
-                    _elem1809.read(iprot);
-                    struct.success.add(_elem1809);
+                    org.apache.thrift.protocol.TList _list1808 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<TableMeta>(_list1808.size);
+                    @org.apache.thrift.annotation.Nullable TableMeta _elem1809;
+                    for (int _i1810 = 0; _i1810 < _list1808.size; ++_i1810)
+                    {
+                      _elem1809 = new TableMeta();
+                      _elem1809.read(iprot);
+                      struct.success.add(_elem1809);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_meta_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -102427,6 +111735,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_meta_res
     }
 
     private static class get_table_meta_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_meta_resultTupleScheme getScheme() {
         return new get_table_meta_resultTupleScheme();
       }
@@ -102461,26 +111770,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_meta_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_meta_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1813 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<TableMeta>(_list1813.size);
-            @org.apache.thrift.annotation.Nullable TableMeta _elem1814;
-            for (int _i1815 = 0; _i1815 < _list1813.size; ++_i1815)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1814 = new TableMeta();
-              _elem1814.read(iprot);
-              struct.success.add(_elem1814);
+              org.apache.thrift.protocol.TList _list1813 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<TableMeta>(_list1813.size);
+              @org.apache.thrift.annotation.Nullable TableMeta _elem1814;
+              for (int _i1815 = 0; _i1815 < _list1813.size; ++_i1815)
+              {
+                _elem1814 = new TableMeta();
+                _elem1814.read(iprot);
+                struct.success.add(_elem1814);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -102490,6 +111804,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_tables_args implements org.apache.thrift.TBase<get_all_tables_args, get_all_tables_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_tables_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_tables_args");
 
@@ -102551,10 +111866,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -102589,6 +111906,7 @@ public get_all_tables_args(get_all_tables_args other) {
       }
     }
 
+    @Override
     public get_all_tables_args deepCopy() {
       return new get_all_tables_args(this);
     }
@@ -102622,6 +111940,7 @@ public void setDb_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -102636,6 +111955,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -102646,6 +111966,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -102716,14 +112037,17 @@ public int compareTo(get_all_tables_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -102766,6 +112090,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_tables_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_tables_argsStandardScheme getScheme() {
         return new get_all_tables_argsStandardScheme();
       }
@@ -102773,33 +112098,40 @@ public get_all_tables_argsStandardScheme getScheme() {
 
     private static class get_all_tables_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_tables_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_tables_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_tables_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -102816,6 +112148,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_tables_arg
     }
 
     private static class get_all_tables_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_tables_argsTupleScheme getScheme() {
         return new get_all_tables_argsTupleScheme();
       }
@@ -102838,11 +112171,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_tables_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_tables_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.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -102852,6 +112190,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_tables_result implements org.apache.thrift.TBase<get_all_tables_result, get_all_tables_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_tables_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_tables_result");
 
@@ -102918,10 +112257,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -102965,6 +112306,7 @@ public get_all_tables_result(get_all_tables_result other) {
       }
     }
 
+    @Override
     public get_all_tables_result deepCopy() {
       return new get_all_tables_result(this);
     }
@@ -103039,6 +112381,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -103061,6 +112404,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -103074,6 +112418,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -103169,10 +112514,12 @@ public int compareTo(get_all_tables_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -103227,6 +112574,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_tables_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_tables_resultStandardScheme getScheme() {
         return new get_all_tables_resultStandardScheme();
       }
@@ -103234,52 +112582,59 @@ public get_all_tables_resultStandardScheme getScheme() {
 
     private static class get_all_tables_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_tables_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_tables_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1816 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1816.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1817;
-                  for (int _i1818 = 0; _i1818 < _list1816.size; ++_i1818)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1817 = iprot.readString();
-                    struct.success.add(_elem1817);
+                    org.apache.thrift.protocol.TList _list1816 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1816.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1817;
+                    for (int _i1818 = 0; _i1818 < _list1816.size; ++_i1818)
+                    {
+                      _elem1817 = iprot.readString();
+                      struct.success.add(_elem1817);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_tables_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -103308,6 +112663,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_tables_res
     }
 
     private static class get_all_tables_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_tables_resultTupleScheme getScheme() {
         return new get_all_tables_resultTupleScheme();
       }
@@ -103342,25 +112698,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_tables_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_tables_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1821 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1821.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1822;
-            for (int _i1823 = 0; _i1823 < _list1821.size; ++_i1823)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1822 = iprot.readString();
-              struct.success.add(_elem1822);
+              org.apache.thrift.protocol.TList _list1821 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1821.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1822;
+              for (int _i1823 = 0; _i1823 < _list1821.size; ++_i1823)
+              {
+                _elem1822 = iprot.readString();
+                struct.success.add(_elem1822);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -103370,6 +112731,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_ext_args implements org.apache.thrift.TBase<get_tables_ext_args, get_tables_ext_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_tables_ext_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_tables_ext_args");
 
@@ -103431,10 +112793,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -103469,6 +112833,7 @@ public get_tables_ext_args(get_tables_ext_args other) {
       }
     }
 
+    @Override
     public get_tables_ext_args deepCopy() {
       return new get_tables_ext_args(this);
     }
@@ -103502,6 +112867,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -103516,6 +112882,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -103526,6 +112893,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -103596,14 +112964,17 @@ public int compareTo(get_tables_ext_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -103649,6 +113020,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_tables_ext_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_ext_argsStandardScheme getScheme() {
         return new get_tables_ext_argsStandardScheme();
       }
@@ -103656,34 +113028,41 @@ public get_tables_ext_argsStandardScheme getScheme() {
 
     private static class get_tables_ext_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_tables_ext_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_tables_ext_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetTablesExtRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetTablesExtRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_ext_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -103700,6 +113079,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_ext_arg
     }
 
     private static class get_tables_ext_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_ext_argsTupleScheme getScheme() {
         return new get_tables_ext_argsTupleScheme();
       }
@@ -103722,12 +113102,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_tables_ext_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_tables_ext_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.req = new GetTablesExtRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetTablesExtRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -103737,6 +113122,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_tables_ext_result implements org.apache.thrift.TBase<get_tables_ext_result, get_tables_ext_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_tables_ext_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_tables_ext_result");
 
@@ -103803,10 +113189,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -103853,6 +113241,7 @@ public get_tables_ext_result(get_tables_ext_result other) {
       }
     }
 
+    @Override
     public get_tables_ext_result deepCopy() {
       return new get_tables_ext_result(this);
     }
@@ -103927,6 +113316,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -103949,6 +113339,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -103962,6 +113353,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -104057,10 +113449,12 @@ public int compareTo(get_tables_ext_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -104115,6 +113509,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_tables_ext_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_ext_resultStandardScheme getScheme() {
         return new get_tables_ext_resultStandardScheme();
       }
@@ -104122,53 +113517,60 @@ public get_tables_ext_resultStandardScheme getScheme() {
 
     private static class get_tables_ext_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_tables_ext_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_tables_ext_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1824 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<ExtendedTableInfo>(_list1824.size);
-                  @org.apache.thrift.annotation.Nullable ExtendedTableInfo _elem1825;
-                  for (int _i1826 = 0; _i1826 < _list1824.size; ++_i1826)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1825 = new ExtendedTableInfo();
-                    _elem1825.read(iprot);
-                    struct.success.add(_elem1825);
+                    org.apache.thrift.protocol.TList _list1824 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<ExtendedTableInfo>(_list1824.size);
+                    @org.apache.thrift.annotation.Nullable ExtendedTableInfo _elem1825;
+                    for (int _i1826 = 0; _i1826 < _list1824.size; ++_i1826)
+                    {
+                      _elem1825 = new ExtendedTableInfo();
+                      _elem1825.read(iprot);
+                      struct.success.add(_elem1825);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_ext_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -104197,6 +113599,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_tables_ext_res
     }
 
     private static class get_tables_ext_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_tables_ext_resultTupleScheme getScheme() {
         return new get_tables_ext_resultTupleScheme();
       }
@@ -104231,26 +113634,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_tables_ext_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_tables_ext_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1829 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<ExtendedTableInfo>(_list1829.size);
-            @org.apache.thrift.annotation.Nullable ExtendedTableInfo _elem1830;
-            for (int _i1831 = 0; _i1831 < _list1829.size; ++_i1831)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem1830 = new ExtendedTableInfo();
-              _elem1830.read(iprot);
-              struct.success.add(_elem1830);
+              org.apache.thrift.protocol.TList _list1829 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<ExtendedTableInfo>(_list1829.size);
+              @org.apache.thrift.annotation.Nullable ExtendedTableInfo _elem1830;
+              for (int _i1831 = 0; _i1831 < _list1829.size; ++_i1831)
+              {
+                _elem1830 = new ExtendedTableInfo();
+                _elem1830.read(iprot);
+                struct.success.add(_elem1830);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -104260,6 +113668,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_req_args implements org.apache.thrift.TBase<get_table_req_args, get_table_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_req_args");
 
@@ -104321,10 +113730,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -104359,6 +113770,7 @@ public get_table_req_args(get_table_req_args other) {
       }
     }
 
+    @Override
     public get_table_req_args deepCopy() {
       return new get_table_req_args(this);
     }
@@ -104392,6 +113804,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -104406,6 +113819,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -104416,6 +113830,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -104486,14 +113901,17 @@ public int compareTo(get_table_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -104539,6 +113957,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_req_argsStandardScheme getScheme() {
         return new get_table_req_argsStandardScheme();
       }
@@ -104546,34 +113965,41 @@ public get_table_req_argsStandardScheme getScheme() {
 
     private static class get_table_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetTableRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetTableRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -104590,6 +114016,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_req_args
     }
 
     private static class get_table_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_req_argsTupleScheme getScheme() {
         return new get_table_req_argsTupleScheme();
       }
@@ -104612,12 +114039,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_req_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_req_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.req = new GetTableRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetTableRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -104627,6 +114059,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_req_result implements org.apache.thrift.TBase<get_table_req_result, get_table_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_req_result");
 
@@ -104698,10 +114131,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -104750,6 +114185,7 @@ public get_table_req_result(get_table_req_result other) {
       }
     }
 
+    @Override
     public get_table_req_result deepCopy() {
       return new get_table_req_result(this);
     }
@@ -104833,6 +114269,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -104863,6 +114300,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -104879,6 +114317,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -104999,10 +114438,12 @@ public int compareTo(get_table_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -105068,6 +114509,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_req_resultStandardScheme getScheme() {
         return new get_table_req_resultStandardScheme();
       }
@@ -105075,52 +114517,59 @@ public get_table_req_resultStandardScheme getScheme() {
 
     private static class get_table_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_req_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 GetTableResult();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetTableResult();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -105147,6 +114596,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_req_resu
     }
 
     private static class get_table_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_req_resultTupleScheme getScheme() {
         return new get_table_req_resultTupleScheme();
       }
@@ -105181,22 +114631,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_req_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_req_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 GetTableResult();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetTableResult();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -105206,6 +114661,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_req_args implements org.apache.thrift.TBase<get_table_objects_by_name_req_args, get_table_objects_by_name_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_objects_by_name_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_req_args");
 
@@ -105267,10 +114723,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -105305,6 +114763,7 @@ public get_table_objects_by_name_req_args(get_table_objects_by_name_req_args oth
       }
     }
 
+    @Override
     public get_table_objects_by_name_req_args deepCopy() {
       return new get_table_objects_by_name_req_args(this);
     }
@@ -105338,6 +114797,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -105352,6 +114812,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -105362,6 +114823,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -105432,14 +114894,17 @@ public int compareTo(get_table_objects_by_name_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -105485,6 +114950,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_objects_by_name_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_objects_by_name_req_argsStandardScheme getScheme() {
         return new get_table_objects_by_name_req_argsStandardScheme();
       }
@@ -105492,34 +114958,41 @@ public get_table_objects_by_name_req_argsStandardScheme getScheme() {
 
     private static class get_table_objects_by_name_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_objects_by_name_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetTablesRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetTablesRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -105536,6 +115009,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_
     }
 
     private static class get_table_objects_by_name_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_objects_by_name_req_argsTupleScheme getScheme() {
         return new get_table_objects_by_name_req_argsTupleScheme();
       }
@@ -105558,12 +115032,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_b
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_req_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.req = new GetTablesRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetTablesRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -105573,6 +115052,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_req_result implements org.apache.thrift.TBase<get_table_objects_by_name_req_result, get_table_objects_by_name_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_objects_by_name_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_req_result");
 
@@ -105649,10 +115129,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -105708,6 +115190,7 @@ public get_table_objects_by_name_req_result(get_table_objects_by_name_req_result
       }
     }
 
+    @Override
     public get_table_objects_by_name_req_result deepCopy() {
       return new get_table_objects_by_name_req_result(this);
     }
@@ -105816,6 +115299,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -105854,6 +115338,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -105873,6 +115358,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -106018,10 +115504,12 @@ public int compareTo(get_table_objects_by_name_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -106095,6 +115583,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_objects_by_name_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_objects_by_name_req_resultStandardScheme getScheme() {
         return new get_table_objects_by_name_req_resultStandardScheme();
       }
@@ -106102,61 +115591,68 @@ public get_table_objects_by_name_req_resultStandardScheme getScheme() {
 
     private static class get_table_objects_by_name_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_objects_by_name_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_req_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 GetTablesResult();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetTablesResult();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -106188,6 +115684,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_
     }
 
     private static class get_table_objects_by_name_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_objects_by_name_req_resultTupleScheme getScheme() {
         return new get_table_objects_by_name_req_resultTupleScheme();
       }
@@ -106228,27 +115725,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_b
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new GetTablesResult();
-          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 InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new GetTablesResult();
+            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 InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -106258,6 +115760,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialization_invalidation_info_args implements org.apache.thrift.TBase<get_materialization_invalidation_info_args, get_materialization_invalidation_info_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_materialization_invalidation_info_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_materialization_invalidation_info_args");
 
@@ -106324,10 +115827,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -106369,6 +115874,7 @@ public get_materialization_invalidation_info_args(get_materialization_invalidati
       }
     }
 
+    @Override
     public get_materialization_invalidation_info_args deepCopy() {
       return new get_materialization_invalidation_info_args(this);
     }
@@ -106427,6 +115933,7 @@ public void setValidTxnListIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CREATION_METADATA:
@@ -106449,6 +115956,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CREATION_METADATA:
@@ -106462,6 +115970,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -106557,14 +116066,17 @@ public int compareTo(get_materialization_invalidation_info_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -106618,6 +116130,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_materialization_invalidation_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialization_invalidation_info_argsStandardScheme getScheme() {
         return new get_materialization_invalidation_info_argsStandardScheme();
       }
@@ -106625,42 +116138,49 @@ public get_materialization_invalidation_info_argsStandardScheme getScheme() {
 
     private static class get_materialization_invalidation_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_materialization_invalidation_info_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_materialization_invalidation_info_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CREATION_METADATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.creation_metadata = new CreationMetadata();
-                struct.creation_metadata.read(iprot);
-                struct.setCreation_metadataIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // VALID_TXN_LIST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.validTxnList = iprot.readString();
-                struct.setValidTxnListIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CREATION_METADATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.creation_metadata = new CreationMetadata();
+                  struct.creation_metadata.read(iprot);
+                  struct.setCreation_metadataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // VALID_TXN_LIST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.validTxnList = iprot.readString();
+                  struct.setValidTxnListIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_materialization_invalidation_info_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -106682,6 +116202,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_materializatio
     }
 
     private static class get_materialization_invalidation_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialization_invalidation_info_argsTupleScheme getScheme() {
         return new get_materialization_invalidation_info_argsTupleScheme();
       }
@@ -106710,16 +116231,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_materialization
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_materialization_invalidation_info_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          struct.creation_metadata = new CreationMetadata();
-          struct.creation_metadata.read(iprot);
-          struct.setCreation_metadataIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.validTxnList = iprot.readString();
-          struct.setValidTxnListIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.creation_metadata = new CreationMetadata();
+            struct.creation_metadata.read(iprot);
+            struct.setCreation_metadataIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.validTxnList = iprot.readString();
+            struct.setValidTxnListIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -106729,6 +116255,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_materialization_invalidation_info_result implements org.apache.thrift.TBase<get_materialization_invalidation_info_result, get_materialization_invalidation_info_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_materialization_invalidation_info_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_materialization_invalidation_info_result");
 
@@ -106805,10 +116332,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -106864,6 +116393,7 @@ public get_materialization_invalidation_info_result(get_materialization_invalida
       }
     }
 
+    @Override
     public get_materialization_invalidation_info_result deepCopy() {
       return new get_materialization_invalidation_info_result(this);
     }
@@ -106972,6 +116502,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -107010,6 +116541,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -107029,6 +116561,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -107174,10 +116707,12 @@ public int compareTo(get_materialization_invalidation_info_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -107251,6 +116786,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_materialization_invalidation_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialization_invalidation_info_resultStandardScheme getScheme() {
         return new get_materialization_invalidation_info_resultStandardScheme();
       }
@@ -107258,61 +116794,68 @@ public get_materialization_invalidation_info_resultStandardScheme getScheme() {
 
     private static class get_materialization_invalidation_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_materialization_invalidation_info_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_materialization_invalidation_info_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 Materialization();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Materialization();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_materialization_invalidation_info_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -107344,6 +116887,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_materializatio
     }
 
     private static class get_materialization_invalidation_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_materialization_invalidation_info_resultTupleScheme getScheme() {
         return new get_materialization_invalidation_info_resultTupleScheme();
       }
@@ -107384,27 +116928,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_materialization
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_materialization_invalidation_info_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
-        if (incoming.get(0)) {
-          struct.success = new Materialization();
-          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 InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Materialization();
+            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 InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -107414,6 +116963,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_creation_metadata_args implements org.apache.thrift.TBase<update_creation_metadata_args, update_creation_metadata_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_creation_metadata_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_creation_metadata_args");
 
@@ -107490,10 +117040,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -107549,6 +117101,7 @@ public update_creation_metadata_args(update_creation_metadata_args other) {
       }
     }
 
+    @Override
     public update_creation_metadata_args deepCopy() {
       return new update_creation_metadata_args(this);
     }
@@ -107657,6 +117210,7 @@ public void setCreation_metadataIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CAT_NAME:
@@ -107695,6 +117249,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CAT_NAME:
@@ -107714,6 +117269,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -107859,14 +117415,17 @@ public int compareTo(update_creation_metadata_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -107936,6 +117495,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_creation_metadata_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_creation_metadata_argsStandardScheme getScheme() {
         return new update_creation_metadata_argsStandardScheme();
       }
@@ -107943,58 +117503,65 @@ public update_creation_metadata_argsStandardScheme getScheme() {
 
     private static class update_creation_metadata_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_creation_metadata_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_creation_metadata_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CAT_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.catName = iprot.readString();
-                struct.setCatNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // 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 3: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // CREATION_METADATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.creation_metadata = new CreationMetadata();
-                struct.creation_metadata.read(iprot);
-                struct.setCreation_metadataIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // CAT_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.catName = iprot.readString();
+                  struct.setCatNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // 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 3: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // CREATION_METADATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.creation_metadata = new CreationMetadata();
+                  struct.creation_metadata.read(iprot);
+                  struct.setCreation_metadataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_creation_metadata_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -108026,6 +117593,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_creation_me
     }
 
     private static class update_creation_metadata_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_creation_metadata_argsTupleScheme getScheme() {
         return new update_creation_metadata_argsTupleScheme();
       }
@@ -108066,24 +117634,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_creation_met
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_creation_metadata_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(4);
-        if (incoming.get(0)) {
-          struct.catName = iprot.readString();
-          struct.setCatNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.creation_metadata = new CreationMetadata();
-          struct.creation_metadata.read(iprot);
-          struct.setCreation_metadataIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.catName = iprot.readString();
+            struct.setCatNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.creation_metadata = new CreationMetadata();
+            struct.creation_metadata.read(iprot);
+            struct.setCreation_metadataIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -108093,6 +117666,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_creation_metadata_result implements org.apache.thrift.TBase<update_creation_metadata_result, update_creation_metadata_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_creation_metadata_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_creation_metadata_result");
 
@@ -108164,10 +117738,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -108216,6 +117792,7 @@ public update_creation_metadata_result(update_creation_metadata_result other) {
       }
     }
 
+    @Override
     public update_creation_metadata_result deepCopy() {
       return new update_creation_metadata_result(this);
     }
@@ -108299,6 +117876,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -108329,6 +117907,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -108345,6 +117924,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -108465,10 +118045,12 @@ public int compareTo(update_creation_metadata_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -108531,6 +118113,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_creation_metadata_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_creation_metadata_resultStandardScheme getScheme() {
         return new update_creation_metadata_resultStandardScheme();
       }
@@ -108538,52 +118121,59 @@ public update_creation_metadata_resultStandardScheme getScheme() {
 
     private static class update_creation_metadata_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_creation_metadata_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_creation_metadata_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 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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_creation_metadata_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -108610,6 +118200,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_creation_me
     }
 
     private static class update_creation_metadata_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_creation_metadata_resultTupleScheme getScheme() {
         return new update_creation_metadata_resultTupleScheme();
       }
@@ -108644,22 +118235,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_creation_met
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_creation_metadata_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -108669,6 +118265,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_names_by_filter_args implements org.apache.thrift.TBase<get_table_names_by_filter_args, get_table_names_by_filter_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_names_by_filter_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_names_by_filter_args");
 
@@ -108740,10 +118337,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -108796,6 +118395,7 @@ public get_table_names_by_filter_args(get_table_names_by_filter_args other) {
       this.max_tables = other.max_tables;
     }
 
+    @Override
     public get_table_names_by_filter_args deepCopy() {
       return new get_table_names_by_filter_args(this);
     }
@@ -108878,6 +118478,7 @@ public void setMax_tablesIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_TABLES_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -108908,6 +118509,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -108924,6 +118526,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -109042,14 +118645,17 @@ public int compareTo(get_table_names_by_filter_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -109106,6 +118712,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_names_by_filter_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_names_by_filter_argsStandardScheme getScheme() {
         return new get_table_names_by_filter_argsStandardScheme();
       }
@@ -109113,49 +118720,56 @@ public get_table_names_by_filter_argsStandardScheme getScheme() {
 
     private static class get_table_names_by_filter_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_names_by_filter_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_names_by_filter_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;
-          }
-          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: // FILTER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.filter = iprot.readString();
-                struct.setFilterIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // MAX_TABLES
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_tables = iprot.readI16();
-                struct.setMax_tablesIsSet(true);
-              } else { 
+            }
+            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: // FILTER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.filter = iprot.readString();
+                  struct.setFilterIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // MAX_TABLES
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_tables = iprot.readI16();
+                  struct.setMax_tablesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_names_by_filter_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -109180,6 +118794,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_names_by
     }
 
     private static class get_table_names_by_filter_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_names_by_filter_argsTupleScheme getScheme() {
         return new get_table_names_by_filter_argsTupleScheme();
       }
@@ -109214,19 +118829,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_names_by_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_names_by_filter_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);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.filter = iprot.readString();
-          struct.setFilterIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.max_tables = iprot.readI16();
-          struct.setMax_tablesIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.filter = iprot.readString();
+            struct.setFilterIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.max_tables = iprot.readI16();
+            struct.setMax_tablesIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -109236,6 +118856,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_names_by_filter_result implements org.apache.thrift.TBase<get_table_names_by_filter_result, get_table_names_by_filter_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_names_by_filter_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_names_by_filter_result");
 
@@ -109312,10 +118933,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -109373,6 +118996,7 @@ public get_table_names_by_filter_result(get_table_names_by_filter_result other)
       }
     }
 
+    @Override
     public get_table_names_by_filter_result deepCopy() {
       return new get_table_names_by_filter_result(this);
     }
@@ -109497,6 +119121,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -109535,6 +119160,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -109554,6 +119180,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -109699,10 +119326,12 @@ public int compareTo(get_table_names_by_filter_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -109773,6 +119402,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_names_by_filter_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_names_by_filter_resultStandardScheme getScheme() {
         return new get_table_names_by_filter_resultStandardScheme();
       }
@@ -109780,70 +119410,77 @@ public get_table_names_by_filter_resultStandardScheme getScheme() {
 
     private static class get_table_names_by_filter_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_names_by_filter_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_names_by_filter_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1832 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1832.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1833;
-                  for (int _i1834 = 0; _i1834 < _list1832.size; ++_i1834)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1833 = iprot.readString();
-                    struct.success.add(_elem1833);
+                    org.apache.thrift.protocol.TList _list1832 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1832.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1833;
+                    for (int _i1834 = 0; _i1834 < _list1832.size; ++_i1834)
+                    {
+                      _elem1833 = iprot.readString();
+                      struct.success.add(_elem1833);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+                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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_names_by_filter_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -109882,6 +119519,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_names_by
     }
 
     private static class get_table_names_by_filter_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_names_by_filter_resultTupleScheme getScheme() {
         return new get_table_names_by_filter_resultTupleScheme();
       }
@@ -109928,35 +119566,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_names_by_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_names_by_filter_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(4);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1837 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1837.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1838;
-            for (int _i1839 = 0; _i1839 < _list1837.size; ++_i1839)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
             {
-              _elem1838 = iprot.readString();
-              struct.success.add(_elem1838);
+              org.apache.thrift.protocol.TList _list1837 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1837.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1838;
+              for (int _i1839 = 0; _i1839 < _list1837.size; ++_i1839)
+              {
+                _elem1838 = iprot.readString();
+                struct.success.add(_elem1838);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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 InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -109966,6 +119609,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_args implements org.apache.thrift.TBase<alter_table_args, alter_table_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_args");
 
@@ -110037,10 +119681,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -110089,6 +119735,7 @@ public alter_table_args(alter_table_args other) {
       }
     }
 
+    @Override
     public alter_table_args deepCopy() {
       return new alter_table_args(this);
     }
@@ -110172,6 +119819,7 @@ public void setNew_tblIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -110202,6 +119850,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -110218,6 +119867,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -110338,14 +119988,17 @@ public int compareTo(alter_table_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -110407,6 +120060,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_argsStandardScheme getScheme() {
         return new alter_table_argsStandardScheme();
       }
@@ -110414,50 +120068,57 @@ public alter_table_argsStandardScheme getScheme() {
 
     private static class alter_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_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;
-          }
-          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
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // NEW_TBL
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_tbl = new Table();
-                struct.new_tbl.read(iprot);
-                struct.setNew_tblIsSet(true);
-              } else { 
+            }
+            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
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_TBL
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_tbl = new Table();
+                  struct.new_tbl.read(iprot);
+                  struct.setNew_tblIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -110484,6 +120145,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_args s
     }
 
     private static class alter_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_argsTupleScheme getScheme() {
         return new alter_table_argsTupleScheme();
       }
@@ -110518,20 +120180,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.new_tbl = new Table();
-          struct.new_tbl.read(iprot);
-          struct.setNew_tblIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.new_tbl = new Table();
+            struct.new_tbl.read(iprot);
+            struct.setNew_tblIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -110541,6 +120208,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_result implements org.apache.thrift.TBase<alter_table_result, alter_table_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_result");
 
@@ -110607,10 +120275,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -110652,6 +120322,7 @@ public alter_table_result(alter_table_result other) {
       }
     }
 
+    @Override
     public alter_table_result deepCopy() {
       return new alter_table_result(this);
     }
@@ -110710,6 +120381,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -110732,6 +120404,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -110745,6 +120418,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -110840,10 +120514,12 @@ public int compareTo(alter_table_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -110898,6 +120574,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_resultStandardScheme getScheme() {
         return new alter_table_resultStandardScheme();
       }
@@ -110905,43 +120582,50 @@ public alter_table_resultStandardScheme getScheme() {
 
     private static class alter_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -110963,6 +120647,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_result
     }
 
     private static class alter_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_resultTupleScheme getScheme() {
         return new alter_table_resultTupleScheme();
       }
@@ -110991,17 +120676,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          struct.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -111011,6 +120701,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_environment_context_args implements org.apache.thrift.TBase<alter_table_with_environment_context_args, alter_table_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_with_environment_context_args");
 
@@ -111087,10 +120778,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -111146,6 +120839,7 @@ public alter_table_with_environment_context_args(alter_table_with_environment_co
       }
     }
 
+    @Override
     public alter_table_with_environment_context_args deepCopy() {
       return new alter_table_with_environment_context_args(this);
     }
@@ -111254,6 +120948,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -111292,6 +120987,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -111311,6 +121007,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -111456,14 +121153,17 @@ public int compareTo(alter_table_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -111536,6 +121236,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_environment_context_argsStandardScheme getScheme() {
         return new alter_table_with_environment_context_argsStandardScheme();
       }
@@ -111543,59 +121244,66 @@ public alter_table_with_environment_context_argsStandardScheme getScheme() {
 
     private static class alter_table_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_with_environment_context_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;
-          }
-          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
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // NEW_TBL
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_tbl = new Table();
-                struct.new_tbl.read(iprot);
-                struct.setNew_tblIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            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
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_TBL
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_tbl = new Table();
+                  struct.new_tbl.read(iprot);
+                  struct.setNew_tblIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -111627,6 +121335,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_e
     }
 
     private static class alter_table_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_environment_context_argsTupleScheme getScheme() {
         return new alter_table_with_environment_context_argsTupleScheme();
       }
@@ -111667,25 +121376,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_with_en
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.new_tbl = new Table();
-          struct.new_tbl.read(iprot);
-          struct.setNew_tblIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.new_tbl = new Table();
+            struct.new_tbl.read(iprot);
+            struct.setNew_tblIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -111695,6 +121409,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_environment_context_result implements org.apache.thrift.TBase<alter_table_with_environment_context_result, alter_table_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_with_environment_context_result");
 
@@ -111761,10 +121476,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -111806,6 +121523,7 @@ public alter_table_with_environment_context_result(alter_table_with_environment_
       }
     }
 
+    @Override
     public alter_table_with_environment_context_result deepCopy() {
       return new alter_table_with_environment_context_result(this);
     }
@@ -111864,6 +121582,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -111886,6 +121605,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -111899,6 +121619,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -111994,10 +121715,12 @@ public int compareTo(alter_table_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -112052,6 +121775,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_environment_context_resultStandardScheme getScheme() {
         return new alter_table_with_environment_context_resultStandardScheme();
       }
@@ -112059,43 +121783,50 @@ public alter_table_with_environment_context_resultStandardScheme getScheme() {
 
     private static class alter_table_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_with_environment_context_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -112117,6 +121848,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_e
     }
 
     private static class alter_table_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_environment_context_resultTupleScheme getScheme() {
         return new alter_table_with_environment_context_resultTupleScheme();
       }
@@ -112145,17 +121877,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_with_en
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_with_environment_context_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -112165,6 +121902,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_cascade_args implements org.apache.thrift.TBase<alter_table_with_cascade_args, alter_table_with_cascade_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_with_cascade_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_with_cascade_args");
 
@@ -112241,10 +121979,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -112302,6 +122042,7 @@ public alter_table_with_cascade_args(alter_table_with_cascade_args other) {
       this.cascade = other.cascade;
     }
 
+    @Override
     public alter_table_with_cascade_args deepCopy() {
       return new alter_table_with_cascade_args(this);
     }
@@ -112409,6 +122150,7 @@ public void setCascadeIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CASCADE_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DBNAME:
@@ -112447,6 +122189,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DBNAME:
@@ -112466,6 +122209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -112609,14 +122353,17 @@ public int compareTo(alter_table_with_cascade_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -112684,6 +122431,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_with_cascade_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_cascade_argsStandardScheme getScheme() {
         return new alter_table_with_cascade_argsStandardScheme();
       }
@@ -112691,58 +122439,65 @@ public alter_table_with_cascade_argsStandardScheme getScheme() {
 
     private static class alter_table_with_cascade_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_with_cascade_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_with_cascade_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;
-          }
-          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
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // NEW_TBL
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_tbl = new Table();
-                struct.new_tbl.read(iprot);
-                struct.setNew_tblIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // CASCADE
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.cascade = iprot.readBool();
-                struct.setCascadeIsSet(true);
-              } else { 
+            }
+            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
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_TBL
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_tbl = new Table();
+                  struct.new_tbl.read(iprot);
+                  struct.setNew_tblIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // CASCADE
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.cascade = iprot.readBool();
+                  struct.setCascadeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_cascade_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -112772,6 +122527,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_c
     }
 
     private static class alter_table_with_cascade_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_cascade_argsTupleScheme getScheme() {
         return new alter_table_with_cascade_argsTupleScheme();
       }
@@ -112812,24 +122568,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_with_ca
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_with_cascade_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(4);
-        if (incoming.get(0)) {
-          struct.dbname = iprot.readString();
-          struct.setDbnameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.new_tbl = new Table();
-          struct.new_tbl.read(iprot);
-          struct.setNew_tblIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.cascade = iprot.readBool();
-          struct.setCascadeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.dbname = iprot.readString();
+            struct.setDbnameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.new_tbl = new Table();
+            struct.new_tbl.read(iprot);
+            struct.setNew_tblIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.cascade = iprot.readBool();
+            struct.setCascadeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -112839,6 +122600,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_with_cascade_result implements org.apache.thrift.TBase<alter_table_with_cascade_result, alter_table_with_cascade_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_with_cascade_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_with_cascade_result");
 
@@ -112905,10 +122667,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -112950,6 +122714,7 @@ public alter_table_with_cascade_result(alter_table_with_cascade_result other) {
       }
     }
 
+    @Override
     public alter_table_with_cascade_result deepCopy() {
       return new alter_table_with_cascade_result(this);
     }
@@ -113008,6 +122773,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -113030,6 +122796,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -113043,6 +122810,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -113138,10 +122906,12 @@ public int compareTo(alter_table_with_cascade_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -113196,6 +122966,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_with_cascade_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_cascade_resultStandardScheme getScheme() {
         return new alter_table_with_cascade_resultStandardScheme();
       }
@@ -113203,43 +122974,50 @@ public alter_table_with_cascade_resultStandardScheme getScheme() {
 
     private static class alter_table_with_cascade_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_with_cascade_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_with_cascade_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_cascade_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -113261,6 +123039,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_with_c
     }
 
     private static class alter_table_with_cascade_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_with_cascade_resultTupleScheme getScheme() {
         return new alter_table_with_cascade_resultTupleScheme();
       }
@@ -113289,17 +123068,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_with_ca
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_with_cascade_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -113309,6 +123093,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_req_args implements org.apache.thrift.TBase<alter_table_req_args, alter_table_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_req_args");
 
@@ -113370,10 +123155,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -113408,6 +123195,7 @@ public alter_table_req_args(alter_table_req_args other) {
       }
     }
 
+    @Override
     public alter_table_req_args deepCopy() {
       return new alter_table_req_args(this);
     }
@@ -113441,6 +123229,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -113455,6 +123244,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -113465,6 +123255,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -113535,14 +123326,17 @@ public int compareTo(alter_table_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -113588,6 +123382,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_req_argsStandardScheme getScheme() {
         return new alter_table_req_argsStandardScheme();
       }
@@ -113595,34 +123390,41 @@ public alter_table_req_argsStandardScheme getScheme() {
 
     private static class alter_table_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AlterTableRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AlterTableRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -113639,6 +123441,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_req_ar
     }
 
     private static class alter_table_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_req_argsTupleScheme getScheme() {
         return new alter_table_req_argsTupleScheme();
       }
@@ -113661,12 +123464,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_req_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_req_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.req = new AlterTableRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AlterTableRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -113676,6 +123484,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_table_req_result implements org.apache.thrift.TBase<alter_table_req_result, alter_table_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_table_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_table_req_result");
 
@@ -113747,10 +123556,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -113799,6 +123610,7 @@ public alter_table_req_result(alter_table_req_result other) {
       }
     }
 
+    @Override
     public alter_table_req_result deepCopy() {
       return new alter_table_req_result(this);
     }
@@ -113882,6 +123694,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -113912,6 +123725,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -113928,6 +123742,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -114048,10 +123863,12 @@ public int compareTo(alter_table_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -114117,6 +123934,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_table_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_req_resultStandardScheme getScheme() {
         return new alter_table_req_resultStandardScheme();
       }
@@ -114124,52 +123942,59 @@ public alter_table_req_resultStandardScheme getScheme() {
 
     private static class alter_table_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_table_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_table_req_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 AlterTableResponse();
-                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 InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AlterTableResponse();
+                  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 InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -114196,6 +124021,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_table_req_re
     }
 
     private static class alter_table_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_table_req_resultTupleScheme getScheme() {
         return new alter_table_req_resultTupleScheme();
       }
@@ -114230,22 +124056,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_table_req_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_table_req_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 AlterTableResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AlterTableResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -114255,6 +124086,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_params_args implements org.apache.thrift.TBase<update_table_params_args, update_table_params_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_table_params_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_table_params_args");
 
@@ -114316,10 +124148,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -114359,6 +124193,7 @@ public update_table_params_args(update_table_params_args other) {
       }
     }
 
+    @Override
     public update_table_params_args deepCopy() {
       return new update_table_params_args(this);
     }
@@ -114408,6 +124243,7 @@ public void setUpdatesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case UPDATES:
@@ -114422,6 +124258,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case UPDATES:
@@ -114432,6 +124269,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -114502,14 +124340,17 @@ public int compareTo(update_table_params_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -114552,6 +124393,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_table_params_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_params_argsStandardScheme getScheme() {
         return new update_table_params_argsStandardScheme();
       }
@@ -114559,44 +124401,51 @@ public update_table_params_argsStandardScheme getScheme() {
 
     private static class update_table_params_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_table_params_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_table_params_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;
-          }
-          switch (schemeField.id) {
-            case 1: // UPDATES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1840 = iprot.readListBegin();
-                  struct.updates = new java.util.ArrayList<TableParamsUpdate>(_list1840.size);
-                  @org.apache.thrift.annotation.Nullable TableParamsUpdate _elem1841;
-                  for (int _i1842 = 0; _i1842 < _list1840.size; ++_i1842)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // UPDATES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1841 = new TableParamsUpdate();
-                    _elem1841.read(iprot);
-                    struct.updates.add(_elem1841);
+                    org.apache.thrift.protocol.TList _list1840 = iprot.readListBegin();
+                    struct.updates = new java.util.ArrayList<TableParamsUpdate>(_list1840.size);
+                    @org.apache.thrift.annotation.Nullable TableParamsUpdate _elem1841;
+                    for (int _i1842 = 0; _i1842 < _list1840.size; ++_i1842)
+                    {
+                      _elem1841 = new TableParamsUpdate();
+                      _elem1841.read(iprot);
+                      struct.updates.add(_elem1841);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setUpdatesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setUpdatesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_params_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -114620,6 +124469,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_param
     }
 
     private static class update_table_params_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_params_argsTupleScheme getScheme() {
         return new update_table_params_argsTupleScheme();
       }
@@ -114648,21 +124498,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_table_params
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_table_params_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 _list1845 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.updates = new java.util.ArrayList<TableParamsUpdate>(_list1845.size);
-            @org.apache.thrift.annotation.Nullable TableParamsUpdate _elem1846;
-            for (int _i1847 = 0; _i1847 < _list1845.size; ++_i1847)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
             {
-              _elem1846 = new TableParamsUpdate();
-              _elem1846.read(iprot);
-              struct.updates.add(_elem1846);
+              org.apache.thrift.protocol.TList _list1845 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.updates = new java.util.ArrayList<TableParamsUpdate>(_list1845.size);
+              @org.apache.thrift.annotation.Nullable TableParamsUpdate _elem1846;
+              for (int _i1847 = 0; _i1847 < _list1845.size; ++_i1847)
+              {
+                _elem1846 = new TableParamsUpdate();
+                _elem1846.read(iprot);
+                struct.updates.add(_elem1846);
+              }
             }
+            struct.setUpdatesIsSet(true);
           }
-          struct.setUpdatesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -114672,6 +124527,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_params_result implements org.apache.thrift.TBase<update_table_params_result, update_table_params_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_table_params_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_table_params_result");
 
@@ -114733,10 +124589,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -114771,6 +124629,7 @@ public update_table_params_result(update_table_params_result other) {
       }
     }
 
+    @Override
     public update_table_params_result deepCopy() {
       return new update_table_params_result(this);
     }
@@ -114804,6 +124663,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -114818,6 +124678,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -114828,6 +124689,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -114898,10 +124760,12 @@ public int compareTo(update_table_params_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -114948,6 +124812,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_table_params_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_params_resultStandardScheme getScheme() {
         return new update_table_params_resultStandardScheme();
       }
@@ -114955,34 +124820,41 @@ public update_table_params_resultStandardScheme getScheme() {
 
     private static class update_table_params_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_table_params_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_table_params_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_params_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -114999,6 +124871,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_param
     }
 
     private static class update_table_params_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_params_resultTupleScheme getScheme() {
         return new update_table_params_resultTupleScheme();
       }
@@ -115021,12 +124894,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_table_params
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_table_params_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -115036,6 +124914,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_args implements org.apache.thrift.TBase<add_partition_args, add_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partition_args");
 
@@ -115097,10 +124976,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -115135,6 +125016,7 @@ public add_partition_args(add_partition_args other) {
       }
     }
 
+    @Override
     public add_partition_args deepCopy() {
       return new add_partition_args(this);
     }
@@ -115168,6 +125050,7 @@ public void setNew_partIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NEW_PART:
@@ -115182,6 +125065,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NEW_PART:
@@ -115192,6 +125076,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -115262,14 +125147,17 @@ public int compareTo(add_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -115315,6 +125203,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_argsStandardScheme getScheme() {
         return new add_partition_argsStandardScheme();
       }
@@ -115322,34 +125211,41 @@ public add_partition_argsStandardScheme getScheme() {
 
     private static class add_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NEW_PART
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_part = new Partition();
-                struct.new_part.read(iprot);
-                struct.setNew_partIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // NEW_PART
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_part = new Partition();
+                  struct.new_part.read(iprot);
+                  struct.setNew_partIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -115366,6 +125262,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_args
     }
 
     private static class add_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_argsTupleScheme getScheme() {
         return new add_partition_argsTupleScheme();
       }
@@ -115388,12 +125285,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partition_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partition_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.new_part = new Partition();
-          struct.new_part.read(iprot);
-          struct.setNew_partIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.new_part = new Partition();
+            struct.new_part.read(iprot);
+            struct.setNew_partIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -115403,6 +125305,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_result implements org.apache.thrift.TBase<add_partition_result, add_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partition_result");
 
@@ -115479,10 +125382,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -115538,6 +125443,7 @@ public add_partition_result(add_partition_result other) {
       }
     }
 
+    @Override
     public add_partition_result deepCopy() {
       return new add_partition_result(this);
     }
@@ -115646,6 +125552,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -115684,6 +125591,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -115703,6 +125611,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -115848,10 +125757,12 @@ public int compareTo(add_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -115925,6 +125836,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_resultStandardScheme getScheme() {
         return new add_partition_resultStandardScheme();
       }
@@ -115932,61 +125844,68 @@ public add_partition_resultStandardScheme getScheme() {
 
     private static class add_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partition_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -116018,6 +125937,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_resu
     }
 
     private static class add_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_resultTupleScheme getScheme() {
         return new add_partition_resultTupleScheme();
       }
@@ -116058,27 +125978,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partition_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partition_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(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -116088,6 +126013,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_with_environment_context_args implements org.apache.thrift.TBase<add_partition_with_environment_context_args, add_partition_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_partition_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partition_with_environment_context_args");
 
@@ -116154,10 +126080,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -116199,6 +126127,7 @@ public add_partition_with_environment_context_args(add_partition_with_environmen
       }
     }
 
+    @Override
     public add_partition_with_environment_context_args deepCopy() {
       return new add_partition_with_environment_context_args(this);
     }
@@ -116257,6 +126186,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NEW_PART:
@@ -116279,6 +126209,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NEW_PART:
@@ -116292,6 +126223,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -116387,14 +126319,17 @@ public int compareTo(add_partition_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -116451,6 +126386,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partition_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_with_environment_context_argsStandardScheme getScheme() {
         return new add_partition_with_environment_context_argsStandardScheme();
       }
@@ -116458,43 +126394,50 @@ public add_partition_with_environment_context_argsStandardScheme getScheme() {
 
     private static class add_partition_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partition_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partition_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NEW_PART
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_part = new Partition();
-                struct.new_part.read(iprot);
-                struct.setNew_partIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // NEW_PART
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_part = new Partition();
+                  struct.new_part.read(iprot);
+                  struct.setNew_partIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -116516,6 +126459,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_with
     }
 
     private static class add_partition_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_with_environment_context_argsTupleScheme getScheme() {
         return new add_partition_with_environment_context_argsTupleScheme();
       }
@@ -116544,17 +126488,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partition_with_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partition_with_environment_context_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);
-        if (incoming.get(0)) {
-          struct.new_part = new Partition();
-          struct.new_part.read(iprot);
-          struct.setNew_partIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.new_part = new Partition();
+            struct.new_part.read(iprot);
+            struct.setNew_partIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -116564,6 +126513,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partition_with_environment_context_result implements org.apache.thrift.TBase<add_partition_with_environment_context_result, add_partition_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_partition_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partition_with_environment_context_result");
 
@@ -116640,10 +126590,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -116699,6 +126651,7 @@ public add_partition_with_environment_context_result(add_partition_with_environm
       }
     }
 
+    @Override
     public add_partition_with_environment_context_result deepCopy() {
       return new add_partition_with_environment_context_result(this);
     }
@@ -116807,6 +126760,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -116845,6 +126799,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -116864,6 +126819,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -117009,10 +126965,12 @@ public int compareTo(add_partition_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -117086,6 +127044,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partition_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_with_environment_context_resultStandardScheme getScheme() {
         return new add_partition_with_environment_context_resultStandardScheme();
       }
@@ -117093,61 +127052,68 @@ public add_partition_with_environment_context_resultStandardScheme getScheme() {
 
     private static class add_partition_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partition_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partition_with_environment_context_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -117179,6 +127145,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partition_with
     }
 
     private static class add_partition_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partition_with_environment_context_resultTupleScheme getScheme() {
         return new add_partition_with_environment_context_resultTupleScheme();
       }
@@ -117219,27 +127186,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partition_with_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partition_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -117249,6 +127221,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_args implements org.apache.thrift.TBase<add_partitions_args, add_partitions_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_partitions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partitions_args");
 
@@ -117310,10 +127283,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -117353,6 +127328,7 @@ public add_partitions_args(add_partitions_args other) {
       }
     }
 
+    @Override
     public add_partitions_args deepCopy() {
       return new add_partitions_args(this);
     }
@@ -117402,6 +127378,7 @@ public void setNew_partsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NEW_PARTS:
@@ -117416,6 +127393,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NEW_PARTS:
@@ -117426,6 +127404,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -117496,14 +127475,17 @@ public int compareTo(add_partitions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -117546,6 +127528,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partitions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_argsStandardScheme getScheme() {
         return new add_partitions_argsStandardScheme();
       }
@@ -117553,44 +127536,51 @@ public add_partitions_argsStandardScheme getScheme() {
 
     private static class add_partitions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partitions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partitions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NEW_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1848 = iprot.readListBegin();
-                  struct.new_parts = new java.util.ArrayList<Partition>(_list1848.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem1849;
-                  for (int _i1850 = 0; _i1850 < _list1848.size; ++_i1850)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // NEW_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1849 = new Partition();
-                    _elem1849.read(iprot);
-                    struct.new_parts.add(_elem1849);
+                    org.apache.thrift.protocol.TList _list1848 = iprot.readListBegin();
+                    struct.new_parts = new java.util.ArrayList<Partition>(_list1848.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem1849;
+                    for (int _i1850 = 0; _i1850 < _list1848.size; ++_i1850)
+                    {
+                      _elem1849 = new Partition();
+                      _elem1849.read(iprot);
+                      struct.new_parts.add(_elem1849);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setNew_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setNew_partsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -117614,6 +127604,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_arg
     }
 
     private static class add_partitions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_argsTupleScheme getScheme() {
         return new add_partitions_argsTupleScheme();
       }
@@ -117642,21 +127633,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partitions_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partitions_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 _list1853 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.new_parts = new java.util.ArrayList<Partition>(_list1853.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem1854;
-            for (int _i1855 = 0; _i1855 < _list1853.size; ++_i1855)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
             {
-              _elem1854 = new Partition();
-              _elem1854.read(iprot);
-              struct.new_parts.add(_elem1854);
+              org.apache.thrift.protocol.TList _list1853 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.new_parts = new java.util.ArrayList<Partition>(_list1853.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem1854;
+              for (int _i1855 = 0; _i1855 < _list1853.size; ++_i1855)
+              {
+                _elem1854 = new Partition();
+                _elem1854.read(iprot);
+                struct.new_parts.add(_elem1854);
+              }
             }
+            struct.setNew_partsIsSet(true);
           }
-          struct.setNew_partsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -117666,6 +127662,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_result implements org.apache.thrift.TBase<add_partitions_result, add_partitions_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_partitions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partitions_result");
 
@@ -117742,10 +127739,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -117803,6 +127802,7 @@ public add_partitions_result(add_partitions_result other) {
       }
     }
 
+    @Override
     public add_partitions_result deepCopy() {
       return new add_partitions_result(this);
     }
@@ -117910,6 +127910,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -117948,6 +127949,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -117967,6 +127969,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -118110,10 +128113,12 @@ public int compareTo(add_partitions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -118182,6 +128187,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partitions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_resultStandardScheme getScheme() {
         return new add_partitions_resultStandardScheme();
       }
@@ -118189,60 +128195,67 @@ public add_partitions_resultStandardScheme getScheme() {
 
     private static class add_partitions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partitions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partitions_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.I32) {
-                struct.success = iprot.readI32();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.success = iprot.readI32();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -118274,6 +128287,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_res
     }
 
     private static class add_partitions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_resultTupleScheme getScheme() {
         return new add_partitions_resultTupleScheme();
       }
@@ -118314,26 +128328,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partitions_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partitions_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(4);
-        if (incoming.get(0)) {
-          struct.success = iprot.readI32();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = iprot.readI32();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -118343,6 +128362,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_pspec_args implements org.apache.thrift.TBase<add_partitions_pspec_args, add_partitions_pspec_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_partitions_pspec_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partitions_pspec_args");
 
@@ -118404,10 +128424,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -118447,6 +128469,7 @@ public add_partitions_pspec_args(add_partitions_pspec_args other) {
       }
     }
 
+    @Override
     public add_partitions_pspec_args deepCopy() {
       return new add_partitions_pspec_args(this);
     }
@@ -118496,6 +128519,7 @@ public void setNew_partsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NEW_PARTS:
@@ -118510,6 +128534,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NEW_PARTS:
@@ -118520,6 +128545,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -118590,14 +128616,17 @@ public int compareTo(add_partitions_pspec_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -118640,6 +128669,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partitions_pspec_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_pspec_argsStandardScheme getScheme() {
         return new add_partitions_pspec_argsStandardScheme();
       }
@@ -118647,44 +128677,51 @@ public add_partitions_pspec_argsStandardScheme getScheme() {
 
     private static class add_partitions_pspec_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partitions_pspec_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partitions_pspec_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NEW_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1856 = iprot.readListBegin();
-                  struct.new_parts = new java.util.ArrayList<PartitionSpec>(_list1856.size);
-                  @org.apache.thrift.annotation.Nullable PartitionSpec _elem1857;
-                  for (int _i1858 = 0; _i1858 < _list1856.size; ++_i1858)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // NEW_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1857 = new PartitionSpec();
-                    _elem1857.read(iprot);
-                    struct.new_parts.add(_elem1857);
+                    org.apache.thrift.protocol.TList _list1856 = iprot.readListBegin();
+                    struct.new_parts = new java.util.ArrayList<PartitionSpec>(_list1856.size);
+                    @org.apache.thrift.annotation.Nullable PartitionSpec _elem1857;
+                    for (int _i1858 = 0; _i1858 < _list1856.size; ++_i1858)
+                    {
+                      _elem1857 = new PartitionSpec();
+                      _elem1857.read(iprot);
+                      struct.new_parts.add(_elem1857);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setNew_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setNew_partsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_pspec_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -118708,6 +128745,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_psp
     }
 
     private static class add_partitions_pspec_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_pspec_argsTupleScheme getScheme() {
         return new add_partitions_pspec_argsTupleScheme();
       }
@@ -118736,21 +128774,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partitions_pspe
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partitions_pspec_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 _list1861 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.new_parts = new java.util.ArrayList<PartitionSpec>(_list1861.size);
-            @org.apache.thrift.annotation.Nullable PartitionSpec _elem1862;
-            for (int _i1863 = 0; _i1863 < _list1861.size; ++_i1863)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
             {
-              _elem1862 = new PartitionSpec();
-              _elem1862.read(iprot);
-              struct.new_parts.add(_elem1862);
+              org.apache.thrift.protocol.TList _list1861 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.new_parts = new java.util.ArrayList<PartitionSpec>(_list1861.size);
+              @org.apache.thrift.annotation.Nullable PartitionSpec _elem1862;
+              for (int _i1863 = 0; _i1863 < _list1861.size; ++_i1863)
+              {
+                _elem1862 = new PartitionSpec();
+                _elem1862.read(iprot);
+                struct.new_parts.add(_elem1862);
+              }
             }
+            struct.setNew_partsIsSet(true);
           }
-          struct.setNew_partsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -118760,6 +128803,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_pspec_result implements org.apache.thrift.TBase<add_partitions_pspec_result, add_partitions_pspec_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_partitions_pspec_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partitions_pspec_result");
 
@@ -118836,10 +128880,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -118897,6 +128943,7 @@ public add_partitions_pspec_result(add_partitions_pspec_result other) {
       }
     }
 
+    @Override
     public add_partitions_pspec_result deepCopy() {
       return new add_partitions_pspec_result(this);
     }
@@ -119004,6 +129051,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -119042,6 +129090,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -119061,6 +129110,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -119204,10 +129254,12 @@ public int compareTo(add_partitions_pspec_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -119276,6 +129328,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partitions_pspec_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_pspec_resultStandardScheme getScheme() {
         return new add_partitions_pspec_resultStandardScheme();
       }
@@ -119283,60 +129336,67 @@ public add_partitions_pspec_resultStandardScheme getScheme() {
 
     private static class add_partitions_pspec_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partitions_pspec_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partitions_pspec_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.I32) {
-                struct.success = iprot.readI32();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.success = iprot.readI32();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_pspec_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -119368,6 +129428,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_psp
     }
 
     private static class add_partitions_pspec_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_pspec_resultTupleScheme getScheme() {
         return new add_partitions_pspec_resultTupleScheme();
       }
@@ -119408,26 +129469,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partitions_pspe
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partitions_pspec_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(4);
-        if (incoming.get(0)) {
-          struct.success = iprot.readI32();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = iprot.readI32();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -119437,6 +129503,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_args implements org.apache.thrift.TBase<append_partition_args, append_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_args");
 
@@ -119508,10 +129575,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -119562,6 +129631,7 @@ public append_partition_args(append_partition_args other) {
       }
     }
 
+    @Override
     public append_partition_args deepCopy() {
       return new append_partition_args(this);
     }
@@ -119661,6 +129731,7 @@ public void setPart_valsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -119691,6 +129762,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -119707,6 +129779,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -119827,14 +129900,17 @@ public int compareTo(append_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -119893,6 +129969,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_argsStandardScheme getScheme() {
         return new append_partition_argsStandardScheme();
       }
@@ -119900,59 +129977,66 @@ public append_partition_argsStandardScheme getScheme() {
 
     private static class append_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1864 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1864.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1865;
-                  for (int _i1866 = 0; _i1866 < _list1864.size; ++_i1866)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1865 = iprot.readString();
-                    struct.part_vals.add(_elem1865);
+                    org.apache.thrift.protocol.TList _list1864 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1864.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1865;
+                    for (int _i1866 = 0; _i1866 < _list1864.size; ++_i1866)
+                    {
+                      _elem1865 = iprot.readString();
+                      struct.part_vals.add(_elem1865);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -119986,6 +130070,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_a
     }
 
     private static class append_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_argsTupleScheme getScheme() {
         return new append_partition_argsTupleScheme();
       }
@@ -120026,28 +130111,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1869 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1869.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1870;
-            for (int _i1871 = 0; _i1871 < _list1869.size; ++_i1871)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1870 = iprot.readString();
-              struct.part_vals.add(_elem1870);
+              org.apache.thrift.protocol.TList _list1869 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1869.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1870;
+              for (int _i1871 = 0; _i1871 < _list1869.size; ++_i1871)
+              {
+                _elem1870 = iprot.readString();
+                struct.part_vals.add(_elem1870);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -120057,6 +130147,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_result implements org.apache.thrift.TBase<append_partition_result, append_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_result");
 
@@ -120133,10 +130224,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -120192,6 +130285,7 @@ public append_partition_result(append_partition_result other) {
       }
     }
 
+    @Override
     public append_partition_result deepCopy() {
       return new append_partition_result(this);
     }
@@ -120300,6 +130394,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -120338,6 +130433,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -120357,6 +130453,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -120502,10 +130599,12 @@ public int compareTo(append_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -120579,6 +130678,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_resultStandardScheme getScheme() {
         return new append_partition_resultStandardScheme();
       }
@@ -120586,61 +130686,68 @@ public append_partition_resultStandardScheme getScheme() {
 
     private static class append_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -120672,6 +130779,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_r
     }
 
     private static class append_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_resultTupleScheme getScheme() {
         return new append_partition_resultTupleScheme();
       }
@@ -120712,27 +130820,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_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(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -120742,6 +130855,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_req_args implements org.apache.thrift.TBase<add_partitions_req_args, add_partitions_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_partitions_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partitions_req_args");
 
@@ -120803,10 +130917,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -120841,6 +130957,7 @@ public add_partitions_req_args(add_partitions_req_args other) {
       }
     }
 
+    @Override
     public add_partitions_req_args deepCopy() {
       return new add_partitions_req_args(this);
     }
@@ -120874,6 +130991,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -120888,6 +131006,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -120898,6 +131017,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -120968,14 +131088,17 @@ public int compareTo(add_partitions_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -121021,6 +131144,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partitions_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_req_argsStandardScheme getScheme() {
         return new add_partitions_req_argsStandardScheme();
       }
@@ -121028,34 +131152,41 @@ public add_partitions_req_argsStandardScheme getScheme() {
 
     private static class add_partitions_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partitions_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partitions_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new AddPartitionsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new AddPartitionsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -121072,6 +131203,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_req
     }
 
     private static class add_partitions_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_req_argsTupleScheme getScheme() {
         return new add_partitions_req_argsTupleScheme();
       }
@@ -121094,12 +131226,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partitions_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partitions_req_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 AddPartitionsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AddPartitionsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -121109,6 +131246,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_partitions_req_result implements org.apache.thrift.TBase<add_partitions_req_result, add_partitions_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_partitions_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_partitions_req_result");
 
@@ -121185,10 +131323,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -121244,6 +131384,7 @@ public add_partitions_req_result(add_partitions_req_result other) {
       }
     }
 
+    @Override
     public add_partitions_req_result deepCopy() {
       return new add_partitions_req_result(this);
     }
@@ -121352,6 +131493,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -121390,6 +131532,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -121409,6 +131552,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -121554,10 +131698,12 @@ public int compareTo(add_partitions_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -121631,6 +131777,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_partitions_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_req_resultStandardScheme getScheme() {
         return new add_partitions_req_resultStandardScheme();
       }
@@ -121638,61 +131785,68 @@ public add_partitions_req_resultStandardScheme getScheme() {
 
     private static class add_partitions_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_partitions_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_partitions_req_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 AddPartitionsResult();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AddPartitionsResult();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -121724,6 +131878,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_partitions_req
     }
 
     private static class add_partitions_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_partitions_req_resultTupleScheme getScheme() {
         return new add_partitions_req_resultTupleScheme();
       }
@@ -121764,27 +131919,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_partitions_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_partitions_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new AddPartitionsResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new AddPartitionsResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -121794,6 +131954,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_with_environment_context_args implements org.apache.thrift.TBase<append_partition_with_environment_context_args, append_partition_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_with_environment_context_args");
 
@@ -121870,10 +132031,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -121931,6 +132094,7 @@ public append_partition_with_environment_context_args(append_partition_with_envi
       }
     }
 
+    @Override
     public append_partition_with_environment_context_args deepCopy() {
       return new append_partition_with_environment_context_args(this);
     }
@@ -122055,6 +132219,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -122093,6 +132258,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -122112,6 +132278,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -122257,14 +132424,17 @@ public int compareTo(append_partition_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -122334,6 +132504,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_with_environment_context_argsStandardScheme getScheme() {
         return new append_partition_with_environment_context_argsStandardScheme();
       }
@@ -122341,68 +132512,75 @@ public append_partition_with_environment_context_argsStandardScheme getScheme()
 
     private static class append_partition_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1872 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1872.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1873;
-                  for (int _i1874 = 0; _i1874 < _list1872.size; ++_i1874)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1873 = iprot.readString();
-                    struct.part_vals.add(_elem1873);
+                    org.apache.thrift.protocol.TList _list1872 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1872.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1873;
+                    for (int _i1874 = 0; _i1874 < _list1872.size; ++_i1874)
+                    {
+                      _elem1873 = iprot.readString();
+                      struct.part_vals.add(_elem1873);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+                break;
+              case 4: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -122441,6 +132619,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_w
     }
 
     private static class append_partition_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_with_environment_context_argsTupleScheme getScheme() {
         return new append_partition_with_environment_context_argsTupleScheme();
       }
@@ -122487,33 +132666,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_wi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1877 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1877.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1878;
-            for (int _i1879 = 0; _i1879 < _list1877.size; ++_i1879)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1878 = iprot.readString();
-              struct.part_vals.add(_elem1878);
+              org.apache.thrift.protocol.TList _list1877 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1877.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1878;
+              for (int _i1879 = 0; _i1879 < _list1877.size; ++_i1879)
+              {
+                _elem1878 = iprot.readString();
+                struct.part_vals.add(_elem1878);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+          if (incoming.get(3)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -122523,6 +132707,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_with_environment_context_result implements org.apache.thrift.TBase<append_partition_with_environment_context_result, append_partition_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_with_environment_context_result");
 
@@ -122599,10 +132784,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -122658,6 +132845,7 @@ public append_partition_with_environment_context_result(append_partition_with_en
       }
     }
 
+    @Override
     public append_partition_with_environment_context_result deepCopy() {
       return new append_partition_with_environment_context_result(this);
     }
@@ -122766,6 +132954,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -122804,6 +132993,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -122823,6 +133013,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -122968,10 +133159,12 @@ public int compareTo(append_partition_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -123045,6 +133238,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_with_environment_context_resultStandardScheme getScheme() {
         return new append_partition_with_environment_context_resultStandardScheme();
       }
@@ -123052,61 +133246,68 @@ public append_partition_with_environment_context_resultStandardScheme getScheme(
 
     private static class append_partition_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_with_environment_context_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -123138,6 +133339,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_w
     }
 
     private static class append_partition_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_with_environment_context_resultTupleScheme getScheme() {
         return new append_partition_with_environment_context_resultTupleScheme();
       }
@@ -123178,27 +133380,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_wi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -123208,6 +133415,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_req_args implements org.apache.thrift.TBase<append_partition_req_args, append_partition_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_req_args");
 
@@ -123269,10 +133477,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -123307,6 +133517,7 @@ public append_partition_req_args(append_partition_req_args other) {
       }
     }
 
+    @Override
     public append_partition_req_args deepCopy() {
       return new append_partition_req_args(this);
     }
@@ -123340,6 +133551,7 @@ public void setAppendPartitionsReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case APPEND_PARTITIONS_REQ:
@@ -123354,6 +133566,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case APPEND_PARTITIONS_REQ:
@@ -123364,6 +133577,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -123434,14 +133648,17 @@ public int compareTo(append_partition_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -123487,6 +133704,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_req_argsStandardScheme getScheme() {
         return new append_partition_req_argsStandardScheme();
       }
@@ -123494,34 +133712,41 @@ public append_partition_req_argsStandardScheme getScheme() {
 
     private static class append_partition_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // APPEND_PARTITIONS_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.appendPartitionsReq = new AppendPartitionsRequest();
-                struct.appendPartitionsReq.read(iprot);
-                struct.setAppendPartitionsReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // APPEND_PARTITIONS_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.appendPartitionsReq = new AppendPartitionsRequest();
+                  struct.appendPartitionsReq.read(iprot);
+                  struct.setAppendPartitionsReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -123538,6 +133763,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_r
     }
 
     private static class append_partition_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_req_argsTupleScheme getScheme() {
         return new append_partition_req_argsTupleScheme();
       }
@@ -123560,12 +133786,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_req_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.appendPartitionsReq = new AppendPartitionsRequest();
-          struct.appendPartitionsReq.read(iprot);
-          struct.setAppendPartitionsReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.appendPartitionsReq = new AppendPartitionsRequest();
+            struct.appendPartitionsReq.read(iprot);
+            struct.setAppendPartitionsReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -123575,6 +133806,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_req_result implements org.apache.thrift.TBase<append_partition_req_result, append_partition_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_req_result");
 
@@ -123651,10 +133883,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -123710,6 +133944,7 @@ public append_partition_req_result(append_partition_req_result other) {
       }
     }
 
+    @Override
     public append_partition_req_result deepCopy() {
       return new append_partition_req_result(this);
     }
@@ -123818,6 +134053,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -123856,6 +134092,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -123875,6 +134112,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -124020,10 +134258,12 @@ public int compareTo(append_partition_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -124097,6 +134337,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_req_resultStandardScheme getScheme() {
         return new append_partition_req_resultStandardScheme();
       }
@@ -124104,61 +134345,68 @@ public append_partition_req_resultStandardScheme getScheme() {
 
     private static class append_partition_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_req_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -124190,6 +134438,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_r
     }
 
     private static class append_partition_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_req_resultTupleScheme getScheme() {
         return new append_partition_req_resultTupleScheme();
       }
@@ -124230,27 +134479,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -124260,6 +134514,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_args implements org.apache.thrift.TBase<append_partition_by_name_args, append_partition_by_name_args._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_by_name_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_by_name_args");
 
@@ -124331,10 +134586,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -124383,6 +134640,7 @@ public append_partition_by_name_args(append_partition_by_name_args other) {
       }
     }
 
+    @Override
     public append_partition_by_name_args deepCopy() {
       return new append_partition_by_name_args(this);
     }
@@ -124466,6 +134724,7 @@ public void setPart_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -124496,6 +134755,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -124512,6 +134772,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -124632,14 +134893,17 @@ public int compareTo(append_partition_by_name_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -124698,6 +134962,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_argsStandardScheme getScheme() {
         return new append_partition_by_name_argsStandardScheme();
       }
@@ -124705,49 +134970,56 @@ public append_partition_by_name_argsStandardScheme getScheme() {
 
     private static class append_partition_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_by_name_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_by_name_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_by_name_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -124774,6 +135046,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_b
     }
 
     private static class append_partition_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_argsTupleScheme getScheme() {
         return new append_partition_by_name_argsTupleScheme();
       }
@@ -124808,19 +135081,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_by
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_by_name_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -124830,6 +135108,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_result implements org.apache.thrift.TBase<append_partition_by_name_result, append_partition_by_name_result._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_by_name_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_by_name_result");
 
@@ -124906,10 +135185,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -124965,6 +135246,7 @@ public append_partition_by_name_result(append_partition_by_name_result other) {
       }
     }
 
+    @Override
     public append_partition_by_name_result deepCopy() {
       return new append_partition_by_name_result(this);
     }
@@ -125073,6 +135355,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -125111,6 +135394,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -125130,6 +135414,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -125275,10 +135560,12 @@ public int compareTo(append_partition_by_name_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -125352,6 +135639,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_resultStandardScheme getScheme() {
         return new append_partition_by_name_resultStandardScheme();
       }
@@ -125359,61 +135647,68 @@ public append_partition_by_name_resultStandardScheme getScheme() {
 
     private static class append_partition_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_by_name_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_by_name_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_by_name_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -125445,6 +135740,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_b
     }
 
     private static class append_partition_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_resultTupleScheme getScheme() {
         return new append_partition_by_name_resultTupleScheme();
       }
@@ -125485,27 +135781,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_by
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_by_name_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -125515,6 +135816,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_with_environment_context_args implements org.apache.thrift.TBase<append_partition_by_name_with_environment_context_args, append_partition_by_name_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_by_name_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_by_name_with_environment_context_args");
 
@@ -125591,10 +135893,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -125650,6 +135954,7 @@ public append_partition_by_name_with_environment_context_args(append_partition_b
       }
     }
 
+    @Override
     public append_partition_by_name_with_environment_context_args deepCopy() {
       return new append_partition_by_name_with_environment_context_args(this);
     }
@@ -125758,6 +136063,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -125796,6 +136102,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -125815,6 +136122,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -125960,14 +136268,17 @@ public int compareTo(append_partition_by_name_with_environment_context_args othe
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -126037,6 +136348,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_by_name_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_with_environment_context_argsStandardScheme getScheme() {
         return new append_partition_by_name_with_environment_context_argsStandardScheme();
       }
@@ -126044,58 +136356,65 @@ public append_partition_by_name_with_environment_context_argsStandardScheme getS
 
     private static class append_partition_by_name_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_by_name_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_by_name_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_by_name_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -126127,6 +136446,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_b
     }
 
     private static class append_partition_by_name_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_with_environment_context_argsTupleScheme getScheme() {
         return new append_partition_by_name_with_environment_context_argsTupleScheme();
       }
@@ -126167,24 +136487,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_by
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_by_name_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -126194,6 +136519,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class append_partition_by_name_with_environment_context_result implements org.apache.thrift.TBase<append_partition_by_name_with_environment_context_result, append_partition_by_name_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<append_partition_by_name_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("append_partition_by_name_with_environment_context_result");
 
@@ -126270,10 +136596,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -126329,6 +136657,7 @@ public append_partition_by_name_with_environment_context_result(append_partition
       }
     }
 
+    @Override
     public append_partition_by_name_with_environment_context_result deepCopy() {
       return new append_partition_by_name_with_environment_context_result(this);
     }
@@ -126437,6 +136766,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -126475,6 +136805,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -126494,6 +136825,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -126639,10 +136971,12 @@ public int compareTo(append_partition_by_name_with_environment_context_result ot
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -126716,6 +137050,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class append_partition_by_name_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_with_environment_context_resultStandardScheme getScheme() {
         return new append_partition_by_name_with_environment_context_resultStandardScheme();
       }
@@ -126723,61 +137058,68 @@ public append_partition_by_name_with_environment_context_resultStandardScheme ge
 
     private static class append_partition_by_name_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<append_partition_by_name_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, append_partition_by_name_with_environment_context_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 Partition();
-                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 InvalidObjectException();
-                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 AlreadyExistsException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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 InvalidObjectException();
+                  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 AlreadyExistsException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_by_name_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -126809,6 +137151,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, append_partition_b
     }
 
     private static class append_partition_by_name_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public append_partition_by_name_with_environment_context_resultTupleScheme getScheme() {
         return new append_partition_by_name_with_environment_context_resultTupleScheme();
       }
@@ -126849,27 +137192,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, append_partition_by
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, append_partition_by_name_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new AlreadyExistsException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new AlreadyExistsException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -126879,6 +137227,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_args implements org.apache.thrift.TBase<drop_partition_args, drop_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_args");
 
@@ -126955,10 +137304,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -127018,6 +137369,7 @@ public drop_partition_args(drop_partition_args other) {
       this.deleteData = other.deleteData;
     }
 
+    @Override
     public drop_partition_args deepCopy() {
       return new drop_partition_args(this);
     }
@@ -127141,6 +137493,7 @@ public void setDeleteDataIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DELETEDATA_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -127179,6 +137532,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -127198,6 +137552,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -127341,14 +137696,17 @@ public int compareTo(drop_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -127413,6 +137771,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_argsStandardScheme getScheme() {
         return new drop_partition_argsStandardScheme();
       }
@@ -127420,67 +137779,74 @@ public drop_partition_argsStandardScheme getScheme() {
 
     private static class drop_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1880 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1880.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1881;
-                  for (int _i1882 = 0; _i1882 < _list1880.size; ++_i1882)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1881 = iprot.readString();
-                    struct.part_vals.add(_elem1881);
+                    org.apache.thrift.protocol.TList _list1880 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1880.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1881;
+                    for (int _i1882 = 0; _i1882 < _list1880.size; ++_i1882)
+                    {
+                      _elem1881 = iprot.readString();
+                      struct.part_vals.add(_elem1881);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
+                break;
+              case 4: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -127517,6 +137883,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_arg
     }
 
     private static class drop_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_argsTupleScheme getScheme() {
         return new drop_partition_argsTupleScheme();
       }
@@ -127563,32 +137930,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1885 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1885.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1886;
-            for (int _i1887 = 0; _i1887 < _list1885.size; ++_i1887)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1886 = iprot.readString();
-              struct.part_vals.add(_elem1886);
+              org.apache.thrift.protocol.TList _list1885 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1885.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1886;
+              for (int _i1887 = 0; _i1887 < _list1885.size; ++_i1887)
+              {
+                _elem1886 = iprot.readString();
+                struct.part_vals.add(_elem1886);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
+          if (incoming.get(3)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -127598,6 +137970,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_result implements org.apache.thrift.TBase<drop_partition_result, drop_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_result");
 
@@ -127669,10 +138042,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -127723,6 +138098,7 @@ public drop_partition_result(drop_partition_result other) {
       }
     }
 
+    @Override
     public drop_partition_result deepCopy() {
       return new drop_partition_result(this);
     }
@@ -127805,6 +138181,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -127835,6 +138212,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -127851,6 +138229,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -127969,10 +138348,12 @@ public int compareTo(drop_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -128033,6 +138414,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_resultStandardScheme getScheme() {
         return new drop_partition_resultStandardScheme();
       }
@@ -128040,51 +138422,58 @@ public drop_partition_resultStandardScheme getScheme() {
 
     private static class drop_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -128111,6 +138500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_res
     }
 
     private static class drop_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_resultTupleScheme getScheme() {
         return new drop_partition_resultTupleScheme();
       }
@@ -128145,21 +138535,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_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 = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -128169,6 +138564,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_with_environment_context_args implements org.apache.thrift.TBase<drop_partition_with_environment_context_args, drop_partition_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_with_environment_context_args");
 
@@ -128250,10 +138646,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -128320,6 +138718,7 @@ public drop_partition_with_environment_context_args(drop_partition_with_environm
       }
     }
 
+    @Override
     public drop_partition_with_environment_context_args deepCopy() {
       return new drop_partition_with_environment_context_args(this);
     }
@@ -128468,6 +138867,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -128514,6 +138914,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -128536,6 +138937,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -128704,14 +139106,17 @@ public int compareTo(drop_partition_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -128787,6 +139192,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_with_environment_context_argsStandardScheme getScheme() {
         return new drop_partition_with_environment_context_argsStandardScheme();
       }
@@ -128794,76 +139200,83 @@ public drop_partition_with_environment_context_argsStandardScheme getScheme() {
 
     private static class drop_partition_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1888 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1888.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1889;
-                  for (int _i1890 = 0; _i1890 < _list1888.size; ++_i1890)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1889 = iprot.readString();
-                    struct.part_vals.add(_elem1889);
+                    org.apache.thrift.protocol.TList _list1888 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1888.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1889;
+                    for (int _i1890 = 0; _i1890 < _list1888.size; ++_i1890)
+                    {
+                      _elem1889 = iprot.readString();
+                      struct.part_vals.add(_elem1889);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+                break;
+              case 4: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -128905,6 +139318,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_wit
     }
 
     private static class drop_partition_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_with_environment_context_argsTupleScheme getScheme() {
         return new drop_partition_with_environment_context_argsTupleScheme();
       }
@@ -128957,37 +139371,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_with
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_with_environment_context_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(5);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1893 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1893.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1894;
-            for (int _i1895 = 0; _i1895 < _list1893.size; ++_i1895)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1894 = iprot.readString();
-              struct.part_vals.add(_elem1894);
+              org.apache.thrift.protocol.TList _list1893 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1893.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1894;
+              for (int _i1895 = 0; _i1895 < _list1893.size; ++_i1895)
+              {
+                _elem1894 = iprot.readString();
+                struct.part_vals.add(_elem1894);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+          if (incoming.get(3)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -128997,6 +139416,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_with_environment_context_result implements org.apache.thrift.TBase<drop_partition_with_environment_context_result, drop_partition_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_with_environment_context_result");
 
@@ -129068,10 +139488,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -129122,6 +139544,7 @@ public drop_partition_with_environment_context_result(drop_partition_with_enviro
       }
     }
 
+    @Override
     public drop_partition_with_environment_context_result deepCopy() {
       return new drop_partition_with_environment_context_result(this);
     }
@@ -129204,6 +139627,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -129234,6 +139658,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -129250,6 +139675,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -129368,10 +139794,12 @@ public int compareTo(drop_partition_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -129432,6 +139860,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_with_environment_context_resultStandardScheme getScheme() {
         return new drop_partition_with_environment_context_resultStandardScheme();
       }
@@ -129439,51 +139868,58 @@ public drop_partition_with_environment_context_resultStandardScheme getScheme()
 
     private static class drop_partition_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_with_environment_context_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -129510,6 +139946,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_wit
     }
 
     private static class drop_partition_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_with_environment_context_resultTupleScheme getScheme() {
         return new drop_partition_with_environment_context_resultTupleScheme();
       }
@@ -129544,21 +139981,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_with
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_with_environment_context_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 = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -129568,6 +140010,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_req_args implements org.apache.thrift.TBase<drop_partition_req_args, drop_partition_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_req_args");
 
@@ -129629,10 +140072,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -129667,6 +140112,7 @@ public drop_partition_req_args(drop_partition_req_args other) {
       }
     }
 
+    @Override
     public drop_partition_req_args deepCopy() {
       return new drop_partition_req_args(this);
     }
@@ -129700,6 +140146,7 @@ public void setDropPartitionReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DROP_PARTITION_REQ:
@@ -129714,6 +140161,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DROP_PARTITION_REQ:
@@ -129724,6 +140172,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -129794,14 +140243,17 @@ public int compareTo(drop_partition_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -129847,6 +140299,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_req_argsStandardScheme getScheme() {
         return new drop_partition_req_argsStandardScheme();
       }
@@ -129854,34 +140307,41 @@ public drop_partition_req_argsStandardScheme getScheme() {
 
     private static class drop_partition_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DROP_PARTITION_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.dropPartitionReq = new DropPartitionRequest();
-                struct.dropPartitionReq.read(iprot);
-                struct.setDropPartitionReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // DROP_PARTITION_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.dropPartitionReq = new DropPartitionRequest();
+                  struct.dropPartitionReq.read(iprot);
+                  struct.setDropPartitionReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -129898,6 +140358,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_req
     }
 
     private static class drop_partition_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_req_argsTupleScheme getScheme() {
         return new drop_partition_req_argsTupleScheme();
       }
@@ -129920,12 +140381,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_req_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.dropPartitionReq = new DropPartitionRequest();
-          struct.dropPartitionReq.read(iprot);
-          struct.setDropPartitionReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.dropPartitionReq = new DropPartitionRequest();
+            struct.dropPartitionReq.read(iprot);
+            struct.setDropPartitionReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -129935,6 +140401,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_req_result implements org.apache.thrift.TBase<drop_partition_req_result, drop_partition_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_req_result");
 
@@ -130006,10 +140473,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -130060,6 +140529,7 @@ public drop_partition_req_result(drop_partition_req_result other) {
       }
     }
 
+    @Override
     public drop_partition_req_result deepCopy() {
       return new drop_partition_req_result(this);
     }
@@ -130142,6 +140612,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -130172,6 +140643,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -130188,6 +140660,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -130306,10 +140779,12 @@ public int compareTo(drop_partition_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -130370,6 +140845,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_req_resultStandardScheme getScheme() {
         return new drop_partition_req_resultStandardScheme();
       }
@@ -130377,51 +140853,58 @@ public drop_partition_req_resultStandardScheme getScheme() {
 
     private static class drop_partition_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_req_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -130448,6 +140931,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_req
     }
 
     private static class drop_partition_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_req_resultTupleScheme getScheme() {
         return new drop_partition_req_resultTupleScheme();
       }
@@ -130482,21 +140966,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_req_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 = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -130506,6 +140995,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_args implements org.apache.thrift.TBase<drop_partition_by_name_args, drop_partition_by_name_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_by_name_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_by_name_args");
 
@@ -130582,10 +141072,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -130643,6 +141135,7 @@ public drop_partition_by_name_args(drop_partition_by_name_args other) {
       this.deleteData = other.deleteData;
     }
 
+    @Override
     public drop_partition_by_name_args deepCopy() {
       return new drop_partition_by_name_args(this);
     }
@@ -130750,6 +141243,7 @@ public void setDeleteDataIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DELETEDATA_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -130788,6 +141282,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -130807,6 +141302,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -130950,14 +141446,17 @@ public int compareTo(drop_partition_by_name_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -131022,6 +141521,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_argsStandardScheme getScheme() {
         return new drop_partition_by_name_argsStandardScheme();
       }
@@ -131029,57 +141529,64 @@ public drop_partition_by_name_argsStandardScheme getScheme() {
 
     private static class drop_partition_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_by_name_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_by_name_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_name_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -131109,6 +141616,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_
     }
 
     private static class drop_partition_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_argsTupleScheme getScheme() {
         return new drop_partition_by_name_argsTupleScheme();
       }
@@ -131149,23 +141657,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_name_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -131175,6 +141688,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_result implements org.apache.thrift.TBase<drop_partition_by_name_result, drop_partition_by_name_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_by_name_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_by_name_result");
 
@@ -131246,10 +141760,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -131300,6 +141816,7 @@ public drop_partition_by_name_result(drop_partition_by_name_result other) {
       }
     }
 
+    @Override
     public drop_partition_by_name_result deepCopy() {
       return new drop_partition_by_name_result(this);
     }
@@ -131382,6 +141899,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -131412,6 +141930,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -131428,6 +141947,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -131546,10 +142066,12 @@ public int compareTo(drop_partition_by_name_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -131610,6 +142132,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_resultStandardScheme getScheme() {
         return new drop_partition_by_name_resultStandardScheme();
       }
@@ -131617,51 +142140,58 @@ public drop_partition_by_name_resultStandardScheme getScheme() {
 
     private static class drop_partition_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_by_name_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_by_name_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_name_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -131688,6 +142218,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_
     }
 
     private static class drop_partition_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_resultTupleScheme getScheme() {
         return new drop_partition_by_name_resultTupleScheme();
       }
@@ -131722,21 +142253,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_name_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -131746,6 +142282,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_with_environment_context_args implements org.apache.thrift.TBase<drop_partition_by_name_with_environment_context_args, drop_partition_by_name_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_by_name_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_by_name_with_environment_context_args");
 
@@ -131827,10 +142364,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -131895,6 +142434,7 @@ public drop_partition_by_name_with_environment_context_args(drop_partition_by_na
       }
     }
 
+    @Override
     public drop_partition_by_name_with_environment_context_args deepCopy() {
       return new drop_partition_by_name_with_environment_context_args(this);
     }
@@ -132027,6 +142567,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -132073,6 +142614,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -132095,6 +142637,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -132263,14 +142806,17 @@ public int compareTo(drop_partition_by_name_with_environment_context_args other)
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -132346,6 +142892,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_by_name_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_with_environment_context_argsStandardScheme getScheme() {
         return new drop_partition_by_name_with_environment_context_argsStandardScheme();
       }
@@ -132353,66 +142900,73 @@ public drop_partition_by_name_with_environment_context_argsStandardScheme getSch
 
     private static class drop_partition_by_name_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_by_name_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_by_name_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // DELETE_DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.deleteData = iprot.readBool();
-                struct.setDeleteDataIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 5: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // DELETE_DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.deleteData = iprot.readBool();
+                  struct.setDeleteDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_name_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -132447,6 +143001,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_
     }
 
     private static class drop_partition_by_name_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_with_environment_context_argsTupleScheme getScheme() {
         return new drop_partition_by_name_with_environment_context_argsTupleScheme();
       }
@@ -132493,28 +143048,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_name_with_environment_context_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(5);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.deleteData = iprot.readBool();
-          struct.setDeleteDataIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.deleteData = iprot.readBool();
+            struct.setDeleteDataIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -132524,6 +143084,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partition_by_name_with_environment_context_result implements org.apache.thrift.TBase<drop_partition_by_name_with_environment_context_result, drop_partition_by_name_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partition_by_name_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partition_by_name_with_environment_context_result");
 
@@ -132595,10 +143156,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -132649,6 +143212,7 @@ public drop_partition_by_name_with_environment_context_result(drop_partition_by_
       }
     }
 
+    @Override
     public drop_partition_by_name_with_environment_context_result deepCopy() {
       return new drop_partition_by_name_with_environment_context_result(this);
     }
@@ -132731,6 +143295,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -132761,6 +143326,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -132777,6 +143343,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -132895,10 +143462,12 @@ public int compareTo(drop_partition_by_name_with_environment_context_result othe
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -132959,6 +143528,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partition_by_name_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_with_environment_context_resultStandardScheme getScheme() {
         return new drop_partition_by_name_with_environment_context_resultStandardScheme();
       }
@@ -132966,51 +143536,58 @@ public drop_partition_by_name_with_environment_context_resultStandardScheme getS
 
     private static class drop_partition_by_name_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partition_by_name_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partition_by_name_with_environment_context_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_name_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -133037,6 +143614,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partition_by_
     }
 
     private static class drop_partition_by_name_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partition_by_name_with_environment_context_resultTupleScheme getScheme() {
         return new drop_partition_by_name_with_environment_context_resultTupleScheme();
       }
@@ -133071,21 +143649,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partition_by_name_with_environment_context_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 = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -133095,6 +143678,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partitions_req_args implements org.apache.thrift.TBase<drop_partitions_req_args, drop_partitions_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partitions_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partitions_req_args");
 
@@ -133156,10 +143740,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -133194,6 +143780,7 @@ public drop_partitions_req_args(drop_partitions_req_args other) {
       }
     }
 
+    @Override
     public drop_partitions_req_args deepCopy() {
       return new drop_partitions_req_args(this);
     }
@@ -133227,6 +143814,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -133241,6 +143829,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -133251,6 +143840,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -133321,14 +143911,17 @@ public int compareTo(drop_partitions_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -133374,6 +143967,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partitions_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partitions_req_argsStandardScheme getScheme() {
         return new drop_partitions_req_argsStandardScheme();
       }
@@ -133381,34 +143975,41 @@ public drop_partitions_req_argsStandardScheme getScheme() {
 
     private static class drop_partitions_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partitions_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partitions_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new DropPartitionsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new DropPartitionsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partitions_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -133425,6 +144026,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partitions_re
     }
 
     private static class drop_partitions_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partitions_req_argsTupleScheme getScheme() {
         return new drop_partitions_req_argsTupleScheme();
       }
@@ -133447,12 +144049,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partitions_req
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partitions_req_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.req = new DropPartitionsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new DropPartitionsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -133462,6 +144069,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_partitions_req_result implements org.apache.thrift.TBase<drop_partitions_req_result, drop_partitions_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_partitions_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_partitions_req_result");
 
@@ -133533,10 +144141,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -133585,6 +144195,7 @@ public drop_partitions_req_result(drop_partitions_req_result other) {
       }
     }
 
+    @Override
     public drop_partitions_req_result deepCopy() {
       return new drop_partitions_req_result(this);
     }
@@ -133668,6 +144279,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -133698,6 +144310,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -133714,6 +144327,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -133834,10 +144448,12 @@ public int compareTo(drop_partitions_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -133903,6 +144519,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_partitions_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partitions_req_resultStandardScheme getScheme() {
         return new drop_partitions_req_resultStandardScheme();
       }
@@ -133910,52 +144527,59 @@ public drop_partitions_req_resultStandardScheme getScheme() {
 
     private static class drop_partitions_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_partitions_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_partitions_req_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 DropPartitionsResult();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 DropPartitionsResult();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partitions_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -133982,6 +144606,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_partitions_re
     }
 
     private static class drop_partitions_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_partitions_req_resultTupleScheme getScheme() {
         return new drop_partitions_req_resultTupleScheme();
       }
@@ -134016,22 +144641,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_partitions_req
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_partitions_req_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 DropPartitionsResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 DropPartitionsResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -134041,6 +144671,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_args implements org.apache.thrift.TBase<get_partition_args, get_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_args");
 
@@ -134112,10 +144743,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -134166,6 +144799,7 @@ public get_partition_args(get_partition_args other) {
       }
     }
 
+    @Override
     public get_partition_args deepCopy() {
       return new get_partition_args(this);
     }
@@ -134265,6 +144899,7 @@ public void setPart_valsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -134295,6 +144930,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -134311,6 +144947,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -134431,14 +145068,17 @@ public int compareTo(get_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -134497,6 +145137,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_argsStandardScheme getScheme() {
         return new get_partition_argsStandardScheme();
       }
@@ -134504,59 +145145,66 @@ public get_partition_argsStandardScheme getScheme() {
 
     private static class get_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1896 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1896.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1897;
-                  for (int _i1898 = 0; _i1898 < _list1896.size; ++_i1898)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1897 = iprot.readString();
-                    struct.part_vals.add(_elem1897);
+                    org.apache.thrift.protocol.TList _list1896 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1896.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1897;
+                    for (int _i1898 = 0; _i1898 < _list1896.size; ++_i1898)
+                    {
+                      _elem1897 = iprot.readString();
+                      struct.part_vals.add(_elem1897);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -134590,6 +145238,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_args
     }
 
     private static class get_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_argsTupleScheme getScheme() {
         return new get_partition_argsTupleScheme();
       }
@@ -134630,28 +145279,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1901 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1901.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1902;
-            for (int _i1903 = 0; _i1903 < _list1901.size; ++_i1903)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1902 = iprot.readString();
-              struct.part_vals.add(_elem1902);
+              org.apache.thrift.protocol.TList _list1901 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1901.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1902;
+              for (int _i1903 = 0; _i1903 < _list1901.size; ++_i1903)
+              {
+                _elem1902 = iprot.readString();
+                struct.part_vals.add(_elem1902);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -134661,6 +145315,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_result implements org.apache.thrift.TBase<get_partition_result, get_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_result");
 
@@ -134732,10 +145387,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -134784,6 +145441,7 @@ public get_partition_result(get_partition_result other) {
       }
     }
 
+    @Override
     public get_partition_result deepCopy() {
       return new get_partition_result(this);
     }
@@ -134867,6 +145525,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -134897,6 +145556,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -134913,6 +145573,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -135033,10 +145694,12 @@ public int compareTo(get_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -135102,6 +145765,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_resultStandardScheme getScheme() {
         return new get_partition_resultStandardScheme();
       }
@@ -135109,52 +145773,59 @@ public get_partition_resultStandardScheme getScheme() {
 
     private static class get_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_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 Partition();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -135181,6 +145852,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_resu
     }
 
     private static class get_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_resultTupleScheme getScheme() {
         return new get_partition_resultTupleScheme();
       }
@@ -135215,22 +145887,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_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 Partition();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 Partition();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -135240,6 +145917,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_req_args implements org.apache.thrift.TBase<get_partition_req_args, get_partition_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_req_args");
 
@@ -135301,10 +145979,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -135339,6 +146019,7 @@ public get_partition_req_args(get_partition_req_args other) {
       }
     }
 
+    @Override
     public get_partition_req_args deepCopy() {
       return new get_partition_req_args(this);
     }
@@ -135372,6 +146053,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -135386,6 +146068,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -135396,6 +146079,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -135466,14 +146150,17 @@ public int compareTo(get_partition_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -135519,6 +146206,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_req_argsStandardScheme getScheme() {
         return new get_partition_req_argsStandardScheme();
       }
@@ -135526,34 +146214,41 @@ public get_partition_req_argsStandardScheme getScheme() {
 
     private static class get_partition_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetPartitionRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetPartitionRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -135570,6 +146265,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_req_
     }
 
     private static class get_partition_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_req_argsTupleScheme getScheme() {
         return new get_partition_req_argsTupleScheme();
       }
@@ -135592,12 +146288,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_req_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_req_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.req = new GetPartitionRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetPartitionRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -135607,6 +146308,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_req_result implements org.apache.thrift.TBase<get_partition_req_result, get_partition_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_req_result");
 
@@ -135678,10 +146380,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -135730,6 +146434,7 @@ public get_partition_req_result(get_partition_req_result other) {
       }
     }
 
+    @Override
     public get_partition_req_result deepCopy() {
       return new get_partition_req_result(this);
     }
@@ -135813,6 +146518,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -135843,6 +146549,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -135859,6 +146566,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -135979,10 +146687,12 @@ public int compareTo(get_partition_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -136048,6 +146758,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_req_resultStandardScheme getScheme() {
         return new get_partition_req_resultStandardScheme();
       }
@@ -136055,52 +146766,59 @@ public get_partition_req_resultStandardScheme getScheme() {
 
     private static class get_partition_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_req_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 GetPartitionResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetPartitionResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -136127,6 +146845,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_req_
     }
 
     private static class get_partition_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_req_resultTupleScheme getScheme() {
         return new get_partition_req_resultTupleScheme();
       }
@@ -136161,22 +146880,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_req_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_req_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 GetPartitionResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetPartitionResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -136186,6 +146910,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partition_args implements org.apache.thrift.TBase<exchange_partition_args, exchange_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<exchange_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exchange_partition_args");
 
@@ -136267,10 +146992,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -136336,6 +147063,7 @@ public exchange_partition_args(exchange_partition_args other) {
       }
     }
 
+    @Override
     public exchange_partition_args deepCopy() {
       return new exchange_partition_args(this);
     }
@@ -136480,6 +147208,7 @@ public void setDest_table_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PARTITION_SPECS:
@@ -136526,6 +147255,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PARTITION_SPECS:
@@ -136548,6 +147278,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -136718,14 +147449,17 @@ public int compareTo(exchange_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -136800,6 +147534,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class exchange_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partition_argsStandardScheme getScheme() {
         return new exchange_partition_argsStandardScheme();
       }
@@ -136807,77 +147542,84 @@ public exchange_partition_argsStandardScheme getScheme() {
 
     private static class exchange_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<exchange_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, exchange_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PARTITION_SPECS
-              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map1904 = iprot.readMapBegin();
-                  struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1904.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key1905;
-                  @org.apache.thrift.annotation.Nullable java.lang.String _val1906;
-                  for (int _i1907 = 0; _i1907 < _map1904.size; ++_i1907)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PARTITION_SPECS
+                if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                   {
-                    _key1905 = iprot.readString();
-                    _val1906 = iprot.readString();
-                    struct.partitionSpecs.put(_key1905, _val1906);
+                    org.apache.thrift.protocol.TMap _map1904 = iprot.readMapBegin();
+                    struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1904.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key1905;
+                    @org.apache.thrift.annotation.Nullable java.lang.String _val1906;
+                    for (int _i1907 = 0; _i1907 < _map1904.size; ++_i1907)
+                    {
+                      _key1905 = iprot.readString();
+                      _val1906 = iprot.readString();
+                      struct.partitionSpecs.put(_key1905, _val1906);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setPartitionSpecsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPartitionSpecsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // SOURCE_DB
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.source_db = iprot.readString();
-                struct.setSource_dbIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // SOURCE_TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.source_table_name = iprot.readString();
-                struct.setSource_table_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // DEST_DB
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.dest_db = iprot.readString();
-                struct.setDest_dbIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // DEST_TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.dest_table_name = iprot.readString();
-                struct.setDest_table_nameIsSet(true);
-              } else { 
+                break;
+              case 2: // SOURCE_DB
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.source_db = iprot.readString();
+                  struct.setSource_dbIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // SOURCE_TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.source_table_name = iprot.readString();
+                  struct.setSource_table_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // DEST_DB
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.dest_db = iprot.readString();
+                  struct.setDest_dbIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // DEST_TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.dest_table_name = iprot.readString();
+                  struct.setDest_table_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -136922,6 +147664,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partition
     }
 
     private static class exchange_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partition_argsTupleScheme getScheme() {
         return new exchange_partition_argsTupleScheme();
       }
@@ -136975,38 +147718,43 @@ public void write(org.apache.thrift.protocol.TProtocol prot, exchange_partition_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, exchange_partition_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(5);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TMap _map1910 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-            struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1910.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key1911;
-            @org.apache.thrift.annotation.Nullable java.lang.String _val1912;
-            for (int _i1913 = 0; _i1913 < _map1910.size; ++_i1913)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
             {
-              _key1911 = iprot.readString();
-              _val1912 = iprot.readString();
-              struct.partitionSpecs.put(_key1911, _val1912);
+              org.apache.thrift.protocol.TMap _map1910 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+              struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1910.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key1911;
+              @org.apache.thrift.annotation.Nullable java.lang.String _val1912;
+              for (int _i1913 = 0; _i1913 < _map1910.size; ++_i1913)
+              {
+                _key1911 = iprot.readString();
+                _val1912 = iprot.readString();
+                struct.partitionSpecs.put(_key1911, _val1912);
+              }
             }
+            struct.setPartitionSpecsIsSet(true);
           }
-          struct.setPartitionSpecsIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.source_db = iprot.readString();
-          struct.setSource_dbIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.source_table_name = iprot.readString();
-          struct.setSource_table_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.dest_db = iprot.readString();
-          struct.setDest_dbIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.dest_table_name = iprot.readString();
-          struct.setDest_table_nameIsSet(true);
+          if (incoming.get(1)) {
+            struct.source_db = iprot.readString();
+            struct.setSource_dbIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.source_table_name = iprot.readString();
+            struct.setSource_table_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.dest_db = iprot.readString();
+            struct.setDest_dbIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.dest_table_name = iprot.readString();
+            struct.setDest_table_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -137016,6 +147764,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partition_result implements org.apache.thrift.TBase<exchange_partition_result, exchange_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<exchange_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exchange_partition_result");
 
@@ -137097,10 +147846,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -137163,6 +147914,7 @@ public exchange_partition_result(exchange_partition_result other) {
       }
     }
 
+    @Override
     public exchange_partition_result deepCopy() {
       return new exchange_partition_result(this);
     }
@@ -137296,6 +148048,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -137342,6 +148095,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -137364,6 +148118,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -137534,10 +148289,12 @@ public int compareTo(exchange_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -137619,6 +148376,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class exchange_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partition_resultStandardScheme getScheme() {
         return new exchange_partition_resultStandardScheme();
       }
@@ -137626,70 +148384,77 @@ public exchange_partition_resultStandardScheme getScheme() {
 
     private static class exchange_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<exchange_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, exchange_partition_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 Partition();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -137726,6 +148491,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partition
     }
 
     private static class exchange_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partition_resultTupleScheme getScheme() {
         return new exchange_partition_resultTupleScheme();
       }
@@ -137772,32 +148538,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, exchange_partition_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, exchange_partition_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(5);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          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);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new Partition();
+            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);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -137807,6 +148578,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partitions_args implements org.apache.thrift.TBase<exchange_partitions_args, exchange_partitions_args._Fields>, java.io.Serializable, Cloneable, Comparable<exchange_partitions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exchange_partitions_args");
 
@@ -137888,10 +148660,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -137957,6 +148731,7 @@ public exchange_partitions_args(exchange_partitions_args other) {
       }
     }
 
+    @Override
     public exchange_partitions_args deepCopy() {
       return new exchange_partitions_args(this);
     }
@@ -138101,6 +148876,7 @@ public void setDest_table_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PARTITION_SPECS:
@@ -138147,6 +148923,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PARTITION_SPECS:
@@ -138169,6 +148946,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -138339,14 +149117,17 @@ public int compareTo(exchange_partitions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -138421,6 +149202,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class exchange_partitions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partitions_argsStandardScheme getScheme() {
         return new exchange_partitions_argsStandardScheme();
       }
@@ -138428,77 +149210,84 @@ public exchange_partitions_argsStandardScheme getScheme() {
 
     private static class exchange_partitions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<exchange_partitions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, exchange_partitions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PARTITION_SPECS
-              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map1914 = iprot.readMapBegin();
-                  struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1914.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key1915;
-                  @org.apache.thrift.annotation.Nullable java.lang.String _val1916;
-                  for (int _i1917 = 0; _i1917 < _map1914.size; ++_i1917)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PARTITION_SPECS
+                if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                   {
-                    _key1915 = iprot.readString();
-                    _val1916 = iprot.readString();
-                    struct.partitionSpecs.put(_key1915, _val1916);
+                    org.apache.thrift.protocol.TMap _map1914 = iprot.readMapBegin();
+                    struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1914.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key1915;
+                    @org.apache.thrift.annotation.Nullable java.lang.String _val1916;
+                    for (int _i1917 = 0; _i1917 < _map1914.size; ++_i1917)
+                    {
+                      _key1915 = iprot.readString();
+                      _val1916 = iprot.readString();
+                      struct.partitionSpecs.put(_key1915, _val1916);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setPartitionSpecsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPartitionSpecsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // SOURCE_DB
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.source_db = iprot.readString();
-                struct.setSource_dbIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // SOURCE_TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.source_table_name = iprot.readString();
-                struct.setSource_table_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // DEST_DB
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.dest_db = iprot.readString();
-                struct.setDest_dbIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // DEST_TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.dest_table_name = iprot.readString();
-                struct.setDest_table_nameIsSet(true);
-              } else { 
+                break;
+              case 2: // SOURCE_DB
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.source_db = iprot.readString();
+                  struct.setSource_dbIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // SOURCE_TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.source_table_name = iprot.readString();
+                  struct.setSource_table_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // DEST_DB
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.dest_db = iprot.readString();
+                  struct.setDest_dbIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // DEST_TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.dest_table_name = iprot.readString();
+                  struct.setDest_table_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partitions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -138543,6 +149332,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partition
     }
 
     private static class exchange_partitions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partitions_argsTupleScheme getScheme() {
         return new exchange_partitions_argsTupleScheme();
       }
@@ -138596,38 +149386,43 @@ public void write(org.apache.thrift.protocol.TProtocol prot, exchange_partitions
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, exchange_partitions_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(5);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TMap _map1920 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-            struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1920.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key1921;
-            @org.apache.thrift.annotation.Nullable java.lang.String _val1922;
-            for (int _i1923 = 0; _i1923 < _map1920.size; ++_i1923)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
             {
-              _key1921 = iprot.readString();
-              _val1922 = iprot.readString();
-              struct.partitionSpecs.put(_key1921, _val1922);
+              org.apache.thrift.protocol.TMap _map1920 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+              struct.partitionSpecs = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map1920.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key1921;
+              @org.apache.thrift.annotation.Nullable java.lang.String _val1922;
+              for (int _i1923 = 0; _i1923 < _map1920.size; ++_i1923)
+              {
+                _key1921 = iprot.readString();
+                _val1922 = iprot.readString();
+                struct.partitionSpecs.put(_key1921, _val1922);
+              }
             }
+            struct.setPartitionSpecsIsSet(true);
           }
-          struct.setPartitionSpecsIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.source_db = iprot.readString();
-          struct.setSource_dbIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.source_table_name = iprot.readString();
-          struct.setSource_table_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.dest_db = iprot.readString();
-          struct.setDest_dbIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.dest_table_name = iprot.readString();
-          struct.setDest_table_nameIsSet(true);
+          if (incoming.get(1)) {
+            struct.source_db = iprot.readString();
+            struct.setSource_dbIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.source_table_name = iprot.readString();
+            struct.setSource_table_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.dest_db = iprot.readString();
+            struct.setDest_dbIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.dest_table_name = iprot.readString();
+            struct.setDest_table_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -138637,6 +149432,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class exchange_partitions_result implements org.apache.thrift.TBase<exchange_partitions_result, exchange_partitions_result._Fields>, java.io.Serializable, Cloneable, Comparable<exchange_partitions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exchange_partitions_result");
 
@@ -138718,10 +149514,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -138789,6 +149587,7 @@ public exchange_partitions_result(exchange_partitions_result other) {
       }
     }
 
+    @Override
     public exchange_partitions_result deepCopy() {
       return new exchange_partitions_result(this);
     }
@@ -138938,6 +149737,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -138984,6 +149784,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -139006,6 +149807,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -139176,10 +149978,12 @@ public int compareTo(exchange_partitions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -139258,6 +150062,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class exchange_partitions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partitions_resultStandardScheme getScheme() {
         return new exchange_partitions_resultStandardScheme();
       }
@@ -139265,80 +150070,87 @@ public exchange_partitions_resultStandardScheme getScheme() {
 
     private static class exchange_partitions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<exchange_partitions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, exchange_partitions_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1924 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list1924.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem1925;
-                  for (int _i1926 = 0; _i1926 < _list1924.size; ++_i1926)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1925 = new Partition();
-                    _elem1925.read(iprot);
-                    struct.success.add(_elem1925);
+                    org.apache.thrift.protocol.TList _list1924 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list1924.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem1925;
+                    for (int _i1926 = 0; _i1926 < _list1924.size; ++_i1926)
+                    {
+                      _elem1925 = new Partition();
+                      _elem1925.read(iprot);
+                      struct.success.add(_elem1925);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+                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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partitions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -139382,6 +150194,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, exchange_partition
     }
 
     private static class exchange_partitions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public exchange_partitions_resultTupleScheme getScheme() {
         return new exchange_partitions_resultTupleScheme();
       }
@@ -139434,41 +150247,46 @@ public void write(org.apache.thrift.protocol.TProtocol prot, exchange_partitions
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, exchange_partitions_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(5);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list1929 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list1929.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem1930;
-            for (int _i1931 = 0; _i1931 < _list1929.size; ++_i1931)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
             {
-              _elem1930 = new Partition();
-              _elem1930.read(iprot);
-              struct.success.add(_elem1930);
+              org.apache.thrift.protocol.TList _list1929 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list1929.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem1930;
+              for (int _i1931 = 0; _i1931 < _list1929.size; ++_i1931)
+              {
+                _elem1930 = new Partition();
+                _elem1930.read(iprot);
+                struct.success.add(_elem1930);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(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);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -139478,6 +150296,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_with_auth_args implements org.apache.thrift.TBase<get_partition_with_auth_args, get_partition_with_auth_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_with_auth_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_with_auth_args");
 
@@ -139559,10 +150378,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -139629,6 +150450,7 @@ public get_partition_with_auth_args(get_partition_with_auth_args other) {
       }
     }
 
+    @Override
     public get_partition_with_auth_args deepCopy() {
       return new get_partition_with_auth_args(this);
     }
@@ -139794,6 +150616,7 @@ public void setGroup_namesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -139840,6 +150663,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -139862,6 +150686,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -140032,14 +150857,17 @@ public int compareTo(get_partition_with_auth_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -140114,6 +150942,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_with_auth_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_with_auth_argsStandardScheme getScheme() {
         return new get_partition_with_auth_argsStandardScheme();
       }
@@ -140121,85 +150950,92 @@ public get_partition_with_auth_argsStandardScheme getScheme() {
 
     private static class get_partition_with_auth_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_with_auth_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_with_auth_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1932 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1932.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1933;
-                  for (int _i1934 = 0; _i1934 < _list1932.size; ++_i1934)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1933 = iprot.readString();
-                    struct.part_vals.add(_elem1933);
+                    org.apache.thrift.protocol.TList _list1932 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1932.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1933;
+                    for (int _i1934 = 0; _i1934 < _list1932.size; ++_i1934)
+                    {
+                      _elem1933 = iprot.readString();
+                      struct.part_vals.add(_elem1933);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // USER_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.user_name = iprot.readString();
-                struct.setUser_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // GROUP_NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1935 = iprot.readListBegin();
-                  struct.group_names = new java.util.ArrayList<java.lang.String>(_list1935.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1936;
-                  for (int _i1937 = 0; _i1937 < _list1935.size; ++_i1937)
+                break;
+              case 4: // USER_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.user_name = iprot.readString();
+                  struct.setUser_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // GROUP_NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1936 = iprot.readString();
-                    struct.group_names.add(_elem1936);
+                    org.apache.thrift.protocol.TList _list1935 = iprot.readListBegin();
+                    struct.group_names = new java.util.ArrayList<java.lang.String>(_list1935.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1936;
+                    for (int _i1937 = 0; _i1937 < _list1935.size; ++_i1937)
+                    {
+                      _elem1936 = iprot.readString();
+                      struct.group_names.add(_elem1936);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setGroup_namesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setGroup_namesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_with_auth_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -140250,6 +151086,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_with
     }
 
     private static class get_partition_with_auth_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_with_auth_argsTupleScheme getScheme() {
         return new get_partition_with_auth_argsTupleScheme();
       }
@@ -140308,45 +151145,50 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_with_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_with_auth_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(5);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list1942 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1942.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1943;
-            for (int _i1944 = 0; _i1944 < _list1942.size; ++_i1944)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem1943 = iprot.readString();
-              struct.part_vals.add(_elem1943);
+              org.apache.thrift.protocol.TList _list1942 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1942.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1943;
+              for (int _i1944 = 0; _i1944 < _list1942.size; ++_i1944)
+              {
+                _elem1943 = iprot.readString();
+                struct.part_vals.add(_elem1943);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.user_name = iprot.readString();
-          struct.setUser_nameIsSet(true);
-        }
-        if (incoming.get(4)) {
-          {
-            org.apache.thrift.protocol.TList _list1945 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.group_names = new java.util.ArrayList<java.lang.String>(_list1945.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1946;
-            for (int _i1947 = 0; _i1947 < _list1945.size; ++_i1947)
+          if (incoming.get(3)) {
+            struct.user_name = iprot.readString();
+            struct.setUser_nameIsSet(true);
+          }
+          if (incoming.get(4)) {
             {
-              _elem1946 = iprot.readString();
-              struct.group_names.add(_elem1946);
+              org.apache.thrift.protocol.TList _list1945 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.group_names = new java.util.ArrayList<java.lang.String>(_list1945.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1946;
+              for (int _i1947 = 0; _i1947 < _list1945.size; ++_i1947)
+              {
+                _elem1946 = iprot.readString();
+                struct.group_names.add(_elem1946);
+              }
             }
+            struct.setGroup_namesIsSet(true);
           }
-          struct.setGroup_namesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -140356,6 +151198,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_with_auth_result implements org.apache.thrift.TBase<get_partition_with_auth_result, get_partition_with_auth_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_with_auth_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_with_auth_result");
 
@@ -140427,10 +151270,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -140479,6 +151324,7 @@ public get_partition_with_auth_result(get_partition_with_auth_result other) {
       }
     }
 
+    @Override
     public get_partition_with_auth_result deepCopy() {
       return new get_partition_with_auth_result(this);
     }
@@ -140562,6 +151408,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -140592,6 +151439,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -140608,6 +151456,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -140728,10 +151577,12 @@ public int compareTo(get_partition_with_auth_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -140797,6 +151648,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_with_auth_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_with_auth_resultStandardScheme getScheme() {
         return new get_partition_with_auth_resultStandardScheme();
       }
@@ -140804,52 +151656,59 @@ public get_partition_with_auth_resultStandardScheme getScheme() {
 
     private static class get_partition_with_auth_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_with_auth_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_with_auth_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 Partition();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_with_auth_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -140876,6 +151735,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_with
     }
 
     private static class get_partition_with_auth_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_with_auth_resultTupleScheme getScheme() {
         return new get_partition_with_auth_resultTupleScheme();
       }
@@ -140910,22 +151770,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_with_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_with_auth_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 Partition();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 Partition();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -140935,6 +151800,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_by_name_args implements org.apache.thrift.TBase<get_partition_by_name_args, get_partition_by_name_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_by_name_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_by_name_args");
 
@@ -141006,10 +151872,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -141058,6 +151926,7 @@ public get_partition_by_name_args(get_partition_by_name_args other) {
       }
     }
 
+    @Override
     public get_partition_by_name_args deepCopy() {
       return new get_partition_by_name_args(this);
     }
@@ -141141,6 +152010,7 @@ public void setPart_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -141171,6 +152041,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -141187,6 +152058,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -141307,14 +152179,17 @@ public int compareTo(get_partition_by_name_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -141373,6 +152248,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_by_name_argsStandardScheme getScheme() {
         return new get_partition_by_name_argsStandardScheme();
       }
@@ -141380,49 +152256,56 @@ public get_partition_by_name_argsStandardScheme getScheme() {
 
     private static class get_partition_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_by_name_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_by_name_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_by_name_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -141449,6 +152332,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_by_n
     }
 
     private static class get_partition_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_by_name_argsTupleScheme getScheme() {
         return new get_partition_by_name_argsTupleScheme();
       }
@@ -141483,19 +152367,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_by_na
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_by_name_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -141505,6 +152394,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_by_name_result implements org.apache.thrift.TBase<get_partition_by_name_result, get_partition_by_name_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_by_name_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_by_name_result");
 
@@ -141576,10 +152466,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -141628,6 +152520,7 @@ public get_partition_by_name_result(get_partition_by_name_result other) {
       }
     }
 
+    @Override
     public get_partition_by_name_result deepCopy() {
       return new get_partition_by_name_result(this);
     }
@@ -141711,6 +152604,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -141741,6 +152635,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -141757,6 +152652,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -141877,10 +152773,12 @@ public int compareTo(get_partition_by_name_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -141946,6 +152844,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_by_name_resultStandardScheme getScheme() {
         return new get_partition_by_name_resultStandardScheme();
       }
@@ -141953,52 +152852,59 @@ public get_partition_by_name_resultStandardScheme getScheme() {
 
     private static class get_partition_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_by_name_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_by_name_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 Partition();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Partition();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_by_name_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -142025,6 +152931,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_by_n
     }
 
     private static class get_partition_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_by_name_resultTupleScheme getScheme() {
         return new get_partition_by_name_resultTupleScheme();
       }
@@ -142059,22 +152966,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_by_na
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_by_name_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
-        if (incoming.get(0)) {
-          struct.success = new Partition();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 Partition();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -142084,6 +152996,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_args implements org.apache.thrift.TBase<get_partitions_args, get_partitions_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_args");
 
@@ -142155,10 +153068,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -142211,6 +153126,7 @@ public get_partitions_args(get_partitions_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_partitions_args deepCopy() {
       return new get_partitions_args(this);
     }
@@ -142293,6 +153209,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -142323,6 +153240,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -142339,6 +153257,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -142457,14 +153376,17 @@ public int compareTo(get_partitions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -142521,6 +153443,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_argsStandardScheme getScheme() {
         return new get_partitions_argsStandardScheme();
       }
@@ -142528,49 +153451,56 @@ public get_partitions_argsStandardScheme getScheme() {
 
     private static class get_partitions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -142595,6 +153525,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_arg
     }
 
     private static class get_partitions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_argsTupleScheme getScheme() {
         return new get_partitions_argsTupleScheme();
       }
@@ -142629,19 +153560,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -142651,6 +153587,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_result implements org.apache.thrift.TBase<get_partitions_result, get_partitions_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_result");
 
@@ -142722,10 +153659,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -142779,6 +153718,7 @@ public get_partitions_result(get_partitions_result other) {
       }
     }
 
+    @Override
     public get_partitions_result deepCopy() {
       return new get_partitions_result(this);
     }
@@ -142878,6 +153818,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -142908,6 +153849,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -142924,6 +153866,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -143044,10 +153987,12 @@ public int compareTo(get_partitions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -143110,6 +154055,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_resultStandardScheme getScheme() {
         return new get_partitions_resultStandardScheme();
       }
@@ -143117,62 +154063,69 @@ public get_partitions_resultStandardScheme getScheme() {
 
     private static class get_partitions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1948 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list1948.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem1949;
-                  for (int _i1950 = 0; _i1950 < _list1948.size; ++_i1950)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1949 = new Partition();
-                    _elem1949.read(iprot);
-                    struct.success.add(_elem1949);
+                    org.apache.thrift.protocol.TList _list1948 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list1948.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem1949;
+                    for (int _i1950 = 0; _i1950 < _list1948.size; ++_i1950)
+                    {
+                      _elem1949 = new Partition();
+                      _elem1949.read(iprot);
+                      struct.success.add(_elem1949);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -143206,6 +154159,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_res
     }
 
     private static class get_partitions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_resultTupleScheme getScheme() {
         return new get_partitions_resultTupleScheme();
       }
@@ -143246,31 +154200,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_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)) {
-          {
-            org.apache.thrift.protocol.TList _list1953 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list1953.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem1954;
-            for (int _i1955 = 0; _i1955 < _list1953.size; ++_i1955)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem1954 = new Partition();
-              _elem1954.read(iprot);
-              struct.success.add(_elem1954);
+              org.apache.thrift.protocol.TList _list1953 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list1953.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem1954;
+              for (int _i1955 = 0; _i1955 < _list1953.size; ++_i1955)
+              {
+                _elem1954 = new Partition();
+                _elem1954.read(iprot);
+                struct.success.add(_elem1954);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -143280,6 +154239,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_req_args implements org.apache.thrift.TBase<get_partitions_req_args, get_partitions_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_req_args");
 
@@ -143341,10 +154301,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -143379,6 +154341,7 @@ public get_partitions_req_args(get_partitions_req_args other) {
       }
     }
 
+    @Override
     public get_partitions_req_args deepCopy() {
       return new get_partitions_req_args(this);
     }
@@ -143412,6 +154375,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -143426,6 +154390,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -143436,6 +154401,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -143506,14 +154472,17 @@ public int compareTo(get_partitions_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -143559,6 +154528,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_req_argsStandardScheme getScheme() {
         return new get_partitions_req_argsStandardScheme();
       }
@@ -143566,34 +154536,41 @@ public get_partitions_req_argsStandardScheme getScheme() {
 
     private static class get_partitions_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PartitionsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PartitionsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -143610,6 +154587,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_req
     }
 
     private static class get_partitions_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_req_argsTupleScheme getScheme() {
         return new get_partitions_req_argsTupleScheme();
       }
@@ -143632,12 +154610,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_req_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.req = new PartitionsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PartitionsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -143647,6 +154630,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_req_result implements org.apache.thrift.TBase<get_partitions_req_result, get_partitions_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_req_result");
 
@@ -143718,10 +154702,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -143770,6 +154756,7 @@ public get_partitions_req_result(get_partitions_req_result other) {
       }
     }
 
+    @Override
     public get_partitions_req_result deepCopy() {
       return new get_partitions_req_result(this);
     }
@@ -143853,6 +154840,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -143883,6 +154871,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -143899,6 +154888,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -144019,10 +155009,12 @@ public int compareTo(get_partitions_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -144088,6 +155080,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_req_resultStandardScheme getScheme() {
         return new get_partitions_req_resultStandardScheme();
       }
@@ -144095,52 +155088,59 @@ public get_partitions_req_resultStandardScheme getScheme() {
 
     private static class get_partitions_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_req_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 PartitionsResponse();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PartitionsResponse();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -144167,6 +155167,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_req
     }
 
     private static class get_partitions_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_req_resultTupleScheme getScheme() {
         return new get_partitions_req_resultTupleScheme();
       }
@@ -144201,22 +155202,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_req_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_req_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 PartitionsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -144226,6 +155232,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_auth_args implements org.apache.thrift.TBase<get_partitions_with_auth_args, get_partitions_with_auth_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_with_auth_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_with_auth_args");
 
@@ -144307,10 +155314,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -144379,6 +155388,7 @@ public get_partitions_with_auth_args(get_partitions_with_auth_args other) {
       }
     }
 
+    @Override
     public get_partitions_with_auth_args deepCopy() {
       return new get_partitions_with_auth_args(this);
     }
@@ -144527,6 +155537,7 @@ public void setGroup_namesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -144573,6 +155584,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -144595,6 +155607,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -144763,14 +155776,17 @@ public int compareTo(get_partitions_with_auth_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -144843,6 +155859,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_with_auth_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_auth_argsStandardScheme getScheme() {
         return new get_partitions_with_auth_argsStandardScheme();
       }
@@ -144850,75 +155867,82 @@ public get_partitions_with_auth_argsStandardScheme getScheme() {
 
     private static class get_partitions_with_auth_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_with_auth_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_with_auth_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // USER_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.user_name = iprot.readString();
-                struct.setUser_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 5: // GROUP_NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1956 = iprot.readListBegin();
-                  struct.group_names = new java.util.ArrayList<java.lang.String>(_list1956.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1957;
-                  for (int _i1958 = 0; _i1958 < _list1956.size; ++_i1958)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // USER_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.user_name = iprot.readString();
+                  struct.setUser_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // GROUP_NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1957 = iprot.readString();
-                    struct.group_names.add(_elem1957);
+                    org.apache.thrift.protocol.TList _list1956 = iprot.readListBegin();
+                    struct.group_names = new java.util.ArrayList<java.lang.String>(_list1956.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1957;
+                    for (int _i1958 = 0; _i1958 < _list1956.size; ++_i1958)
+                    {
+                      _elem1957 = iprot.readString();
+                      struct.group_names.add(_elem1957);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setGroup_namesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setGroup_namesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_with_auth_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -144960,6 +155984,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_wit
     }
 
     private static class get_partitions_with_auth_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_auth_argsTupleScheme getScheme() {
         return new get_partitions_with_auth_argsTupleScheme();
       }
@@ -145012,36 +156037,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_with
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_with_auth_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(5);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.user_name = iprot.readString();
-          struct.setUser_nameIsSet(true);
-        }
-        if (incoming.get(4)) {
-          {
-            org.apache.thrift.protocol.TList _list1961 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.group_names = new java.util.ArrayList<java.lang.String>(_list1961.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1962;
-            for (int _i1963 = 0; _i1963 < _list1961.size; ++_i1963)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.user_name = iprot.readString();
+            struct.setUser_nameIsSet(true);
+          }
+          if (incoming.get(4)) {
             {
-              _elem1962 = iprot.readString();
-              struct.group_names.add(_elem1962);
+              org.apache.thrift.protocol.TList _list1961 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.group_names = new java.util.ArrayList<java.lang.String>(_list1961.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1962;
+              for (int _i1963 = 0; _i1963 < _list1961.size; ++_i1963)
+              {
+                _elem1962 = iprot.readString();
+                struct.group_names.add(_elem1962);
+              }
             }
+            struct.setGroup_namesIsSet(true);
           }
-          struct.setGroup_namesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -145051,6 +156081,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_auth_result implements org.apache.thrift.TBase<get_partitions_with_auth_result, get_partitions_with_auth_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_with_auth_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_with_auth_result");
 
@@ -145122,10 +156153,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -145179,6 +156212,7 @@ public get_partitions_with_auth_result(get_partitions_with_auth_result other) {
       }
     }
 
+    @Override
     public get_partitions_with_auth_result deepCopy() {
       return new get_partitions_with_auth_result(this);
     }
@@ -145278,6 +156312,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -145308,6 +156343,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -145324,6 +156360,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -145444,10 +156481,12 @@ public int compareTo(get_partitions_with_auth_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -145510,6 +156549,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_with_auth_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_auth_resultStandardScheme getScheme() {
         return new get_partitions_with_auth_resultStandardScheme();
       }
@@ -145517,62 +156557,69 @@ public get_partitions_with_auth_resultStandardScheme getScheme() {
 
     private static class get_partitions_with_auth_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_with_auth_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_with_auth_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1964 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list1964.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem1965;
-                  for (int _i1966 = 0; _i1966 < _list1964.size; ++_i1966)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1965 = new Partition();
-                    _elem1965.read(iprot);
-                    struct.success.add(_elem1965);
+                    org.apache.thrift.protocol.TList _list1964 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list1964.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem1965;
+                    for (int _i1966 = 0; _i1966 < _list1964.size; ++_i1966)
+                    {
+                      _elem1965 = new Partition();
+                      _elem1965.read(iprot);
+                      struct.success.add(_elem1965);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_with_auth_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -145606,6 +156653,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_wit
     }
 
     private static class get_partitions_with_auth_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_auth_resultTupleScheme getScheme() {
         return new get_partitions_with_auth_resultTupleScheme();
       }
@@ -145646,31 +156694,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_with
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_with_auth_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)) {
-          {
-            org.apache.thrift.protocol.TList _list1969 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list1969.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem1970;
-            for (int _i1971 = 0; _i1971 < _list1969.size; ++_i1971)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem1970 = new Partition();
-              _elem1970.read(iprot);
-              struct.success.add(_elem1970);
+              org.apache.thrift.protocol.TList _list1969 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list1969.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem1970;
+              for (int _i1971 = 0; _i1971 < _list1969.size; ++_i1971)
+              {
+                _elem1970 = new Partition();
+                _elem1970.read(iprot);
+                struct.success.add(_elem1970);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -145680,6 +156733,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_pspec_args implements org.apache.thrift.TBase<get_partitions_pspec_args, get_partitions_pspec_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_pspec_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_pspec_args");
 
@@ -145751,10 +156805,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -145807,6 +156863,7 @@ public get_partitions_pspec_args(get_partitions_pspec_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_partitions_pspec_args deepCopy() {
       return new get_partitions_pspec_args(this);
     }
@@ -145889,6 +156946,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -145919,6 +156977,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -145935,6 +156994,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -146053,14 +157113,17 @@ public int compareTo(get_partitions_pspec_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -146117,6 +157180,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_pspec_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_pspec_argsStandardScheme getScheme() {
         return new get_partitions_pspec_argsStandardScheme();
       }
@@ -146124,49 +157188,56 @@ public get_partitions_pspec_argsStandardScheme getScheme() {
 
     private static class get_partitions_pspec_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_pspec_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_pspec_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.max_parts = iprot.readI32();
-                struct.setMax_partsIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.max_parts = iprot.readI32();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_pspec_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -146191,6 +157262,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_psp
     }
 
     private static class get_partitions_pspec_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_pspec_argsTupleScheme getScheme() {
         return new get_partitions_pspec_argsTupleScheme();
       }
@@ -146225,19 +157297,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_pspe
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_pspec_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.max_parts = iprot.readI32();
-          struct.setMax_partsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.max_parts = iprot.readI32();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -146247,6 +157324,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_pspec_result implements org.apache.thrift.TBase<get_partitions_pspec_result, get_partitions_pspec_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_pspec_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_pspec_result");
 
@@ -146318,10 +157396,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -146375,6 +157455,7 @@ public get_partitions_pspec_result(get_partitions_pspec_result other) {
       }
     }
 
+    @Override
     public get_partitions_pspec_result deepCopy() {
       return new get_partitions_pspec_result(this);
     }
@@ -146474,6 +157555,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -146504,6 +157586,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -146520,6 +157603,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -146640,10 +157724,12 @@ public int compareTo(get_partitions_pspec_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -146706,6 +157792,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_pspec_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_pspec_resultStandardScheme getScheme() {
         return new get_partitions_pspec_resultStandardScheme();
       }
@@ -146713,62 +157800,69 @@ public get_partitions_pspec_resultStandardScheme getScheme() {
 
     private static class get_partitions_pspec_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_pspec_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_pspec_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1972 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<PartitionSpec>(_list1972.size);
-                  @org.apache.thrift.annotation.Nullable PartitionSpec _elem1973;
-                  for (int _i1974 = 0; _i1974 < _list1972.size; ++_i1974)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1973 = new PartitionSpec();
-                    _elem1973.read(iprot);
-                    struct.success.add(_elem1973);
+                    org.apache.thrift.protocol.TList _list1972 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<PartitionSpec>(_list1972.size);
+                    @org.apache.thrift.annotation.Nullable PartitionSpec _elem1973;
+                    for (int _i1974 = 0; _i1974 < _list1972.size; ++_i1974)
+                    {
+                      _elem1973 = new PartitionSpec();
+                      _elem1973.read(iprot);
+                      struct.success.add(_elem1973);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_pspec_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -146802,6 +157896,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_psp
     }
 
     private static class get_partitions_pspec_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_pspec_resultTupleScheme getScheme() {
         return new get_partitions_pspec_resultTupleScheme();
       }
@@ -146842,31 +157937,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_pspe
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_pspec_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)) {
-          {
-            org.apache.thrift.protocol.TList _list1977 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<PartitionSpec>(_list1977.size);
-            @org.apache.thrift.annotation.Nullable PartitionSpec _elem1978;
-            for (int _i1979 = 0; _i1979 < _list1977.size; ++_i1979)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem1978 = new PartitionSpec();
-              _elem1978.read(iprot);
-              struct.success.add(_elem1978);
+              org.apache.thrift.protocol.TList _list1977 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<PartitionSpec>(_list1977.size);
+              @org.apache.thrift.annotation.Nullable PartitionSpec _elem1978;
+              for (int _i1979 = 0; _i1979 < _list1977.size; ++_i1979)
+              {
+                _elem1978 = new PartitionSpec();
+                _elem1978.read(iprot);
+                struct.success.add(_elem1978);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -146876,6 +157976,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_args implements org.apache.thrift.TBase<get_partition_names_args, get_partition_names_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_args");
 
@@ -146947,10 +158048,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -147003,6 +158106,7 @@ public get_partition_names_args(get_partition_names_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_partition_names_args deepCopy() {
       return new get_partition_names_args(this);
     }
@@ -147085,6 +158189,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -147115,6 +158220,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -147131,6 +158237,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -147249,14 +158356,17 @@ public int compareTo(get_partition_names_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -147313,6 +158423,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_argsStandardScheme getScheme() {
         return new get_partition_names_argsStandardScheme();
       }
@@ -147320,49 +158431,56 @@ public get_partition_names_argsStandardScheme getScheme() {
 
     private static class get_partition_names_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -147387,6 +158505,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_argsTupleScheme getScheme() {
         return new get_partition_names_argsTupleScheme();
       }
@@ -147421,19 +158540,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -147443,6 +158567,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_result implements org.apache.thrift.TBase<get_partition_names_result, get_partition_names_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_result");
 
@@ -147514,10 +158639,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -147568,6 +158695,7 @@ public get_partition_names_result(get_partition_names_result other) {
       }
     }
 
+    @Override
     public get_partition_names_result deepCopy() {
       return new get_partition_names_result(this);
     }
@@ -147667,6 +158795,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -147697,6 +158826,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -147713,6 +158843,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -147833,10 +158964,12 @@ public int compareTo(get_partition_names_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -147899,6 +159032,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_resultStandardScheme getScheme() {
         return new get_partition_names_resultStandardScheme();
       }
@@ -147906,61 +159040,68 @@ public get_partition_names_resultStandardScheme getScheme() {
 
     private static class get_partition_names_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1980 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1980.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1981;
-                  for (int _i1982 = 0; _i1982 < _list1980.size; ++_i1982)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1981 = iprot.readString();
-                    struct.success.add(_elem1981);
+                    org.apache.thrift.protocol.TList _list1980 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1980.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1981;
+                    for (int _i1982 = 0; _i1982 < _list1980.size; ++_i1982)
+                    {
+                      _elem1981 = iprot.readString();
+                      struct.success.add(_elem1981);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -147994,6 +159135,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_resultTupleScheme getScheme() {
         return new get_partition_names_resultTupleScheme();
       }
@@ -148034,30 +159176,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_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)) {
-          {
-            org.apache.thrift.protocol.TList _list1985 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1985.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1986;
-            for (int _i1987 = 0; _i1987 < _list1985.size; ++_i1987)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem1986 = iprot.readString();
-              struct.success.add(_elem1986);
+              org.apache.thrift.protocol.TList _list1985 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1985.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1986;
+              for (int _i1987 = 0; _i1987 < _list1985.size; ++_i1987)
+              {
+                _elem1986 = iprot.readString();
+                struct.success.add(_elem1986);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -148067,6 +159214,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fetch_partition_names_req_args implements org.apache.thrift.TBase<fetch_partition_names_req_args, fetch_partition_names_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<fetch_partition_names_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetch_partition_names_req_args");
 
@@ -148128,10 +159276,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -148166,6 +159316,7 @@ public fetch_partition_names_req_args(fetch_partition_names_req_args other) {
       }
     }
 
+    @Override
     public fetch_partition_names_req_args deepCopy() {
       return new fetch_partition_names_req_args(this);
     }
@@ -148199,6 +159350,7 @@ public void setPartitionReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PARTITION_REQ:
@@ -148213,6 +159365,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PARTITION_REQ:
@@ -148223,6 +159376,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -148293,14 +159447,17 @@ public int compareTo(fetch_partition_names_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -148346,6 +159503,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class fetch_partition_names_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fetch_partition_names_req_argsStandardScheme getScheme() {
         return new fetch_partition_names_req_argsStandardScheme();
       }
@@ -148353,34 +159511,41 @@ public fetch_partition_names_req_argsStandardScheme getScheme() {
 
     private static class fetch_partition_names_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<fetch_partition_names_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, fetch_partition_names_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PARTITION_REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.partitionReq = new PartitionsRequest();
-                struct.partitionReq.read(iprot);
-                struct.setPartitionReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PARTITION_REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.partitionReq = new PartitionsRequest();
+                  struct.partitionReq.read(iprot);
+                  struct.setPartitionReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, fetch_partition_names_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -148397,6 +159562,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, fetch_partition_na
     }
 
     private static class fetch_partition_names_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fetch_partition_names_req_argsTupleScheme getScheme() {
         return new fetch_partition_names_req_argsTupleScheme();
       }
@@ -148419,12 +159585,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, fetch_partition_nam
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, fetch_partition_names_req_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.partitionReq = new PartitionsRequest();
-          struct.partitionReq.read(iprot);
-          struct.setPartitionReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.partitionReq = new PartitionsRequest();
+            struct.partitionReq.read(iprot);
+            struct.setPartitionReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -148434,6 +159605,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fetch_partition_names_req_result implements org.apache.thrift.TBase<fetch_partition_names_req_result, fetch_partition_names_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<fetch_partition_names_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetch_partition_names_req_result");
 
@@ -148505,10 +159677,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -148559,6 +159733,7 @@ public fetch_partition_names_req_result(fetch_partition_names_req_result other)
       }
     }
 
+    @Override
     public fetch_partition_names_req_result deepCopy() {
       return new fetch_partition_names_req_result(this);
     }
@@ -148658,6 +159833,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -148688,6 +159864,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -148704,6 +159881,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -148824,10 +160002,12 @@ public int compareTo(fetch_partition_names_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -148890,6 +160070,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class fetch_partition_names_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fetch_partition_names_req_resultStandardScheme getScheme() {
         return new fetch_partition_names_req_resultStandardScheme();
       }
@@ -148897,61 +160078,68 @@ public fetch_partition_names_req_resultStandardScheme getScheme() {
 
     private static class fetch_partition_names_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<fetch_partition_names_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, fetch_partition_names_req_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1988 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list1988.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1989;
-                  for (int _i1990 = 0; _i1990 < _list1988.size; ++_i1990)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem1989 = iprot.readString();
-                    struct.success.add(_elem1989);
+                    org.apache.thrift.protocol.TList _list1988 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list1988.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1989;
+                    for (int _i1990 = 0; _i1990 < _list1988.size; ++_i1990)
+                    {
+                      _elem1989 = iprot.readString();
+                      struct.success.add(_elem1989);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, fetch_partition_names_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -148985,6 +160173,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, fetch_partition_na
     }
 
     private static class fetch_partition_names_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fetch_partition_names_req_resultTupleScheme getScheme() {
         return new fetch_partition_names_req_resultTupleScheme();
       }
@@ -149025,30 +160214,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, fetch_partition_nam
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, fetch_partition_names_req_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)) {
-          {
-            org.apache.thrift.protocol.TList _list1993 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list1993.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem1994;
-            for (int _i1995 = 0; _i1995 < _list1993.size; ++_i1995)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem1994 = iprot.readString();
-              struct.success.add(_elem1994);
+              org.apache.thrift.protocol.TList _list1993 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list1993.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem1994;
+              for (int _i1995 = 0; _i1995 < _list1993.size; ++_i1995)
+              {
+                _elem1994 = iprot.readString();
+                struct.success.add(_elem1994);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -149058,6 +160252,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_values_args implements org.apache.thrift.TBase<get_partition_values_args, get_partition_values_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_values_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_values_args");
 
@@ -149119,10 +160314,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -149157,6 +160354,7 @@ public get_partition_values_args(get_partition_values_args other) {
       }
     }
 
+    @Override
     public get_partition_values_args deepCopy() {
       return new get_partition_values_args(this);
     }
@@ -149190,6 +160388,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -149204,6 +160403,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -149214,6 +160414,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -149284,14 +160485,17 @@ public int compareTo(get_partition_values_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -149337,6 +160541,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_values_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_values_argsStandardScheme getScheme() {
         return new get_partition_values_argsStandardScheme();
       }
@@ -149344,34 +160549,41 @@ public get_partition_values_argsStandardScheme getScheme() {
 
     private static class get_partition_values_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_values_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_values_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new PartitionValuesRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new PartitionValuesRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_values_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -149388,6 +160600,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_valu
     }
 
     private static class get_partition_values_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_values_argsTupleScheme getScheme() {
         return new get_partition_values_argsTupleScheme();
       }
@@ -149410,12 +160623,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_value
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_values_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 PartitionValuesRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionValuesRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -149425,6 +160643,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_values_result implements org.apache.thrift.TBase<get_partition_values_result, get_partition_values_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_values_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_values_result");
 
@@ -149496,10 +160715,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -149548,6 +160769,7 @@ public get_partition_values_result(get_partition_values_result other) {
       }
     }
 
+    @Override
     public get_partition_values_result deepCopy() {
       return new get_partition_values_result(this);
     }
@@ -149631,6 +160853,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -149661,6 +160884,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -149677,6 +160901,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -149797,10 +161022,12 @@ public int compareTo(get_partition_values_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -149866,6 +161093,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_values_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_values_resultStandardScheme getScheme() {
         return new get_partition_values_resultStandardScheme();
       }
@@ -149873,52 +161101,59 @@ public get_partition_values_resultStandardScheme getScheme() {
 
     private static class get_partition_values_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_values_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_values_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 PartitionValuesResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PartitionValuesResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_values_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -149945,6 +161180,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_valu
     }
 
     private static class get_partition_values_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_values_resultTupleScheme getScheme() {
         return new get_partition_values_resultTupleScheme();
       }
@@ -149979,22 +161215,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_value
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_values_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 PartitionValuesResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionValuesResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -150004,6 +161245,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_args implements org.apache.thrift.TBase<get_partitions_ps_args, get_partitions_ps_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_ps_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_ps_args");
 
@@ -150080,10 +161322,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -150145,6 +161389,7 @@ public get_partitions_ps_args(get_partitions_ps_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_partitions_ps_args deepCopy() {
       return new get_partitions_ps_args(this);
     }
@@ -150268,6 +161513,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -150306,6 +161552,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -150325,6 +161572,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -150468,14 +161716,17 @@ public int compareTo(get_partitions_ps_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -150540,6 +161791,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_ps_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_argsStandardScheme getScheme() {
         return new get_partitions_ps_argsStandardScheme();
       }
@@ -150547,67 +161799,74 @@ public get_partitions_ps_argsStandardScheme getScheme() {
 
     private static class get_partitions_ps_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_ps_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_ps_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list1996 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1996.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1997;
-                  for (int _i1998 = 0; _i1998 < _list1996.size; ++_i1998)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem1997 = iprot.readString();
-                    struct.part_vals.add(_elem1997);
+                    org.apache.thrift.protocol.TList _list1996 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list1996.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem1997;
+                    for (int _i1998 = 0; _i1998 < _list1996.size; ++_i1998)
+                    {
+                      _elem1997 = iprot.readString();
+                      struct.part_vals.add(_elem1997);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
+                break;
+              case 4: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -150644,6 +161903,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_
     }
 
     private static class get_partitions_ps_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_argsTupleScheme getScheme() {
         return new get_partitions_ps_argsTupleScheme();
       }
@@ -150690,32 +161950,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2001 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2001.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2002;
-            for (int _i2003 = 0; _i2003 < _list2001.size; ++_i2003)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2002 = iprot.readString();
-              struct.part_vals.add(_elem2002);
+              org.apache.thrift.protocol.TList _list2001 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2001.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2002;
+              for (int _i2003 = 0; _i2003 < _list2001.size; ++_i2003)
+              {
+                _elem2002 = iprot.readString();
+                struct.part_vals.add(_elem2002);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
+          if (incoming.get(3)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -150725,6 +161990,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_result implements org.apache.thrift.TBase<get_partitions_ps_result, get_partitions_ps_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_ps_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_ps_result");
 
@@ -150796,10 +162062,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -150853,6 +162121,7 @@ public get_partitions_ps_result(get_partitions_ps_result other) {
       }
     }
 
+    @Override
     public get_partitions_ps_result deepCopy() {
       return new get_partitions_ps_result(this);
     }
@@ -150952,6 +162221,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -150982,6 +162252,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -150998,6 +162269,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -151118,10 +162390,12 @@ public int compareTo(get_partitions_ps_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -151184,6 +162458,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_ps_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_resultStandardScheme getScheme() {
         return new get_partitions_ps_resultStandardScheme();
       }
@@ -151191,62 +162466,69 @@ public get_partitions_ps_resultStandardScheme getScheme() {
 
     private static class get_partitions_ps_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_ps_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_ps_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2004 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list2004.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2005;
-                  for (int _i2006 = 0; _i2006 < _list2004.size; ++_i2006)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2005 = new Partition();
-                    _elem2005.read(iprot);
-                    struct.success.add(_elem2005);
+                    org.apache.thrift.protocol.TList _list2004 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list2004.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2005;
+                    for (int _i2006 = 0; _i2006 < _list2004.size; ++_i2006)
+                    {
+                      _elem2005 = new Partition();
+                      _elem2005.read(iprot);
+                      struct.success.add(_elem2005);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -151280,6 +162562,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_
     }
 
     private static class get_partitions_ps_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_resultTupleScheme getScheme() {
         return new get_partitions_ps_resultTupleScheme();
       }
@@ -151320,31 +162603,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2009 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list2009.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2010;
-            for (int _i2011 = 0; _i2011 < _list2009.size; ++_i2011)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2010 = new Partition();
-              _elem2010.read(iprot);
-              struct.success.add(_elem2010);
+              org.apache.thrift.protocol.TList _list2009 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list2009.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2010;
+              for (int _i2011 = 0; _i2011 < _list2009.size; ++_i2011)
+              {
+                _elem2010 = new Partition();
+                _elem2010.read(iprot);
+                struct.success.add(_elem2010);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -151354,6 +162642,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_args implements org.apache.thrift.TBase<get_partitions_ps_with_auth_args, get_partitions_ps_with_auth_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_ps_with_auth_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_ps_with_auth_args");
 
@@ -151440,10 +162729,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -151521,6 +162812,7 @@ public get_partitions_ps_with_auth_args(get_partitions_ps_with_auth_args other)
       }
     }
 
+    @Override
     public get_partitions_ps_with_auth_args deepCopy() {
       return new get_partitions_ps_with_auth_args(this);
     }
@@ -151710,6 +163002,7 @@ public void setGroup_namesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -151764,6 +163057,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -151789,6 +163083,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -151982,14 +163277,17 @@ public int compareTo(get_partitions_ps_with_auth_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -152070,6 +163368,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_ps_with_auth_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_argsStandardScheme getScheme() {
         return new get_partitions_ps_with_auth_argsStandardScheme();
       }
@@ -152077,93 +163376,100 @@ public get_partitions_ps_with_auth_argsStandardScheme getScheme() {
 
     private static class get_partitions_ps_with_auth_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_ps_with_auth_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_ps_with_auth_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2012 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2012.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2013;
-                  for (int _i2014 = 0; _i2014 < _list2012.size; ++_i2014)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2013 = iprot.readString();
-                    struct.part_vals.add(_elem2013);
+                    org.apache.thrift.protocol.TList _list2012 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2012.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2013;
+                    for (int _i2014 = 0; _i2014 < _list2012.size; ++_i2014)
+                    {
+                      _elem2013 = iprot.readString();
+                      struct.part_vals.add(_elem2013);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // USER_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.user_name = iprot.readString();
-                struct.setUser_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 6: // GROUP_NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2015 = iprot.readListBegin();
-                  struct.group_names = new java.util.ArrayList<java.lang.String>(_list2015.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2016;
-                  for (int _i2017 = 0; _i2017 < _list2015.size; ++_i2017)
+                break;
+              case 4: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // USER_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.user_name = iprot.readString();
+                  struct.setUser_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 6: // GROUP_NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2016 = iprot.readString();
-                    struct.group_names.add(_elem2016);
+                    org.apache.thrift.protocol.TList _list2015 = iprot.readListBegin();
+                    struct.group_names = new java.util.ArrayList<java.lang.String>(_list2015.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2016;
+                    for (int _i2017 = 0; _i2017 < _list2015.size; ++_i2017)
+                    {
+                      _elem2016 = iprot.readString();
+                      struct.group_names.add(_elem2016);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setGroup_namesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setGroup_namesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_with_auth_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -152217,6 +163523,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_
     }
 
     private static class get_partitions_ps_with_auth_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_argsTupleScheme getScheme() {
         return new get_partitions_ps_with_auth_argsTupleScheme();
       }
@@ -152281,49 +163588,54 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_w
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_with_auth_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(6);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2022 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2022.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2023;
-            for (int _i2024 = 0; _i2024 < _list2022.size; ++_i2024)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(6);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2023 = iprot.readString();
-              struct.part_vals.add(_elem2023);
+              org.apache.thrift.protocol.TList _list2022 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2022.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2023;
+              for (int _i2024 = 0; _i2024 < _list2022.size; ++_i2024)
+              {
+                _elem2023 = iprot.readString();
+                struct.part_vals.add(_elem2023);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.user_name = iprot.readString();
-          struct.setUser_nameIsSet(true);
-        }
-        if (incoming.get(5)) {
-          {
-            org.apache.thrift.protocol.TList _list2025 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.group_names = new java.util.ArrayList<java.lang.String>(_list2025.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2026;
-            for (int _i2027 = 0; _i2027 < _list2025.size; ++_i2027)
+          if (incoming.get(3)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.user_name = iprot.readString();
+            struct.setUser_nameIsSet(true);
+          }
+          if (incoming.get(5)) {
             {
-              _elem2026 = iprot.readString();
-              struct.group_names.add(_elem2026);
+              org.apache.thrift.protocol.TList _list2025 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.group_names = new java.util.ArrayList<java.lang.String>(_list2025.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2026;
+              for (int _i2027 = 0; _i2027 < _list2025.size; ++_i2027)
+              {
+                _elem2026 = iprot.readString();
+                struct.group_names.add(_elem2026);
+              }
             }
+            struct.setGroup_namesIsSet(true);
           }
-          struct.setGroup_namesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -152333,6 +163645,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_result implements org.apache.thrift.TBase<get_partitions_ps_with_auth_result, get_partitions_ps_with_auth_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_ps_with_auth_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_ps_with_auth_result");
 
@@ -152404,10 +163717,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -152461,6 +163776,7 @@ public get_partitions_ps_with_auth_result(get_partitions_ps_with_auth_result oth
       }
     }
 
+    @Override
     public get_partitions_ps_with_auth_result deepCopy() {
       return new get_partitions_ps_with_auth_result(this);
     }
@@ -152560,6 +163876,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -152590,6 +163907,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -152606,6 +163924,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -152726,10 +164045,12 @@ public int compareTo(get_partitions_ps_with_auth_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -152792,6 +164113,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_ps_with_auth_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_resultStandardScheme getScheme() {
         return new get_partitions_ps_with_auth_resultStandardScheme();
       }
@@ -152799,62 +164121,69 @@ public get_partitions_ps_with_auth_resultStandardScheme getScheme() {
 
     private static class get_partitions_ps_with_auth_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_ps_with_auth_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_ps_with_auth_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2028 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list2028.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2029;
-                  for (int _i2030 = 0; _i2030 < _list2028.size; ++_i2030)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2029 = new Partition();
-                    _elem2029.read(iprot);
-                    struct.success.add(_elem2029);
+                    org.apache.thrift.protocol.TList _list2028 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list2028.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2029;
+                    for (int _i2030 = 0; _i2030 < _list2028.size; ++_i2030)
+                    {
+                      _elem2029 = new Partition();
+                      _elem2029.read(iprot);
+                      struct.success.add(_elem2029);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_with_auth_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -152888,6 +164217,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_
     }
 
     private static class get_partitions_ps_with_auth_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_resultTupleScheme getScheme() {
         return new get_partitions_ps_with_auth_resultTupleScheme();
       }
@@ -152928,31 +164258,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_w
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_with_auth_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2033 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list2033.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2034;
-            for (int _i2035 = 0; _i2035 < _list2033.size; ++_i2035)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2034 = new Partition();
-              _elem2034.read(iprot);
-              struct.success.add(_elem2034);
+              org.apache.thrift.protocol.TList _list2033 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list2033.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2034;
+              for (int _i2035 = 0; _i2035 < _list2033.size; ++_i2035)
+              {
+                _elem2034 = new Partition();
+                _elem2034.read(iprot);
+                struct.success.add(_elem2034);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -152962,6 +164297,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_req_args implements org.apache.thrift.TBase<get_partitions_ps_with_auth_req_args, get_partitions_ps_with_auth_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_ps_with_auth_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_ps_with_auth_req_args");
 
@@ -153023,10 +164359,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -153061,6 +164399,7 @@ public get_partitions_ps_with_auth_req_args(get_partitions_ps_with_auth_req_args
       }
     }
 
+    @Override
     public get_partitions_ps_with_auth_req_args deepCopy() {
       return new get_partitions_ps_with_auth_req_args(this);
     }
@@ -153094,6 +164433,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -153108,6 +164448,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -153118,6 +164459,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -153188,14 +164530,17 @@ public int compareTo(get_partitions_ps_with_auth_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -153241,6 +164586,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_ps_with_auth_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_req_argsStandardScheme getScheme() {
         return new get_partitions_ps_with_auth_req_argsStandardScheme();
       }
@@ -153248,34 +164594,41 @@ public get_partitions_ps_with_auth_req_argsStandardScheme getScheme() {
 
     private static class get_partitions_ps_with_auth_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_ps_with_auth_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_ps_with_auth_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetPartitionsPsWithAuthRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetPartitionsPsWithAuthRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_with_auth_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -153292,6 +164645,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_
     }
 
     private static class get_partitions_ps_with_auth_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_req_argsTupleScheme getScheme() {
         return new get_partitions_ps_with_auth_req_argsTupleScheme();
       }
@@ -153314,12 +164668,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_w
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_with_auth_req_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.req = new GetPartitionsPsWithAuthRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetPartitionsPsWithAuthRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -153329,6 +164688,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_ps_with_auth_req_result implements org.apache.thrift.TBase<get_partitions_ps_with_auth_req_result, get_partitions_ps_with_auth_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_ps_with_auth_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_ps_with_auth_req_result");
 
@@ -153400,10 +164760,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -153452,6 +164814,7 @@ public get_partitions_ps_with_auth_req_result(get_partitions_ps_with_auth_req_re
       }
     }
 
+    @Override
     public get_partitions_ps_with_auth_req_result deepCopy() {
       return new get_partitions_ps_with_auth_req_result(this);
     }
@@ -153535,6 +164898,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -153565,6 +164929,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -153581,6 +164946,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -153701,10 +165067,12 @@ public int compareTo(get_partitions_ps_with_auth_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -153770,6 +165138,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_ps_with_auth_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_req_resultStandardScheme getScheme() {
         return new get_partitions_ps_with_auth_req_resultStandardScheme();
       }
@@ -153777,52 +165146,59 @@ public get_partitions_ps_with_auth_req_resultStandardScheme getScheme() {
 
     private static class get_partitions_ps_with_auth_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_ps_with_auth_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_ps_with_auth_req_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 GetPartitionsPsWithAuthResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetPartitionsPsWithAuthResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_with_auth_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -153849,6 +165225,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_ps_
     }
 
     private static class get_partitions_ps_with_auth_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_ps_with_auth_req_resultTupleScheme getScheme() {
         return new get_partitions_ps_with_auth_req_resultTupleScheme();
       }
@@ -153883,22 +165260,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_w
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_ps_with_auth_req_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 GetPartitionsPsWithAuthResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetPartitionsPsWithAuthResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -153908,6 +165290,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_args implements org.apache.thrift.TBase<get_partition_names_ps_args, get_partition_names_ps_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_ps_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_ps_args");
 
@@ -153984,10 +165367,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -154049,6 +165434,7 @@ public get_partition_names_ps_args(get_partition_names_ps_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_partition_names_ps_args deepCopy() {
       return new get_partition_names_ps_args(this);
     }
@@ -154172,6 +165558,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -154210,6 +165597,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -154229,6 +165617,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -154372,14 +165761,17 @@ public int compareTo(get_partition_names_ps_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -154444,6 +165836,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_ps_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_argsStandardScheme getScheme() {
         return new get_partition_names_ps_argsStandardScheme();
       }
@@ -154451,67 +165844,74 @@ public get_partition_names_ps_argsStandardScheme getScheme() {
 
     private static class get_partition_names_ps_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_ps_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_ps_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2036 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2036.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2037;
-                  for (int _i2038 = 0; _i2038 < _list2036.size; ++_i2038)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2037 = iprot.readString();
-                    struct.part_vals.add(_elem2037);
+                    org.apache.thrift.protocol.TList _list2036 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2036.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2037;
+                    for (int _i2038 = 0; _i2038 < _list2036.size; ++_i2038)
+                    {
+                      _elem2037 = iprot.readString();
+                      struct.part_vals.add(_elem2037);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
+                break;
+              case 4: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_ps_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -154548,6 +165948,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_ps_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_argsTupleScheme getScheme() {
         return new get_partition_names_ps_argsTupleScheme();
       }
@@ -154594,32 +165995,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_ps_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2041 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2041.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2042;
-            for (int _i2043 = 0; _i2043 < _list2041.size; ++_i2043)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2042 = iprot.readString();
-              struct.part_vals.add(_elem2042);
+              org.apache.thrift.protocol.TList _list2041 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2041.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2042;
+              for (int _i2043 = 0; _i2043 < _list2041.size; ++_i2043)
+              {
+                _elem2042 = iprot.readString();
+                struct.part_vals.add(_elem2042);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
+          if (incoming.get(3)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -154629,6 +166035,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_result implements org.apache.thrift.TBase<get_partition_names_ps_result, get_partition_names_ps_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_ps_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_ps_result");
 
@@ -154700,10 +166107,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -154754,6 +166163,7 @@ public get_partition_names_ps_result(get_partition_names_ps_result other) {
       }
     }
 
+    @Override
     public get_partition_names_ps_result deepCopy() {
       return new get_partition_names_ps_result(this);
     }
@@ -154853,6 +166263,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -154883,6 +166294,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -154899,6 +166311,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -155019,10 +166432,12 @@ public int compareTo(get_partition_names_ps_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -155085,6 +166500,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_ps_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_resultStandardScheme getScheme() {
         return new get_partition_names_ps_resultStandardScheme();
       }
@@ -155092,61 +166508,68 @@ public get_partition_names_ps_resultStandardScheme getScheme() {
 
     private static class get_partition_names_ps_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_ps_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_ps_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2044 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2044.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2045;
-                  for (int _i2046 = 0; _i2046 < _list2044.size; ++_i2046)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2045 = iprot.readString();
-                    struct.success.add(_elem2045);
+                    org.apache.thrift.protocol.TList _list2044 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2044.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2045;
+                    for (int _i2046 = 0; _i2046 < _list2044.size; ++_i2046)
+                    {
+                      _elem2045 = iprot.readString();
+                      struct.success.add(_elem2045);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_ps_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -155180,6 +166603,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_ps_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_resultTupleScheme getScheme() {
         return new get_partition_names_ps_resultTupleScheme();
       }
@@ -155220,30 +166644,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_ps_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2049 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2049.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2050;
-            for (int _i2051 = 0; _i2051 < _list2049.size; ++_i2051)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2050 = iprot.readString();
-              struct.success.add(_elem2050);
+              org.apache.thrift.protocol.TList _list2049 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2049.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2050;
+              for (int _i2051 = 0; _i2051 < _list2049.size; ++_i2051)
+              {
+                _elem2050 = iprot.readString();
+                struct.success.add(_elem2050);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -155253,6 +166682,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_req_args implements org.apache.thrift.TBase<get_partition_names_ps_req_args, get_partition_names_ps_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_ps_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_ps_req_args");
 
@@ -155314,10 +166744,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -155352,6 +166784,7 @@ public get_partition_names_ps_req_args(get_partition_names_ps_req_args other) {
       }
     }
 
+    @Override
     public get_partition_names_ps_req_args deepCopy() {
       return new get_partition_names_ps_req_args(this);
     }
@@ -155385,6 +166818,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -155399,6 +166833,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -155409,6 +166844,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -155479,14 +166915,17 @@ public int compareTo(get_partition_names_ps_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -155532,6 +166971,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_ps_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_req_argsStandardScheme getScheme() {
         return new get_partition_names_ps_req_argsStandardScheme();
       }
@@ -155539,34 +166979,41 @@ public get_partition_names_ps_req_argsStandardScheme getScheme() {
 
     private static class get_partition_names_ps_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_ps_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_ps_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetPartitionNamesPsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetPartitionNamesPsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_ps_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -155583,6 +167030,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_ps_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_req_argsTupleScheme getScheme() {
         return new get_partition_names_ps_req_argsTupleScheme();
       }
@@ -155605,12 +167053,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_ps_req_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.req = new GetPartitionNamesPsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetPartitionNamesPsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -155620,6 +167073,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_ps_req_result implements org.apache.thrift.TBase<get_partition_names_ps_req_result, get_partition_names_ps_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_ps_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_ps_req_result");
 
@@ -155691,10 +167145,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -155743,6 +167199,7 @@ public get_partition_names_ps_req_result(get_partition_names_ps_req_result other
       }
     }
 
+    @Override
     public get_partition_names_ps_req_result deepCopy() {
       return new get_partition_names_ps_req_result(this);
     }
@@ -155826,6 +167283,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -155856,6 +167314,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -155872,6 +167331,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -155992,10 +167452,12 @@ public int compareTo(get_partition_names_ps_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -156061,6 +167523,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_ps_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_req_resultStandardScheme getScheme() {
         return new get_partition_names_ps_req_resultStandardScheme();
       }
@@ -156068,52 +167531,59 @@ public get_partition_names_ps_req_resultStandardScheme getScheme() {
 
     private static class get_partition_names_ps_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_ps_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_ps_req_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 GetPartitionNamesPsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetPartitionNamesPsResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_ps_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -156140,6 +167610,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_ps_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_ps_req_resultTupleScheme getScheme() {
         return new get_partition_names_ps_req_resultTupleScheme();
       }
@@ -156174,22 +167645,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_ps_req_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 GetPartitionNamesPsResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetPartitionNamesPsResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -156199,6 +167675,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_req_args implements org.apache.thrift.TBase<get_partition_names_req_args, get_partition_names_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_req_args");
 
@@ -156260,10 +167737,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -156298,6 +167777,7 @@ public get_partition_names_req_args(get_partition_names_req_args other) {
       }
     }
 
+    @Override
     public get_partition_names_req_args deepCopy() {
       return new get_partition_names_req_args(this);
     }
@@ -156331,6 +167811,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -156345,6 +167826,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -156355,6 +167837,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -156425,14 +167908,17 @@ public int compareTo(get_partition_names_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -156478,6 +167964,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_req_argsStandardScheme getScheme() {
         return new get_partition_names_req_argsStandardScheme();
       }
@@ -156485,34 +167972,41 @@ public get_partition_names_req_argsStandardScheme getScheme() {
 
     private static class get_partition_names_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PartitionsByExprRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PartitionsByExprRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -156529,6 +168023,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_req_argsTupleScheme getScheme() {
         return new get_partition_names_req_argsTupleScheme();
       }
@@ -156551,12 +168046,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_req_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.req = new PartitionsByExprRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PartitionsByExprRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -156566,6 +168066,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_names_req_result implements org.apache.thrift.TBase<get_partition_names_req_result, get_partition_names_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_names_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_names_req_result");
 
@@ -156637,10 +168138,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -156691,6 +168194,7 @@ public get_partition_names_req_result(get_partition_names_req_result other) {
       }
     }
 
+    @Override
     public get_partition_names_req_result deepCopy() {
       return new get_partition_names_req_result(this);
     }
@@ -156790,6 +168294,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -156820,6 +168325,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -156836,6 +168342,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -156956,10 +168463,12 @@ public int compareTo(get_partition_names_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -157022,6 +168531,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_names_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_req_resultStandardScheme getScheme() {
         return new get_partition_names_req_resultStandardScheme();
       }
@@ -157029,61 +168539,68 @@ public get_partition_names_req_resultStandardScheme getScheme() {
 
     private static class get_partition_names_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_names_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_names_req_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2052 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2052.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2053;
-                  for (int _i2054 = 0; _i2054 < _list2052.size; ++_i2054)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2053 = iprot.readString();
-                    struct.success.add(_elem2053);
+                    org.apache.thrift.protocol.TList _list2052 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2052.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2053;
+                    for (int _i2054 = 0; _i2054 < _list2052.size; ++_i2054)
+                    {
+                      _elem2053 = iprot.readString();
+                      struct.success.add(_elem2053);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_names_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -157117,6 +168634,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_name
     }
 
     private static class get_partition_names_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_names_req_resultTupleScheme getScheme() {
         return new get_partition_names_req_resultTupleScheme();
       }
@@ -157157,30 +168675,35 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_names
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_names_req_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2057 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2057.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2058;
-            for (int _i2059 = 0; _i2059 < _list2057.size; ++_i2059)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2058 = iprot.readString();
-              struct.success.add(_elem2058);
+              org.apache.thrift.protocol.TList _list2057 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2057.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2058;
+              for (int _i2059 = 0; _i2059 < _list2057.size; ++_i2059)
+              {
+                _elem2058 = iprot.readString();
+                struct.success.add(_elem2058);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -157190,6 +168713,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_args implements org.apache.thrift.TBase<get_partitions_by_filter_args, get_partitions_by_filter_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_filter_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_filter_args");
 
@@ -157266,10 +168790,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -157329,6 +168855,7 @@ public get_partitions_by_filter_args(get_partitions_by_filter_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_partitions_by_filter_args deepCopy() {
       return new get_partitions_by_filter_args(this);
     }
@@ -157436,6 +168963,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -157474,6 +169002,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -157493,6 +169022,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -157636,14 +169166,17 @@ public int compareTo(get_partitions_by_filter_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -157708,6 +169241,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_filter_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_argsStandardScheme getScheme() {
         return new get_partitions_by_filter_argsStandardScheme();
       }
@@ -157715,57 +169249,64 @@ public get_partitions_by_filter_argsStandardScheme getScheme() {
 
     private static class get_partitions_by_filter_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_filter_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_filter_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // FILTER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.filter = iprot.readString();
-                struct.setFilterIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
-                struct.max_parts = iprot.readI16();
-                struct.setMax_partsIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // FILTER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.filter = iprot.readString();
+                  struct.setFilterIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
+                  struct.max_parts = iprot.readI16();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_filter_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -157795,6 +169336,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_filter_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_argsTupleScheme getScheme() {
         return new get_partitions_by_filter_argsTupleScheme();
       }
@@ -157835,23 +169377,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_filter_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.filter = iprot.readString();
-          struct.setFilterIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.max_parts = iprot.readI16();
-          struct.setMax_partsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.filter = iprot.readString();
+            struct.setFilterIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.max_parts = iprot.readI16();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -157861,6 +169408,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_result implements org.apache.thrift.TBase<get_partitions_by_filter_result, get_partitions_by_filter_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_filter_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_filter_result");
 
@@ -157932,10 +169480,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -157989,6 +169539,7 @@ public get_partitions_by_filter_result(get_partitions_by_filter_result other) {
       }
     }
 
+    @Override
     public get_partitions_by_filter_result deepCopy() {
       return new get_partitions_by_filter_result(this);
     }
@@ -158088,6 +169639,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -158118,6 +169670,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -158134,6 +169687,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -158254,10 +169808,12 @@ public int compareTo(get_partitions_by_filter_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -158320,6 +169876,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_filter_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_resultStandardScheme getScheme() {
         return new get_partitions_by_filter_resultStandardScheme();
       }
@@ -158327,62 +169884,69 @@ public get_partitions_by_filter_resultStandardScheme getScheme() {
 
     private static class get_partitions_by_filter_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_filter_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_filter_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2060 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list2060.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2061;
-                  for (int _i2062 = 0; _i2062 < _list2060.size; ++_i2062)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2061 = new Partition();
-                    _elem2061.read(iprot);
-                    struct.success.add(_elem2061);
+                    org.apache.thrift.protocol.TList _list2060 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list2060.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2061;
+                    for (int _i2062 = 0; _i2062 < _list2060.size; ++_i2062)
+                    {
+                      _elem2061 = new Partition();
+                      _elem2061.read(iprot);
+                      struct.success.add(_elem2061);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_filter_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -158416,6 +169980,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_filter_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_resultTupleScheme getScheme() {
         return new get_partitions_by_filter_resultTupleScheme();
       }
@@ -158456,31 +170021,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_filter_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2065 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list2065.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2066;
-            for (int _i2067 = 0; _i2067 < _list2065.size; ++_i2067)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2066 = new Partition();
-              _elem2066.read(iprot);
-              struct.success.add(_elem2066);
+              org.apache.thrift.protocol.TList _list2065 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list2065.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2066;
+              for (int _i2067 = 0; _i2067 < _list2065.size; ++_i2067)
+              {
+                _elem2066 = new Partition();
+                _elem2066.read(iprot);
+                struct.success.add(_elem2066);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -158490,6 +170060,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_req_args implements org.apache.thrift.TBase<get_partitions_by_filter_req_args, get_partitions_by_filter_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_filter_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_filter_req_args");
 
@@ -158551,10 +170122,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -158589,6 +170162,7 @@ public get_partitions_by_filter_req_args(get_partitions_by_filter_req_args other
       }
     }
 
+    @Override
     public get_partitions_by_filter_req_args deepCopy() {
       return new get_partitions_by_filter_req_args(this);
     }
@@ -158622,6 +170196,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -158636,6 +170211,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -158646,6 +170222,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -158716,14 +170293,17 @@ public int compareTo(get_partitions_by_filter_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -158769,6 +170349,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_filter_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_req_argsStandardScheme getScheme() {
         return new get_partitions_by_filter_req_argsStandardScheme();
       }
@@ -158776,34 +170357,41 @@ public get_partitions_by_filter_req_argsStandardScheme getScheme() {
 
     private static class get_partitions_by_filter_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_filter_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_filter_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetPartitionsByFilterRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetPartitionsByFilterRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_filter_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -158820,6 +170408,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_filter_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_req_argsTupleScheme getScheme() {
         return new get_partitions_by_filter_req_argsTupleScheme();
       }
@@ -158842,12 +170431,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_filter_req_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.req = new GetPartitionsByFilterRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetPartitionsByFilterRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -158857,6 +170451,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_filter_req_result implements org.apache.thrift.TBase<get_partitions_by_filter_req_result, get_partitions_by_filter_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_filter_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_filter_req_result");
 
@@ -158928,10 +170523,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -158985,6 +170582,7 @@ public get_partitions_by_filter_req_result(get_partitions_by_filter_req_result o
       }
     }
 
+    @Override
     public get_partitions_by_filter_req_result deepCopy() {
       return new get_partitions_by_filter_req_result(this);
     }
@@ -159084,6 +170682,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -159114,6 +170713,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -159130,6 +170730,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -159250,10 +170851,12 @@ public int compareTo(get_partitions_by_filter_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -159316,6 +170919,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_filter_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_req_resultStandardScheme getScheme() {
         return new get_partitions_by_filter_req_resultStandardScheme();
       }
@@ -159323,62 +170927,69 @@ public get_partitions_by_filter_req_resultStandardScheme getScheme() {
 
     private static class get_partitions_by_filter_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_filter_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_filter_req_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2068 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list2068.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2069;
-                  for (int _i2070 = 0; _i2070 < _list2068.size; ++_i2070)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2069 = new Partition();
-                    _elem2069.read(iprot);
-                    struct.success.add(_elem2069);
+                    org.apache.thrift.protocol.TList _list2068 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list2068.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2069;
+                    for (int _i2070 = 0; _i2070 < _list2068.size; ++_i2070)
+                    {
+                      _elem2069 = new Partition();
+                      _elem2069.read(iprot);
+                      struct.success.add(_elem2069);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_filter_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -159412,6 +171023,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_filter_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_filter_req_resultTupleScheme getScheme() {
         return new get_partitions_by_filter_req_resultTupleScheme();
       }
@@ -159452,31 +171064,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_filter_req_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2073 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list2073.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2074;
-            for (int _i2075 = 0; _i2075 < _list2073.size; ++_i2075)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2074 = new Partition();
-              _elem2074.read(iprot);
-              struct.success.add(_elem2074);
+              org.apache.thrift.protocol.TList _list2073 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list2073.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2074;
+              for (int _i2075 = 0; _i2075 < _list2073.size; ++_i2075)
+              {
+                _elem2074 = new Partition();
+                _elem2074.read(iprot);
+                struct.success.add(_elem2074);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -159486,6 +171103,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_part_specs_by_filter_args implements org.apache.thrift.TBase<get_part_specs_by_filter_args, get_part_specs_by_filter_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_part_specs_by_filter_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_part_specs_by_filter_args");
 
@@ -159562,10 +171180,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -159625,6 +171245,7 @@ public get_part_specs_by_filter_args(get_part_specs_by_filter_args other) {
       this.max_parts = other.max_parts;
     }
 
+    @Override
     public get_part_specs_by_filter_args deepCopy() {
       return new get_part_specs_by_filter_args(this);
     }
@@ -159732,6 +171353,7 @@ public void setMax_partsIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAX_PARTS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -159770,6 +171392,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -159789,6 +171412,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -159932,14 +171556,17 @@ public int compareTo(get_part_specs_by_filter_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -160004,6 +171631,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_part_specs_by_filter_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_part_specs_by_filter_argsStandardScheme getScheme() {
         return new get_part_specs_by_filter_argsStandardScheme();
       }
@@ -160011,57 +171639,64 @@ public get_part_specs_by_filter_argsStandardScheme getScheme() {
 
     private static class get_part_specs_by_filter_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_part_specs_by_filter_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_part_specs_by_filter_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // FILTER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.filter = iprot.readString();
-                struct.setFilterIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // MAX_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.max_parts = iprot.readI32();
-                struct.setMax_partsIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // FILTER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.filter = iprot.readString();
+                  struct.setFilterIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // MAX_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.max_parts = iprot.readI32();
+                  struct.setMax_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_part_specs_by_filter_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -160091,6 +171726,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_part_specs_by_
     }
 
     private static class get_part_specs_by_filter_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_part_specs_by_filter_argsTupleScheme getScheme() {
         return new get_part_specs_by_filter_argsTupleScheme();
       }
@@ -160131,23 +171767,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_part_specs_by_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_part_specs_by_filter_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.filter = iprot.readString();
-          struct.setFilterIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.max_parts = iprot.readI32();
-          struct.setMax_partsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.filter = iprot.readString();
+            struct.setFilterIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.max_parts = iprot.readI32();
+            struct.setMax_partsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -160157,6 +171798,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_part_specs_by_filter_result implements org.apache.thrift.TBase<get_part_specs_by_filter_result, get_part_specs_by_filter_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_part_specs_by_filter_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_part_specs_by_filter_result");
 
@@ -160228,10 +171870,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -160285,6 +171929,7 @@ public get_part_specs_by_filter_result(get_part_specs_by_filter_result other) {
       }
     }
 
+    @Override
     public get_part_specs_by_filter_result deepCopy() {
       return new get_part_specs_by_filter_result(this);
     }
@@ -160384,6 +172029,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -160414,6 +172060,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -160430,6 +172077,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -160550,10 +172198,12 @@ public int compareTo(get_part_specs_by_filter_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -160616,6 +172266,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_part_specs_by_filter_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_part_specs_by_filter_resultStandardScheme getScheme() {
         return new get_part_specs_by_filter_resultStandardScheme();
       }
@@ -160623,62 +172274,69 @@ public get_part_specs_by_filter_resultStandardScheme getScheme() {
 
     private static class get_part_specs_by_filter_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_part_specs_by_filter_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_part_specs_by_filter_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2076 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<PartitionSpec>(_list2076.size);
-                  @org.apache.thrift.annotation.Nullable PartitionSpec _elem2077;
-                  for (int _i2078 = 0; _i2078 < _list2076.size; ++_i2078)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2077 = new PartitionSpec();
-                    _elem2077.read(iprot);
-                    struct.success.add(_elem2077);
+                    org.apache.thrift.protocol.TList _list2076 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<PartitionSpec>(_list2076.size);
+                    @org.apache.thrift.annotation.Nullable PartitionSpec _elem2077;
+                    for (int _i2078 = 0; _i2078 < _list2076.size; ++_i2078)
+                    {
+                      _elem2077 = new PartitionSpec();
+                      _elem2077.read(iprot);
+                      struct.success.add(_elem2077);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_part_specs_by_filter_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -160712,6 +172370,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_part_specs_by_
     }
 
     private static class get_part_specs_by_filter_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_part_specs_by_filter_resultTupleScheme getScheme() {
         return new get_part_specs_by_filter_resultTupleScheme();
       }
@@ -160752,31 +172411,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_part_specs_by_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_part_specs_by_filter_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2081 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<PartitionSpec>(_list2081.size);
-            @org.apache.thrift.annotation.Nullable PartitionSpec _elem2082;
-            for (int _i2083 = 0; _i2083 < _list2081.size; ++_i2083)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2082 = new PartitionSpec();
-              _elem2082.read(iprot);
-              struct.success.add(_elem2082);
+              org.apache.thrift.protocol.TList _list2081 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<PartitionSpec>(_list2081.size);
+              @org.apache.thrift.annotation.Nullable PartitionSpec _elem2082;
+              for (int _i2083 = 0; _i2083 < _list2081.size; ++_i2083)
+              {
+                _elem2082 = new PartitionSpec();
+                _elem2082.read(iprot);
+                struct.success.add(_elem2082);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -160786,6 +172450,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_expr_args implements org.apache.thrift.TBase<get_partitions_by_expr_args, get_partitions_by_expr_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_expr_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_expr_args");
 
@@ -160847,10 +172512,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -160885,6 +172552,7 @@ public get_partitions_by_expr_args(get_partitions_by_expr_args other) {
       }
     }
 
+    @Override
     public get_partitions_by_expr_args deepCopy() {
       return new get_partitions_by_expr_args(this);
     }
@@ -160918,6 +172586,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -160932,6 +172601,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -160942,6 +172612,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -161012,14 +172683,17 @@ public int compareTo(get_partitions_by_expr_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -161065,6 +172739,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_expr_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_expr_argsStandardScheme getScheme() {
         return new get_partitions_by_expr_argsStandardScheme();
       }
@@ -161072,34 +172747,41 @@ public get_partitions_by_expr_argsStandardScheme getScheme() {
 
     private static class get_partitions_by_expr_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_expr_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_expr_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PartitionsByExprRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PartitionsByExprRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_expr_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -161116,6 +172798,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_expr_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_expr_argsTupleScheme getScheme() {
         return new get_partitions_by_expr_argsTupleScheme();
       }
@@ -161138,12 +172821,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_e
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_expr_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.req = new PartitionsByExprRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PartitionsByExprRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -161153,6 +172841,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_expr_result implements org.apache.thrift.TBase<get_partitions_by_expr_result, get_partitions_by_expr_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_expr_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_expr_result");
 
@@ -161224,10 +172913,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -161276,6 +172967,7 @@ public get_partitions_by_expr_result(get_partitions_by_expr_result other) {
       }
     }
 
+    @Override
     public get_partitions_by_expr_result deepCopy() {
       return new get_partitions_by_expr_result(this);
     }
@@ -161359,6 +173051,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -161389,6 +173082,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -161405,6 +173099,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -161525,10 +173220,12 @@ public int compareTo(get_partitions_by_expr_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -161594,6 +173291,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_expr_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_expr_resultStandardScheme getScheme() {
         return new get_partitions_by_expr_resultStandardScheme();
       }
@@ -161601,52 +173299,59 @@ public get_partitions_by_expr_resultStandardScheme getScheme() {
 
     private static class get_partitions_by_expr_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_expr_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_expr_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 PartitionsByExprResult();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PartitionsByExprResult();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_expr_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -161673,6 +173378,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_expr_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_expr_resultTupleScheme getScheme() {
         return new get_partitions_by_expr_resultTupleScheme();
       }
@@ -161707,22 +173413,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_e
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_expr_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 PartitionsByExprResult();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionsByExprResult();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -161732,6 +173443,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_spec_by_expr_args implements org.apache.thrift.TBase<get_partitions_spec_by_expr_args, get_partitions_spec_by_expr_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_spec_by_expr_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_spec_by_expr_args");
 
@@ -161793,10 +173505,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -161831,6 +173545,7 @@ public get_partitions_spec_by_expr_args(get_partitions_spec_by_expr_args other)
       }
     }
 
+    @Override
     public get_partitions_spec_by_expr_args deepCopy() {
       return new get_partitions_spec_by_expr_args(this);
     }
@@ -161864,6 +173579,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -161878,6 +173594,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -161888,6 +173605,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -161958,14 +173676,17 @@ public int compareTo(get_partitions_spec_by_expr_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -162011,6 +173732,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_spec_by_expr_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_spec_by_expr_argsStandardScheme getScheme() {
         return new get_partitions_spec_by_expr_argsStandardScheme();
       }
@@ -162018,34 +173740,41 @@ public get_partitions_spec_by_expr_argsStandardScheme getScheme() {
 
     private static class get_partitions_spec_by_expr_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_spec_by_expr_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_spec_by_expr_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PartitionsByExprRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PartitionsByExprRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_spec_by_expr_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -162062,6 +173791,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_spe
     }
 
     private static class get_partitions_spec_by_expr_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_spec_by_expr_argsTupleScheme getScheme() {
         return new get_partitions_spec_by_expr_argsTupleScheme();
       }
@@ -162084,12 +173814,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_spec
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_spec_by_expr_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.req = new PartitionsByExprRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PartitionsByExprRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -162099,6 +173834,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_spec_by_expr_result implements org.apache.thrift.TBase<get_partitions_spec_by_expr_result, get_partitions_spec_by_expr_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_spec_by_expr_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_spec_by_expr_result");
 
@@ -162170,10 +173906,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -162222,6 +173960,7 @@ public get_partitions_spec_by_expr_result(get_partitions_spec_by_expr_result oth
       }
     }
 
+    @Override
     public get_partitions_spec_by_expr_result deepCopy() {
       return new get_partitions_spec_by_expr_result(this);
     }
@@ -162305,6 +174044,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -162335,6 +174075,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -162351,6 +174092,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -162471,10 +174213,12 @@ public int compareTo(get_partitions_spec_by_expr_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -162540,6 +174284,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_spec_by_expr_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_spec_by_expr_resultStandardScheme getScheme() {
         return new get_partitions_spec_by_expr_resultStandardScheme();
       }
@@ -162547,52 +174292,59 @@ public get_partitions_spec_by_expr_resultStandardScheme getScheme() {
 
     private static class get_partitions_spec_by_expr_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_spec_by_expr_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_spec_by_expr_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 PartitionsSpecByExprResult();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PartitionsSpecByExprResult();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_spec_by_expr_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -162619,6 +174371,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_spe
     }
 
     private static class get_partitions_spec_by_expr_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_spec_by_expr_resultTupleScheme getScheme() {
         return new get_partitions_spec_by_expr_resultTupleScheme();
       }
@@ -162653,22 +174406,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_spec
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_spec_by_expr_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 PartitionsSpecByExprResult();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionsSpecByExprResult();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -162678,6 +174436,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_num_partitions_by_filter_args implements org.apache.thrift.TBase<get_num_partitions_by_filter_args, get_num_partitions_by_filter_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_num_partitions_by_filter_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_num_partitions_by_filter_args");
 
@@ -162749,10 +174508,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -162801,6 +174562,7 @@ public get_num_partitions_by_filter_args(get_num_partitions_by_filter_args other
       }
     }
 
+    @Override
     public get_num_partitions_by_filter_args deepCopy() {
       return new get_num_partitions_by_filter_args(this);
     }
@@ -162884,6 +174646,7 @@ public void setFilterIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -162914,6 +174677,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -162930,6 +174694,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -163050,14 +174815,17 @@ public int compareTo(get_num_partitions_by_filter_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -163116,6 +174884,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_num_partitions_by_filter_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_num_partitions_by_filter_argsStandardScheme getScheme() {
         return new get_num_partitions_by_filter_argsStandardScheme();
       }
@@ -163123,49 +174892,56 @@ public get_num_partitions_by_filter_argsStandardScheme getScheme() {
 
     private static class get_num_partitions_by_filter_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_num_partitions_by_filter_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_num_partitions_by_filter_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // FILTER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.filter = iprot.readString();
-                struct.setFilterIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // FILTER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.filter = iprot.readString();
+                  struct.setFilterIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_num_partitions_by_filter_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -163192,6 +174968,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_num_partitions
     }
 
     private static class get_num_partitions_by_filter_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_num_partitions_by_filter_argsTupleScheme getScheme() {
         return new get_num_partitions_by_filter_argsTupleScheme();
       }
@@ -163226,19 +175003,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_num_partitions_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_num_partitions_by_filter_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.filter = iprot.readString();
-          struct.setFilterIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.filter = iprot.readString();
+            struct.setFilterIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -163248,6 +175030,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_num_partitions_by_filter_result implements org.apache.thrift.TBase<get_num_partitions_by_filter_result, get_num_partitions_by_filter_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_num_partitions_by_filter_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_num_partitions_by_filter_result");
 
@@ -163319,10 +175102,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -163373,6 +175158,7 @@ public get_num_partitions_by_filter_result(get_num_partitions_by_filter_result o
       }
     }
 
+    @Override
     public get_num_partitions_by_filter_result deepCopy() {
       return new get_num_partitions_by_filter_result(this);
     }
@@ -163455,6 +175241,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -163485,6 +175272,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -163501,6 +175289,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -163619,10 +175408,12 @@ public int compareTo(get_num_partitions_by_filter_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -163683,6 +175474,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_num_partitions_by_filter_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_num_partitions_by_filter_resultStandardScheme getScheme() {
         return new get_num_partitions_by_filter_resultStandardScheme();
       }
@@ -163690,51 +175482,58 @@ public get_num_partitions_by_filter_resultStandardScheme getScheme() {
 
     private static class get_num_partitions_by_filter_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_num_partitions_by_filter_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_num_partitions_by_filter_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.I32) {
-                struct.success = iprot.readI32();
-                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);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.success = iprot.readI32();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_num_partitions_by_filter_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -163761,6 +175560,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_num_partitions
     }
 
     private static class get_num_partitions_by_filter_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_num_partitions_by_filter_resultTupleScheme getScheme() {
         return new get_num_partitions_by_filter_resultTupleScheme();
       }
@@ -163795,21 +175595,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_num_partitions_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_num_partitions_by_filter_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 = iprot.readI32();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readI32();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -163819,6 +175624,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_args implements org.apache.thrift.TBase<get_partitions_by_names_args, get_partitions_by_names_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_names_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_names_args");
 
@@ -163890,10 +175696,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -163944,6 +175752,7 @@ public get_partitions_by_names_args(get_partitions_by_names_args other) {
       }
     }
 
+    @Override
     public get_partitions_by_names_args deepCopy() {
       return new get_partitions_by_names_args(this);
     }
@@ -164043,6 +175852,7 @@ public void setNamesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -164073,6 +175883,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -164089,6 +175900,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -164209,14 +176021,17 @@ public int compareTo(get_partitions_by_names_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -164275,6 +176090,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_names_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_argsStandardScheme getScheme() {
         return new get_partitions_by_names_argsStandardScheme();
       }
@@ -164282,59 +176098,66 @@ public get_partitions_by_names_argsStandardScheme getScheme() {
 
     private static class get_partitions_by_names_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_names_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_names_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2084 = iprot.readListBegin();
-                  struct.names = new java.util.ArrayList<java.lang.String>(_list2084.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2085;
-                  for (int _i2086 = 0; _i2086 < _list2084.size; ++_i2086)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2085 = iprot.readString();
-                    struct.names.add(_elem2085);
+                    org.apache.thrift.protocol.TList _list2084 = iprot.readListBegin();
+                    struct.names = new java.util.ArrayList<java.lang.String>(_list2084.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2085;
+                    for (int _i2086 = 0; _i2086 < _list2084.size; ++_i2086)
+                    {
+                      _elem2085 = iprot.readString();
+                      struct.names.add(_elem2085);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setNamesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setNamesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_names_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -164368,6 +176191,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_names_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_argsTupleScheme getScheme() {
         return new get_partitions_by_names_argsTupleScheme();
       }
@@ -164408,28 +176232,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_names_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2089 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.names = new java.util.ArrayList<java.lang.String>(_list2089.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2090;
-            for (int _i2091 = 0; _i2091 < _list2089.size; ++_i2091)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2090 = iprot.readString();
-              struct.names.add(_elem2090);
+              org.apache.thrift.protocol.TList _list2089 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.names = new java.util.ArrayList<java.lang.String>(_list2089.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2090;
+              for (int _i2091 = 0; _i2091 < _list2089.size; ++_i2091)
+              {
+                _elem2090 = iprot.readString();
+                struct.names.add(_elem2090);
+              }
             }
+            struct.setNamesIsSet(true);
           }
-          struct.setNamesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -164439,6 +176268,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_result implements org.apache.thrift.TBase<get_partitions_by_names_result, get_partitions_by_names_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_names_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_names_result");
 
@@ -164515,10 +176345,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -164579,6 +176411,7 @@ public get_partitions_by_names_result(get_partitions_by_names_result other) {
       }
     }
 
+    @Override
     public get_partitions_by_names_result deepCopy() {
       return new get_partitions_by_names_result(this);
     }
@@ -164703,6 +176536,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -164741,6 +176575,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -164760,6 +176595,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -164905,10 +176741,12 @@ public int compareTo(get_partitions_by_names_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -164979,6 +176817,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_names_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_resultStandardScheme getScheme() {
         return new get_partitions_by_names_resultStandardScheme();
       }
@@ -164986,71 +176825,78 @@ public get_partitions_by_names_resultStandardScheme getScheme() {
 
     private static class get_partitions_by_names_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_names_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_names_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2092 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Partition>(_list2092.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2093;
-                  for (int _i2094 = 0; _i2094 < _list2092.size; ++_i2094)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2093 = new Partition();
-                    _elem2093.read(iprot);
-                    struct.success.add(_elem2093);
+                    org.apache.thrift.protocol.TList _list2092 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Partition>(_list2092.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2093;
+                    for (int _i2094 = 0; _i2094 < _list2092.size; ++_i2094)
+                    {
+                      _elem2093 = new Partition();
+                      _elem2093.read(iprot);
+                      struct.success.add(_elem2093);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+                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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_names_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -165089,6 +176935,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_names_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_resultTupleScheme getScheme() {
         return new get_partitions_by_names_resultTupleScheme();
       }
@@ -165135,36 +176982,41 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_names_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(4);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2097 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Partition>(_list2097.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2098;
-            for (int _i2099 = 0; _i2099 < _list2097.size; ++_i2099)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
             {
-              _elem2098 = new Partition();
-              _elem2098.read(iprot);
-              struct.success.add(_elem2098);
+              org.apache.thrift.protocol.TList _list2097 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Partition>(_list2097.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2098;
+              for (int _i2099 = 0; _i2099 < _list2097.size; ++_i2099)
+              {
+                _elem2098 = new Partition();
+                _elem2098.read(iprot);
+                struct.success.add(_elem2098);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          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);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(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);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -165174,6 +177026,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_req_args implements org.apache.thrift.TBase<get_partitions_by_names_req_args, get_partitions_by_names_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_names_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_names_req_args");
 
@@ -165235,10 +177088,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -165273,6 +177128,7 @@ public get_partitions_by_names_req_args(get_partitions_by_names_req_args other)
       }
     }
 
+    @Override
     public get_partitions_by_names_req_args deepCopy() {
       return new get_partitions_by_names_req_args(this);
     }
@@ -165306,6 +177162,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -165320,6 +177177,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -165330,6 +177188,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -165400,14 +177259,17 @@ public int compareTo(get_partitions_by_names_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -165453,6 +177315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_names_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_req_argsStandardScheme getScheme() {
         return new get_partitions_by_names_req_argsStandardScheme();
       }
@@ -165460,34 +177323,41 @@ public get_partitions_by_names_req_argsStandardScheme getScheme() {
 
     private static class get_partitions_by_names_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_names_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_names_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetPartitionsByNamesRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetPartitionsByNamesRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_names_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -165504,6 +177374,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_names_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_req_argsTupleScheme getScheme() {
         return new get_partitions_by_names_req_argsTupleScheme();
       }
@@ -165526,12 +177397,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_names_req_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.req = new GetPartitionsByNamesRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetPartitionsByNamesRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -165541,6 +177417,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_by_names_req_result implements org.apache.thrift.TBase<get_partitions_by_names_req_result, get_partitions_by_names_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_by_names_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_by_names_req_result");
 
@@ -165617,10 +177494,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -165676,6 +177555,7 @@ public get_partitions_by_names_req_result(get_partitions_by_names_req_result oth
       }
     }
 
+    @Override
     public get_partitions_by_names_req_result deepCopy() {
       return new get_partitions_by_names_req_result(this);
     }
@@ -165784,6 +177664,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -165822,6 +177703,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -165841,6 +177723,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -165986,10 +177869,12 @@ public int compareTo(get_partitions_by_names_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -166063,6 +177948,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_by_names_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_req_resultStandardScheme getScheme() {
         return new get_partitions_by_names_req_resultStandardScheme();
       }
@@ -166070,61 +177956,68 @@ public get_partitions_by_names_req_resultStandardScheme getScheme() {
 
     private static class get_partitions_by_names_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_by_names_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_by_names_req_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 GetPartitionsByNamesResult();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetPartitionsByNamesResult();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_names_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -166156,6 +178049,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_by_
     }
 
     private static class get_partitions_by_names_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_by_names_req_resultTupleScheme getScheme() {
         return new get_partitions_by_names_req_resultTupleScheme();
       }
@@ -166196,27 +178090,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_n
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_by_names_req_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(4);
-        if (incoming.get(0)) {
-          struct.success = new GetPartitionsByNamesResult();
-          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);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new GetPartitionsByNamesResult();
+            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);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -166226,6 +178125,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_properties_args implements org.apache.thrift.TBase<get_properties_args, get_properties_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_properties_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_properties_args");
 
@@ -166287,10 +178187,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -166325,6 +178227,7 @@ public get_properties_args(get_properties_args other) {
       }
     }
 
+    @Override
     public get_properties_args deepCopy() {
       return new get_properties_args(this);
     }
@@ -166358,6 +178261,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -166372,6 +178276,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -166382,6 +178287,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -166452,14 +178358,17 @@ public int compareTo(get_properties_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -166505,6 +178414,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_properties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_properties_argsStandardScheme getScheme() {
         return new get_properties_argsStandardScheme();
       }
@@ -166512,34 +178422,41 @@ public get_properties_argsStandardScheme getScheme() {
 
     private static class get_properties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_properties_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_properties_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PropertyGetRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PropertyGetRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_properties_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -166556,6 +178473,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_properties_arg
     }
 
     private static class get_properties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_properties_argsTupleScheme getScheme() {
         return new get_properties_argsTupleScheme();
       }
@@ -166578,12 +178496,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_properties_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_properties_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.req = new PropertyGetRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PropertyGetRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -166593,6 +178516,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_properties_result implements org.apache.thrift.TBase<get_properties_result, get_properties_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_properties_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_properties_result");
 
@@ -166664,10 +178588,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -166716,6 +178642,7 @@ public get_properties_result(get_properties_result other) {
       }
     }
 
+    @Override
     public get_properties_result deepCopy() {
       return new get_properties_result(this);
     }
@@ -166799,6 +178726,7 @@ public void setE2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -166829,6 +178757,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -166845,6 +178774,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -166965,10 +178895,12 @@ public int compareTo(get_properties_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -167034,6 +178966,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_properties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_properties_resultStandardScheme getScheme() {
         return new get_properties_resultStandardScheme();
       }
@@ -167041,52 +178974,59 @@ public get_properties_resultStandardScheme getScheme() {
 
     private static class get_properties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_properties_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_properties_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 PropertyGetResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // E1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.e1 = new MetaException();
-                struct.e1.read(iprot);
-                struct.setE1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // E2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.e2 = new NoSuchObjectException();
-                struct.e2.read(iprot);
-                struct.setE2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PropertyGetResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // E1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.e1 = new MetaException();
+                  struct.e1.read(iprot);
+                  struct.setE1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // E2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.e2 = new NoSuchObjectException();
+                  struct.e2.read(iprot);
+                  struct.setE2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_properties_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -167113,6 +179053,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_properties_res
     }
 
     private static class get_properties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_properties_resultTupleScheme getScheme() {
         return new get_properties_resultTupleScheme();
       }
@@ -167147,22 +179088,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_properties_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_properties_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 PropertyGetResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.e1 = new MetaException();
-          struct.e1.read(iprot);
-          struct.setE1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.e2 = new NoSuchObjectException();
-          struct.e2.read(iprot);
-          struct.setE2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PropertyGetResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.e1 = new MetaException();
+            struct.e1.read(iprot);
+            struct.setE1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.e2 = new NoSuchObjectException();
+            struct.e2.read(iprot);
+            struct.setE2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -167172,6 +179118,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_properties_args implements org.apache.thrift.TBase<set_properties_args, set_properties_args._Fields>, java.io.Serializable, Cloneable, Comparable<set_properties_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_properties_args");
 
@@ -167233,10 +179180,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -167271,6 +179220,7 @@ public set_properties_args(set_properties_args other) {
       }
     }
 
+    @Override
     public set_properties_args deepCopy() {
       return new set_properties_args(this);
     }
@@ -167304,6 +179254,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -167318,6 +179269,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -167328,6 +179280,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -167398,14 +179351,17 @@ public int compareTo(set_properties_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -167451,6 +179407,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_properties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_properties_argsStandardScheme getScheme() {
         return new set_properties_argsStandardScheme();
       }
@@ -167458,34 +179415,41 @@ public set_properties_argsStandardScheme getScheme() {
 
     private static class set_properties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_properties_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_properties_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PropertySetRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PropertySetRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_properties_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -167502,6 +179466,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_properties_arg
     }
 
     private static class set_properties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_properties_argsTupleScheme getScheme() {
         return new set_properties_argsTupleScheme();
       }
@@ -167524,12 +179489,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_properties_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_properties_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.req = new PropertySetRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PropertySetRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -167539,6 +179509,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_properties_result implements org.apache.thrift.TBase<set_properties_result, set_properties_result._Fields>, java.io.Serializable, Cloneable, Comparable<set_properties_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_properties_result");
 
@@ -167610,10 +179581,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -167664,6 +179637,7 @@ public set_properties_result(set_properties_result other) {
       }
     }
 
+    @Override
     public set_properties_result deepCopy() {
       return new set_properties_result(this);
     }
@@ -167746,6 +179720,7 @@ public void setE2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -167776,6 +179751,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -167792,6 +179768,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -167910,10 +179887,12 @@ public int compareTo(set_properties_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -167974,6 +179953,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_properties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_properties_resultStandardScheme getScheme() {
         return new set_properties_resultStandardScheme();
       }
@@ -167981,51 +179961,58 @@ public set_properties_resultStandardScheme getScheme() {
 
     private static class set_properties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_properties_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_properties_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // E1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.e1 = new MetaException();
-                struct.e1.read(iprot);
-                struct.setE1IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // E2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.e2 = new NoSuchObjectException();
-                struct.e2.read(iprot);
-                struct.setE2IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // E1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.e1 = new MetaException();
+                  struct.e1.read(iprot);
+                  struct.setE1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // E2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.e2 = new NoSuchObjectException();
+                  struct.e2.read(iprot);
+                  struct.setE2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_properties_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -168052,6 +180039,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_properties_res
     }
 
     private static class set_properties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_properties_resultTupleScheme getScheme() {
         return new set_properties_resultTupleScheme();
       }
@@ -168086,21 +180074,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_properties_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_properties_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 = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.e1 = new MetaException();
-          struct.e1.read(iprot);
-          struct.setE1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.e2 = new NoSuchObjectException();
-          struct.e2.read(iprot);
-          struct.setE2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.e1 = new MetaException();
+            struct.e1.read(iprot);
+            struct.setE1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.e2 = new NoSuchObjectException();
+            struct.e2.read(iprot);
+            struct.setE2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -168110,6 +180103,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_args implements org.apache.thrift.TBase<alter_partition_args, alter_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partition_args");
 
@@ -168181,10 +180175,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -168233,6 +180229,7 @@ public alter_partition_args(alter_partition_args other) {
       }
     }
 
+    @Override
     public alter_partition_args deepCopy() {
       return new alter_partition_args(this);
     }
@@ -168316,6 +180313,7 @@ public void setNew_partIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -168346,6 +180344,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -168362,6 +180361,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -168482,14 +180482,17 @@ public int compareTo(alter_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -168551,6 +180554,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_argsStandardScheme getScheme() {
         return new alter_partition_argsStandardScheme();
       }
@@ -168558,50 +180562,57 @@ public alter_partition_argsStandardScheme getScheme() {
 
     private static class alter_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // NEW_PART
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_part = new Partition();
-                struct.new_part.read(iprot);
-                struct.setNew_partIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_PART
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_part = new Partition();
+                  struct.new_part.read(iprot);
+                  struct.setNew_partIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -168628,6 +180639,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_ar
     }
 
     private static class alter_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_argsTupleScheme getScheme() {
         return new alter_partition_argsTupleScheme();
       }
@@ -168662,20 +180674,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partition_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partition_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.new_part = new Partition();
-          struct.new_part.read(iprot);
-          struct.setNew_partIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.new_part = new Partition();
+            struct.new_part.read(iprot);
+            struct.setNew_partIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -168685,6 +180702,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_result implements org.apache.thrift.TBase<alter_partition_result, alter_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partition_result");
 
@@ -168751,10 +180769,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -168796,6 +180816,7 @@ public alter_partition_result(alter_partition_result other) {
       }
     }
 
+    @Override
     public alter_partition_result deepCopy() {
       return new alter_partition_result(this);
     }
@@ -168854,6 +180875,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -168876,6 +180898,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -168889,6 +180912,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -168984,10 +181008,12 @@ public int compareTo(alter_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -169042,6 +181068,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_resultStandardScheme getScheme() {
         return new alter_partition_resultStandardScheme();
       }
@@ -169049,43 +181076,50 @@ public alter_partition_resultStandardScheme getScheme() {
 
     private static class alter_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partition_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -169107,6 +181141,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_re
     }
 
     private static class alter_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_resultTupleScheme getScheme() {
         return new alter_partition_resultTupleScheme();
       }
@@ -169135,17 +181170,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partition_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partition_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -169155,6 +181195,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_args implements org.apache.thrift.TBase<alter_partitions_args, alter_partitions_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partitions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partitions_args");
 
@@ -169226,10 +181267,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -169283,6 +181326,7 @@ public alter_partitions_args(alter_partitions_args other) {
       }
     }
 
+    @Override
     public alter_partitions_args deepCopy() {
       return new alter_partitions_args(this);
     }
@@ -169382,6 +181426,7 @@ public void setNew_partsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -169412,6 +181457,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -169428,6 +181474,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -169548,14 +181595,17 @@ public int compareTo(alter_partitions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -169614,6 +181664,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partitions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_argsStandardScheme getScheme() {
         return new alter_partitions_argsStandardScheme();
       }
@@ -169621,60 +181672,67 @@ public alter_partitions_argsStandardScheme getScheme() {
 
     private static class alter_partitions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partitions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partitions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // NEW_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2100 = iprot.readListBegin();
-                  struct.new_parts = new java.util.ArrayList<Partition>(_list2100.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2101;
-                  for (int _i2102 = 0; _i2102 < _list2100.size; ++_i2102)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2101 = new Partition();
-                    _elem2101.read(iprot);
-                    struct.new_parts.add(_elem2101);
+                    org.apache.thrift.protocol.TList _list2100 = iprot.readListBegin();
+                    struct.new_parts = new java.util.ArrayList<Partition>(_list2100.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2101;
+                    for (int _i2102 = 0; _i2102 < _list2100.size; ++_i2102)
+                    {
+                      _elem2101 = new Partition();
+                      _elem2101.read(iprot);
+                      struct.new_parts.add(_elem2101);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setNew_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setNew_partsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -169708,6 +181766,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_a
     }
 
     private static class alter_partitions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_argsTupleScheme getScheme() {
         return new alter_partitions_argsTupleScheme();
       }
@@ -169748,29 +181807,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partitions_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partitions_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2105 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.new_parts = new java.util.ArrayList<Partition>(_list2105.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2106;
-            for (int _i2107 = 0; _i2107 < _list2105.size; ++_i2107)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2106 = new Partition();
-              _elem2106.read(iprot);
-              struct.new_parts.add(_elem2106);
+              org.apache.thrift.protocol.TList _list2105 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.new_parts = new java.util.ArrayList<Partition>(_list2105.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2106;
+              for (int _i2107 = 0; _i2107 < _list2105.size; ++_i2107)
+              {
+                _elem2106 = new Partition();
+                _elem2106.read(iprot);
+                struct.new_parts.add(_elem2106);
+              }
             }
+            struct.setNew_partsIsSet(true);
           }
-          struct.setNew_partsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -169780,6 +181844,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_result implements org.apache.thrift.TBase<alter_partitions_result, alter_partitions_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partitions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partitions_result");
 
@@ -169846,10 +181911,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -169891,6 +181958,7 @@ public alter_partitions_result(alter_partitions_result other) {
       }
     }
 
+    @Override
     public alter_partitions_result deepCopy() {
       return new alter_partitions_result(this);
     }
@@ -169949,6 +182017,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -169971,6 +182040,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -169984,6 +182054,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -170079,10 +182150,12 @@ public int compareTo(alter_partitions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -170137,6 +182210,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partitions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_resultStandardScheme getScheme() {
         return new alter_partitions_resultStandardScheme();
       }
@@ -170144,43 +182218,50 @@ public alter_partitions_resultStandardScheme getScheme() {
 
     private static class alter_partitions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partitions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partitions_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -170202,6 +182283,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_r
     }
 
     private static class alter_partitions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_resultTupleScheme getScheme() {
         return new alter_partitions_resultTupleScheme();
       }
@@ -170230,17 +182312,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partitions_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partitions_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -170250,6 +182337,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_with_environment_context_args implements org.apache.thrift.TBase<alter_partitions_with_environment_context_args, alter_partitions_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partitions_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partitions_with_environment_context_args");
 
@@ -170326,10 +182414,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -170390,6 +182480,7 @@ public alter_partitions_with_environment_context_args(alter_partitions_with_envi
       }
     }
 
+    @Override
     public alter_partitions_with_environment_context_args deepCopy() {
       return new alter_partitions_with_environment_context_args(this);
     }
@@ -170514,6 +182605,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -170552,6 +182644,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -170571,6 +182664,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -170716,14 +182810,17 @@ public int compareTo(alter_partitions_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -170793,6 +182890,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partitions_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_with_environment_context_argsStandardScheme getScheme() {
         return new alter_partitions_with_environment_context_argsStandardScheme();
       }
@@ -170800,69 +182898,76 @@ public alter_partitions_with_environment_context_argsStandardScheme getScheme()
 
     private static class alter_partitions_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partitions_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partitions_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // NEW_PARTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2108 = iprot.readListBegin();
-                  struct.new_parts = new java.util.ArrayList<Partition>(_list2108.size);
-                  @org.apache.thrift.annotation.Nullable Partition _elem2109;
-                  for (int _i2110 = 0; _i2110 < _list2108.size; ++_i2110)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_PARTS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2109 = new Partition();
-                    _elem2109.read(iprot);
-                    struct.new_parts.add(_elem2109);
+                    org.apache.thrift.protocol.TList _list2108 = iprot.readListBegin();
+                    struct.new_parts = new java.util.ArrayList<Partition>(_list2108.size);
+                    @org.apache.thrift.annotation.Nullable Partition _elem2109;
+                    for (int _i2110 = 0; _i2110 < _list2108.size; ++_i2110)
+                    {
+                      _elem2109 = new Partition();
+                      _elem2109.read(iprot);
+                      struct.new_parts.add(_elem2109);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setNew_partsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setNew_partsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+                break;
+              case 4: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -170901,6 +183006,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_w
     }
 
     private static class alter_partitions_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_with_environment_context_argsTupleScheme getScheme() {
         return new alter_partitions_with_environment_context_argsTupleScheme();
       }
@@ -170947,34 +183053,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partitions_wi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partitions_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2113 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.new_parts = new java.util.ArrayList<Partition>(_list2113.size);
-            @org.apache.thrift.annotation.Nullable Partition _elem2114;
-            for (int _i2115 = 0; _i2115 < _list2113.size; ++_i2115)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2114 = new Partition();
-              _elem2114.read(iprot);
-              struct.new_parts.add(_elem2114);
+              org.apache.thrift.protocol.TList _list2113 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.new_parts = new java.util.ArrayList<Partition>(_list2113.size);
+              @org.apache.thrift.annotation.Nullable Partition _elem2114;
+              for (int _i2115 = 0; _i2115 < _list2113.size; ++_i2115)
+              {
+                _elem2114 = new Partition();
+                _elem2114.read(iprot);
+                struct.new_parts.add(_elem2114);
+              }
             }
+            struct.setNew_partsIsSet(true);
           }
-          struct.setNew_partsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+          if (incoming.get(3)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -170984,6 +183095,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_with_environment_context_result implements org.apache.thrift.TBase<alter_partitions_with_environment_context_result, alter_partitions_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partitions_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partitions_with_environment_context_result");
 
@@ -171050,10 +183162,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -171095,6 +183209,7 @@ public alter_partitions_with_environment_context_result(alter_partitions_with_en
       }
     }
 
+    @Override
     public alter_partitions_with_environment_context_result deepCopy() {
       return new alter_partitions_with_environment_context_result(this);
     }
@@ -171153,6 +183268,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -171175,6 +183291,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -171188,6 +183305,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -171283,10 +183401,12 @@ public int compareTo(alter_partitions_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -171341,6 +183461,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partitions_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_with_environment_context_resultStandardScheme getScheme() {
         return new alter_partitions_with_environment_context_resultStandardScheme();
       }
@@ -171348,43 +183469,50 @@ public alter_partitions_with_environment_context_resultStandardScheme getScheme(
 
     private static class alter_partitions_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partitions_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partitions_with_environment_context_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -171406,6 +183534,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_w
     }
 
     private static class alter_partitions_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_with_environment_context_resultTupleScheme getScheme() {
         return new alter_partitions_with_environment_context_resultTupleScheme();
       }
@@ -171434,17 +183563,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partitions_wi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partitions_with_environment_context_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -171454,6 +183588,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_req_args implements org.apache.thrift.TBase<alter_partitions_req_args, alter_partitions_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partitions_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partitions_req_args");
 
@@ -171515,10 +183650,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -171553,6 +183690,7 @@ public alter_partitions_req_args(alter_partitions_req_args other) {
       }
     }
 
+    @Override
     public alter_partitions_req_args deepCopy() {
       return new alter_partitions_req_args(this);
     }
@@ -171586,6 +183724,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -171600,6 +183739,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -171610,6 +183750,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -171680,14 +183821,17 @@ public int compareTo(alter_partitions_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -171733,6 +183877,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partitions_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_req_argsStandardScheme getScheme() {
         return new alter_partitions_req_argsStandardScheme();
       }
@@ -171740,34 +183885,41 @@ public alter_partitions_req_argsStandardScheme getScheme() {
 
     private static class alter_partitions_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partitions_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partitions_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new AlterPartitionsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new AlterPartitionsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -171784,6 +183936,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_r
     }
 
     private static class alter_partitions_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_req_argsTupleScheme getScheme() {
         return new alter_partitions_req_argsTupleScheme();
       }
@@ -171806,12 +183959,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partitions_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partitions_req_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.req = new AlterPartitionsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new AlterPartitionsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -171821,6 +183979,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partitions_req_result implements org.apache.thrift.TBase<alter_partitions_req_result, alter_partitions_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partitions_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partitions_req_result");
 
@@ -171892,10 +184051,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -171944,6 +184105,7 @@ public alter_partitions_req_result(alter_partitions_req_result other) {
       }
     }
 
+    @Override
     public alter_partitions_req_result deepCopy() {
       return new alter_partitions_req_result(this);
     }
@@ -172027,6 +184189,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -172057,6 +184220,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -172073,6 +184237,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -172193,10 +184358,12 @@ public int compareTo(alter_partitions_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -172262,6 +184429,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partitions_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_req_resultStandardScheme getScheme() {
         return new alter_partitions_req_resultStandardScheme();
       }
@@ -172269,52 +184437,59 @@ public alter_partitions_req_resultStandardScheme getScheme() {
 
     private static class alter_partitions_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partitions_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partitions_req_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 AlterPartitionsResponse();
-                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 InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AlterPartitionsResponse();
+                  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 InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -172341,6 +184516,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partitions_r
     }
 
     private static class alter_partitions_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partitions_req_resultTupleScheme getScheme() {
         return new alter_partitions_req_resultTupleScheme();
       }
@@ -172375,22 +184551,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partitions_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partitions_req_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 AlterPartitionsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AlterPartitionsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -172400,6 +184581,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_with_environment_context_args implements org.apache.thrift.TBase<alter_partition_with_environment_context_args, alter_partition_with_environment_context_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partition_with_environment_context_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partition_with_environment_context_args");
 
@@ -172476,10 +184658,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -172535,6 +184719,7 @@ public alter_partition_with_environment_context_args(alter_partition_with_enviro
       }
     }
 
+    @Override
     public alter_partition_with_environment_context_args deepCopy() {
       return new alter_partition_with_environment_context_args(this);
     }
@@ -172643,6 +184828,7 @@ public void setEnvironment_contextIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -172681,6 +184867,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -172700,6 +184887,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -172845,14 +185033,17 @@ public int compareTo(alter_partition_with_environment_context_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -172925,6 +185116,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partition_with_environment_context_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_with_environment_context_argsStandardScheme getScheme() {
         return new alter_partition_with_environment_context_argsStandardScheme();
       }
@@ -172932,59 +185124,66 @@ public alter_partition_with_environment_context_argsStandardScheme getScheme() {
 
     private static class alter_partition_with_environment_context_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partition_with_environment_context_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partition_with_environment_context_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // NEW_PART
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_part = new Partition();
-                struct.new_part.read(iprot);
-                struct.setNew_partIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // ENVIRONMENT_CONTEXT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.environment_context = new EnvironmentContext();
-                struct.environment_context.read(iprot);
-                struct.setEnvironment_contextIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_PART
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_part = new Partition();
+                  struct.new_part.read(iprot);
+                  struct.setNew_partIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // ENVIRONMENT_CONTEXT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.environment_context = new EnvironmentContext();
+                  struct.environment_context.read(iprot);
+                  struct.setEnvironment_contextIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_with_environment_context_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -173016,6 +185215,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_wi
     }
 
     private static class alter_partition_with_environment_context_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_with_environment_context_argsTupleScheme getScheme() {
         return new alter_partition_with_environment_context_argsTupleScheme();
       }
@@ -173056,25 +185256,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partition_wit
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partition_with_environment_context_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.new_part = new Partition();
-          struct.new_part.read(iprot);
-          struct.setNew_partIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.environment_context = new EnvironmentContext();
-          struct.environment_context.read(iprot);
-          struct.setEnvironment_contextIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.new_part = new Partition();
+            struct.new_part.read(iprot);
+            struct.setNew_partIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.environment_context = new EnvironmentContext();
+            struct.environment_context.read(iprot);
+            struct.setEnvironment_contextIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -173084,6 +185289,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_partition_with_environment_context_result implements org.apache.thrift.TBase<alter_partition_with_environment_context_result, alter_partition_with_environment_context_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_partition_with_environment_context_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_partition_with_environment_context_result");
 
@@ -173150,10 +185356,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -173195,6 +185403,7 @@ public alter_partition_with_environment_context_result(alter_partition_with_envi
       }
     }
 
+    @Override
     public alter_partition_with_environment_context_result deepCopy() {
       return new alter_partition_with_environment_context_result(this);
     }
@@ -173253,6 +185462,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -173275,6 +185485,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -173288,6 +185499,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -173383,10 +185595,12 @@ public int compareTo(alter_partition_with_environment_context_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -173441,6 +185655,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_partition_with_environment_context_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_with_environment_context_resultStandardScheme getScheme() {
         return new alter_partition_with_environment_context_resultStandardScheme();
       }
@@ -173448,43 +185663,50 @@ public alter_partition_with_environment_context_resultStandardScheme getScheme()
 
     private static class alter_partition_with_environment_context_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_partition_with_environment_context_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_partition_with_environment_context_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_with_environment_context_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -173506,6 +185728,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_partition_wi
     }
 
     private static class alter_partition_with_environment_context_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_partition_with_environment_context_resultTupleScheme getScheme() {
         return new alter_partition_with_environment_context_resultTupleScheme();
       }
@@ -173534,17 +185757,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_partition_wit
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_partition_with_environment_context_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -173554,6 +185782,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_args implements org.apache.thrift.TBase<rename_partition_args, rename_partition_args._Fields>, java.io.Serializable, Cloneable, Comparable<rename_partition_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_partition_args");
 
@@ -173630,10 +185859,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -173691,6 +185922,7 @@ public rename_partition_args(rename_partition_args other) {
       }
     }
 
+    @Override
     public rename_partition_args deepCopy() {
       return new rename_partition_args(this);
     }
@@ -173815,6 +186047,7 @@ public void setNew_partIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -173853,6 +186086,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -173872,6 +186106,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -174017,14 +186252,17 @@ public int compareTo(rename_partition_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -174094,6 +186332,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class rename_partition_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_argsStandardScheme getScheme() {
         return new rename_partition_argsStandardScheme();
       }
@@ -174101,68 +186340,75 @@ public rename_partition_argsStandardScheme getScheme() {
 
     private static class rename_partition_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<rename_partition_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, rename_partition_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2116 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2116.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2117;
-                  for (int _i2118 = 0; _i2118 < _list2116.size; ++_i2118)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2117 = iprot.readString();
-                    struct.part_vals.add(_elem2117);
+                    org.apache.thrift.protocol.TList _list2116 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2116.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2117;
+                    for (int _i2118 = 0; _i2118 < _list2116.size; ++_i2118)
+                    {
+                      _elem2117 = iprot.readString();
+                      struct.part_vals.add(_elem2117);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // NEW_PART
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.new_part = new Partition();
-                struct.new_part.read(iprot);
-                struct.setNew_partIsSet(true);
-              } else { 
+                break;
+              case 4: // NEW_PART
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.new_part = new Partition();
+                  struct.new_part.read(iprot);
+                  struct.setNew_partIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -174201,6 +186447,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_a
     }
 
     private static class rename_partition_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_argsTupleScheme getScheme() {
         return new rename_partition_argsTupleScheme();
       }
@@ -174247,33 +186494,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, rename_partition_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, rename_partition_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2121 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2121.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2122;
-            for (int _i2123 = 0; _i2123 < _list2121.size; ++_i2123)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2122 = iprot.readString();
-              struct.part_vals.add(_elem2122);
+              org.apache.thrift.protocol.TList _list2121 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2121.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2122;
+              for (int _i2123 = 0; _i2123 < _list2121.size; ++_i2123)
+              {
+                _elem2122 = iprot.readString();
+                struct.part_vals.add(_elem2122);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.new_part = new Partition();
-          struct.new_part.read(iprot);
-          struct.setNew_partIsSet(true);
+          if (incoming.get(3)) {
+            struct.new_part = new Partition();
+            struct.new_part.read(iprot);
+            struct.setNew_partIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -174283,6 +186535,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_result implements org.apache.thrift.TBase<rename_partition_result, rename_partition_result._Fields>, java.io.Serializable, Cloneable, Comparable<rename_partition_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_partition_result");
 
@@ -174349,10 +186602,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -174394,6 +186649,7 @@ public rename_partition_result(rename_partition_result other) {
       }
     }
 
+    @Override
     public rename_partition_result deepCopy() {
       return new rename_partition_result(this);
     }
@@ -174452,6 +186708,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -174474,6 +186731,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -174487,6 +186745,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -174582,10 +186841,12 @@ public int compareTo(rename_partition_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -174640,6 +186901,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class rename_partition_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_resultStandardScheme getScheme() {
         return new rename_partition_resultStandardScheme();
       }
@@ -174647,43 +186909,50 @@ public rename_partition_resultStandardScheme getScheme() {
 
     private static class rename_partition_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<rename_partition_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, rename_partition_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -174705,6 +186974,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_r
     }
 
     private static class rename_partition_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_resultTupleScheme getScheme() {
         return new rename_partition_resultTupleScheme();
       }
@@ -174733,17 +187003,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, rename_partition_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, rename_partition_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -174753,6 +187028,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_req_args implements org.apache.thrift.TBase<rename_partition_req_args, rename_partition_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<rename_partition_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_partition_req_args");
 
@@ -174814,10 +187090,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -174852,6 +187130,7 @@ public rename_partition_req_args(rename_partition_req_args other) {
       }
     }
 
+    @Override
     public rename_partition_req_args deepCopy() {
       return new rename_partition_req_args(this);
     }
@@ -174885,6 +187164,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -174899,6 +187179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -174909,6 +187190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -174979,14 +187261,17 @@ public int compareTo(rename_partition_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -175032,6 +187317,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class rename_partition_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_req_argsStandardScheme getScheme() {
         return new rename_partition_req_argsStandardScheme();
       }
@@ -175039,34 +187325,41 @@ public rename_partition_req_argsStandardScheme getScheme() {
 
     private static class rename_partition_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<rename_partition_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, rename_partition_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new RenamePartitionRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new RenamePartitionRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -175083,6 +187376,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_r
     }
 
     private static class rename_partition_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_req_argsTupleScheme getScheme() {
         return new rename_partition_req_argsTupleScheme();
       }
@@ -175105,12 +187399,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, rename_partition_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, rename_partition_req_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.req = new RenamePartitionRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new RenamePartitionRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -175120,6 +187419,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class rename_partition_req_result implements org.apache.thrift.TBase<rename_partition_req_result, rename_partition_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<rename_partition_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rename_partition_req_result");
 
@@ -175191,10 +187491,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -175243,6 +187545,7 @@ public rename_partition_req_result(rename_partition_req_result other) {
       }
     }
 
+    @Override
     public rename_partition_req_result deepCopy() {
       return new rename_partition_req_result(this);
     }
@@ -175326,6 +187629,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -175356,6 +187660,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -175372,6 +187677,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -175492,10 +187798,12 @@ public int compareTo(rename_partition_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -175561,6 +187869,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class rename_partition_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_req_resultStandardScheme getScheme() {
         return new rename_partition_req_resultStandardScheme();
       }
@@ -175568,52 +187877,59 @@ public rename_partition_req_resultStandardScheme getScheme() {
 
     private static class rename_partition_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<rename_partition_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, rename_partition_req_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 RenamePartitionResponse();
-                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 InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 RenamePartitionResponse();
+                  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 InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -175640,6 +187956,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, rename_partition_r
     }
 
     private static class rename_partition_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public rename_partition_req_resultTupleScheme getScheme() {
         return new rename_partition_req_resultTupleScheme();
       }
@@ -175674,22 +187991,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, rename_partition_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, rename_partition_req_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 RenamePartitionResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 RenamePartitionResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -175699,6 +188021,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_has_valid_characters_args implements org.apache.thrift.TBase<partition_name_has_valid_characters_args, partition_name_has_valid_characters_args._Fields>, java.io.Serializable, Cloneable, Comparable<partition_name_has_valid_characters_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("partition_name_has_valid_characters_args");
 
@@ -175765,10 +188088,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -175814,6 +188139,7 @@ public partition_name_has_valid_characters_args(partition_name_has_valid_charact
       this.throw_exception = other.throw_exception;
     }
 
+    @Override
     public partition_name_has_valid_characters_args deepCopy() {
       return new partition_name_has_valid_characters_args(this);
     }
@@ -175887,6 +188213,7 @@ public void setThrow_exceptionIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __THROW_EXCEPTION_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PART_VALS:
@@ -175909,6 +188236,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PART_VALS:
@@ -175922,6 +188250,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -176015,14 +188344,17 @@ public int compareTo(partition_name_has_valid_characters_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -176071,6 +188403,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class partition_name_has_valid_characters_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_has_valid_characters_argsStandardScheme getScheme() {
         return new partition_name_has_valid_characters_argsStandardScheme();
       }
@@ -176078,51 +188411,58 @@ public partition_name_has_valid_characters_argsStandardScheme getScheme() {
 
     private static class partition_name_has_valid_characters_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<partition_name_has_valid_characters_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, partition_name_has_valid_characters_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2124 = iprot.readListBegin();
-                  struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2124.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2125;
-                  for (int _i2126 = 0; _i2126 < _list2124.size; ++_i2126)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2125 = iprot.readString();
-                    struct.part_vals.add(_elem2125);
+                    org.apache.thrift.protocol.TList _list2124 = iprot.readListBegin();
+                    struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2124.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2125;
+                    for (int _i2126 = 0; _i2126 < _list2124.size; ++_i2126)
+                    {
+                      _elem2125 = iprot.readString();
+                      struct.part_vals.add(_elem2125);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // THROW_EXCEPTION
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.throw_exception = iprot.readBool();
-                struct.setThrow_exceptionIsSet(true);
-              } else { 
+                break;
+              case 2: // THROW_EXCEPTION
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.throw_exception = iprot.readBool();
+                  struct.setThrow_exceptionIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_has_valid_characters_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -176149,6 +188489,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_has
     }
 
     private static class partition_name_has_valid_characters_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_has_valid_characters_argsTupleScheme getScheme() {
         return new partition_name_has_valid_characters_argsTupleScheme();
       }
@@ -176183,24 +188524,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, partition_name_has_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, partition_name_has_valid_characters_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);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2129 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2129.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2130;
-            for (int _i2131 = 0; _i2131 < _list2129.size; ++_i2131)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2130 = iprot.readString();
-              struct.part_vals.add(_elem2130);
+              org.apache.thrift.protocol.TList _list2129 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.part_vals = new java.util.ArrayList<java.lang.String>(_list2129.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2130;
+              for (int _i2131 = 0; _i2131 < _list2129.size; ++_i2131)
+              {
+                _elem2130 = iprot.readString();
+                struct.part_vals.add(_elem2130);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.throw_exception = iprot.readBool();
-          struct.setThrow_exceptionIsSet(true);
+          if (incoming.get(1)) {
+            struct.throw_exception = iprot.readBool();
+            struct.setThrow_exceptionIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -176210,6 +188556,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_has_valid_characters_result implements org.apache.thrift.TBase<partition_name_has_valid_characters_result, partition_name_has_valid_characters_result._Fields>, java.io.Serializable, Cloneable, Comparable<partition_name_has_valid_characters_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("partition_name_has_valid_characters_result");
 
@@ -176276,10 +188623,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -176323,6 +188672,7 @@ public partition_name_has_valid_characters_result(partition_name_has_valid_chara
       }
     }
 
+    @Override
     public partition_name_has_valid_characters_result deepCopy() {
       return new partition_name_has_valid_characters_result(this);
     }
@@ -176380,6 +188730,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -176402,6 +188753,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -176415,6 +188767,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -176508,10 +188861,12 @@ public int compareTo(partition_name_has_valid_characters_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -176564,6 +188919,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class partition_name_has_valid_characters_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_has_valid_characters_resultStandardScheme getScheme() {
         return new partition_name_has_valid_characters_resultStandardScheme();
       }
@@ -176571,42 +188927,49 @@ public partition_name_has_valid_characters_resultStandardScheme getScheme() {
 
     private static class partition_name_has_valid_characters_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<partition_name_has_valid_characters_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, partition_name_has_valid_characters_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_has_valid_characters_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -176628,6 +188991,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_has
     }
 
     private static class partition_name_has_valid_characters_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_has_valid_characters_resultTupleScheme getScheme() {
         return new partition_name_has_valid_characters_resultTupleScheme();
       }
@@ -176656,16 +189020,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, partition_name_has_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, partition_name_has_valid_characters_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -176675,6 +189044,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_config_value_args implements org.apache.thrift.TBase<get_config_value_args, get_config_value_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_config_value_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_config_value_args");
 
@@ -176741,10 +189111,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -176786,6 +189158,7 @@ public get_config_value_args(get_config_value_args other) {
       }
     }
 
+    @Override
     public get_config_value_args deepCopy() {
       return new get_config_value_args(this);
     }
@@ -176844,6 +189217,7 @@ public void setDefaultValueIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -176866,6 +189240,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -176879,6 +189254,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -176974,14 +189350,17 @@ public int compareTo(get_config_value_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -177032,6 +189411,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_config_value_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_config_value_argsStandardScheme getScheme() {
         return new get_config_value_argsStandardScheme();
       }
@@ -177039,41 +189419,48 @@ public get_config_value_argsStandardScheme getScheme() {
 
     private static class get_config_value_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_config_value_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_config_value_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.name = iprot.readString();
-                struct.setNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // DEFAULT_VALUE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.defaultValue = iprot.readString();
-                struct.setDefaultValueIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.name = iprot.readString();
+                  struct.setNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // DEFAULT_VALUE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.defaultValue = iprot.readString();
+                  struct.setDefaultValueIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_config_value_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -177095,6 +189482,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_config_value_a
     }
 
     private static class get_config_value_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_config_value_argsTupleScheme getScheme() {
         return new get_config_value_argsTupleScheme();
       }
@@ -177123,15 +189511,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_config_value_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_config_value_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);
-        if (incoming.get(0)) {
-          struct.name = iprot.readString();
-          struct.setNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.defaultValue = iprot.readString();
-          struct.setDefaultValueIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.name = iprot.readString();
+            struct.setNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.defaultValue = iprot.readString();
+            struct.setDefaultValueIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -177141,6 +189534,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_config_value_result implements org.apache.thrift.TBase<get_config_value_result, get_config_value_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_config_value_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_config_value_result");
 
@@ -177207,10 +189601,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -177252,6 +189648,7 @@ public get_config_value_result(get_config_value_result other) {
       }
     }
 
+    @Override
     public get_config_value_result deepCopy() {
       return new get_config_value_result(this);
     }
@@ -177310,6 +189707,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -177332,6 +189730,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -177345,6 +189744,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -177440,10 +189840,12 @@ public int compareTo(get_config_value_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -177498,6 +189900,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_config_value_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_config_value_resultStandardScheme getScheme() {
         return new get_config_value_resultStandardScheme();
       }
@@ -177505,42 +189908,49 @@ public get_config_value_resultStandardScheme getScheme() {
 
     private static class get_config_value_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_config_value_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_config_value_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.STRING) {
-                struct.success = iprot.readString();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new ConfigValSecurityException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.success = iprot.readString();
+                  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 ConfigValSecurityException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_config_value_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -177562,6 +189972,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_config_value_r
     }
 
     private static class get_config_value_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_config_value_resultTupleScheme getScheme() {
         return new get_config_value_resultTupleScheme();
       }
@@ -177590,16 +190001,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_config_value_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_config_value_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.success = iprot.readString();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new ConfigValSecurityException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new ConfigValSecurityException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -177609,6 +190025,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_vals_args implements org.apache.thrift.TBase<partition_name_to_vals_args, partition_name_to_vals_args._Fields>, java.io.Serializable, Cloneable, Comparable<partition_name_to_vals_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("partition_name_to_vals_args");
 
@@ -177670,10 +190087,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -177708,6 +190127,7 @@ public partition_name_to_vals_args(partition_name_to_vals_args other) {
       }
     }
 
+    @Override
     public partition_name_to_vals_args deepCopy() {
       return new partition_name_to_vals_args(this);
     }
@@ -177741,6 +190161,7 @@ public void setPart_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PART_NAME:
@@ -177755,6 +190176,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PART_NAME:
@@ -177765,6 +190187,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -177835,14 +190258,17 @@ public int compareTo(partition_name_to_vals_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -177885,6 +190311,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class partition_name_to_vals_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_vals_argsStandardScheme getScheme() {
         return new partition_name_to_vals_argsStandardScheme();
       }
@@ -177892,33 +190319,40 @@ public partition_name_to_vals_argsStandardScheme getScheme() {
 
     private static class partition_name_to_vals_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<partition_name_to_vals_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, partition_name_to_vals_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_vals_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -177935,6 +190369,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_
     }
 
     private static class partition_name_to_vals_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_vals_argsTupleScheme getScheme() {
         return new partition_name_to_vals_argsTupleScheme();
       }
@@ -177957,11 +190392,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, partition_name_to_v
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, partition_name_to_vals_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.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -177971,6 +190411,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_vals_result implements org.apache.thrift.TBase<partition_name_to_vals_result, partition_name_to_vals_result._Fields>, java.io.Serializable, Cloneable, Comparable<partition_name_to_vals_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("partition_name_to_vals_result");
 
@@ -178037,10 +190478,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -178084,6 +190527,7 @@ public partition_name_to_vals_result(partition_name_to_vals_result other) {
       }
     }
 
+    @Override
     public partition_name_to_vals_result deepCopy() {
       return new partition_name_to_vals_result(this);
     }
@@ -178158,6 +190602,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -178180,6 +190625,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -178193,6 +190639,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -178288,10 +190735,12 @@ public int compareTo(partition_name_to_vals_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -178346,6 +190795,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class partition_name_to_vals_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_vals_resultStandardScheme getScheme() {
         return new partition_name_to_vals_resultStandardScheme();
       }
@@ -178353,52 +190803,59 @@ public partition_name_to_vals_resultStandardScheme getScheme() {
 
     private static class partition_name_to_vals_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<partition_name_to_vals_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, partition_name_to_vals_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2132 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2132.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2133;
-                  for (int _i2134 = 0; _i2134 < _list2132.size; ++_i2134)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2133 = iprot.readString();
-                    struct.success.add(_elem2133);
+                    org.apache.thrift.protocol.TList _list2132 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2132.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2133;
+                    for (int _i2134 = 0; _i2134 < _list2132.size; ++_i2134)
+                    {
+                      _elem2133 = iprot.readString();
+                      struct.success.add(_elem2133);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_vals_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -178427,6 +190884,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_
     }
 
     private static class partition_name_to_vals_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_vals_resultTupleScheme getScheme() {
         return new partition_name_to_vals_resultTupleScheme();
       }
@@ -178461,25 +190919,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, partition_name_to_v
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, partition_name_to_vals_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2137 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2137.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2138;
-            for (int _i2139 = 0; _i2139 < _list2137.size; ++_i2139)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2138 = iprot.readString();
-              struct.success.add(_elem2138);
+              org.apache.thrift.protocol.TList _list2137 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2137.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2138;
+              for (int _i2139 = 0; _i2139 < _list2137.size; ++_i2139)
+              {
+                _elem2138 = iprot.readString();
+                struct.success.add(_elem2138);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -178489,6 +190952,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_spec_args implements org.apache.thrift.TBase<partition_name_to_spec_args, partition_name_to_spec_args._Fields>, java.io.Serializable, Cloneable, Comparable<partition_name_to_spec_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("partition_name_to_spec_args");
 
@@ -178550,10 +191014,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -178588,6 +191054,7 @@ public partition_name_to_spec_args(partition_name_to_spec_args other) {
       }
     }
 
+    @Override
     public partition_name_to_spec_args deepCopy() {
       return new partition_name_to_spec_args(this);
     }
@@ -178621,6 +191088,7 @@ public void setPart_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PART_NAME:
@@ -178635,6 +191103,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PART_NAME:
@@ -178645,6 +191114,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -178715,14 +191185,17 @@ public int compareTo(partition_name_to_spec_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -178765,6 +191238,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class partition_name_to_spec_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_spec_argsStandardScheme getScheme() {
         return new partition_name_to_spec_argsStandardScheme();
       }
@@ -178772,33 +191246,40 @@ public partition_name_to_spec_argsStandardScheme getScheme() {
 
     private static class partition_name_to_spec_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<partition_name_to_spec_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, partition_name_to_spec_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_spec_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -178815,6 +191296,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_
     }
 
     private static class partition_name_to_spec_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_spec_argsTupleScheme getScheme() {
         return new partition_name_to_spec_argsTupleScheme();
       }
@@ -178837,11 +191319,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, partition_name_to_s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, partition_name_to_spec_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.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -178851,6 +191338,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class partition_name_to_spec_result implements org.apache.thrift.TBase<partition_name_to_spec_result, partition_name_to_spec_result._Fields>, java.io.Serializable, Cloneable, Comparable<partition_name_to_spec_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("partition_name_to_spec_result");
 
@@ -178917,10 +191405,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -178965,6 +191455,7 @@ public partition_name_to_spec_result(partition_name_to_spec_result other) {
       }
     }
 
+    @Override
     public partition_name_to_spec_result deepCopy() {
       return new partition_name_to_spec_result(this);
     }
@@ -179034,6 +191525,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -179056,6 +191548,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -179069,6 +191562,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -179164,10 +191658,12 @@ public int compareTo(partition_name_to_spec_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -179222,6 +191718,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class partition_name_to_spec_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_spec_resultStandardScheme getScheme() {
         return new partition_name_to_spec_resultStandardScheme();
       }
@@ -179229,54 +191726,61 @@ public partition_name_to_spec_resultStandardScheme getScheme() {
 
     private static class partition_name_to_spec_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<partition_name_to_spec_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, partition_name_to_spec_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.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map2140 = iprot.readMapBegin();
-                  struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2140.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key2141;
-                  @org.apache.thrift.annotation.Nullable java.lang.String _val2142;
-                  for (int _i2143 = 0; _i2143 < _map2140.size; ++_i2143)
+        iprot.incrementRecursionDepth();
+        try {
+          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.MAP) {
                   {
-                    _key2141 = iprot.readString();
-                    _val2142 = iprot.readString();
-                    struct.success.put(_key2141, _val2142);
+                    org.apache.thrift.protocol.TMap _map2140 = iprot.readMapBegin();
+                    struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2140.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key2141;
+                    @org.apache.thrift.annotation.Nullable java.lang.String _val2142;
+                    for (int _i2143 = 0; _i2143 < _map2140.size; ++_i2143)
+                    {
+                      _key2141 = iprot.readString();
+                      _val2142 = iprot.readString();
+                      struct.success.put(_key2141, _val2142);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_spec_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -179306,6 +191810,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, partition_name_to_
     }
 
     private static class partition_name_to_spec_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public partition_name_to_spec_resultTupleScheme getScheme() {
         return new partition_name_to_spec_resultTupleScheme();
       }
@@ -179341,27 +191846,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, partition_name_to_s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, partition_name_to_spec_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TMap _map2146 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-            struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2146.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key2147;
-            @org.apache.thrift.annotation.Nullable java.lang.String _val2148;
-            for (int _i2149 = 0; _i2149 < _map2146.size; ++_i2149)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _key2147 = iprot.readString();
-              _val2148 = iprot.readString();
-              struct.success.put(_key2147, _val2148);
+              org.apache.thrift.protocol.TMap _map2146 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+              struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2146.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key2147;
+              @org.apache.thrift.annotation.Nullable java.lang.String _val2148;
+              for (int _i2149 = 0; _i2149 < _map2146.size; ++_i2149)
+              {
+                _key2147 = iprot.readString();
+                _val2148 = iprot.readString();
+                struct.success.put(_key2147, _val2148);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -179371,6 +191881,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class markPartitionForEvent_args implements org.apache.thrift.TBase<markPartitionForEvent_args, markPartitionForEvent_args._Fields>, java.io.Serializable, Cloneable, Comparable<markPartitionForEvent_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("markPartitionForEvent_args");
 
@@ -179451,10 +191962,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -179513,6 +192026,7 @@ public markPartitionForEvent_args(markPartitionForEvent_args other) {
       }
     }
 
+    @Override
     public markPartitionForEvent_args deepCopy() {
       return new markPartitionForEvent_args(this);
     }
@@ -179640,6 +192154,7 @@ public void setEventTypeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -179678,6 +192193,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -179697,6 +192213,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -179842,14 +192359,17 @@ public int compareTo(markPartitionForEvent_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -179916,6 +192436,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class markPartitionForEvent_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public markPartitionForEvent_argsStandardScheme getScheme() {
         return new markPartitionForEvent_argsStandardScheme();
       }
@@ -179923,69 +192444,76 @@ public markPartitionForEvent_argsStandardScheme getScheme() {
 
     private static class markPartitionForEvent_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<markPartitionForEvent_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, markPartitionForEvent_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map2150 = iprot.readMapBegin();
-                  struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2150.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key2151;
-                  @org.apache.thrift.annotation.Nullable java.lang.String _val2152;
-                  for (int _i2153 = 0; _i2153 < _map2150.size; ++_i2153)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                   {
-                    _key2151 = iprot.readString();
-                    _val2152 = iprot.readString();
-                    struct.part_vals.put(_key2151, _val2152);
+                    org.apache.thrift.protocol.TMap _map2150 = iprot.readMapBegin();
+                    struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2150.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key2151;
+                    @org.apache.thrift.annotation.Nullable java.lang.String _val2152;
+                    for (int _i2153 = 0; _i2153 < _map2150.size; ++_i2153)
+                    {
+                      _key2151 = iprot.readString();
+                      _val2152 = iprot.readString();
+                      struct.part_vals.put(_key2151, _val2152);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // EVENT_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
-                struct.setEventTypeIsSet(true);
-              } else { 
+                break;
+              case 4: // EVENT_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
+                  struct.setEventTypeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, markPartitionForEvent_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -180025,6 +192553,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, markPartitionForEv
     }
 
     private static class markPartitionForEvent_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public markPartitionForEvent_argsTupleScheme getScheme() {
         return new markPartitionForEvent_argsTupleScheme();
       }
@@ -180072,34 +192601,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, markPartitionForEve
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, markPartitionForEvent_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TMap _map2156 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-            struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2156.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key2157;
-            @org.apache.thrift.annotation.Nullable java.lang.String _val2158;
-            for (int _i2159 = 0; _i2159 < _map2156.size; ++_i2159)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _key2157 = iprot.readString();
-              _val2158 = iprot.readString();
-              struct.part_vals.put(_key2157, _val2158);
+              org.apache.thrift.protocol.TMap _map2156 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+              struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2156.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key2157;
+              @org.apache.thrift.annotation.Nullable java.lang.String _val2158;
+              for (int _i2159 = 0; _i2159 < _map2156.size; ++_i2159)
+              {
+                _key2157 = iprot.readString();
+                _val2158 = iprot.readString();
+                struct.part_vals.put(_key2157, _val2158);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
-          struct.setEventTypeIsSet(true);
+          if (incoming.get(3)) {
+            struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
+            struct.setEventTypeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -180109,6 +192643,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class markPartitionForEvent_result implements org.apache.thrift.TBase<markPartitionForEvent_result, markPartitionForEvent_result._Fields>, java.io.Serializable, Cloneable, Comparable<markPartitionForEvent_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("markPartitionForEvent_result");
 
@@ -180195,10 +192730,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -180268,6 +192805,7 @@ public markPartitionForEvent_result(markPartitionForEvent_result other) {
       }
     }
 
+    @Override
     public markPartitionForEvent_result deepCopy() {
       return new markPartitionForEvent_result(this);
     }
@@ -180426,6 +192964,7 @@ public void setO6IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -180480,6 +193019,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -180505,6 +193045,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -180700,10 +193241,12 @@ public int compareTo(markPartitionForEvent_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -180790,6 +193333,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class markPartitionForEvent_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public markPartitionForEvent_resultStandardScheme getScheme() {
         return new markPartitionForEvent_resultStandardScheme();
       }
@@ -180797,79 +193341,86 @@ public markPartitionForEvent_resultStandardScheme getScheme() {
 
     private static class markPartitionForEvent_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<markPartitionForEvent_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, markPartitionForEvent_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 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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new UnknownTableException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // O5
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o5 = new UnknownPartitionException();
-                struct.o5.read(iprot);
-                struct.setO5IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 6: // O6
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o6 = new InvalidPartitionException();
-                struct.o6.read(iprot);
-                struct.setO6IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new UnknownTableException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // O5
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o5 = new UnknownPartitionException();
+                  struct.o5.read(iprot);
+                  struct.setO5IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 6: // O6
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o6 = new InvalidPartitionException();
+                  struct.o6.read(iprot);
+                  struct.setO6IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, markPartitionForEvent_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -180911,6 +193462,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, markPartitionForEv
     }
 
     private static class markPartitionForEvent_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public markPartitionForEvent_resultTupleScheme getScheme() {
         return new markPartitionForEvent_resultTupleScheme();
       }
@@ -180963,37 +193515,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, markPartitionForEve
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, markPartitionForEvent_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(6);
-        if (incoming.get(0)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new UnknownTableException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o5 = new UnknownPartitionException();
-          struct.o5.read(iprot);
-          struct.setO5IsSet(true);
-        }
-        if (incoming.get(5)) {
-          struct.o6 = new InvalidPartitionException();
-          struct.o6.read(iprot);
-          struct.setO6IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(6);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new UnknownTableException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o5 = new UnknownPartitionException();
+            struct.o5.read(iprot);
+            struct.setO5IsSet(true);
+          }
+          if (incoming.get(5)) {
+            struct.o6 = new InvalidPartitionException();
+            struct.o6.read(iprot);
+            struct.setO6IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -181003,6 +193560,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class isPartitionMarkedForEvent_args implements org.apache.thrift.TBase<isPartitionMarkedForEvent_args, isPartitionMarkedForEvent_args._Fields>, java.io.Serializable, Cloneable, Comparable<isPartitionMarkedForEvent_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isPartitionMarkedForEvent_args");
 
@@ -181083,10 +193641,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -181145,6 +193705,7 @@ public isPartitionMarkedForEvent_args(isPartitionMarkedForEvent_args other) {
       }
     }
 
+    @Override
     public isPartitionMarkedForEvent_args deepCopy() {
       return new isPartitionMarkedForEvent_args(this);
     }
@@ -181272,6 +193833,7 @@ public void setEventTypeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -181310,6 +193872,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -181329,6 +193892,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -181474,14 +194038,17 @@ public int compareTo(isPartitionMarkedForEvent_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -181548,6 +194115,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class isPartitionMarkedForEvent_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public isPartitionMarkedForEvent_argsStandardScheme getScheme() {
         return new isPartitionMarkedForEvent_argsStandardScheme();
       }
@@ -181555,69 +194123,76 @@ public isPartitionMarkedForEvent_argsStandardScheme getScheme() {
 
     private static class isPartitionMarkedForEvent_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<isPartitionMarkedForEvent_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, isPartitionMarkedForEvent_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PART_VALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map2160 = iprot.readMapBegin();
-                  struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2160.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key2161;
-                  @org.apache.thrift.annotation.Nullable java.lang.String _val2162;
-                  for (int _i2163 = 0; _i2163 < _map2160.size; ++_i2163)
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_VALS
+                if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                   {
-                    _key2161 = iprot.readString();
-                    _val2162 = iprot.readString();
-                    struct.part_vals.put(_key2161, _val2162);
+                    org.apache.thrift.protocol.TMap _map2160 = iprot.readMapBegin();
+                    struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2160.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key2161;
+                    @org.apache.thrift.annotation.Nullable java.lang.String _val2162;
+                    for (int _i2163 = 0; _i2163 < _map2160.size; ++_i2163)
+                    {
+                      _key2161 = iprot.readString();
+                      _val2162 = iprot.readString();
+                      struct.part_vals.put(_key2161, _val2162);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setPart_valsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setPart_valsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // EVENT_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
-                struct.setEventTypeIsSet(true);
-              } else { 
+                break;
+              case 4: // EVENT_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
+                  struct.setEventTypeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, isPartitionMarkedForEvent_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -181657,6 +194232,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, isPartitionMarkedF
     }
 
     private static class isPartitionMarkedForEvent_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public isPartitionMarkedForEvent_argsTupleScheme getScheme() {
         return new isPartitionMarkedForEvent_argsTupleScheme();
       }
@@ -181704,34 +194280,39 @@ public void write(org.apache.thrift.protocol.TProtocol prot, isPartitionMarkedFo
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, isPartitionMarkedForEvent_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TMap _map2166 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-            struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2166.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key2167;
-            @org.apache.thrift.annotation.Nullable java.lang.String _val2168;
-            for (int _i2169 = 0; _i2169 < _map2166.size; ++_i2169)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _key2167 = iprot.readString();
-              _val2168 = iprot.readString();
-              struct.part_vals.put(_key2167, _val2168);
+              org.apache.thrift.protocol.TMap _map2166 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+              struct.part_vals = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map2166.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key2167;
+              @org.apache.thrift.annotation.Nullable java.lang.String _val2168;
+              for (int _i2169 = 0; _i2169 < _map2166.size; ++_i2169)
+              {
+                _key2167 = iprot.readString();
+                _val2168 = iprot.readString();
+                struct.part_vals.put(_key2167, _val2168);
+              }
             }
+            struct.setPart_valsIsSet(true);
           }
-          struct.setPart_valsIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
-          struct.setEventTypeIsSet(true);
+          if (incoming.get(3)) {
+            struct.eventType = org.apache.hadoop.hive.metastore.api.PartitionEventType.findByValue(iprot.readI32());
+            struct.setEventTypeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -181741,6 +194322,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class isPartitionMarkedForEvent_result implements org.apache.thrift.TBase<isPartitionMarkedForEvent_result, isPartitionMarkedForEvent_result._Fields>, java.io.Serializable, Cloneable, Comparable<isPartitionMarkedForEvent_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isPartitionMarkedForEvent_result");
 
@@ -181832,10 +194414,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -181914,6 +194498,7 @@ public isPartitionMarkedForEvent_result(isPartitionMarkedForEvent_result other)
       }
     }
 
+    @Override
     public isPartitionMarkedForEvent_result deepCopy() {
       return new isPartitionMarkedForEvent_result(this);
     }
@@ -182096,6 +194681,7 @@ public void setO6IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -182158,6 +194744,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -182186,6 +194773,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -182404,10 +194992,12 @@ public int compareTo(isPartitionMarkedForEvent_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -182500,6 +195090,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class isPartitionMarkedForEvent_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public isPartitionMarkedForEvent_resultStandardScheme getScheme() {
         return new isPartitionMarkedForEvent_resultStandardScheme();
       }
@@ -182507,87 +195098,94 @@ public isPartitionMarkedForEvent_resultStandardScheme getScheme() {
 
     private static class isPartitionMarkedForEvent_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<isPartitionMarkedForEvent_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, isPartitionMarkedForEvent_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.BOOL) {
-                struct.success = iprot.readBool();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new UnknownDBException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new UnknownTableException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // O5
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o5 = new UnknownPartitionException();
-                struct.o5.read(iprot);
-                struct.setO5IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 6: // O6
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o6 = new InvalidPartitionException();
-                struct.o6.read(iprot);
-                struct.setO6IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new UnknownDBException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new UnknownTableException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // O5
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o5 = new UnknownPartitionException();
+                  struct.o5.read(iprot);
+                  struct.setO5IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 6: // O6
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o6 = new InvalidPartitionException();
+                  struct.o6.read(iprot);
+                  struct.setO6IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, isPartitionMarkedForEvent_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -182634,6 +195232,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, isPartitionMarkedF
     }
 
     private static class isPartitionMarkedForEvent_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public isPartitionMarkedForEvent_resultTupleScheme getScheme() {
         return new isPartitionMarkedForEvent_resultTupleScheme();
       }
@@ -182692,41 +195291,46 @@ public void write(org.apache.thrift.protocol.TProtocol prot, isPartitionMarkedFo
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, isPartitionMarkedForEvent_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(7);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          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);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new UnknownDBException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new UnknownTableException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
-        }
-        if (incoming.get(5)) {
-          struct.o5 = new UnknownPartitionException();
-          struct.o5.read(iprot);
-          struct.setO5IsSet(true);
-        }
-        if (incoming.get(6)) {
-          struct.o6 = new InvalidPartitionException();
-          struct.o6.read(iprot);
-          struct.setO6IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(7);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            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);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new UnknownDBException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new UnknownTableException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+          if (incoming.get(5)) {
+            struct.o5 = new UnknownPartitionException();
+            struct.o5.read(iprot);
+            struct.setO5IsSet(true);
+          }
+          if (incoming.get(6)) {
+            struct.o6 = new InvalidPartitionException();
+            struct.o6.read(iprot);
+            struct.setO6IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -182736,6 +195340,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_primary_keys_args implements org.apache.thrift.TBase<get_primary_keys_args, get_primary_keys_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_primary_keys_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_primary_keys_args");
 
@@ -182797,10 +195402,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -182835,6 +195442,7 @@ public get_primary_keys_args(get_primary_keys_args other) {
       }
     }
 
+    @Override
     public get_primary_keys_args deepCopy() {
       return new get_primary_keys_args(this);
     }
@@ -182868,6 +195476,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -182882,6 +195491,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -182892,6 +195502,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -182962,14 +195573,17 @@ public int compareTo(get_primary_keys_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -183015,6 +195629,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_primary_keys_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_primary_keys_argsStandardScheme getScheme() {
         return new get_primary_keys_argsStandardScheme();
       }
@@ -183022,34 +195637,41 @@ public get_primary_keys_argsStandardScheme getScheme() {
 
     private static class get_primary_keys_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_primary_keys_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_primary_keys_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new PrimaryKeysRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new PrimaryKeysRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_primary_keys_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -183066,6 +195688,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_primary_keys_a
     }
 
     private static class get_primary_keys_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_primary_keys_argsTupleScheme getScheme() {
         return new get_primary_keys_argsTupleScheme();
       }
@@ -183088,12 +195711,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_primary_keys_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_primary_keys_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 PrimaryKeysRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PrimaryKeysRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -183103,6 +195731,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_primary_keys_result implements org.apache.thrift.TBase<get_primary_keys_result, get_primary_keys_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_primary_keys_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_primary_keys_result");
 
@@ -183174,10 +195803,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -183226,6 +195857,7 @@ public get_primary_keys_result(get_primary_keys_result other) {
       }
     }
 
+    @Override
     public get_primary_keys_result deepCopy() {
       return new get_primary_keys_result(this);
     }
@@ -183309,6 +195941,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -183339,6 +195972,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -183355,6 +195989,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -183475,10 +196110,12 @@ public int compareTo(get_primary_keys_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -183544,6 +196181,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_primary_keys_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_primary_keys_resultStandardScheme getScheme() {
         return new get_primary_keys_resultStandardScheme();
       }
@@ -183551,52 +196189,59 @@ public get_primary_keys_resultStandardScheme getScheme() {
 
     private static class get_primary_keys_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_primary_keys_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_primary_keys_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 PrimaryKeysResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PrimaryKeysResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_primary_keys_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -183623,6 +196268,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_primary_keys_r
     }
 
     private static class get_primary_keys_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_primary_keys_resultTupleScheme getScheme() {
         return new get_primary_keys_resultTupleScheme();
       }
@@ -183657,22 +196303,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_primary_keys_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_primary_keys_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 PrimaryKeysResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 PrimaryKeysResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -183682,6 +196333,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_foreign_keys_args implements org.apache.thrift.TBase<get_foreign_keys_args, get_foreign_keys_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_foreign_keys_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_foreign_keys_args");
 
@@ -183743,10 +196395,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -183781,6 +196435,7 @@ public get_foreign_keys_args(get_foreign_keys_args other) {
       }
     }
 
+    @Override
     public get_foreign_keys_args deepCopy() {
       return new get_foreign_keys_args(this);
     }
@@ -183814,6 +196469,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -183828,6 +196484,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -183838,6 +196495,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -183908,14 +196566,17 @@ public int compareTo(get_foreign_keys_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -183961,6 +196622,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_foreign_keys_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_foreign_keys_argsStandardScheme getScheme() {
         return new get_foreign_keys_argsStandardScheme();
       }
@@ -183968,34 +196630,41 @@ public get_foreign_keys_argsStandardScheme getScheme() {
 
     private static class get_foreign_keys_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_foreign_keys_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_foreign_keys_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new ForeignKeysRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new ForeignKeysRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_foreign_keys_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -184012,6 +196681,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_foreign_keys_a
     }
 
     private static class get_foreign_keys_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_foreign_keys_argsTupleScheme getScheme() {
         return new get_foreign_keys_argsTupleScheme();
       }
@@ -184034,12 +196704,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_foreign_keys_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_foreign_keys_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 ForeignKeysRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ForeignKeysRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -184049,6 +196724,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_foreign_keys_result implements org.apache.thrift.TBase<get_foreign_keys_result, get_foreign_keys_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_foreign_keys_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_foreign_keys_result");
 
@@ -184120,10 +196796,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -184172,6 +196850,7 @@ public get_foreign_keys_result(get_foreign_keys_result other) {
       }
     }
 
+    @Override
     public get_foreign_keys_result deepCopy() {
       return new get_foreign_keys_result(this);
     }
@@ -184255,6 +196934,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -184285,6 +196965,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -184301,6 +196982,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -184421,10 +197103,12 @@ public int compareTo(get_foreign_keys_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -184490,6 +197174,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_foreign_keys_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_foreign_keys_resultStandardScheme getScheme() {
         return new get_foreign_keys_resultStandardScheme();
       }
@@ -184497,52 +197182,59 @@ public get_foreign_keys_resultStandardScheme getScheme() {
 
     private static class get_foreign_keys_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_foreign_keys_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_foreign_keys_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 ForeignKeysResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ForeignKeysResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_foreign_keys_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -184569,6 +197261,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_foreign_keys_r
     }
 
     private static class get_foreign_keys_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_foreign_keys_resultTupleScheme getScheme() {
         return new get_foreign_keys_resultTupleScheme();
       }
@@ -184603,22 +197296,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_foreign_keys_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_foreign_keys_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 ForeignKeysResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 ForeignKeysResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -184628,6 +197326,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_unique_constraints_args implements org.apache.thrift.TBase<get_unique_constraints_args, get_unique_constraints_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_unique_constraints_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_unique_constraints_args");
 
@@ -184689,10 +197388,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -184727,6 +197428,7 @@ public get_unique_constraints_args(get_unique_constraints_args other) {
       }
     }
 
+    @Override
     public get_unique_constraints_args deepCopy() {
       return new get_unique_constraints_args(this);
     }
@@ -184760,6 +197462,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -184774,6 +197477,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -184784,6 +197488,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -184854,14 +197559,17 @@ public int compareTo(get_unique_constraints_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -184907,6 +197615,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_unique_constraints_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_unique_constraints_argsStandardScheme getScheme() {
         return new get_unique_constraints_argsStandardScheme();
       }
@@ -184914,34 +197623,41 @@ public get_unique_constraints_argsStandardScheme getScheme() {
 
     private static class get_unique_constraints_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_unique_constraints_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_unique_constraints_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new UniqueConstraintsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new UniqueConstraintsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_unique_constraints_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -184958,6 +197674,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_unique_constra
     }
 
     private static class get_unique_constraints_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_unique_constraints_argsTupleScheme getScheme() {
         return new get_unique_constraints_argsTupleScheme();
       }
@@ -184980,12 +197697,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_unique_constrai
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_unique_constraints_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 UniqueConstraintsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 UniqueConstraintsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -184995,6 +197717,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_unique_constraints_result implements org.apache.thrift.TBase<get_unique_constraints_result, get_unique_constraints_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_unique_constraints_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_unique_constraints_result");
 
@@ -185066,10 +197789,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -185118,6 +197843,7 @@ public get_unique_constraints_result(get_unique_constraints_result other) {
       }
     }
 
+    @Override
     public get_unique_constraints_result deepCopy() {
       return new get_unique_constraints_result(this);
     }
@@ -185201,6 +197927,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -185231,6 +197958,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -185247,6 +197975,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -185367,10 +198096,12 @@ public int compareTo(get_unique_constraints_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -185436,6 +198167,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_unique_constraints_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_unique_constraints_resultStandardScheme getScheme() {
         return new get_unique_constraints_resultStandardScheme();
       }
@@ -185443,52 +198175,59 @@ public get_unique_constraints_resultStandardScheme getScheme() {
 
     private static class get_unique_constraints_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_unique_constraints_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_unique_constraints_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 UniqueConstraintsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 UniqueConstraintsResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_unique_constraints_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -185515,6 +198254,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_unique_constra
     }
 
     private static class get_unique_constraints_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_unique_constraints_resultTupleScheme getScheme() {
         return new get_unique_constraints_resultTupleScheme();
       }
@@ -185549,22 +198289,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_unique_constrai
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_unique_constraints_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 UniqueConstraintsResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 UniqueConstraintsResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -185574,6 +198319,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_not_null_constraints_args implements org.apache.thrift.TBase<get_not_null_constraints_args, get_not_null_constraints_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_not_null_constraints_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_not_null_constraints_args");
 
@@ -185635,10 +198381,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -185673,6 +198421,7 @@ public get_not_null_constraints_args(get_not_null_constraints_args other) {
       }
     }
 
+    @Override
     public get_not_null_constraints_args deepCopy() {
       return new get_not_null_constraints_args(this);
     }
@@ -185706,6 +198455,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -185720,6 +198470,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -185730,6 +198481,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -185800,14 +198552,17 @@ public int compareTo(get_not_null_constraints_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -185853,6 +198608,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_not_null_constraints_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_not_null_constraints_argsStandardScheme getScheme() {
         return new get_not_null_constraints_argsStandardScheme();
       }
@@ -185860,34 +198616,41 @@ public get_not_null_constraints_argsStandardScheme getScheme() {
 
     private static class get_not_null_constraints_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_not_null_constraints_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_not_null_constraints_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new NotNullConstraintsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new NotNullConstraintsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_not_null_constraints_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -185904,6 +198667,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_not_null_const
     }
 
     private static class get_not_null_constraints_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_not_null_constraints_argsTupleScheme getScheme() {
         return new get_not_null_constraints_argsTupleScheme();
       }
@@ -185926,12 +198690,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_not_null_constr
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_not_null_constraints_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 NotNullConstraintsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 NotNullConstraintsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -185941,6 +198710,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_not_null_constraints_result implements org.apache.thrift.TBase<get_not_null_constraints_result, get_not_null_constraints_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_not_null_constraints_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_not_null_constraints_result");
 
@@ -186012,10 +198782,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -186064,6 +198836,7 @@ public get_not_null_constraints_result(get_not_null_constraints_result other) {
       }
     }
 
+    @Override
     public get_not_null_constraints_result deepCopy() {
       return new get_not_null_constraints_result(this);
     }
@@ -186147,6 +198920,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -186177,6 +198951,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -186193,6 +198968,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -186313,10 +199089,12 @@ public int compareTo(get_not_null_constraints_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -186382,6 +199160,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_not_null_constraints_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_not_null_constraints_resultStandardScheme getScheme() {
         return new get_not_null_constraints_resultStandardScheme();
       }
@@ -186389,52 +199168,59 @@ public get_not_null_constraints_resultStandardScheme getScheme() {
 
     private static class get_not_null_constraints_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_not_null_constraints_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_not_null_constraints_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 NotNullConstraintsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 NotNullConstraintsResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_not_null_constraints_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -186461,6 +199247,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_not_null_const
     }
 
     private static class get_not_null_constraints_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_not_null_constraints_resultTupleScheme getScheme() {
         return new get_not_null_constraints_resultTupleScheme();
       }
@@ -186495,22 +199282,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_not_null_constr
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_not_null_constraints_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 NotNullConstraintsResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 NotNullConstraintsResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -186520,6 +199312,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_default_constraints_args implements org.apache.thrift.TBase<get_default_constraints_args, get_default_constraints_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_default_constraints_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_default_constraints_args");
 
@@ -186581,10 +199374,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -186619,6 +199414,7 @@ public get_default_constraints_args(get_default_constraints_args other) {
       }
     }
 
+    @Override
     public get_default_constraints_args deepCopy() {
       return new get_default_constraints_args(this);
     }
@@ -186652,6 +199448,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -186666,6 +199463,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -186676,6 +199474,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -186746,14 +199545,17 @@ public int compareTo(get_default_constraints_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -186799,6 +199601,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_default_constraints_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_default_constraints_argsStandardScheme getScheme() {
         return new get_default_constraints_argsStandardScheme();
       }
@@ -186806,34 +199609,41 @@ public get_default_constraints_argsStandardScheme getScheme() {
 
     private static class get_default_constraints_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_default_constraints_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_default_constraints_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new DefaultConstraintsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new DefaultConstraintsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_default_constraints_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -186850,6 +199660,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_default_constr
     }
 
     private static class get_default_constraints_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_default_constraints_argsTupleScheme getScheme() {
         return new get_default_constraints_argsTupleScheme();
       }
@@ -186872,12 +199683,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_default_constra
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_default_constraints_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 DefaultConstraintsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 DefaultConstraintsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -186887,6 +199703,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_default_constraints_result implements org.apache.thrift.TBase<get_default_constraints_result, get_default_constraints_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_default_constraints_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_default_constraints_result");
 
@@ -186958,10 +199775,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -187010,6 +199829,7 @@ public get_default_constraints_result(get_default_constraints_result other) {
       }
     }
 
+    @Override
     public get_default_constraints_result deepCopy() {
       return new get_default_constraints_result(this);
     }
@@ -187093,6 +199913,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -187123,6 +199944,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -187139,6 +199961,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -187259,10 +200082,12 @@ public int compareTo(get_default_constraints_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -187328,6 +200153,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_default_constraints_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_default_constraints_resultStandardScheme getScheme() {
         return new get_default_constraints_resultStandardScheme();
       }
@@ -187335,52 +200161,59 @@ public get_default_constraints_resultStandardScheme getScheme() {
 
     private static class get_default_constraints_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_default_constraints_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_default_constraints_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 DefaultConstraintsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 DefaultConstraintsResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_default_constraints_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -187407,6 +200240,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_default_constr
     }
 
     private static class get_default_constraints_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_default_constraints_resultTupleScheme getScheme() {
         return new get_default_constraints_resultTupleScheme();
       }
@@ -187441,22 +200275,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_default_constra
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_default_constraints_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 DefaultConstraintsResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 DefaultConstraintsResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -187466,6 +200305,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_check_constraints_args implements org.apache.thrift.TBase<get_check_constraints_args, get_check_constraints_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_check_constraints_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_check_constraints_args");
 
@@ -187527,10 +200367,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -187565,6 +200407,7 @@ public get_check_constraints_args(get_check_constraints_args other) {
       }
     }
 
+    @Override
     public get_check_constraints_args deepCopy() {
       return new get_check_constraints_args(this);
     }
@@ -187598,6 +200441,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -187612,6 +200456,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -187622,6 +200467,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -187692,14 +200538,17 @@ public int compareTo(get_check_constraints_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -187745,6 +200594,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_check_constraints_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_check_constraints_argsStandardScheme getScheme() {
         return new get_check_constraints_argsStandardScheme();
       }
@@ -187752,34 +200602,41 @@ public get_check_constraints_argsStandardScheme getScheme() {
 
     private static class get_check_constraints_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_check_constraints_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_check_constraints_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new CheckConstraintsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new CheckConstraintsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_check_constraints_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -187796,6 +200653,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_check_constrai
     }
 
     private static class get_check_constraints_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_check_constraints_argsTupleScheme getScheme() {
         return new get_check_constraints_argsTupleScheme();
       }
@@ -187818,12 +200676,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_check_constrain
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_check_constraints_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 CheckConstraintsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CheckConstraintsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -187833,6 +200696,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_check_constraints_result implements org.apache.thrift.TBase<get_check_constraints_result, get_check_constraints_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_check_constraints_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_check_constraints_result");
 
@@ -187904,10 +200768,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -187956,6 +200822,7 @@ public get_check_constraints_result(get_check_constraints_result other) {
       }
     }
 
+    @Override
     public get_check_constraints_result deepCopy() {
       return new get_check_constraints_result(this);
     }
@@ -188039,6 +200906,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -188069,6 +200937,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -188085,6 +200954,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -188205,10 +201075,12 @@ public int compareTo(get_check_constraints_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -188274,6 +201146,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_check_constraints_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_check_constraints_resultStandardScheme getScheme() {
         return new get_check_constraints_resultStandardScheme();
       }
@@ -188281,52 +201154,59 @@ public get_check_constraints_resultStandardScheme getScheme() {
 
     private static class get_check_constraints_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_check_constraints_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_check_constraints_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 CheckConstraintsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 CheckConstraintsResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_check_constraints_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -188353,6 +201233,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_check_constrai
     }
 
     private static class get_check_constraints_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_check_constraints_resultTupleScheme getScheme() {
         return new get_check_constraints_resultTupleScheme();
       }
@@ -188387,22 +201268,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_check_constrain
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_check_constraints_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 CheckConstraintsResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 CheckConstraintsResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -188412,6 +201298,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_table_constraints_args implements org.apache.thrift.TBase<get_all_table_constraints_args, get_all_table_constraints_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_table_constraints_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_table_constraints_args");
 
@@ -188473,10 +201360,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -188511,6 +201400,7 @@ public get_all_table_constraints_args(get_all_table_constraints_args other) {
       }
     }
 
+    @Override
     public get_all_table_constraints_args deepCopy() {
       return new get_all_table_constraints_args(this);
     }
@@ -188544,6 +201434,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -188558,6 +201449,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -188568,6 +201460,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -188638,14 +201531,17 @@ public int compareTo(get_all_table_constraints_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -188691,6 +201587,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_table_constraints_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_table_constraints_argsStandardScheme getScheme() {
         return new get_all_table_constraints_argsStandardScheme();
       }
@@ -188698,34 +201595,41 @@ public get_all_table_constraints_argsStandardScheme getScheme() {
 
     private static class get_all_table_constraints_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_table_constraints_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_table_constraints_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new AllTableConstraintsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new AllTableConstraintsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_table_constraints_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -188742,6 +201646,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_table_cons
     }
 
     private static class get_all_table_constraints_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_table_constraints_argsTupleScheme getScheme() {
         return new get_all_table_constraints_argsTupleScheme();
       }
@@ -188764,12 +201669,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_table_const
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_table_constraints_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 AllTableConstraintsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AllTableConstraintsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -188779,6 +201689,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_table_constraints_result implements org.apache.thrift.TBase<get_all_table_constraints_result, get_all_table_constraints_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_table_constraints_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_table_constraints_result");
 
@@ -188850,10 +201761,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -188902,6 +201815,7 @@ public get_all_table_constraints_result(get_all_table_constraints_result other)
       }
     }
 
+    @Override
     public get_all_table_constraints_result deepCopy() {
       return new get_all_table_constraints_result(this);
     }
@@ -188985,6 +201899,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -189015,6 +201930,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -189031,6 +201947,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -189151,10 +202068,12 @@ public int compareTo(get_all_table_constraints_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -189220,6 +202139,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_table_constraints_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_table_constraints_resultStandardScheme getScheme() {
         return new get_all_table_constraints_resultStandardScheme();
       }
@@ -189227,52 +202147,59 @@ public get_all_table_constraints_resultStandardScheme getScheme() {
 
     private static class get_all_table_constraints_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_table_constraints_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_table_constraints_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 AllTableConstraintsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AllTableConstraintsResponse();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_table_constraints_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -189299,6 +202226,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_table_cons
     }
 
     private static class get_all_table_constraints_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_table_constraints_resultTupleScheme getScheme() {
         return new get_all_table_constraints_resultTupleScheme();
       }
@@ -189333,22 +202261,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_table_const
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_table_constraints_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 AllTableConstraintsResponse();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 AllTableConstraintsResponse();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -189358,6 +202291,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_args implements org.apache.thrift.TBase<update_table_column_statistics_args, update_table_column_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_table_column_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_table_column_statistics_args");
 
@@ -189419,10 +202353,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -189457,6 +202393,7 @@ public update_table_column_statistics_args(update_table_column_statistics_args o
       }
     }
 
+    @Override
     public update_table_column_statistics_args deepCopy() {
       return new update_table_column_statistics_args(this);
     }
@@ -189490,6 +202427,7 @@ public void setStats_objIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case STATS_OBJ:
@@ -189504,6 +202442,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case STATS_OBJ:
@@ -189514,6 +202453,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -189584,14 +202524,17 @@ public int compareTo(update_table_column_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -189637,6 +202580,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_table_column_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_argsStandardScheme getScheme() {
         return new update_table_column_statistics_argsStandardScheme();
       }
@@ -189644,34 +202588,41 @@ public update_table_column_statistics_argsStandardScheme getScheme() {
 
     private static class update_table_column_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_table_column_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_table_column_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // STATS_OBJ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.stats_obj = new ColumnStatistics();
-                struct.stats_obj.read(iprot);
-                struct.setStats_objIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // STATS_OBJ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.stats_obj = new ColumnStatistics();
+                  struct.stats_obj.read(iprot);
+                  struct.setStats_objIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_column_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -189688,6 +202639,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_colum
     }
 
     private static class update_table_column_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_argsTupleScheme getScheme() {
         return new update_table_column_statistics_argsTupleScheme();
       }
@@ -189710,12 +202662,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_table_column
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_table_column_statistics_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.stats_obj = new ColumnStatistics();
-          struct.stats_obj.read(iprot);
-          struct.setStats_objIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.stats_obj = new ColumnStatistics();
+            struct.stats_obj.read(iprot);
+            struct.setStats_objIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -189725,6 +202682,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_result implements org.apache.thrift.TBase<update_table_column_statistics_result, update_table_column_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_table_column_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_table_column_statistics_result");
 
@@ -189806,10 +202764,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -189874,6 +202834,7 @@ public update_table_column_statistics_result(update_table_column_statistics_resu
       }
     }
 
+    @Override
     public update_table_column_statistics_result deepCopy() {
       return new update_table_column_statistics_result(this);
     }
@@ -190006,6 +202967,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -190052,6 +203014,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -190074,6 +203037,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -190242,10 +203206,12 @@ public int compareTo(update_table_column_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -190322,6 +203288,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_table_column_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_resultStandardScheme getScheme() {
         return new update_table_column_statistics_resultStandardScheme();
       }
@@ -190329,69 +203296,76 @@ public update_table_column_statistics_resultStandardScheme getScheme() {
 
     private static class update_table_column_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_table_column_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_table_column_statistics_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_column_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -190428,6 +203402,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_colum
     }
 
     private static class update_table_column_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_resultTupleScheme getScheme() {
         return new update_table_column_statistics_resultTupleScheme();
       }
@@ -190474,31 +203449,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_table_column
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_table_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -190508,6 +203488,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_args implements org.apache.thrift.TBase<update_partition_column_statistics_args, update_partition_column_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_partition_column_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_partition_column_statistics_args");
 
@@ -190569,10 +203550,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -190607,6 +203590,7 @@ public update_partition_column_statistics_args(update_partition_column_statistic
       }
     }
 
+    @Override
     public update_partition_column_statistics_args deepCopy() {
       return new update_partition_column_statistics_args(this);
     }
@@ -190640,6 +203624,7 @@ public void setStats_objIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case STATS_OBJ:
@@ -190654,6 +203639,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case STATS_OBJ:
@@ -190664,6 +203650,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -190734,14 +203721,17 @@ public int compareTo(update_partition_column_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -190787,6 +203777,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_partition_column_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_argsStandardScheme getScheme() {
         return new update_partition_column_statistics_argsStandardScheme();
       }
@@ -190794,34 +203785,41 @@ public update_partition_column_statistics_argsStandardScheme getScheme() {
 
     private static class update_partition_column_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_partition_column_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_partition_column_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // STATS_OBJ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.stats_obj = new ColumnStatistics();
-                struct.stats_obj.read(iprot);
-                struct.setStats_objIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // STATS_OBJ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.stats_obj = new ColumnStatistics();
+                  struct.stats_obj.read(iprot);
+                  struct.setStats_objIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_column_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -190838,6 +203836,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_c
     }
 
     private static class update_partition_column_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_argsTupleScheme getScheme() {
         return new update_partition_column_statistics_argsTupleScheme();
       }
@@ -190860,12 +203859,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_partition_co
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_partition_column_statistics_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.stats_obj = new ColumnStatistics();
-          struct.stats_obj.read(iprot);
-          struct.setStats_objIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.stats_obj = new ColumnStatistics();
+            struct.stats_obj.read(iprot);
+            struct.setStats_objIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -190875,6 +203879,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_result implements org.apache.thrift.TBase<update_partition_column_statistics_result, update_partition_column_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_partition_column_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_partition_column_statistics_result");
 
@@ -190956,10 +203961,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -191024,6 +204031,7 @@ public update_partition_column_statistics_result(update_partition_column_statist
       }
     }
 
+    @Override
     public update_partition_column_statistics_result deepCopy() {
       return new update_partition_column_statistics_result(this);
     }
@@ -191156,6 +204164,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -191202,6 +204211,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -191224,6 +204234,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -191392,10 +204403,12 @@ public int compareTo(update_partition_column_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -191472,6 +204485,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_partition_column_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_resultStandardScheme getScheme() {
         return new update_partition_column_statistics_resultStandardScheme();
       }
@@ -191479,69 +204493,76 @@ public update_partition_column_statistics_resultStandardScheme getScheme() {
 
     private static class update_partition_column_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_partition_column_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_partition_column_statistics_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_column_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -191578,6 +204599,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_c
     }
 
     private static class update_partition_column_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_resultTupleScheme getScheme() {
         return new update_partition_column_statistics_resultTupleScheme();
       }
@@ -191624,31 +204646,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_partition_co
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_partition_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -191658,6 +204685,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_req_args implements org.apache.thrift.TBase<update_table_column_statistics_req_args, update_table_column_statistics_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_table_column_statistics_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_table_column_statistics_req_args");
 
@@ -191719,10 +204747,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -191757,6 +204787,7 @@ public update_table_column_statistics_req_args(update_table_column_statistics_re
       }
     }
 
+    @Override
     public update_table_column_statistics_req_args deepCopy() {
       return new update_table_column_statistics_req_args(this);
     }
@@ -191790,6 +204821,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -191804,6 +204836,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -191814,6 +204847,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -191884,14 +204918,17 @@ public int compareTo(update_table_column_statistics_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -191937,6 +204974,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_table_column_statistics_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_req_argsStandardScheme getScheme() {
         return new update_table_column_statistics_req_argsStandardScheme();
       }
@@ -191944,34 +204982,41 @@ public update_table_column_statistics_req_argsStandardScheme getScheme() {
 
     private static class update_table_column_statistics_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_table_column_statistics_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_table_column_statistics_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new SetPartitionsStatsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new SetPartitionsStatsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_column_statistics_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -191988,6 +205033,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_colum
     }
 
     private static class update_table_column_statistics_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_req_argsTupleScheme getScheme() {
         return new update_table_column_statistics_req_argsTupleScheme();
       }
@@ -192010,12 +205056,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_table_column
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_table_column_statistics_req_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.req = new SetPartitionsStatsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new SetPartitionsStatsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -192025,6 +205076,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_table_column_statistics_req_result implements org.apache.thrift.TBase<update_table_column_statistics_req_result, update_table_column_statistics_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_table_column_statistics_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_table_column_statistics_req_result");
 
@@ -192106,10 +205158,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -192172,6 +205226,7 @@ public update_table_column_statistics_req_result(update_table_column_statistics_
       }
     }
 
+    @Override
     public update_table_column_statistics_req_result deepCopy() {
       return new update_table_column_statistics_req_result(this);
     }
@@ -192305,6 +205360,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -192351,6 +205407,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -192373,6 +205430,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -192543,10 +205601,12 @@ public int compareTo(update_table_column_statistics_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -192628,6 +205688,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_table_column_statistics_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_req_resultStandardScheme getScheme() {
         return new update_table_column_statistics_req_resultStandardScheme();
       }
@@ -192635,70 +205696,77 @@ public update_table_column_statistics_req_resultStandardScheme getScheme() {
 
     private static class update_table_column_statistics_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_table_column_statistics_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_table_column_statistics_req_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 SetPartitionsStatsResponse();
-                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 NoSuchObjectException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 SetPartitionsStatsResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_column_statistics_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -192735,6 +205803,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_table_colum
     }
 
     private static class update_table_column_statistics_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_table_column_statistics_req_resultTupleScheme getScheme() {
         return new update_table_column_statistics_req_resultTupleScheme();
       }
@@ -192781,32 +205850,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_table_column
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_table_column_statistics_req_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(5);
-        if (incoming.get(0)) {
-          struct.success = new SetPartitionsStatsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new SetPartitionsStatsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -192816,6 +205890,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_req_args implements org.apache.thrift.TBase<update_partition_column_statistics_req_args, update_partition_column_statistics_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_partition_column_statistics_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_partition_column_statistics_req_args");
 
@@ -192877,10 +205952,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -192915,6 +205992,7 @@ public update_partition_column_statistics_req_args(update_partition_column_stati
       }
     }
 
+    @Override
     public update_partition_column_statistics_req_args deepCopy() {
       return new update_partition_column_statistics_req_args(this);
     }
@@ -192948,6 +206026,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -192962,6 +206041,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -192972,6 +206052,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -193042,14 +206123,17 @@ public int compareTo(update_partition_column_statistics_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -193095,6 +206179,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_partition_column_statistics_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_req_argsStandardScheme getScheme() {
         return new update_partition_column_statistics_req_argsStandardScheme();
       }
@@ -193102,34 +206187,41 @@ public update_partition_column_statistics_req_argsStandardScheme getScheme() {
 
     private static class update_partition_column_statistics_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_partition_column_statistics_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_partition_column_statistics_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new SetPartitionsStatsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new SetPartitionsStatsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_column_statistics_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -193146,6 +206238,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_c
     }
 
     private static class update_partition_column_statistics_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_req_argsTupleScheme getScheme() {
         return new update_partition_column_statistics_req_argsTupleScheme();
       }
@@ -193168,12 +206261,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_partition_co
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_partition_column_statistics_req_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.req = new SetPartitionsStatsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new SetPartitionsStatsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -193183,6 +206281,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_partition_column_statistics_req_result implements org.apache.thrift.TBase<update_partition_column_statistics_req_result, update_partition_column_statistics_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_partition_column_statistics_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_partition_column_statistics_req_result");
 
@@ -193264,10 +206363,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -193330,6 +206431,7 @@ public update_partition_column_statistics_req_result(update_partition_column_sta
       }
     }
 
+    @Override
     public update_partition_column_statistics_req_result deepCopy() {
       return new update_partition_column_statistics_req_result(this);
     }
@@ -193463,6 +206565,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -193509,6 +206612,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -193531,6 +206635,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -193701,10 +206806,12 @@ public int compareTo(update_partition_column_statistics_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -193786,6 +206893,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_partition_column_statistics_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_req_resultStandardScheme getScheme() {
         return new update_partition_column_statistics_req_resultStandardScheme();
       }
@@ -193793,70 +206901,77 @@ public update_partition_column_statistics_req_resultStandardScheme getScheme() {
 
     private static class update_partition_column_statistics_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_partition_column_statistics_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_partition_column_statistics_req_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 SetPartitionsStatsResponse();
-                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 NoSuchObjectException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 SetPartitionsStatsResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_column_statistics_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -193893,6 +207008,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_partition_c
     }
 
     private static class update_partition_column_statistics_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_partition_column_statistics_req_resultTupleScheme getScheme() {
         return new update_partition_column_statistics_req_resultTupleScheme();
       }
@@ -193939,32 +207055,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_partition_co
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_partition_column_statistics_req_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(5);
-        if (incoming.get(0)) {
-          struct.success = new SetPartitionsStatsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new SetPartitionsStatsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -193974,6 +207095,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_transaction_statistics_args implements org.apache.thrift.TBase<update_transaction_statistics_args, update_transaction_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_transaction_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_transaction_statistics_args");
 
@@ -194035,10 +207157,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -194073,6 +207197,7 @@ public update_transaction_statistics_args(update_transaction_statistics_args oth
       }
     }
 
+    @Override
     public update_transaction_statistics_args deepCopy() {
       return new update_transaction_statistics_args(this);
     }
@@ -194106,6 +207231,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -194120,6 +207246,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -194130,6 +207257,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -194200,14 +207328,17 @@ public int compareTo(update_transaction_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -194253,6 +207384,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_transaction_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_transaction_statistics_argsStandardScheme getScheme() {
         return new update_transaction_statistics_argsStandardScheme();
       }
@@ -194260,34 +207392,41 @@ public update_transaction_statistics_argsStandardScheme getScheme() {
 
     private static class update_transaction_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_transaction_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_transaction_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new UpdateTransactionalStatsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new UpdateTransactionalStatsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_transaction_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -194304,6 +207443,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_transaction
     }
 
     private static class update_transaction_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_transaction_statistics_argsTupleScheme getScheme() {
         return new update_transaction_statistics_argsTupleScheme();
       }
@@ -194326,12 +207466,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_transaction_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_transaction_statistics_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.req = new UpdateTransactionalStatsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new UpdateTransactionalStatsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -194341,6 +207486,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_transaction_statistics_result implements org.apache.thrift.TBase<update_transaction_statistics_result, update_transaction_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_transaction_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_transaction_statistics_result");
 
@@ -194402,10 +207548,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -194440,6 +207588,7 @@ public update_transaction_statistics_result(update_transaction_statistics_result
       }
     }
 
+    @Override
     public update_transaction_statistics_result deepCopy() {
       return new update_transaction_statistics_result(this);
     }
@@ -194473,6 +207622,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -194487,6 +207637,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -194497,6 +207648,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -194567,10 +207719,12 @@ public int compareTo(update_transaction_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -194617,6 +207771,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_transaction_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_transaction_statistics_resultStandardScheme getScheme() {
         return new update_transaction_statistics_resultStandardScheme();
       }
@@ -194624,34 +207779,41 @@ public update_transaction_statistics_resultStandardScheme getScheme() {
 
     private static class update_transaction_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_transaction_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_transaction_statistics_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_transaction_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -194668,6 +207830,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_transaction
     }
 
     private static class update_transaction_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_transaction_statistics_resultTupleScheme getScheme() {
         return new update_transaction_statistics_resultTupleScheme();
       }
@@ -194690,12 +207853,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_transaction_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_transaction_statistics_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -194705,6 +207873,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_column_statistics_args implements org.apache.thrift.TBase<get_table_column_statistics_args, get_table_column_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_column_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_column_statistics_args");
 
@@ -194776,10 +207945,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -194828,6 +207999,7 @@ public get_table_column_statistics_args(get_table_column_statistics_args other)
       }
     }
 
+    @Override
     public get_table_column_statistics_args deepCopy() {
       return new get_table_column_statistics_args(this);
     }
@@ -194911,6 +208083,7 @@ public void setCol_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -194941,6 +208114,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -194957,6 +208131,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -195077,14 +208252,17 @@ public int compareTo(get_table_column_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -195143,6 +208321,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_column_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_column_statistics_argsStandardScheme getScheme() {
         return new get_table_column_statistics_argsStandardScheme();
       }
@@ -195150,49 +208329,56 @@ public get_table_column_statistics_argsStandardScheme getScheme() {
 
     private static class get_table_column_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_column_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_column_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // COL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.col_name = iprot.readString();
-                struct.setCol_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // COL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.col_name = iprot.readString();
+                  struct.setCol_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_column_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -195219,6 +208405,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_column_s
     }
 
     private static class get_table_column_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_column_statistics_argsTupleScheme getScheme() {
         return new get_table_column_statistics_argsTupleScheme();
       }
@@ -195253,19 +208440,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_column_st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_column_statistics_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);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.col_name = iprot.readString();
-          struct.setCol_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.col_name = iprot.readString();
+            struct.setCol_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -195275,6 +208467,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_column_statistics_result implements org.apache.thrift.TBase<get_table_column_statistics_result, get_table_column_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_column_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_column_statistics_result");
 
@@ -195356,10 +208549,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -195422,6 +208617,7 @@ public get_table_column_statistics_result(get_table_column_statistics_result oth
       }
     }
 
+    @Override
     public get_table_column_statistics_result deepCopy() {
       return new get_table_column_statistics_result(this);
     }
@@ -195555,6 +208751,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -195601,6 +208798,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -195623,6 +208821,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -195793,10 +208992,12 @@ public int compareTo(get_table_column_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -195878,6 +209079,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_column_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_column_statistics_resultStandardScheme getScheme() {
         return new get_table_column_statistics_resultStandardScheme();
       }
@@ -195885,70 +209087,77 @@ public get_table_column_statistics_resultStandardScheme getScheme() {
 
     private static class get_table_column_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_column_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_column_statistics_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 ColumnStatistics();
-                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 NoSuchObjectException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidInputException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ColumnStatistics();
+                  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 NoSuchObjectException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidInputException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_column_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -195985,6 +209194,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_column_s
     }
 
     private static class get_table_column_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_column_statistics_resultTupleScheme getScheme() {
         return new get_table_column_statistics_resultTupleScheme();
       }
@@ -196031,32 +209241,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_column_st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.success = new ColumnStatistics();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidInputException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new ColumnStatistics();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidInputException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -196066,6 +209281,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_column_statistics_args implements org.apache.thrift.TBase<get_partition_column_statistics_args, get_partition_column_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_column_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_column_statistics_args");
 
@@ -196142,10 +209358,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -196201,6 +209419,7 @@ public get_partition_column_statistics_args(get_partition_column_statistics_args
       }
     }
 
+    @Override
     public get_partition_column_statistics_args deepCopy() {
       return new get_partition_column_statistics_args(this);
     }
@@ -196309,6 +209528,7 @@ public void setCol_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -196347,6 +209567,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -196366,6 +209587,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -196511,14 +209733,17 @@ public int compareTo(get_partition_column_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -196585,6 +209810,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_column_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_column_statistics_argsStandardScheme getScheme() {
         return new get_partition_column_statistics_argsStandardScheme();
       }
@@ -196592,57 +209818,64 @@ public get_partition_column_statistics_argsStandardScheme getScheme() {
 
     private static class get_partition_column_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_column_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_column_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // COL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.col_name = iprot.readString();
-                struct.setCol_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // COL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.col_name = iprot.readString();
+                  struct.setCol_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_column_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -196674,6 +209907,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_colu
     }
 
     private static class get_partition_column_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_column_statistics_argsTupleScheme getScheme() {
         return new get_partition_column_statistics_argsTupleScheme();
       }
@@ -196714,23 +209948,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_colum
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_column_statistics_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.col_name = iprot.readString();
-          struct.setCol_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.col_name = iprot.readString();
+            struct.setCol_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -196740,6 +209979,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partition_column_statistics_result implements org.apache.thrift.TBase<get_partition_column_statistics_result, get_partition_column_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partition_column_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partition_column_statistics_result");
 
@@ -196821,10 +210061,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -196887,6 +210129,7 @@ public get_partition_column_statistics_result(get_partition_column_statistics_re
       }
     }
 
+    @Override
     public get_partition_column_statistics_result deepCopy() {
       return new get_partition_column_statistics_result(this);
     }
@@ -197020,6 +210263,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -197066,6 +210310,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -197088,6 +210333,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -197258,10 +210504,12 @@ public int compareTo(get_partition_column_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -197343,6 +210591,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partition_column_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_column_statistics_resultStandardScheme getScheme() {
         return new get_partition_column_statistics_resultStandardScheme();
       }
@@ -197350,70 +210599,77 @@ public get_partition_column_statistics_resultStandardScheme getScheme() {
 
     private static class get_partition_column_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partition_column_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partition_column_statistics_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 ColumnStatistics();
-                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 NoSuchObjectException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidInputException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ColumnStatistics();
+                  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 NoSuchObjectException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidInputException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_column_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -197450,6 +210706,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partition_colu
     }
 
     private static class get_partition_column_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partition_column_statistics_resultTupleScheme getScheme() {
         return new get_partition_column_statistics_resultTupleScheme();
       }
@@ -197496,32 +210753,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partition_colum
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partition_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.success = new ColumnStatistics();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidInputException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new ColumnStatistics();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidInputException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -197531,6 +210793,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_statistics_req_args implements org.apache.thrift.TBase<get_table_statistics_req_args, get_table_statistics_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_statistics_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_statistics_req_args");
 
@@ -197592,10 +210855,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -197630,6 +210895,7 @@ public get_table_statistics_req_args(get_table_statistics_req_args other) {
       }
     }
 
+    @Override
     public get_table_statistics_req_args deepCopy() {
       return new get_table_statistics_req_args(this);
     }
@@ -197663,6 +210929,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -197677,6 +210944,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -197687,6 +210955,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -197757,14 +211026,17 @@ public int compareTo(get_table_statistics_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -197810,6 +211082,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_statistics_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_statistics_req_argsStandardScheme getScheme() {
         return new get_table_statistics_req_argsStandardScheme();
       }
@@ -197817,34 +211090,41 @@ public get_table_statistics_req_argsStandardScheme getScheme() {
 
     private static class get_table_statistics_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_statistics_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_statistics_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new TableStatsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new TableStatsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_statistics_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -197861,6 +211141,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_statisti
     }
 
     private static class get_table_statistics_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_statistics_req_argsTupleScheme getScheme() {
         return new get_table_statistics_req_argsTupleScheme();
       }
@@ -197883,12 +211164,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_statistic
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_statistics_req_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 TableStatsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TableStatsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -197898,6 +211184,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_statistics_req_result implements org.apache.thrift.TBase<get_table_statistics_req_result, get_table_statistics_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_table_statistics_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_statistics_req_result");
 
@@ -197969,10 +211256,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -198021,6 +211310,7 @@ public get_table_statistics_req_result(get_table_statistics_req_result other) {
       }
     }
 
+    @Override
     public get_table_statistics_req_result deepCopy() {
       return new get_table_statistics_req_result(this);
     }
@@ -198104,6 +211394,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -198134,6 +211425,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -198150,6 +211442,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -198270,10 +211563,12 @@ public int compareTo(get_table_statistics_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -198339,6 +211634,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_table_statistics_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_statistics_req_resultStandardScheme getScheme() {
         return new get_table_statistics_req_resultStandardScheme();
       }
@@ -198346,52 +211642,59 @@ public get_table_statistics_req_resultStandardScheme getScheme() {
 
     private static class get_table_statistics_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_table_statistics_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_statistics_req_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 TableStatsResult();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 TableStatsResult();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_statistics_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -198418,6 +211721,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_statisti
     }
 
     private static class get_table_statistics_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_table_statistics_req_resultTupleScheme getScheme() {
         return new get_table_statistics_req_resultTupleScheme();
       }
@@ -198452,22 +211756,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_statistic
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_table_statistics_req_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 TableStatsResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 TableStatsResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -198477,6 +211786,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_statistics_req_args implements org.apache.thrift.TBase<get_partitions_statistics_req_args, get_partitions_statistics_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_statistics_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_statistics_req_args");
 
@@ -198538,10 +211848,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -198576,6 +211888,7 @@ public get_partitions_statistics_req_args(get_partitions_statistics_req_args oth
       }
     }
 
+    @Override
     public get_partitions_statistics_req_args deepCopy() {
       return new get_partitions_statistics_req_args(this);
     }
@@ -198609,6 +211922,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -198623,6 +211937,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -198633,6 +211948,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -198703,14 +212019,17 @@ public int compareTo(get_partitions_statistics_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -198756,6 +212075,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_statistics_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_statistics_req_argsStandardScheme getScheme() {
         return new get_partitions_statistics_req_argsStandardScheme();
       }
@@ -198763,34 +212083,41 @@ public get_partitions_statistics_req_argsStandardScheme getScheme() {
 
     private static class get_partitions_statistics_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_statistics_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_statistics_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new PartitionsStatsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new PartitionsStatsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_statistics_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -198807,6 +212134,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_sta
     }
 
     private static class get_partitions_statistics_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_statistics_req_argsTupleScheme getScheme() {
         return new get_partitions_statistics_req_argsTupleScheme();
       }
@@ -198829,12 +212157,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_stat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_statistics_req_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 PartitionsStatsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionsStatsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -198844,6 +212177,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_statistics_req_result implements org.apache.thrift.TBase<get_partitions_statistics_req_result, get_partitions_statistics_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_statistics_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_statistics_req_result");
 
@@ -198915,10 +212249,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -198967,6 +212303,7 @@ public get_partitions_statistics_req_result(get_partitions_statistics_req_result
       }
     }
 
+    @Override
     public get_partitions_statistics_req_result deepCopy() {
       return new get_partitions_statistics_req_result(this);
     }
@@ -199050,6 +212387,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -199080,6 +212418,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -199096,6 +212435,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -199216,10 +212556,12 @@ public int compareTo(get_partitions_statistics_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -199285,6 +212627,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_statistics_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_statistics_req_resultStandardScheme getScheme() {
         return new get_partitions_statistics_req_resultStandardScheme();
       }
@@ -199292,52 +212635,59 @@ public get_partitions_statistics_req_resultStandardScheme getScheme() {
 
     private static class get_partitions_statistics_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_statistics_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_statistics_req_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 PartitionsStatsResult();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PartitionsStatsResult();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_statistics_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -199364,6 +212714,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_sta
     }
 
     private static class get_partitions_statistics_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_statistics_req_resultTupleScheme getScheme() {
         return new get_partitions_statistics_req_resultTupleScheme();
       }
@@ -199398,22 +212749,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_stat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_statistics_req_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 PartitionsStatsResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionsStatsResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -199423,6 +212779,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_aggr_stats_for_args implements org.apache.thrift.TBase<get_aggr_stats_for_args, get_aggr_stats_for_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_aggr_stats_for_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_aggr_stats_for_args");
 
@@ -199484,10 +212841,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -199522,6 +212881,7 @@ public get_aggr_stats_for_args(get_aggr_stats_for_args other) {
       }
     }
 
+    @Override
     public get_aggr_stats_for_args deepCopy() {
       return new get_aggr_stats_for_args(this);
     }
@@ -199555,6 +212915,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -199569,6 +212930,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -199579,6 +212941,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -199649,14 +213012,17 @@ public int compareTo(get_aggr_stats_for_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -199702,6 +213068,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_aggr_stats_for_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_aggr_stats_for_argsStandardScheme getScheme() {
         return new get_aggr_stats_for_argsStandardScheme();
       }
@@ -199709,34 +213076,41 @@ public get_aggr_stats_for_argsStandardScheme getScheme() {
 
     private static class get_aggr_stats_for_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_aggr_stats_for_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_aggr_stats_for_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new PartitionsStatsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new PartitionsStatsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_aggr_stats_for_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -199753,6 +213127,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_aggr_stats_for
     }
 
     private static class get_aggr_stats_for_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_aggr_stats_for_argsTupleScheme getScheme() {
         return new get_aggr_stats_for_argsTupleScheme();
       }
@@ -199775,12 +213150,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_aggr_stats_for_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_aggr_stats_for_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 PartitionsStatsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PartitionsStatsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -199790,6 +213170,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_aggr_stats_for_result implements org.apache.thrift.TBase<get_aggr_stats_for_result, get_aggr_stats_for_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_aggr_stats_for_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_aggr_stats_for_result");
 
@@ -199861,10 +213242,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -199913,6 +213296,7 @@ public get_aggr_stats_for_result(get_aggr_stats_for_result other) {
       }
     }
 
+    @Override
     public get_aggr_stats_for_result deepCopy() {
       return new get_aggr_stats_for_result(this);
     }
@@ -199996,6 +213380,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -200026,6 +213411,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -200042,6 +213428,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -200162,10 +213549,12 @@ public int compareTo(get_aggr_stats_for_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -200231,6 +213620,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_aggr_stats_for_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_aggr_stats_for_resultStandardScheme getScheme() {
         return new get_aggr_stats_for_resultStandardScheme();
       }
@@ -200238,52 +213628,59 @@ public get_aggr_stats_for_resultStandardScheme getScheme() {
 
     private static class get_aggr_stats_for_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_aggr_stats_for_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_aggr_stats_for_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 AggrStats();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AggrStats();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_aggr_stats_for_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -200310,6 +213707,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_aggr_stats_for
     }
 
     private static class get_aggr_stats_for_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_aggr_stats_for_resultTupleScheme getScheme() {
         return new get_aggr_stats_for_resultTupleScheme();
       }
@@ -200344,22 +213742,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_aggr_stats_for_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_aggr_stats_for_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 AggrStats();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AggrStats();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -200369,6 +213772,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_aggr_stats_for_args implements org.apache.thrift.TBase<set_aggr_stats_for_args, set_aggr_stats_for_args._Fields>, java.io.Serializable, Cloneable, Comparable<set_aggr_stats_for_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_aggr_stats_for_args");
 
@@ -200430,10 +213834,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -200468,6 +213874,7 @@ public set_aggr_stats_for_args(set_aggr_stats_for_args other) {
       }
     }
 
+    @Override
     public set_aggr_stats_for_args deepCopy() {
       return new set_aggr_stats_for_args(this);
     }
@@ -200501,6 +213908,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -200515,6 +213923,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -200525,6 +213934,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -200595,14 +214005,17 @@ public int compareTo(set_aggr_stats_for_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -200648,6 +214061,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_aggr_stats_for_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_aggr_stats_for_argsStandardScheme getScheme() {
         return new set_aggr_stats_for_argsStandardScheme();
       }
@@ -200655,34 +214069,41 @@ public set_aggr_stats_for_argsStandardScheme getScheme() {
 
     private static class set_aggr_stats_for_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_aggr_stats_for_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_aggr_stats_for_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new SetPartitionsStatsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new SetPartitionsStatsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_aggr_stats_for_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -200699,6 +214120,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_aggr_stats_for
     }
 
     private static class set_aggr_stats_for_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_aggr_stats_for_argsTupleScheme getScheme() {
         return new set_aggr_stats_for_argsTupleScheme();
       }
@@ -200721,12 +214143,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_aggr_stats_for_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_aggr_stats_for_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 SetPartitionsStatsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SetPartitionsStatsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -200736,6 +214163,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_aggr_stats_for_result implements org.apache.thrift.TBase<set_aggr_stats_for_result, set_aggr_stats_for_result._Fields>, java.io.Serializable, Cloneable, Comparable<set_aggr_stats_for_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_aggr_stats_for_result");
 
@@ -200817,10 +214245,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -200885,6 +214315,7 @@ public set_aggr_stats_for_result(set_aggr_stats_for_result other) {
       }
     }
 
+    @Override
     public set_aggr_stats_for_result deepCopy() {
       return new set_aggr_stats_for_result(this);
     }
@@ -201017,6 +214448,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -201063,6 +214495,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -201085,6 +214518,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -201253,10 +214687,12 @@ public int compareTo(set_aggr_stats_for_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -201333,6 +214769,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_aggr_stats_for_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_aggr_stats_for_resultStandardScheme getScheme() {
         return new set_aggr_stats_for_resultStandardScheme();
       }
@@ -201340,69 +214777,76 @@ public set_aggr_stats_for_resultStandardScheme getScheme() {
 
     private static class set_aggr_stats_for_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_aggr_stats_for_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_aggr_stats_for_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_aggr_stats_for_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -201439,6 +214883,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_aggr_stats_for
     }
 
     private static class set_aggr_stats_for_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_aggr_stats_for_resultTupleScheme getScheme() {
         return new set_aggr_stats_for_resultTupleScheme();
       }
@@ -201485,31 +214930,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_aggr_stats_for_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_aggr_stats_for_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(5);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -201519,6 +214969,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_partition_column_statistics_args implements org.apache.thrift.TBase<delete_partition_column_statistics_args, delete_partition_column_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<delete_partition_column_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("delete_partition_column_statistics_args");
 
@@ -201600,10 +215051,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -201666,6 +215119,7 @@ public delete_partition_column_statistics_args(delete_partition_column_statistic
       }
     }
 
+    @Override
     public delete_partition_column_statistics_args deepCopy() {
       return new delete_partition_column_statistics_args(this);
     }
@@ -201799,6 +215253,7 @@ public void setEngineIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -201845,6 +215300,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -201867,6 +215323,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -202037,14 +215494,17 @@ public int compareTo(delete_partition_column_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -202119,6 +215579,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class delete_partition_column_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_partition_column_statistics_argsStandardScheme getScheme() {
         return new delete_partition_column_statistics_argsStandardScheme();
       }
@@ -202126,65 +215587,72 @@ public delete_partition_column_statistics_argsStandardScheme getScheme() {
 
     private static class delete_partition_column_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<delete_partition_column_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, delete_partition_column_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // PART_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.part_name = iprot.readString();
-                struct.setPart_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // COL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.col_name = iprot.readString();
-                struct.setCol_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 5: // ENGINE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.engine = iprot.readString();
-                struct.setEngineIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PART_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.part_name = iprot.readString();
+                  struct.setPart_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // COL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.col_name = iprot.readString();
+                  struct.setCol_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // ENGINE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.engine = iprot.readString();
+                  struct.setEngineIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, delete_partition_column_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -202221,6 +215689,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, delete_partition_c
     }
 
     private static class delete_partition_column_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_partition_column_statistics_argsTupleScheme getScheme() {
         return new delete_partition_column_statistics_argsTupleScheme();
       }
@@ -202267,27 +215736,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, delete_partition_co
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, delete_partition_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.part_name = iprot.readString();
-          struct.setPart_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.col_name = iprot.readString();
-          struct.setCol_nameIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.engine = iprot.readString();
-          struct.setEngineIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.part_name = iprot.readString();
+            struct.setPart_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.col_name = iprot.readString();
+            struct.setCol_nameIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.engine = iprot.readString();
+            struct.setEngineIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -202297,6 +215771,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_partition_column_statistics_result implements org.apache.thrift.TBase<delete_partition_column_statistics_result, delete_partition_column_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<delete_partition_column_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("delete_partition_column_statistics_result");
 
@@ -202378,10 +215853,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -202446,6 +215923,7 @@ public delete_partition_column_statistics_result(delete_partition_column_statist
       }
     }
 
+    @Override
     public delete_partition_column_statistics_result deepCopy() {
       return new delete_partition_column_statistics_result(this);
     }
@@ -202578,6 +216056,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -202624,6 +216103,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -202646,6 +216126,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -202814,10 +216295,12 @@ public int compareTo(delete_partition_column_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -202894,6 +216377,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class delete_partition_column_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_partition_column_statistics_resultStandardScheme getScheme() {
         return new delete_partition_column_statistics_resultStandardScheme();
       }
@@ -202901,69 +216385,76 @@ public delete_partition_column_statistics_resultStandardScheme getScheme() {
 
     private static class delete_partition_column_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<delete_partition_column_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, delete_partition_column_statistics_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, delete_partition_column_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -203000,6 +216491,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, delete_partition_c
     }
 
     private static class delete_partition_column_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_partition_column_statistics_resultTupleScheme getScheme() {
         return new delete_partition_column_statistics_resultTupleScheme();
       }
@@ -203046,31 +216538,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, delete_partition_co
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, delete_partition_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -203080,6 +216577,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_table_column_statistics_args implements org.apache.thrift.TBase<delete_table_column_statistics_args, delete_table_column_statistics_args._Fields>, java.io.Serializable, Cloneable, Comparable<delete_table_column_statistics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("delete_table_column_statistics_args");
 
@@ -203156,10 +216654,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -203215,6 +216715,7 @@ public delete_table_column_statistics_args(delete_table_column_statistics_args o
       }
     }
 
+    @Override
     public delete_table_column_statistics_args deepCopy() {
       return new delete_table_column_statistics_args(this);
     }
@@ -203323,6 +216824,7 @@ public void setEngineIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -203361,6 +216863,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -203380,6 +216883,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -203525,14 +217029,17 @@ public int compareTo(delete_table_column_statistics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -203599,6 +217106,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class delete_table_column_statistics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_table_column_statistics_argsStandardScheme getScheme() {
         return new delete_table_column_statistics_argsStandardScheme();
       }
@@ -203606,57 +217114,64 @@ public delete_table_column_statistics_argsStandardScheme getScheme() {
 
     private static class delete_table_column_statistics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<delete_table_column_statistics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, delete_table_column_statistics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.db_name = iprot.readString();
-                struct.setDb_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TBL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tbl_name = iprot.readString();
-                struct.setTbl_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // COL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.col_name = iprot.readString();
-                struct.setCol_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // ENGINE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.engine = iprot.readString();
-                struct.setEngineIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.db_name = iprot.readString();
+                  struct.setDb_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TBL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tbl_name = iprot.readString();
+                  struct.setTbl_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // COL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.col_name = iprot.readString();
+                  struct.setCol_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // ENGINE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.engine = iprot.readString();
+                  struct.setEngineIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, delete_table_column_statistics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -203688,6 +217203,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, delete_table_colum
     }
 
     private static class delete_table_column_statistics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_table_column_statistics_argsTupleScheme getScheme() {
         return new delete_table_column_statistics_argsTupleScheme();
       }
@@ -203728,23 +217244,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, delete_table_column
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, delete_table_column_statistics_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(4);
-        if (incoming.get(0)) {
-          struct.db_name = iprot.readString();
-          struct.setDb_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tbl_name = iprot.readString();
-          struct.setTbl_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.col_name = iprot.readString();
-          struct.setCol_nameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.engine = iprot.readString();
-          struct.setEngineIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.db_name = iprot.readString();
+            struct.setDb_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tbl_name = iprot.readString();
+            struct.setTbl_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.col_name = iprot.readString();
+            struct.setCol_nameIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.engine = iprot.readString();
+            struct.setEngineIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -203754,6 +217275,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_table_column_statistics_result implements org.apache.thrift.TBase<delete_table_column_statistics_result, delete_table_column_statistics_result._Fields>, java.io.Serializable, Cloneable, Comparable<delete_table_column_statistics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("delete_table_column_statistics_result");
 
@@ -203835,10 +217357,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -203903,6 +217427,7 @@ public delete_table_column_statistics_result(delete_table_column_statistics_resu
       }
     }
 
+    @Override
     public delete_table_column_statistics_result deepCopy() {
       return new delete_table_column_statistics_result(this);
     }
@@ -204035,6 +217560,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -204081,6 +217607,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -204103,6 +217630,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -204271,10 +217799,12 @@ public int compareTo(delete_table_column_statistics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -204351,6 +217881,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class delete_table_column_statistics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_table_column_statistics_resultStandardScheme getScheme() {
         return new delete_table_column_statistics_resultStandardScheme();
       }
@@ -204358,69 +217889,76 @@ public delete_table_column_statistics_resultStandardScheme getScheme() {
 
     private static class delete_table_column_statistics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<delete_table_column_statistics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, delete_table_column_statistics_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, delete_table_column_statistics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -204457,6 +217995,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, delete_table_colum
     }
 
     private static class delete_table_column_statistics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_table_column_statistics_resultTupleScheme getScheme() {
         return new delete_table_column_statistics_resultTupleScheme();
       }
@@ -204503,31 +218042,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, delete_table_column
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, delete_table_column_statistics_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(5);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -204537,6 +218081,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_column_statistics_req_args implements org.apache.thrift.TBase<delete_column_statistics_req_args, delete_column_statistics_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<delete_column_statistics_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("delete_column_statistics_req_args");
 
@@ -204598,10 +218143,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -204636,6 +218183,7 @@ public delete_column_statistics_req_args(delete_column_statistics_req_args other
       }
     }
 
+    @Override
     public delete_column_statistics_req_args deepCopy() {
       return new delete_column_statistics_req_args(this);
     }
@@ -204669,6 +218217,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -204683,6 +218232,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -204693,6 +218243,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -204763,14 +218314,17 @@ public int compareTo(delete_column_statistics_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -204816,6 +218370,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class delete_column_statistics_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_column_statistics_req_argsStandardScheme getScheme() {
         return new delete_column_statistics_req_argsStandardScheme();
       }
@@ -204823,34 +218378,41 @@ public delete_column_statistics_req_argsStandardScheme getScheme() {
 
     private static class delete_column_statistics_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<delete_column_statistics_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, delete_column_statistics_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new DeleteColumnStatisticsRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new DeleteColumnStatisticsRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, delete_column_statistics_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -204867,6 +218429,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, delete_column_stat
     }
 
     private static class delete_column_statistics_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_column_statistics_req_argsTupleScheme getScheme() {
         return new delete_column_statistics_req_argsTupleScheme();
       }
@@ -204889,12 +218452,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, delete_column_stati
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, delete_column_statistics_req_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.req = new DeleteColumnStatisticsRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new DeleteColumnStatisticsRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -204904,6 +218472,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class delete_column_statistics_req_result implements org.apache.thrift.TBase<delete_column_statistics_req_result, delete_column_statistics_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<delete_column_statistics_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("delete_column_statistics_req_result");
 
@@ -204985,10 +218554,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -205053,6 +218624,7 @@ public delete_column_statistics_req_result(delete_column_statistics_req_result o
       }
     }
 
+    @Override
     public delete_column_statistics_req_result deepCopy() {
       return new delete_column_statistics_req_result(this);
     }
@@ -205185,6 +218757,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -205231,6 +218804,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -205253,6 +218827,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -205421,10 +218996,12 @@ public int compareTo(delete_column_statistics_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -205501,6 +219078,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class delete_column_statistics_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_column_statistics_req_resultStandardScheme getScheme() {
         return new delete_column_statistics_req_resultStandardScheme();
       }
@@ -205508,69 +219086,76 @@ public delete_column_statistics_req_resultStandardScheme getScheme() {
 
     private static class delete_column_statistics_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<delete_column_statistics_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, delete_column_statistics_req_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.BOOL) {
-                struct.success = iprot.readBool();
-                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 NoSuchObjectException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  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 NoSuchObjectException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, delete_column_statistics_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -205607,6 +219192,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, delete_column_stat
     }
 
     private static class delete_column_statistics_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public delete_column_statistics_req_resultTupleScheme getScheme() {
         return new delete_column_statistics_req_resultTupleScheme();
       }
@@ -205653,31 +219239,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, delete_column_stati
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, delete_column_statistics_req_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(5);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -205687,6 +219278,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_function_args implements org.apache.thrift.TBase<create_function_args, create_function_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_function_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_function_args");
 
@@ -205748,10 +219340,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -205786,6 +219380,7 @@ public create_function_args(create_function_args other) {
       }
     }
 
+    @Override
     public create_function_args deepCopy() {
       return new create_function_args(this);
     }
@@ -205819,6 +219414,7 @@ public void setFuncIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case FUNC:
@@ -205833,6 +219429,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case FUNC:
@@ -205843,6 +219440,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -205913,14 +219511,17 @@ public int compareTo(create_function_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -205966,6 +219567,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_function_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_function_argsStandardScheme getScheme() {
         return new create_function_argsStandardScheme();
       }
@@ -205973,34 +219575,41 @@ public create_function_argsStandardScheme getScheme() {
 
     private static class create_function_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_function_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_function_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;
-          }
-          switch (schemeField.id) {
-            case 1: // FUNC
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.func = new Function();
-                struct.func.read(iprot);
-                struct.setFuncIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // FUNC
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.func = new Function();
+                  struct.func.read(iprot);
+                  struct.setFuncIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_function_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -206017,6 +219626,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_function_ar
     }
 
     private static class create_function_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_function_argsTupleScheme getScheme() {
         return new create_function_argsTupleScheme();
       }
@@ -206039,12 +219649,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_function_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_function_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.func = new Function();
-          struct.func.read(iprot);
-          struct.setFuncIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.func = new Function();
+            struct.func.read(iprot);
+            struct.setFuncIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -206054,6 +219669,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_function_result implements org.apache.thrift.TBase<create_function_result, create_function_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_function_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_function_result");
 
@@ -206130,10 +219746,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -206189,6 +219807,7 @@ public create_function_result(create_function_result other) {
       }
     }
 
+    @Override
     public create_function_result deepCopy() {
       return new create_function_result(this);
     }
@@ -206297,6 +219916,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -206335,6 +219955,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -206354,6 +219975,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -206499,10 +220121,12 @@ public int compareTo(create_function_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -206573,6 +220197,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_function_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_function_resultStandardScheme getScheme() {
         return new create_function_resultStandardScheme();
       }
@@ -206580,61 +220205,68 @@ public create_function_resultStandardScheme getScheme() {
 
     private static class create_function_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_function_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_function_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new NoSuchObjectException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new NoSuchObjectException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_function_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -206666,6 +220298,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_function_re
     }
 
     private static class create_function_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_function_resultTupleScheme getScheme() {
         return new create_function_resultTupleScheme();
       }
@@ -206706,27 +220339,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_function_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_function_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(4);
-        if (incoming.get(0)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new NoSuchObjectException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new NoSuchObjectException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -206736,6 +220374,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_function_args implements org.apache.thrift.TBase<drop_function_args, drop_function_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_function_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_function_args");
 
@@ -206802,10 +220441,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -206847,6 +220488,7 @@ public drop_function_args(drop_function_args other) {
       }
     }
 
+    @Override
     public drop_function_args deepCopy() {
       return new drop_function_args(this);
     }
@@ -206905,6 +220547,7 @@ public void setFuncNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -206927,6 +220570,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -206940,6 +220584,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -207035,14 +220680,17 @@ public int compareTo(drop_function_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -207093,6 +220741,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_function_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_function_argsStandardScheme getScheme() {
         return new drop_function_argsStandardScheme();
       }
@@ -207100,41 +220749,48 @@ public drop_function_argsStandardScheme getScheme() {
 
     private static class drop_function_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_function_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_function_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // FUNC_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.funcName = iprot.readString();
-                struct.setFuncNameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // FUNC_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.funcName = iprot.readString();
+                  struct.setFuncNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_function_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -207156,6 +220812,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_function_args
     }
 
     private static class drop_function_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_function_argsTupleScheme getScheme() {
         return new drop_function_argsTupleScheme();
       }
@@ -207184,15 +220841,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_function_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_function_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);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.funcName = iprot.readString();
-          struct.setFuncNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+          if (incoming.get(1)) {
+            struct.funcName = iprot.readString();
+            struct.setFuncNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -207202,6 +220864,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_function_result implements org.apache.thrift.TBase<drop_function_result, drop_function_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_function_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_function_result");
 
@@ -207268,10 +220931,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -207313,6 +220978,7 @@ public drop_function_result(drop_function_result other) {
       }
     }
 
+    @Override
     public drop_function_result deepCopy() {
       return new drop_function_result(this);
     }
@@ -207371,6 +221037,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -207393,6 +221060,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -207406,6 +221074,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -207501,10 +221170,12 @@ public int compareTo(drop_function_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -207559,6 +221230,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_function_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_function_resultStandardScheme getScheme() {
         return new drop_function_resultStandardScheme();
       }
@@ -207566,43 +221238,50 @@ public drop_function_resultStandardScheme getScheme() {
 
     private static class drop_function_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_function_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_function_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 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: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_function_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -207624,6 +221303,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_function_resu
     }
 
     private static class drop_function_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_function_resultTupleScheme getScheme() {
         return new drop_function_resultTupleScheme();
       }
@@ -207652,17 +221332,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_function_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_function_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -207672,6 +221357,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_function_args implements org.apache.thrift.TBase<alter_function_args, alter_function_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_function_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_function_args");
 
@@ -207743,10 +221429,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -207795,6 +221483,7 @@ public alter_function_args(alter_function_args other) {
       }
     }
 
+    @Override
     public alter_function_args deepCopy() {
       return new alter_function_args(this);
     }
@@ -207878,6 +221567,7 @@ public void setNewFuncIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -207908,6 +221598,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -207924,6 +221615,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -208044,14 +221736,17 @@ public int compareTo(alter_function_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -208113,6 +221808,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_function_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_function_argsStandardScheme getScheme() {
         return new alter_function_argsStandardScheme();
       }
@@ -208120,50 +221816,57 @@ public alter_function_argsStandardScheme getScheme() {
 
     private static class alter_function_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_function_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_function_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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: // FUNC_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.funcName = iprot.readString();
-                struct.setFuncNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // NEW_FUNC
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.newFunc = new Function();
-                struct.newFunc.read(iprot);
-                struct.setNewFuncIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // FUNC_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.funcName = iprot.readString();
+                  struct.setFuncNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // NEW_FUNC
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.newFunc = new Function();
+                  struct.newFunc.read(iprot);
+                  struct.setNewFuncIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_function_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -208190,6 +221893,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_function_arg
     }
 
     private static class alter_function_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_function_argsTupleScheme getScheme() {
         return new alter_function_argsTupleScheme();
       }
@@ -208224,20 +221928,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_function_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_function_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);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.funcName = iprot.readString();
-          struct.setFuncNameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.newFunc = new Function();
-          struct.newFunc.read(iprot);
-          struct.setNewFuncIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbName = iprot.readString();
+            struct.setDbNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.funcName = iprot.readString();
+            struct.setFuncNameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.newFunc = new Function();
+            struct.newFunc.read(iprot);
+            struct.setNewFuncIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -208247,6 +221956,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_function_result implements org.apache.thrift.TBase<alter_function_result, alter_function_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_function_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_function_result");
 
@@ -208313,10 +222023,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -208358,6 +222070,7 @@ public alter_function_result(alter_function_result other) {
       }
     }
 
+    @Override
     public alter_function_result deepCopy() {
       return new alter_function_result(this);
     }
@@ -208416,6 +222129,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -208438,6 +222152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -208451,6 +222166,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -208546,10 +222262,12 @@ public int compareTo(alter_function_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -208604,6 +222322,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_function_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_function_resultStandardScheme getScheme() {
         return new alter_function_resultStandardScheme();
       }
@@ -208611,43 +222330,50 @@ public alter_function_resultStandardScheme getScheme() {
 
     private static class alter_function_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_function_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_function_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new InvalidOperationException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_function_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -208669,6 +222395,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_function_res
     }
 
     private static class alter_function_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_function_resultTupleScheme getScheme() {
         return new alter_function_resultTupleScheme();
       }
@@ -208697,17 +222424,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_function_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_function_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.o1 = new InvalidOperationException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new InvalidOperationException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -208717,6 +222449,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_args implements org.apache.thrift.TBase<get_functions_args, get_functions_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_functions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_functions_args");
 
@@ -208783,10 +222516,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -208828,6 +222563,7 @@ public get_functions_args(get_functions_args other) {
       }
     }
 
+    @Override
     public get_functions_args deepCopy() {
       return new get_functions_args(this);
     }
@@ -208886,6 +222622,7 @@ public void setPatternIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -208908,6 +222645,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -208921,6 +222659,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -209016,14 +222755,17 @@ public int compareTo(get_functions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -209074,6 +222816,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_functions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_argsStandardScheme getScheme() {
         return new get_functions_argsStandardScheme();
       }
@@ -209081,41 +222824,48 @@ public get_functions_argsStandardScheme getScheme() {
 
     private static class get_functions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_functions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_functions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // PATTERN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.pattern = iprot.readString();
-                struct.setPatternIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // PATTERN
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.pattern = iprot.readString();
+                  struct.setPatternIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -209137,6 +222887,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_args
     }
 
     private static class get_functions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_argsTupleScheme getScheme() {
         return new get_functions_argsTupleScheme();
       }
@@ -209165,15 +222916,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_functions_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_functions_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);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.pattern = iprot.readString();
-          struct.setPatternIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+          if (incoming.get(1)) {
+            struct.pattern = iprot.readString();
+            struct.setPatternIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -209183,6 +222939,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_result implements org.apache.thrift.TBase<get_functions_result, get_functions_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_functions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_functions_result");
 
@@ -209249,10 +223006,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -209296,6 +223055,7 @@ public get_functions_result(get_functions_result other) {
       }
     }
 
+    @Override
     public get_functions_result deepCopy() {
       return new get_functions_result(this);
     }
@@ -209370,6 +223130,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -209392,6 +223153,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -209405,6 +223167,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -209500,10 +223263,12 @@ public int compareTo(get_functions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -209558,6 +223323,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_functions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_resultStandardScheme getScheme() {
         return new get_functions_resultStandardScheme();
       }
@@ -209565,52 +223331,59 @@ public get_functions_resultStandardScheme getScheme() {
 
     private static class get_functions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_functions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_functions_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2170 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2170.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2171;
-                  for (int _i2172 = 0; _i2172 < _list2170.size; ++_i2172)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2171 = iprot.readString();
-                    struct.success.add(_elem2171);
+                    org.apache.thrift.protocol.TList _list2170 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2170.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2171;
+                    for (int _i2172 = 0; _i2172 < _list2170.size; ++_i2172)
+                    {
+                      _elem2171 = iprot.readString();
+                      struct.success.add(_elem2171);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -209639,6 +223412,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_resu
     }
 
     private static class get_functions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_resultTupleScheme getScheme() {
         return new get_functions_resultTupleScheme();
       }
@@ -209673,25 +223447,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_functions_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_functions_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2175 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2175.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2176;
-            for (int _i2177 = 0; _i2177 < _list2175.size; ++_i2177)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2176 = iprot.readString();
-              struct.success.add(_elem2176);
+              org.apache.thrift.protocol.TList _list2175 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2175.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2176;
+              for (int _i2177 = 0; _i2177 < _list2175.size; ++_i2177)
+              {
+                _elem2176 = iprot.readString();
+                struct.success.add(_elem2176);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -209701,6 +223480,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_req_args implements org.apache.thrift.TBase<get_functions_req_args, get_functions_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_functions_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_functions_req_args");
 
@@ -209762,10 +223542,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -209800,6 +223582,7 @@ public get_functions_req_args(get_functions_req_args other) {
       }
     }
 
+    @Override
     public get_functions_req_args deepCopy() {
       return new get_functions_req_args(this);
     }
@@ -209833,6 +223616,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -209847,6 +223631,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -209857,6 +223642,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -209927,14 +223713,17 @@ public int compareTo(get_functions_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -209980,6 +223769,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_functions_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_req_argsStandardScheme getScheme() {
         return new get_functions_req_argsStandardScheme();
       }
@@ -209987,34 +223777,41 @@ public get_functions_req_argsStandardScheme getScheme() {
 
     private static class get_functions_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_functions_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_functions_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetFunctionsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetFunctionsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -210031,6 +223828,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_req_
     }
 
     private static class get_functions_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_req_argsTupleScheme getScheme() {
         return new get_functions_req_argsTupleScheme();
       }
@@ -210053,12 +223851,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_functions_req_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_functions_req_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 GetFunctionsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetFunctionsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -210068,6 +223871,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_functions_req_result implements org.apache.thrift.TBase<get_functions_req_result, get_functions_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_functions_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_functions_req_result");
 
@@ -210134,10 +223938,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -210179,6 +223985,7 @@ public get_functions_req_result(get_functions_req_result other) {
       }
     }
 
+    @Override
     public get_functions_req_result deepCopy() {
       return new get_functions_req_result(this);
     }
@@ -210237,6 +224044,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -210259,6 +224067,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -210272,6 +224081,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -210367,10 +224177,12 @@ public int compareTo(get_functions_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -210428,6 +224240,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_functions_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_req_resultStandardScheme getScheme() {
         return new get_functions_req_resultStandardScheme();
       }
@@ -210435,43 +224248,50 @@ public get_functions_req_resultStandardScheme getScheme() {
 
     private static class get_functions_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_functions_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_functions_req_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 GetFunctionsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetFunctionsResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -210493,6 +224313,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_functions_req_
     }
 
     private static class get_functions_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_functions_req_resultTupleScheme getScheme() {
         return new get_functions_req_resultTupleScheme();
       }
@@ -210521,17 +224342,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_functions_req_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_functions_req_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.success = new GetFunctionsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetFunctionsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -210541,6 +224367,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_function_args implements org.apache.thrift.TBase<get_function_args, get_function_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_function_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_function_args");
 
@@ -210607,10 +224434,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -210652,6 +224481,7 @@ public get_function_args(get_function_args other) {
       }
     }
 
+    @Override
     public get_function_args deepCopy() {
       return new get_function_args(this);
     }
@@ -210710,6 +224540,7 @@ public void setFuncNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -210732,6 +224563,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -210745,6 +224577,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -210840,14 +224673,17 @@ public int compareTo(get_function_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -210898,6 +224734,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_function_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_function_argsStandardScheme getScheme() {
         return new get_function_argsStandardScheme();
       }
@@ -210905,41 +224742,48 @@ public get_function_argsStandardScheme getScheme() {
 
     private static class get_function_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_function_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_function_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // FUNC_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.funcName = iprot.readString();
-                struct.setFuncNameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // FUNC_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.funcName = iprot.readString();
+                  struct.setFuncNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_function_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -210961,6 +224805,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_function_args
     }
 
     private static class get_function_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_function_argsTupleScheme getScheme() {
         return new get_function_argsTupleScheme();
       }
@@ -210989,15 +224834,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_function_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_function_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);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.funcName = iprot.readString();
-          struct.setFuncNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+          if (incoming.get(1)) {
+            struct.funcName = iprot.readString();
+            struct.setFuncNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -211007,6 +224857,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_function_result implements org.apache.thrift.TBase<get_function_result, get_function_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_function_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_function_result");
 
@@ -211078,10 +224929,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -211130,6 +224983,7 @@ public get_function_result(get_function_result other) {
       }
     }
 
+    @Override
     public get_function_result deepCopy() {
       return new get_function_result(this);
     }
@@ -211213,6 +225067,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -211243,6 +225098,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -211259,6 +225115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -211379,10 +225236,12 @@ public int compareTo(get_function_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -211448,6 +225307,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_function_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_function_resultStandardScheme getScheme() {
         return new get_function_resultStandardScheme();
       }
@@ -211455,52 +225315,59 @@ public get_function_resultStandardScheme getScheme() {
 
     private static class get_function_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_function_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_function_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 Function();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 Function();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_function_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -211527,6 +225394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_function_resul
     }
 
     private static class get_function_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_function_resultTupleScheme getScheme() {
         return new get_function_resultTupleScheme();
       }
@@ -211561,22 +225429,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_function_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_function_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 Function();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 Function();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -211586,6 +225459,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_functions_args implements org.apache.thrift.TBase<get_all_functions_args, get_all_functions_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_functions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_functions_args");
 
@@ -211643,10 +225517,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -211667,6 +225543,7 @@ public get_all_functions_args() {
     public get_all_functions_args(get_all_functions_args other) {
     }
 
+    @Override
     public get_all_functions_args deepCopy() {
       return new get_all_functions_args(this);
     }
@@ -211675,12 +225552,14 @@ public get_all_functions_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -211688,6 +225567,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -211733,14 +225613,17 @@ public int compareTo(get_all_functions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -211776,6 +225659,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_functions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_functions_argsStandardScheme getScheme() {
         return new get_all_functions_argsStandardScheme();
       }
@@ -211783,25 +225667,32 @@ public get_all_functions_argsStandardScheme getScheme() {
 
     private static class get_all_functions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_functions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_functions_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_functions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -211813,6 +225704,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_functions_
     }
 
     private static class get_all_functions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_functions_argsTupleScheme getScheme() {
         return new get_all_functions_argsTupleScheme();
       }
@@ -211827,7 +225719,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_functions_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_functions_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -211836,6 +225733,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_functions_result implements org.apache.thrift.TBase<get_all_functions_result, get_all_functions_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_functions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_functions_result");
 
@@ -211902,10 +225800,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -211947,6 +225847,7 @@ public get_all_functions_result(get_all_functions_result other) {
       }
     }
 
+    @Override
     public get_all_functions_result deepCopy() {
       return new get_all_functions_result(this);
     }
@@ -212005,6 +225906,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -212027,6 +225929,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -212040,6 +225943,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -212135,10 +226039,12 @@ public int compareTo(get_all_functions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -212196,6 +226102,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_functions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_functions_resultStandardScheme getScheme() {
         return new get_all_functions_resultStandardScheme();
       }
@@ -212203,43 +226110,50 @@ public get_all_functions_resultStandardScheme getScheme() {
 
     private static class get_all_functions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_functions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_functions_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 GetAllFunctionsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetAllFunctionsResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_functions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -212261,6 +226175,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_functions_
     }
 
     private static class get_all_functions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_functions_resultTupleScheme getScheme() {
         return new get_all_functions_resultTupleScheme();
       }
@@ -212289,17 +226204,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_functions_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_functions_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.success = new GetAllFunctionsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetAllFunctionsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -212309,6 +226229,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_role_args implements org.apache.thrift.TBase<create_role_args, create_role_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_role_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_role_args");
 
@@ -212370,10 +226291,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -212408,6 +226331,7 @@ public create_role_args(create_role_args other) {
       }
     }
 
+    @Override
     public create_role_args deepCopy() {
       return new create_role_args(this);
     }
@@ -212441,6 +226365,7 @@ public void setRoleIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ROLE:
@@ -212455,6 +226380,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ROLE:
@@ -212465,6 +226391,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -212535,14 +226462,17 @@ public int compareTo(create_role_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -212588,6 +226518,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_role_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_role_argsStandardScheme getScheme() {
         return new create_role_argsStandardScheme();
       }
@@ -212595,34 +226526,41 @@ public create_role_argsStandardScheme getScheme() {
 
     private static class create_role_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_role_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_role_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;
-          }
-          switch (schemeField.id) {
-            case 1: // ROLE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.role = new Role();
-                struct.role.read(iprot);
-                struct.setRoleIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // ROLE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.role = new Role();
+                  struct.role.read(iprot);
+                  struct.setRoleIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_role_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -212639,6 +226577,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_role_args s
     }
 
     private static class create_role_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_role_argsTupleScheme getScheme() {
         return new create_role_argsTupleScheme();
       }
@@ -212661,12 +226600,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_role_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_role_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.role = new Role();
-          struct.role.read(iprot);
-          struct.setRoleIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.role = new Role();
+            struct.role.read(iprot);
+            struct.setRoleIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -212676,6 +226620,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_role_result implements org.apache.thrift.TBase<create_role_result, create_role_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_role_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_role_result");
 
@@ -212742,10 +226687,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -212789,6 +226736,7 @@ public create_role_result(create_role_result other) {
       }
     }
 
+    @Override
     public create_role_result deepCopy() {
       return new create_role_result(this);
     }
@@ -212846,6 +226794,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -212868,6 +226817,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -212881,6 +226831,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -212974,10 +226925,12 @@ public int compareTo(create_role_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -213030,6 +226983,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_role_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_role_resultStandardScheme getScheme() {
         return new create_role_resultStandardScheme();
       }
@@ -213037,42 +226991,49 @@ public create_role_resultStandardScheme getScheme() {
 
     private static class create_role_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_role_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_role_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_role_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -213094,6 +227055,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_role_result
     }
 
     private static class create_role_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_role_resultTupleScheme getScheme() {
         return new create_role_resultTupleScheme();
       }
@@ -213122,16 +227084,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_role_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_role_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -213141,6 +227108,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_role_args implements org.apache.thrift.TBase<drop_role_args, drop_role_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_role_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_role_args");
 
@@ -213202,10 +227170,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -213240,6 +227210,7 @@ public drop_role_args(drop_role_args other) {
       }
     }
 
+    @Override
     public drop_role_args deepCopy() {
       return new drop_role_args(this);
     }
@@ -213273,6 +227244,7 @@ public void setRole_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ROLE_NAME:
@@ -213287,6 +227259,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ROLE_NAME:
@@ -213297,6 +227270,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -213367,14 +227341,17 @@ public int compareTo(drop_role_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -213417,6 +227394,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_role_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_role_argsStandardScheme getScheme() {
         return new drop_role_argsStandardScheme();
       }
@@ -213424,33 +227402,40 @@ public drop_role_argsStandardScheme getScheme() {
 
     private static class drop_role_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_role_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_role_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;
-          }
-          switch (schemeField.id) {
-            case 1: // ROLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.role_name = iprot.readString();
-                struct.setRole_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // ROLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.role_name = iprot.readString();
+                  struct.setRole_nameIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_role_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -213467,6 +227452,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_role_args str
     }
 
     private static class drop_role_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_role_argsTupleScheme getScheme() {
         return new drop_role_argsTupleScheme();
       }
@@ -213489,11 +227475,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_role_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_role_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.role_name = iprot.readString();
-          struct.setRole_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.role_name = iprot.readString();
+            struct.setRole_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -213503,6 +227494,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_role_result implements org.apache.thrift.TBase<drop_role_result, drop_role_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_role_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_role_result");
 
@@ -213569,10 +227561,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -213616,6 +227610,7 @@ public drop_role_result(drop_role_result other) {
       }
     }
 
+    @Override
     public drop_role_result deepCopy() {
       return new drop_role_result(this);
     }
@@ -213673,6 +227668,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -213695,6 +227691,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -213708,6 +227705,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -213801,10 +227799,12 @@ public int compareTo(drop_role_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -213857,6 +227857,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_role_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_role_resultStandardScheme getScheme() {
         return new drop_role_resultStandardScheme();
       }
@@ -213864,42 +227865,49 @@ public drop_role_resultStandardScheme getScheme() {
 
     private static class drop_role_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_role_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_role_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_role_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -213921,6 +227929,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_role_result s
     }
 
     private static class drop_role_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_role_resultTupleScheme getScheme() {
         return new drop_role_resultTupleScheme();
       }
@@ -213949,16 +227958,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_role_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_role_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -213968,6 +227982,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_names_args implements org.apache.thrift.TBase<get_role_names_args, get_role_names_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_role_names_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_role_names_args");
 
@@ -214025,10 +228040,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -214049,6 +228066,7 @@ public get_role_names_args() {
     public get_role_names_args(get_role_names_args other) {
     }
 
+    @Override
     public get_role_names_args deepCopy() {
       return new get_role_names_args(this);
     }
@@ -214057,12 +228075,14 @@ public get_role_names_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -214070,6 +228090,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -214115,14 +228136,17 @@ public int compareTo(get_role_names_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -214158,6 +228182,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_role_names_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_names_argsStandardScheme getScheme() {
         return new get_role_names_argsStandardScheme();
       }
@@ -214165,25 +228190,32 @@ public get_role_names_argsStandardScheme getScheme() {
 
     private static class get_role_names_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_role_names_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_role_names_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_names_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -214195,6 +228227,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_names_arg
     }
 
     private static class get_role_names_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_names_argsTupleScheme getScheme() {
         return new get_role_names_argsTupleScheme();
       }
@@ -214209,7 +228242,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_role_names_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_role_names_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -214218,6 +228256,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_names_result implements org.apache.thrift.TBase<get_role_names_result, get_role_names_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_role_names_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_role_names_result");
 
@@ -214284,10 +228323,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -214331,6 +228372,7 @@ public get_role_names_result(get_role_names_result other) {
       }
     }
 
+    @Override
     public get_role_names_result deepCopy() {
       return new get_role_names_result(this);
     }
@@ -214405,6 +228447,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -214427,6 +228470,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -214440,6 +228484,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -214535,10 +228580,12 @@ public int compareTo(get_role_names_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -214593,6 +228640,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_role_names_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_names_resultStandardScheme getScheme() {
         return new get_role_names_resultStandardScheme();
       }
@@ -214600,52 +228648,59 @@ public get_role_names_resultStandardScheme getScheme() {
 
     private static class get_role_names_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_role_names_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_role_names_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2178 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2178.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2179;
-                  for (int _i2180 = 0; _i2180 < _list2178.size; ++_i2180)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2179 = iprot.readString();
-                    struct.success.add(_elem2179);
+                    org.apache.thrift.protocol.TList _list2178 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2178.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2179;
+                    for (int _i2180 = 0; _i2180 < _list2178.size; ++_i2180)
+                    {
+                      _elem2179 = iprot.readString();
+                      struct.success.add(_elem2179);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_names_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -214674,6 +228729,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_names_res
     }
 
     private static class get_role_names_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_names_resultTupleScheme getScheme() {
         return new get_role_names_resultTupleScheme();
       }
@@ -214708,25 +228764,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_role_names_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_role_names_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2183 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2183.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2184;
-            for (int _i2185 = 0; _i2185 < _list2183.size; ++_i2185)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2184 = iprot.readString();
-              struct.success.add(_elem2184);
+              org.apache.thrift.protocol.TList _list2183 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2183.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2184;
+              for (int _i2185 = 0; _i2185 < _list2183.size; ++_i2185)
+              {
+                _elem2184 = iprot.readString();
+                struct.success.add(_elem2184);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -214736,6 +228797,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_role_args implements org.apache.thrift.TBase<grant_role_args, grant_role_args._Fields>, java.io.Serializable, Cloneable, Comparable<grant_role_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_role_args");
 
@@ -214830,10 +228892,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -214905,6 +228969,7 @@ public grant_role_args(grant_role_args other) {
       this.grant_option = other.grant_option;
     }
 
+    @Override
     public grant_role_args deepCopy() {
       return new grant_role_args(this);
     }
@@ -215078,6 +229143,7 @@ public void setGrant_optionIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __GRANT_OPTION_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ROLE_NAME:
@@ -215132,6 +229198,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ROLE_NAME:
@@ -215157,6 +229224,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -215350,14 +229418,17 @@ public int compareTo(grant_role_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -215438,6 +229509,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_role_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_role_argsStandardScheme getScheme() {
         return new grant_role_argsStandardScheme();
       }
@@ -215445,73 +229517,80 @@ public grant_role_argsStandardScheme getScheme() {
 
     private static class grant_role_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_role_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_role_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;
-          }
-          switch (schemeField.id) {
-            case 1: // ROLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.role_name = iprot.readString();
-                struct.setRole_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // PRINCIPAL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.principal_name = iprot.readString();
-                struct.setPrincipal_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // PRINCIPAL_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-                struct.setPrincipal_typeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // GRANTOR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.grantor = iprot.readString();
-                struct.setGrantorIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // GRANTOR_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-                struct.setGrantorTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 6: // GRANT_OPTION
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.grant_option = iprot.readBool();
-                struct.setGrant_optionIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // ROLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.role_name = iprot.readString();
+                  struct.setRole_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PRINCIPAL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.principal_name = iprot.readString();
+                  struct.setPrincipal_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PRINCIPAL_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                  struct.setPrincipal_typeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // GRANTOR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.grantor = iprot.readString();
+                  struct.setGrantorIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 5: // GRANTOR_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                  struct.setGrantorTypeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 6: // GRANT_OPTION
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.grant_option = iprot.readBool();
+                  struct.setGrant_optionIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_role_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -215551,6 +229630,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_role_args st
     }
 
     private static class grant_role_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_role_argsTupleScheme getScheme() {
         return new grant_role_argsTupleScheme();
       }
@@ -215603,31 +229683,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_role_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_role_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(6);
-        if (incoming.get(0)) {
-          struct.role_name = iprot.readString();
-          struct.setRole_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.principal_name = iprot.readString();
-          struct.setPrincipal_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-          struct.setPrincipal_typeIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.grantor = iprot.readString();
-          struct.setGrantorIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-          struct.setGrantorTypeIsSet(true);
-        }
-        if (incoming.get(5)) {
-          struct.grant_option = iprot.readBool();
-          struct.setGrant_optionIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(6);
+          if (incoming.get(0)) {
+            struct.role_name = iprot.readString();
+            struct.setRole_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.principal_name = iprot.readString();
+            struct.setPrincipal_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+            struct.setPrincipal_typeIsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.grantor = iprot.readString();
+            struct.setGrantorIsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+            struct.setGrantorTypeIsSet(true);
+          }
+          if (incoming.get(5)) {
+            struct.grant_option = iprot.readBool();
+            struct.setGrant_optionIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -215637,6 +229722,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_role_result implements org.apache.thrift.TBase<grant_role_result, grant_role_result._Fields>, java.io.Serializable, Cloneable, Comparable<grant_role_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_role_result");
 
@@ -215703,10 +229789,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -215750,6 +229838,7 @@ public grant_role_result(grant_role_result other) {
       }
     }
 
+    @Override
     public grant_role_result deepCopy() {
       return new grant_role_result(this);
     }
@@ -215807,6 +229896,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -215829,6 +229919,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -215842,6 +229933,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -215935,10 +230027,12 @@ public int compareTo(grant_role_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -215991,6 +230085,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_role_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_role_resultStandardScheme getScheme() {
         return new grant_role_resultStandardScheme();
       }
@@ -215998,42 +230093,49 @@ public grant_role_resultStandardScheme getScheme() {
 
     private static class grant_role_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_role_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_role_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_role_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -216055,6 +230157,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_role_result
     }
 
     private static class grant_role_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_role_resultTupleScheme getScheme() {
         return new grant_role_resultTupleScheme();
       }
@@ -216083,16 +230186,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_role_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_role_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -216102,6 +230210,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_role_args implements org.apache.thrift.TBase<revoke_role_args, revoke_role_args._Fields>, java.io.Serializable, Cloneable, Comparable<revoke_role_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("revoke_role_args");
 
@@ -216177,10 +230286,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -216229,6 +230340,7 @@ public revoke_role_args(revoke_role_args other) {
       }
     }
 
+    @Override
     public revoke_role_args deepCopy() {
       return new revoke_role_args(this);
     }
@@ -216320,6 +230432,7 @@ public void setPrincipal_typeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case ROLE_NAME:
@@ -216350,6 +230463,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case ROLE_NAME:
@@ -216366,6 +230480,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -216486,14 +230601,17 @@ public int compareTo(revoke_role_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -216552,6 +230670,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class revoke_role_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_role_argsStandardScheme getScheme() {
         return new revoke_role_argsStandardScheme();
       }
@@ -216559,49 +230678,56 @@ public revoke_role_argsStandardScheme getScheme() {
 
     private static class revoke_role_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<revoke_role_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, revoke_role_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;
-          }
-          switch (schemeField.id) {
-            case 1: // ROLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.role_name = iprot.readString();
-                struct.setRole_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // PRINCIPAL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.principal_name = iprot.readString();
-                struct.setPrincipal_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // PRINCIPAL_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-                struct.setPrincipal_typeIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // ROLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.role_name = iprot.readString();
+                  struct.setRole_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PRINCIPAL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.principal_name = iprot.readString();
+                  struct.setPrincipal_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // PRINCIPAL_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                  struct.setPrincipal_typeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_role_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -216628,6 +230754,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_role_args s
     }
 
     private static class revoke_role_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_role_argsTupleScheme getScheme() {
         return new revoke_role_argsTupleScheme();
       }
@@ -216662,19 +230789,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, revoke_role_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, revoke_role_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);
-        if (incoming.get(0)) {
-          struct.role_name = iprot.readString();
-          struct.setRole_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.principal_name = iprot.readString();
-          struct.setPrincipal_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-          struct.setPrincipal_typeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.role_name = iprot.readString();
+            struct.setRole_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.principal_name = iprot.readString();
+            struct.setPrincipal_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+            struct.setPrincipal_typeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -216684,6 +230816,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_role_result implements org.apache.thrift.TBase<revoke_role_result, revoke_role_result._Fields>, java.io.Serializable, Cloneable, Comparable<revoke_role_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("revoke_role_result");
 
@@ -216750,10 +230883,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -216797,6 +230932,7 @@ public revoke_role_result(revoke_role_result other) {
       }
     }
 
+    @Override
     public revoke_role_result deepCopy() {
       return new revoke_role_result(this);
     }
@@ -216854,6 +230990,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -216876,6 +231013,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -216889,6 +231027,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -216982,10 +231121,12 @@ public int compareTo(revoke_role_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -217038,6 +231179,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class revoke_role_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_role_resultStandardScheme getScheme() {
         return new revoke_role_resultStandardScheme();
       }
@@ -217045,42 +231187,49 @@ public revoke_role_resultStandardScheme getScheme() {
 
     private static class revoke_role_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<revoke_role_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, revoke_role_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_role_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -217102,6 +231251,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_role_result
     }
 
     private static class revoke_role_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_role_resultTupleScheme getScheme() {
         return new revoke_role_resultTupleScheme();
       }
@@ -217130,16 +231280,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, revoke_role_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, revoke_role_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -217149,6 +231304,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_roles_args implements org.apache.thrift.TBase<list_roles_args, list_roles_args._Fields>, java.io.Serializable, Cloneable, Comparable<list_roles_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("list_roles_args");
 
@@ -217219,10 +231375,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -217264,6 +231422,7 @@ public list_roles_args(list_roles_args other) {
       }
     }
 
+    @Override
     public list_roles_args deepCopy() {
       return new list_roles_args(this);
     }
@@ -217330,6 +231489,7 @@ public void setPrincipal_typeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PRINCIPAL_NAME:
@@ -217352,6 +231512,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PRINCIPAL_NAME:
@@ -217365,6 +231526,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -217460,14 +231622,17 @@ public int compareTo(list_roles_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -217518,6 +231683,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class list_roles_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_roles_argsStandardScheme getScheme() {
         return new list_roles_argsStandardScheme();
       }
@@ -217525,41 +231691,48 @@ public list_roles_argsStandardScheme getScheme() {
 
     private static class list_roles_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<list_roles_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, list_roles_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PRINCIPAL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.principal_name = iprot.readString();
-                struct.setPrincipal_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // PRINCIPAL_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-                struct.setPrincipal_typeIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // PRINCIPAL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.principal_name = iprot.readString();
+                  struct.setPrincipal_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PRINCIPAL_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                  struct.setPrincipal_typeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, list_roles_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -217581,6 +231754,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, list_roles_args st
     }
 
     private static class list_roles_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_roles_argsTupleScheme getScheme() {
         return new list_roles_argsTupleScheme();
       }
@@ -217609,15 +231783,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, list_roles_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, list_roles_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);
-        if (incoming.get(0)) {
-          struct.principal_name = iprot.readString();
-          struct.setPrincipal_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-          struct.setPrincipal_typeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.principal_name = iprot.readString();
+            struct.setPrincipal_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+            struct.setPrincipal_typeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -217627,6 +231806,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_roles_result implements org.apache.thrift.TBase<list_roles_result, list_roles_result._Fields>, java.io.Serializable, Cloneable, Comparable<list_roles_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("list_roles_result");
 
@@ -217693,10 +231873,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -217743,6 +231925,7 @@ public list_roles_result(list_roles_result other) {
       }
     }
 
+    @Override
     public list_roles_result deepCopy() {
       return new list_roles_result(this);
     }
@@ -217817,6 +232000,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -217839,6 +232023,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -217852,6 +232037,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -217947,10 +232133,12 @@ public int compareTo(list_roles_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -218005,6 +232193,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class list_roles_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_roles_resultStandardScheme getScheme() {
         return new list_roles_resultStandardScheme();
       }
@@ -218012,53 +232201,60 @@ public list_roles_resultStandardScheme getScheme() {
 
     private static class list_roles_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<list_roles_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, list_roles_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2186 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<Role>(_list2186.size);
-                  @org.apache.thrift.annotation.Nullable Role _elem2187;
-                  for (int _i2188 = 0; _i2188 < _list2186.size; ++_i2188)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2187 = new Role();
-                    _elem2187.read(iprot);
-                    struct.success.add(_elem2187);
+                    org.apache.thrift.protocol.TList _list2186 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<Role>(_list2186.size);
+                    @org.apache.thrift.annotation.Nullable Role _elem2187;
+                    for (int _i2188 = 0; _i2188 < _list2186.size; ++_i2188)
+                    {
+                      _elem2187 = new Role();
+                      _elem2187.read(iprot);
+                      struct.success.add(_elem2187);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, list_roles_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -218087,6 +232283,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, list_roles_result
     }
 
     private static class list_roles_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_roles_resultTupleScheme getScheme() {
         return new list_roles_resultTupleScheme();
       }
@@ -218121,26 +232318,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, list_roles_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, list_roles_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2191 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<Role>(_list2191.size);
-            @org.apache.thrift.annotation.Nullable Role _elem2192;
-            for (int _i2193 = 0; _i2193 < _list2191.size; ++_i2193)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2192 = new Role();
-              _elem2192.read(iprot);
-              struct.success.add(_elem2192);
+              org.apache.thrift.protocol.TList _list2191 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<Role>(_list2191.size);
+              @org.apache.thrift.annotation.Nullable Role _elem2192;
+              for (int _i2193 = 0; _i2193 < _list2191.size; ++_i2193)
+              {
+                _elem2192 = new Role();
+                _elem2192.read(iprot);
+                struct.success.add(_elem2192);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -218150,6 +232352,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_role_args implements org.apache.thrift.TBase<grant_revoke_role_args, grant_revoke_role_args._Fields>, java.io.Serializable, Cloneable, Comparable<grant_revoke_role_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_revoke_role_args");
 
@@ -218211,10 +232414,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -218249,6 +232454,7 @@ public grant_revoke_role_args(grant_revoke_role_args other) {
       }
     }
 
+    @Override
     public grant_revoke_role_args deepCopy() {
       return new grant_revoke_role_args(this);
     }
@@ -218282,6 +232488,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -218296,6 +232503,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -218306,6 +232514,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -218376,14 +232585,17 @@ public int compareTo(grant_revoke_role_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -218429,6 +232641,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_revoke_role_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_role_argsStandardScheme getScheme() {
         return new grant_revoke_role_argsStandardScheme();
       }
@@ -218436,34 +232649,41 @@ public grant_revoke_role_argsStandardScheme getScheme() {
 
     private static class grant_revoke_role_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_revoke_role_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_revoke_role_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GrantRevokeRoleRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GrantRevokeRoleRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_role_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -218480,6 +232700,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_role_
     }
 
     private static class grant_revoke_role_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_role_argsTupleScheme getScheme() {
         return new grant_revoke_role_argsTupleScheme();
       }
@@ -218502,12 +232723,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_revoke_role_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_revoke_role_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 GrantRevokeRoleRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GrantRevokeRoleRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -218517,6 +232743,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_role_result implements org.apache.thrift.TBase<grant_revoke_role_result, grant_revoke_role_result._Fields>, java.io.Serializable, Cloneable, Comparable<grant_revoke_role_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_revoke_role_result");
 
@@ -218583,10 +232810,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -218628,6 +232857,7 @@ public grant_revoke_role_result(grant_revoke_role_result other) {
       }
     }
 
+    @Override
     public grant_revoke_role_result deepCopy() {
       return new grant_revoke_role_result(this);
     }
@@ -218686,6 +232916,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -218708,6 +232939,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -218721,6 +232953,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -218816,10 +233049,12 @@ public int compareTo(grant_revoke_role_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -218877,6 +233112,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_revoke_role_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_role_resultStandardScheme getScheme() {
         return new grant_revoke_role_resultStandardScheme();
       }
@@ -218884,43 +233120,50 @@ public grant_revoke_role_resultStandardScheme getScheme() {
 
     private static class grant_revoke_role_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_revoke_role_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_revoke_role_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 GrantRevokeRoleResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GrantRevokeRoleResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_role_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -218942,6 +233185,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_role_
     }
 
     private static class grant_revoke_role_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_role_resultTupleScheme getScheme() {
         return new grant_revoke_role_resultTupleScheme();
       }
@@ -218970,17 +233214,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_revoke_role_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_revoke_role_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.success = new GrantRevokeRoleResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GrantRevokeRoleResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -218990,6 +233239,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_principals_in_role_args implements org.apache.thrift.TBase<get_principals_in_role_args, get_principals_in_role_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_principals_in_role_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_principals_in_role_args");
 
@@ -219051,10 +233301,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -219089,6 +233341,7 @@ public get_principals_in_role_args(get_principals_in_role_args other) {
       }
     }
 
+    @Override
     public get_principals_in_role_args deepCopy() {
       return new get_principals_in_role_args(this);
     }
@@ -219122,6 +233375,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -219136,6 +233390,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -219146,6 +233401,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -219216,14 +233472,17 @@ public int compareTo(get_principals_in_role_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -219269,6 +233528,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_principals_in_role_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_principals_in_role_argsStandardScheme getScheme() {
         return new get_principals_in_role_argsStandardScheme();
       }
@@ -219276,34 +233536,41 @@ public get_principals_in_role_argsStandardScheme getScheme() {
 
     private static class get_principals_in_role_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_principals_in_role_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_principals_in_role_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetPrincipalsInRoleRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetPrincipalsInRoleRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_principals_in_role_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -219320,6 +233587,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_principals_in_
     }
 
     private static class get_principals_in_role_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_principals_in_role_argsTupleScheme getScheme() {
         return new get_principals_in_role_argsTupleScheme();
       }
@@ -219342,12 +233610,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_principals_in_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_principals_in_role_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 GetPrincipalsInRoleRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetPrincipalsInRoleRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -219357,6 +233630,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_principals_in_role_result implements org.apache.thrift.TBase<get_principals_in_role_result, get_principals_in_role_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_principals_in_role_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_principals_in_role_result");
 
@@ -219423,10 +233697,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -219468,6 +233744,7 @@ public get_principals_in_role_result(get_principals_in_role_result other) {
       }
     }
 
+    @Override
     public get_principals_in_role_result deepCopy() {
       return new get_principals_in_role_result(this);
     }
@@ -219526,6 +233803,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -219548,6 +233826,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -219561,6 +233840,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -219656,10 +233936,12 @@ public int compareTo(get_principals_in_role_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -219717,6 +233999,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_principals_in_role_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_principals_in_role_resultStandardScheme getScheme() {
         return new get_principals_in_role_resultStandardScheme();
       }
@@ -219724,43 +234007,50 @@ public get_principals_in_role_resultStandardScheme getScheme() {
 
     private static class get_principals_in_role_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_principals_in_role_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_principals_in_role_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 GetPrincipalsInRoleResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetPrincipalsInRoleResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_principals_in_role_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -219782,6 +234072,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_principals_in_
     }
 
     private static class get_principals_in_role_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_principals_in_role_resultTupleScheme getScheme() {
         return new get_principals_in_role_resultTupleScheme();
       }
@@ -219810,17 +234101,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_principals_in_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_principals_in_role_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.success = new GetPrincipalsInRoleResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetPrincipalsInRoleResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -219830,6 +234126,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_grants_for_principal_args implements org.apache.thrift.TBase<get_role_grants_for_principal_args, get_role_grants_for_principal_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_role_grants_for_principal_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_role_grants_for_principal_args");
 
@@ -219891,10 +234188,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -219929,6 +234228,7 @@ public get_role_grants_for_principal_args(get_role_grants_for_principal_args oth
       }
     }
 
+    @Override
     public get_role_grants_for_principal_args deepCopy() {
       return new get_role_grants_for_principal_args(this);
     }
@@ -219962,6 +234262,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -219976,6 +234277,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -219986,6 +234288,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -220056,14 +234359,17 @@ public int compareTo(get_role_grants_for_principal_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -220109,6 +234415,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_role_grants_for_principal_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_grants_for_principal_argsStandardScheme getScheme() {
         return new get_role_grants_for_principal_argsStandardScheme();
       }
@@ -220116,34 +234423,41 @@ public get_role_grants_for_principal_argsStandardScheme getScheme() {
 
     private static class get_role_grants_for_principal_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_role_grants_for_principal_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_role_grants_for_principal_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetRoleGrantsForPrincipalRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetRoleGrantsForPrincipalRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_grants_for_principal_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -220160,6 +234474,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_grants_fo
     }
 
     private static class get_role_grants_for_principal_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_grants_for_principal_argsTupleScheme getScheme() {
         return new get_role_grants_for_principal_argsTupleScheme();
       }
@@ -220182,12 +234497,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_role_grants_for
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_role_grants_for_principal_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 GetRoleGrantsForPrincipalRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetRoleGrantsForPrincipalRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -220197,6 +234517,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_role_grants_for_principal_result implements org.apache.thrift.TBase<get_role_grants_for_principal_result, get_role_grants_for_principal_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_role_grants_for_principal_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_role_grants_for_principal_result");
 
@@ -220263,10 +234584,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -220308,6 +234631,7 @@ public get_role_grants_for_principal_result(get_role_grants_for_principal_result
       }
     }
 
+    @Override
     public get_role_grants_for_principal_result deepCopy() {
       return new get_role_grants_for_principal_result(this);
     }
@@ -220366,6 +234690,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -220388,6 +234713,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -220401,6 +234727,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -220496,10 +234823,12 @@ public int compareTo(get_role_grants_for_principal_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -220557,6 +234886,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_role_grants_for_principal_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_grants_for_principal_resultStandardScheme getScheme() {
         return new get_role_grants_for_principal_resultStandardScheme();
       }
@@ -220564,43 +234894,50 @@ public get_role_grants_for_principal_resultStandardScheme getScheme() {
 
     private static class get_role_grants_for_principal_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_role_grants_for_principal_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_role_grants_for_principal_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 GetRoleGrantsForPrincipalResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetRoleGrantsForPrincipalResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_grants_for_principal_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -220622,6 +234959,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_role_grants_fo
     }
 
     private static class get_role_grants_for_principal_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_role_grants_for_principal_resultTupleScheme getScheme() {
         return new get_role_grants_for_principal_resultTupleScheme();
       }
@@ -220650,17 +234988,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_role_grants_for
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_role_grants_for_principal_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.success = new GetRoleGrantsForPrincipalResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetRoleGrantsForPrincipalResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -220670,6 +235013,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_privilege_set_args implements org.apache.thrift.TBase<get_privilege_set_args, get_privilege_set_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_privilege_set_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_privilege_set_args");
 
@@ -220741,10 +235085,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -220795,6 +235141,7 @@ public get_privilege_set_args(get_privilege_set_args other) {
       }
     }
 
+    @Override
     public get_privilege_set_args deepCopy() {
       return new get_privilege_set_args(this);
     }
@@ -220894,6 +235241,7 @@ public void setGroup_namesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case HIVE_OBJECT:
@@ -220924,6 +235272,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case HIVE_OBJECT:
@@ -220940,6 +235289,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -221060,14 +235410,17 @@ public int compareTo(get_privilege_set_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -221129,6 +235482,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_privilege_set_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_privilege_set_argsStandardScheme getScheme() {
         return new get_privilege_set_argsStandardScheme();
       }
@@ -221136,60 +235490,67 @@ public get_privilege_set_argsStandardScheme getScheme() {
 
     private static class get_privilege_set_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_privilege_set_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_privilege_set_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;
-          }
-          switch (schemeField.id) {
-            case 1: // HIVE_OBJECT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.hiveObject = new HiveObjectRef();
-                struct.hiveObject.read(iprot);
-                struct.setHiveObjectIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // USER_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.user_name = iprot.readString();
-                struct.setUser_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // GROUP_NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2194 = iprot.readListBegin();
-                  struct.group_names = new java.util.ArrayList<java.lang.String>(_list2194.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2195;
-                  for (int _i2196 = 0; _i2196 < _list2194.size; ++_i2196)
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // HIVE_OBJECT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.hiveObject = new HiveObjectRef();
+                  struct.hiveObject.read(iprot);
+                  struct.setHiveObjectIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // USER_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.user_name = iprot.readString();
+                  struct.setUser_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // GROUP_NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2195 = iprot.readString();
-                    struct.group_names.add(_elem2195);
+                    org.apache.thrift.protocol.TList _list2194 = iprot.readListBegin();
+                    struct.group_names = new java.util.ArrayList<java.lang.String>(_list2194.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2195;
+                    for (int _i2196 = 0; _i2196 < _list2194.size; ++_i2196)
+                    {
+                      _elem2195 = iprot.readString();
+                      struct.group_names.add(_elem2195);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setGroup_namesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setGroup_namesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_privilege_set_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -221223,6 +235584,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_privilege_set_
     }
 
     private static class get_privilege_set_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_privilege_set_argsTupleScheme getScheme() {
         return new get_privilege_set_argsTupleScheme();
       }
@@ -221263,29 +235625,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_privilege_set_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_privilege_set_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);
-        if (incoming.get(0)) {
-          struct.hiveObject = new HiveObjectRef();
-          struct.hiveObject.read(iprot);
-          struct.setHiveObjectIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.user_name = iprot.readString();
-          struct.setUser_nameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list2199 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.group_names = new java.util.ArrayList<java.lang.String>(_list2199.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2200;
-            for (int _i2201 = 0; _i2201 < _list2199.size; ++_i2201)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.hiveObject = new HiveObjectRef();
+            struct.hiveObject.read(iprot);
+            struct.setHiveObjectIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.user_name = iprot.readString();
+            struct.setUser_nameIsSet(true);
+          }
+          if (incoming.get(2)) {
             {
-              _elem2200 = iprot.readString();
-              struct.group_names.add(_elem2200);
+              org.apache.thrift.protocol.TList _list2199 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.group_names = new java.util.ArrayList<java.lang.String>(_list2199.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2200;
+              for (int _i2201 = 0; _i2201 < _list2199.size; ++_i2201)
+              {
+                _elem2200 = iprot.readString();
+                struct.group_names.add(_elem2200);
+              }
             }
+            struct.setGroup_namesIsSet(true);
           }
-          struct.setGroup_namesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -221295,6 +235662,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_privilege_set_result implements org.apache.thrift.TBase<get_privilege_set_result, get_privilege_set_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_privilege_set_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_privilege_set_result");
 
@@ -221361,10 +235729,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -221406,6 +235776,7 @@ public get_privilege_set_result(get_privilege_set_result other) {
       }
     }
 
+    @Override
     public get_privilege_set_result deepCopy() {
       return new get_privilege_set_result(this);
     }
@@ -221464,6 +235835,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -221486,6 +235858,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -221499,6 +235872,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -221594,10 +235968,12 @@ public int compareTo(get_privilege_set_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -221655,6 +236031,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_privilege_set_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_privilege_set_resultStandardScheme getScheme() {
         return new get_privilege_set_resultStandardScheme();
       }
@@ -221662,43 +236039,50 @@ public get_privilege_set_resultStandardScheme getScheme() {
 
     private static class get_privilege_set_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_privilege_set_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_privilege_set_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 PrincipalPrivilegeSet();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PrincipalPrivilegeSet();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_privilege_set_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -221720,6 +236104,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_privilege_set_
     }
 
     private static class get_privilege_set_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_privilege_set_resultTupleScheme getScheme() {
         return new get_privilege_set_resultTupleScheme();
       }
@@ -221748,17 +236133,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_privilege_set_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_privilege_set_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.success = new PrincipalPrivilegeSet();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new PrincipalPrivilegeSet();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -221768,6 +236158,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_privileges_args implements org.apache.thrift.TBase<list_privileges_args, list_privileges_args._Fields>, java.io.Serializable, Cloneable, Comparable<list_privileges_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("list_privileges_args");
 
@@ -221843,10 +236234,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -221895,6 +236288,7 @@ public list_privileges_args(list_privileges_args other) {
       }
     }
 
+    @Override
     public list_privileges_args deepCopy() {
       return new list_privileges_args(this);
     }
@@ -221986,6 +236380,7 @@ public void setHiveObjectIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PRINCIPAL_NAME:
@@ -222016,6 +236411,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PRINCIPAL_NAME:
@@ -222032,6 +236428,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -222152,14 +236549,17 @@ public int compareTo(list_privileges_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -222221,6 +236621,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class list_privileges_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_privileges_argsStandardScheme getScheme() {
         return new list_privileges_argsStandardScheme();
       }
@@ -222228,50 +236629,57 @@ public list_privileges_argsStandardScheme getScheme() {
 
     private static class list_privileges_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<list_privileges_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, list_privileges_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PRINCIPAL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.principal_name = iprot.readString();
-                struct.setPrincipal_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // PRINCIPAL_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-                struct.setPrincipal_typeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // HIVE_OBJECT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.hiveObject = new HiveObjectRef();
-                struct.hiveObject.read(iprot);
-                struct.setHiveObjectIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // PRINCIPAL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.principal_name = iprot.readString();
+                  struct.setPrincipal_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // PRINCIPAL_TYPE
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+                  struct.setPrincipal_typeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // HIVE_OBJECT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.hiveObject = new HiveObjectRef();
+                  struct.hiveObject.read(iprot);
+                  struct.setHiveObjectIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, list_privileges_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -222298,6 +236706,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, list_privileges_ar
     }
 
     private static class list_privileges_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_privileges_argsTupleScheme getScheme() {
         return new list_privileges_argsTupleScheme();
       }
@@ -222332,20 +236741,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, list_privileges_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, list_privileges_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);
-        if (incoming.get(0)) {
-          struct.principal_name = iprot.readString();
-          struct.setPrincipal_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-          struct.setPrincipal_typeIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.hiveObject = new HiveObjectRef();
-          struct.hiveObject.read(iprot);
-          struct.setHiveObjectIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.principal_name = iprot.readString();
+            struct.setPrincipal_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+            struct.setPrincipal_typeIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.hiveObject = new HiveObjectRef();
+            struct.hiveObject.read(iprot);
+            struct.setHiveObjectIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -222355,6 +236769,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class list_privileges_result implements org.apache.thrift.TBase<list_privileges_result, list_privileges_result._Fields>, java.io.Serializable, Cloneable, Comparable<list_privileges_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("list_privileges_result");
 
@@ -222421,10 +236836,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -222471,6 +236888,7 @@ public list_privileges_result(list_privileges_result other) {
       }
     }
 
+    @Override
     public list_privileges_result deepCopy() {
       return new list_privileges_result(this);
     }
@@ -222545,6 +236963,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -222567,6 +236986,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -222580,6 +237000,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -222675,10 +237096,12 @@ public int compareTo(list_privileges_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -222733,6 +237156,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class list_privileges_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_privileges_resultStandardScheme getScheme() {
         return new list_privileges_resultStandardScheme();
       }
@@ -222740,53 +237164,60 @@ public list_privileges_resultStandardScheme getScheme() {
 
     private static class list_privileges_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<list_privileges_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, list_privileges_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2202 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<HiveObjectPrivilege>(_list2202.size);
-                  @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem2203;
-                  for (int _i2204 = 0; _i2204 < _list2202.size; ++_i2204)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2203 = new HiveObjectPrivilege();
-                    _elem2203.read(iprot);
-                    struct.success.add(_elem2203);
+                    org.apache.thrift.protocol.TList _list2202 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<HiveObjectPrivilege>(_list2202.size);
+                    @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem2203;
+                    for (int _i2204 = 0; _i2204 < _list2202.size; ++_i2204)
+                    {
+                      _elem2203 = new HiveObjectPrivilege();
+                      _elem2203.read(iprot);
+                      struct.success.add(_elem2203);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, list_privileges_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -222815,6 +237246,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, list_privileges_re
     }
 
     private static class list_privileges_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public list_privileges_resultTupleScheme getScheme() {
         return new list_privileges_resultTupleScheme();
       }
@@ -222849,26 +237281,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, list_privileges_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, list_privileges_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2207 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<HiveObjectPrivilege>(_list2207.size);
-            @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem2208;
-            for (int _i2209 = 0; _i2209 < _list2207.size; ++_i2209)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2208 = new HiveObjectPrivilege();
-              _elem2208.read(iprot);
-              struct.success.add(_elem2208);
+              org.apache.thrift.protocol.TList _list2207 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<HiveObjectPrivilege>(_list2207.size);
+              @org.apache.thrift.annotation.Nullable HiveObjectPrivilege _elem2208;
+              for (int _i2209 = 0; _i2209 < _list2207.size; ++_i2209)
+              {
+                _elem2208 = new HiveObjectPrivilege();
+                _elem2208.read(iprot);
+                struct.success.add(_elem2208);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -222878,6 +237315,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_privileges_args implements org.apache.thrift.TBase<grant_privileges_args, grant_privileges_args._Fields>, java.io.Serializable, Cloneable, Comparable<grant_privileges_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_privileges_args");
 
@@ -222939,10 +237377,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -222977,6 +237417,7 @@ public grant_privileges_args(grant_privileges_args other) {
       }
     }
 
+    @Override
     public grant_privileges_args deepCopy() {
       return new grant_privileges_args(this);
     }
@@ -223010,6 +237451,7 @@ public void setPrivilegesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PRIVILEGES:
@@ -223024,6 +237466,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PRIVILEGES:
@@ -223034,6 +237477,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -223104,14 +237548,17 @@ public int compareTo(grant_privileges_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -223157,6 +237604,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_privileges_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_privileges_argsStandardScheme getScheme() {
         return new grant_privileges_argsStandardScheme();
       }
@@ -223164,34 +237612,41 @@ public grant_privileges_argsStandardScheme getScheme() {
 
     private static class grant_privileges_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_privileges_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_privileges_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PRIVILEGES
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.privileges = new PrivilegeBag();
-                struct.privileges.read(iprot);
-                struct.setPrivilegesIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PRIVILEGES
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.privileges = new PrivilegeBag();
+                  struct.privileges.read(iprot);
+                  struct.setPrivilegesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_privileges_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -223208,6 +237663,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_privileges_a
     }
 
     private static class grant_privileges_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_privileges_argsTupleScheme getScheme() {
         return new grant_privileges_argsTupleScheme();
       }
@@ -223230,12 +237686,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_privileges_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_privileges_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.privileges = new PrivilegeBag();
-          struct.privileges.read(iprot);
-          struct.setPrivilegesIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.privileges = new PrivilegeBag();
+            struct.privileges.read(iprot);
+            struct.setPrivilegesIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -223245,6 +237706,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_privileges_result implements org.apache.thrift.TBase<grant_privileges_result, grant_privileges_result._Fields>, java.io.Serializable, Cloneable, Comparable<grant_privileges_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_privileges_result");
 
@@ -223311,10 +237773,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -223358,6 +237822,7 @@ public grant_privileges_result(grant_privileges_result other) {
       }
     }
 
+    @Override
     public grant_privileges_result deepCopy() {
       return new grant_privileges_result(this);
     }
@@ -223415,6 +237880,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -223437,6 +237903,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -223450,6 +237917,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -223543,10 +238011,12 @@ public int compareTo(grant_privileges_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -223599,6 +238069,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_privileges_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_privileges_resultStandardScheme getScheme() {
         return new grant_privileges_resultStandardScheme();
       }
@@ -223606,42 +238077,49 @@ public grant_privileges_resultStandardScheme getScheme() {
 
     private static class grant_privileges_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_privileges_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_privileges_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_privileges_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -223663,6 +238141,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_privileges_r
     }
 
     private static class grant_privileges_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_privileges_resultTupleScheme getScheme() {
         return new grant_privileges_resultTupleScheme();
       }
@@ -223691,16 +238170,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_privileges_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_privileges_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -223710,6 +238194,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_privileges_args implements org.apache.thrift.TBase<revoke_privileges_args, revoke_privileges_args._Fields>, java.io.Serializable, Cloneable, Comparable<revoke_privileges_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("revoke_privileges_args");
 
@@ -223771,10 +238256,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -223809,6 +238296,7 @@ public revoke_privileges_args(revoke_privileges_args other) {
       }
     }
 
+    @Override
     public revoke_privileges_args deepCopy() {
       return new revoke_privileges_args(this);
     }
@@ -223842,6 +238330,7 @@ public void setPrivilegesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PRIVILEGES:
@@ -223856,6 +238345,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PRIVILEGES:
@@ -223866,6 +238356,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -223936,14 +238427,17 @@ public int compareTo(revoke_privileges_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -223989,6 +238483,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class revoke_privileges_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_privileges_argsStandardScheme getScheme() {
         return new revoke_privileges_argsStandardScheme();
       }
@@ -223996,34 +238491,41 @@ public revoke_privileges_argsStandardScheme getScheme() {
 
     private static class revoke_privileges_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<revoke_privileges_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, revoke_privileges_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;
-          }
-          switch (schemeField.id) {
-            case 1: // PRIVILEGES
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.privileges = new PrivilegeBag();
-                struct.privileges.read(iprot);
-                struct.setPrivilegesIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PRIVILEGES
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.privileges = new PrivilegeBag();
+                  struct.privileges.read(iprot);
+                  struct.setPrivilegesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_privileges_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -224040,6 +238542,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_privileges_
     }
 
     private static class revoke_privileges_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_privileges_argsTupleScheme getScheme() {
         return new revoke_privileges_argsTupleScheme();
       }
@@ -224062,12 +238565,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, revoke_privileges_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, revoke_privileges_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.privileges = new PrivilegeBag();
-          struct.privileges.read(iprot);
-          struct.setPrivilegesIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.privileges = new PrivilegeBag();
+            struct.privileges.read(iprot);
+            struct.setPrivilegesIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -224077,6 +238585,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class revoke_privileges_result implements org.apache.thrift.TBase<revoke_privileges_result, revoke_privileges_result._Fields>, java.io.Serializable, Cloneable, Comparable<revoke_privileges_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("revoke_privileges_result");
 
@@ -224143,10 +238652,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -224190,6 +238701,7 @@ public revoke_privileges_result(revoke_privileges_result other) {
       }
     }
 
+    @Override
     public revoke_privileges_result deepCopy() {
       return new revoke_privileges_result(this);
     }
@@ -224247,6 +238759,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -224269,6 +238782,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -224282,6 +238796,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -224375,10 +238890,12 @@ public int compareTo(revoke_privileges_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -224431,6 +238948,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class revoke_privileges_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_privileges_resultStandardScheme getScheme() {
         return new revoke_privileges_resultStandardScheme();
       }
@@ -224438,42 +238956,49 @@ public revoke_privileges_resultStandardScheme getScheme() {
 
     private static class revoke_privileges_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<revoke_privileges_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, revoke_privileges_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_privileges_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -224495,6 +239020,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, revoke_privileges_
     }
 
     private static class revoke_privileges_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public revoke_privileges_resultTupleScheme getScheme() {
         return new revoke_privileges_resultTupleScheme();
       }
@@ -224523,16 +239049,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, revoke_privileges_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, revoke_privileges_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -224542,6 +239073,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_privileges_args implements org.apache.thrift.TBase<grant_revoke_privileges_args, grant_revoke_privileges_args._Fields>, java.io.Serializable, Cloneable, Comparable<grant_revoke_privileges_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_revoke_privileges_args");
 
@@ -224603,10 +239135,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -224641,6 +239175,7 @@ public grant_revoke_privileges_args(grant_revoke_privileges_args other) {
       }
     }
 
+    @Override
     public grant_revoke_privileges_args deepCopy() {
       return new grant_revoke_privileges_args(this);
     }
@@ -224674,6 +239209,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -224688,6 +239224,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -224698,6 +239235,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -224768,14 +239306,17 @@ public int compareTo(grant_revoke_privileges_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -224821,6 +239362,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_revoke_privileges_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_privileges_argsStandardScheme getScheme() {
         return new grant_revoke_privileges_argsStandardScheme();
       }
@@ -224828,34 +239370,41 @@ public grant_revoke_privileges_argsStandardScheme getScheme() {
 
     private static class grant_revoke_privileges_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_revoke_privileges_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_revoke_privileges_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GrantRevokePrivilegeRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GrantRevokePrivilegeRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_privileges_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -224872,6 +239421,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_privi
     }
 
     private static class grant_revoke_privileges_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_privileges_argsTupleScheme getScheme() {
         return new grant_revoke_privileges_argsTupleScheme();
       }
@@ -224894,12 +239444,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_revoke_privil
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_revoke_privileges_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 GrantRevokePrivilegeRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GrantRevokePrivilegeRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -224909,6 +239464,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class grant_revoke_privileges_result implements org.apache.thrift.TBase<grant_revoke_privileges_result, grant_revoke_privileges_result._Fields>, java.io.Serializable, Cloneable, Comparable<grant_revoke_privileges_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("grant_revoke_privileges_result");
 
@@ -224975,10 +239531,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -225020,6 +239578,7 @@ public grant_revoke_privileges_result(grant_revoke_privileges_result other) {
       }
     }
 
+    @Override
     public grant_revoke_privileges_result deepCopy() {
       return new grant_revoke_privileges_result(this);
     }
@@ -225078,6 +239637,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -225100,6 +239660,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -225113,6 +239674,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -225208,10 +239770,12 @@ public int compareTo(grant_revoke_privileges_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -225269,6 +239833,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class grant_revoke_privileges_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_privileges_resultStandardScheme getScheme() {
         return new grant_revoke_privileges_resultStandardScheme();
       }
@@ -225276,43 +239841,50 @@ public grant_revoke_privileges_resultStandardScheme getScheme() {
 
     private static class grant_revoke_privileges_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<grant_revoke_privileges_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, grant_revoke_privileges_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 GrantRevokePrivilegeResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GrantRevokePrivilegeResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_privileges_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -225334,6 +239906,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, grant_revoke_privi
     }
 
     private static class grant_revoke_privileges_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public grant_revoke_privileges_resultTupleScheme getScheme() {
         return new grant_revoke_privileges_resultTupleScheme();
       }
@@ -225362,17 +239935,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, grant_revoke_privil
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, grant_revoke_privileges_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.success = new GrantRevokePrivilegeResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GrantRevokePrivilegeResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -225382,6 +239960,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class refresh_privileges_args implements org.apache.thrift.TBase<refresh_privileges_args, refresh_privileges_args._Fields>, java.io.Serializable, Cloneable, Comparable<refresh_privileges_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("refresh_privileges_args");
 
@@ -225453,10 +240032,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -225505,6 +240086,7 @@ public refresh_privileges_args(refresh_privileges_args other) {
       }
     }
 
+    @Override
     public refresh_privileges_args deepCopy() {
       return new refresh_privileges_args(this);
     }
@@ -225588,6 +240170,7 @@ public void setGrantRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case OBJ_TO_REFRESH:
@@ -225618,6 +240201,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case OBJ_TO_REFRESH:
@@ -225634,6 +240218,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -225754,14 +240339,17 @@ public int compareTo(refresh_privileges_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -225826,6 +240414,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class refresh_privileges_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public refresh_privileges_argsStandardScheme getScheme() {
         return new refresh_privileges_argsStandardScheme();
       }
@@ -225833,51 +240422,58 @@ public refresh_privileges_argsStandardScheme getScheme() {
 
     private static class refresh_privileges_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<refresh_privileges_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, refresh_privileges_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;
-          }
-          switch (schemeField.id) {
-            case 1: // OBJ_TO_REFRESH
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.objToRefresh = new HiveObjectRef();
-                struct.objToRefresh.read(iprot);
-                struct.setObjToRefreshIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // AUTHORIZER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.authorizer = iprot.readString();
-                struct.setAuthorizerIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // GRANT_REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.grantRequest = new GrantRevokePrivilegeRequest();
-                struct.grantRequest.read(iprot);
-                struct.setGrantRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // OBJ_TO_REFRESH
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.objToRefresh = new HiveObjectRef();
+                  struct.objToRefresh.read(iprot);
+                  struct.setObjToRefreshIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // AUTHORIZER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.authorizer = iprot.readString();
+                  struct.setAuthorizerIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // GRANT_REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.grantRequest = new GrantRevokePrivilegeRequest();
+                  struct.grantRequest.read(iprot);
+                  struct.setGrantRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, refresh_privileges_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -225904,6 +240500,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, refresh_privileges
     }
 
     private static class refresh_privileges_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public refresh_privileges_argsTupleScheme getScheme() {
         return new refresh_privileges_argsTupleScheme();
       }
@@ -225938,21 +240535,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, refresh_privileges_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, refresh_privileges_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);
-        if (incoming.get(0)) {
-          struct.objToRefresh = new HiveObjectRef();
-          struct.objToRefresh.read(iprot);
-          struct.setObjToRefreshIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.authorizer = iprot.readString();
-          struct.setAuthorizerIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.grantRequest = new GrantRevokePrivilegeRequest();
-          struct.grantRequest.read(iprot);
-          struct.setGrantRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.objToRefresh = new HiveObjectRef();
+            struct.objToRefresh.read(iprot);
+            struct.setObjToRefreshIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.authorizer = iprot.readString();
+            struct.setAuthorizerIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.grantRequest = new GrantRevokePrivilegeRequest();
+            struct.grantRequest.read(iprot);
+            struct.setGrantRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -225962,6 +240564,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class refresh_privileges_result implements org.apache.thrift.TBase<refresh_privileges_result, refresh_privileges_result._Fields>, java.io.Serializable, Cloneable, Comparable<refresh_privileges_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("refresh_privileges_result");
 
@@ -226028,10 +240631,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -226073,6 +240678,7 @@ public refresh_privileges_result(refresh_privileges_result other) {
       }
     }
 
+    @Override
     public refresh_privileges_result deepCopy() {
       return new refresh_privileges_result(this);
     }
@@ -226131,6 +240737,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -226153,6 +240760,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -226166,6 +240774,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -226261,10 +240870,12 @@ public int compareTo(refresh_privileges_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -226322,6 +240933,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class refresh_privileges_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public refresh_privileges_resultStandardScheme getScheme() {
         return new refresh_privileges_resultStandardScheme();
       }
@@ -226329,43 +240941,50 @@ public refresh_privileges_resultStandardScheme getScheme() {
 
     private static class refresh_privileges_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<refresh_privileges_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, refresh_privileges_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 GrantRevokePrivilegeResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GrantRevokePrivilegeResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, refresh_privileges_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -226387,6 +241006,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, refresh_privileges
     }
 
     private static class refresh_privileges_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public refresh_privileges_resultTupleScheme getScheme() {
         return new refresh_privileges_resultTupleScheme();
       }
@@ -226415,17 +241035,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, refresh_privileges_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, refresh_privileges_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.success = new GrantRevokePrivilegeResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GrantRevokePrivilegeResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -226435,6 +241060,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_ugi_args implements org.apache.thrift.TBase<set_ugi_args, set_ugi_args._Fields>, java.io.Serializable, Cloneable, Comparable<set_ugi_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_ugi_args");
 
@@ -226501,10 +241127,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -226548,6 +241176,7 @@ public set_ugi_args(set_ugi_args other) {
       }
     }
 
+    @Override
     public set_ugi_args deepCopy() {
       return new set_ugi_args(this);
     }
@@ -226622,6 +241251,7 @@ public void setGroup_namesIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_NAME:
@@ -226644,6 +241274,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_NAME:
@@ -226657,6 +241288,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -226752,14 +241384,17 @@ public int compareTo(set_ugi_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -226810,6 +241445,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_ugi_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_ugi_argsStandardScheme getScheme() {
         return new set_ugi_argsStandardScheme();
       }
@@ -226817,51 +241453,58 @@ public set_ugi_argsStandardScheme getScheme() {
 
     private static class set_ugi_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_ugi_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_ugi_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;
-          }
-          switch (schemeField.id) {
-            case 1: // USER_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.user_name = iprot.readString();
-                struct.setUser_nameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // GROUP_NAMES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2210 = iprot.readListBegin();
-                  struct.group_names = new java.util.ArrayList<java.lang.String>(_list2210.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2211;
-                  for (int _i2212 = 0; _i2212 < _list2210.size; ++_i2212)
+            }
+            switch (schemeField.id) {
+              case 1: // USER_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.user_name = iprot.readString();
+                  struct.setUser_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // GROUP_NAMES
+                if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                   {
-                    _elem2211 = iprot.readString();
-                    struct.group_names.add(_elem2211);
+                    org.apache.thrift.protocol.TList _list2210 = iprot.readListBegin();
+                    struct.group_names = new java.util.ArrayList<java.lang.String>(_list2210.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2211;
+                    for (int _i2212 = 0; _i2212 < _list2210.size; ++_i2212)
+                    {
+                      _elem2211 = iprot.readString();
+                      struct.group_names.add(_elem2211);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setGroup_namesIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setGroup_namesIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_ugi_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -226890,6 +241533,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_ugi_args struc
     }
 
     private static class set_ugi_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_ugi_argsTupleScheme getScheme() {
         return new set_ugi_argsTupleScheme();
       }
@@ -226924,24 +241568,29 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_ugi_args struct
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_ugi_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);
-        if (incoming.get(0)) {
-          struct.user_name = iprot.readString();
-          struct.setUser_nameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          {
-            org.apache.thrift.protocol.TList _list2215 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.group_names = new java.util.ArrayList<java.lang.String>(_list2215.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2216;
-            for (int _i2217 = 0; _i2217 < _list2215.size; ++_i2217)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.user_name = iprot.readString();
+            struct.setUser_nameIsSet(true);
+          }
+          if (incoming.get(1)) {
             {
-              _elem2216 = iprot.readString();
-              struct.group_names.add(_elem2216);
+              org.apache.thrift.protocol.TList _list2215 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.group_names = new java.util.ArrayList<java.lang.String>(_list2215.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2216;
+              for (int _i2217 = 0; _i2217 < _list2215.size; ++_i2217)
+              {
+                _elem2216 = iprot.readString();
+                struct.group_names.add(_elem2216);
+              }
             }
+            struct.setGroup_namesIsSet(true);
           }
-          struct.setGroup_namesIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -226951,6 +241600,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_ugi_result implements org.apache.thrift.TBase<set_ugi_result, set_ugi_result._Fields>, java.io.Serializable, Cloneable, Comparable<set_ugi_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_ugi_result");
 
@@ -227017,10 +241667,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -227064,6 +241716,7 @@ public set_ugi_result(set_ugi_result other) {
       }
     }
 
+    @Override
     public set_ugi_result deepCopy() {
       return new set_ugi_result(this);
     }
@@ -227138,6 +241791,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -227160,6 +241814,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -227173,6 +241828,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -227268,10 +241924,12 @@ public int compareTo(set_ugi_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -227326,6 +241984,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_ugi_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_ugi_resultStandardScheme getScheme() {
         return new set_ugi_resultStandardScheme();
       }
@@ -227333,52 +241992,59 @@ public set_ugi_resultStandardScheme getScheme() {
 
     private static class set_ugi_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_ugi_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_ugi_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2218 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2218.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2219;
-                  for (int _i2220 = 0; _i2220 < _list2218.size; ++_i2220)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2219 = iprot.readString();
-                    struct.success.add(_elem2219);
+                    org.apache.thrift.protocol.TList _list2218 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2218.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2219;
+                    for (int _i2220 = 0; _i2220 < _list2218.size; ++_i2220)
+                    {
+                      _elem2219 = iprot.readString();
+                      struct.success.add(_elem2219);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_ugi_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -227407,6 +242073,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_ugi_result str
     }
 
     private static class set_ugi_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_ugi_resultTupleScheme getScheme() {
         return new set_ugi_resultTupleScheme();
       }
@@ -227441,25 +242108,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_ugi_result stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_ugi_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2223 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2223.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2224;
-            for (int _i2225 = 0; _i2225 < _list2223.size; ++_i2225)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2224 = iprot.readString();
-              struct.success.add(_elem2224);
+              org.apache.thrift.protocol.TList _list2223 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2223.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2224;
+              for (int _i2225 = 0; _i2225 < _list2223.size; ++_i2225)
+              {
+                _elem2224 = iprot.readString();
+                struct.success.add(_elem2224);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -227469,6 +242141,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_delegation_token_args implements org.apache.thrift.TBase<get_delegation_token_args, get_delegation_token_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_delegation_token_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_delegation_token_args");
 
@@ -227535,10 +242208,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -227580,6 +242255,7 @@ public get_delegation_token_args(get_delegation_token_args other) {
       }
     }
 
+    @Override
     public get_delegation_token_args deepCopy() {
       return new get_delegation_token_args(this);
     }
@@ -227638,6 +242314,7 @@ public void setRenewer_kerberos_principal_nameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN_OWNER:
@@ -227660,6 +242337,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN_OWNER:
@@ -227673,6 +242351,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -227768,14 +242447,17 @@ public int compareTo(get_delegation_token_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -227826,6 +242508,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_delegation_token_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_delegation_token_argsStandardScheme getScheme() {
         return new get_delegation_token_argsStandardScheme();
       }
@@ -227833,41 +242516,48 @@ public get_delegation_token_argsStandardScheme getScheme() {
 
     private static class get_delegation_token_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_delegation_token_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_delegation_token_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TOKEN_OWNER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.token_owner = iprot.readString();
-                struct.setToken_ownerIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // RENEWER_KERBEROS_PRINCIPAL_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.renewer_kerberos_principal_name = iprot.readString();
-                struct.setRenewer_kerberos_principal_nameIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // TOKEN_OWNER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.token_owner = iprot.readString();
+                  struct.setToken_ownerIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // RENEWER_KERBEROS_PRINCIPAL_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.renewer_kerberos_principal_name = iprot.readString();
+                  struct.setRenewer_kerberos_principal_nameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_delegation_token_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -227889,6 +242579,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_delegation_tok
     }
 
     private static class get_delegation_token_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_delegation_token_argsTupleScheme getScheme() {
         return new get_delegation_token_argsTupleScheme();
       }
@@ -227917,15 +242608,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_delegation_toke
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_delegation_token_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);
-        if (incoming.get(0)) {
-          struct.token_owner = iprot.readString();
-          struct.setToken_ownerIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.renewer_kerberos_principal_name = iprot.readString();
-          struct.setRenewer_kerberos_principal_nameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.token_owner = iprot.readString();
+            struct.setToken_ownerIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.renewer_kerberos_principal_name = iprot.readString();
+            struct.setRenewer_kerberos_principal_nameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -227935,6 +242631,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_delegation_token_result implements org.apache.thrift.TBase<get_delegation_token_result, get_delegation_token_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_delegation_token_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_delegation_token_result");
 
@@ -228001,10 +242698,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -228046,6 +242745,7 @@ public get_delegation_token_result(get_delegation_token_result other) {
       }
     }
 
+    @Override
     public get_delegation_token_result deepCopy() {
       return new get_delegation_token_result(this);
     }
@@ -228104,6 +242804,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -228126,6 +242827,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -228139,6 +242841,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -228234,10 +242937,12 @@ public int compareTo(get_delegation_token_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -228292,6 +242997,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_delegation_token_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_delegation_token_resultStandardScheme getScheme() {
         return new get_delegation_token_resultStandardScheme();
       }
@@ -228299,42 +243005,49 @@ public get_delegation_token_resultStandardScheme getScheme() {
 
     private static class get_delegation_token_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_delegation_token_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_delegation_token_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.STRING) {
-                struct.success = iprot.readString();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_delegation_token_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -228356,6 +243069,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_delegation_tok
     }
 
     private static class get_delegation_token_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_delegation_token_resultTupleScheme getScheme() {
         return new get_delegation_token_resultTupleScheme();
       }
@@ -228384,16 +243098,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_delegation_toke
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_delegation_token_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.success = iprot.readString();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -228403,6 +243122,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class renew_delegation_token_args implements org.apache.thrift.TBase<renew_delegation_token_args, renew_delegation_token_args._Fields>, java.io.Serializable, Cloneable, Comparable<renew_delegation_token_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("renew_delegation_token_args");
 
@@ -228464,10 +243184,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -228502,6 +243224,7 @@ public renew_delegation_token_args(renew_delegation_token_args other) {
       }
     }
 
+    @Override
     public renew_delegation_token_args deepCopy() {
       return new renew_delegation_token_args(this);
     }
@@ -228535,6 +243258,7 @@ public void setToken_str_formIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN_STR_FORM:
@@ -228549,6 +243273,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN_STR_FORM:
@@ -228559,6 +243284,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -228629,14 +243355,17 @@ public int compareTo(renew_delegation_token_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -228679,6 +243408,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class renew_delegation_token_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public renew_delegation_token_argsStandardScheme getScheme() {
         return new renew_delegation_token_argsStandardScheme();
       }
@@ -228686,33 +243416,40 @@ public renew_delegation_token_argsStandardScheme getScheme() {
 
     private static class renew_delegation_token_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<renew_delegation_token_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, renew_delegation_token_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TOKEN_STR_FORM
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.token_str_form = iprot.readString();
-                struct.setToken_str_formIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // TOKEN_STR_FORM
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.token_str_form = iprot.readString();
+                  struct.setToken_str_formIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, renew_delegation_token_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -228729,6 +243466,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, renew_delegation_t
     }
 
     private static class renew_delegation_token_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public renew_delegation_token_argsTupleScheme getScheme() {
         return new renew_delegation_token_argsTupleScheme();
       }
@@ -228751,11 +243489,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, renew_delegation_to
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, renew_delegation_token_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.token_str_form = iprot.readString();
-          struct.setToken_str_formIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.token_str_form = iprot.readString();
+            struct.setToken_str_formIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -228765,6 +243508,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class renew_delegation_token_result implements org.apache.thrift.TBase<renew_delegation_token_result, renew_delegation_token_result._Fields>, java.io.Serializable, Cloneable, Comparable<renew_delegation_token_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("renew_delegation_token_result");
 
@@ -228831,10 +243575,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -228878,6 +243624,7 @@ public renew_delegation_token_result(renew_delegation_token_result other) {
       }
     }
 
+    @Override
     public renew_delegation_token_result deepCopy() {
       return new renew_delegation_token_result(this);
     }
@@ -228935,6 +243682,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -228957,6 +243705,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -228970,6 +243719,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -229063,10 +243813,12 @@ public int compareTo(renew_delegation_token_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -229119,6 +243871,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class renew_delegation_token_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public renew_delegation_token_resultStandardScheme getScheme() {
         return new renew_delegation_token_resultStandardScheme();
       }
@@ -229126,42 +243879,49 @@ public renew_delegation_token_resultStandardScheme getScheme() {
 
     private static class renew_delegation_token_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<renew_delegation_token_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, renew_delegation_token_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.I64) {
-                struct.success = iprot.readI64();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.success = iprot.readI64();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, renew_delegation_token_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -229183,6 +243943,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, renew_delegation_t
     }
 
     private static class renew_delegation_token_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public renew_delegation_token_resultTupleScheme getScheme() {
         return new renew_delegation_token_resultTupleScheme();
       }
@@ -229211,16 +243972,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, renew_delegation_to
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, renew_delegation_token_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.success = iprot.readI64();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readI64();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -229230,6 +243996,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cancel_delegation_token_args implements org.apache.thrift.TBase<cancel_delegation_token_args, cancel_delegation_token_args._Fields>, java.io.Serializable, Cloneable, Comparable<cancel_delegation_token_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cancel_delegation_token_args");
 
@@ -229291,10 +244058,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -229329,6 +244098,7 @@ public cancel_delegation_token_args(cancel_delegation_token_args other) {
       }
     }
 
+    @Override
     public cancel_delegation_token_args deepCopy() {
       return new cancel_delegation_token_args(this);
     }
@@ -229362,6 +244132,7 @@ public void setToken_str_formIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN_STR_FORM:
@@ -229376,6 +244147,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN_STR_FORM:
@@ -229386,6 +244158,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -229456,14 +244229,17 @@ public int compareTo(cancel_delegation_token_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -229506,6 +244282,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class cancel_delegation_token_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cancel_delegation_token_argsStandardScheme getScheme() {
         return new cancel_delegation_token_argsStandardScheme();
       }
@@ -229513,33 +244290,40 @@ public cancel_delegation_token_argsStandardScheme getScheme() {
 
     private static class cancel_delegation_token_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<cancel_delegation_token_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, cancel_delegation_token_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TOKEN_STR_FORM
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.token_str_form = iprot.readString();
-                struct.setToken_str_formIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // TOKEN_STR_FORM
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.token_str_form = iprot.readString();
+                  struct.setToken_str_formIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, cancel_delegation_token_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -229556,6 +244340,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, cancel_delegation_
     }
 
     private static class cancel_delegation_token_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cancel_delegation_token_argsTupleScheme getScheme() {
         return new cancel_delegation_token_argsTupleScheme();
       }
@@ -229578,11 +244363,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, cancel_delegation_t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancel_delegation_token_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.token_str_form = iprot.readString();
-          struct.setToken_str_formIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.token_str_form = iprot.readString();
+            struct.setToken_str_formIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -229592,6 +244382,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cancel_delegation_token_result implements org.apache.thrift.TBase<cancel_delegation_token_result, cancel_delegation_token_result._Fields>, java.io.Serializable, Cloneable, Comparable<cancel_delegation_token_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cancel_delegation_token_result");
 
@@ -229653,10 +244444,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -229691,6 +244484,7 @@ public cancel_delegation_token_result(cancel_delegation_token_result other) {
       }
     }
 
+    @Override
     public cancel_delegation_token_result deepCopy() {
       return new cancel_delegation_token_result(this);
     }
@@ -229724,6 +244518,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -229738,6 +244533,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -229748,6 +244544,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -229818,10 +244615,12 @@ public int compareTo(cancel_delegation_token_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -229868,6 +244667,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class cancel_delegation_token_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cancel_delegation_token_resultStandardScheme getScheme() {
         return new cancel_delegation_token_resultStandardScheme();
       }
@@ -229875,34 +244675,41 @@ public cancel_delegation_token_resultStandardScheme getScheme() {
 
     private static class cancel_delegation_token_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<cancel_delegation_token_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, cancel_delegation_token_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, cancel_delegation_token_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -229919,6 +244726,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, cancel_delegation_
     }
 
     private static class cancel_delegation_token_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cancel_delegation_token_resultTupleScheme getScheme() {
         return new cancel_delegation_token_resultTupleScheme();
       }
@@ -229941,12 +244749,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, cancel_delegation_t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancel_delegation_token_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -229956,6 +244769,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_token_args implements org.apache.thrift.TBase<add_token_args, add_token_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_token_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_token_args");
 
@@ -230022,10 +244836,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -230067,6 +244883,7 @@ public add_token_args(add_token_args other) {
       }
     }
 
+    @Override
     public add_token_args deepCopy() {
       return new add_token_args(this);
     }
@@ -230125,6 +244942,7 @@ public void setDelegation_tokenIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN_IDENTIFIER:
@@ -230147,6 +244965,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN_IDENTIFIER:
@@ -230160,6 +244979,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -230255,14 +245075,17 @@ public int compareTo(add_token_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -230313,6 +245136,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_token_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_token_argsStandardScheme getScheme() {
         return new add_token_argsStandardScheme();
       }
@@ -230320,41 +245144,48 @@ public add_token_argsStandardScheme getScheme() {
 
     private static class add_token_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_token_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_token_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TOKEN_IDENTIFIER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.token_identifier = iprot.readString();
-                struct.setToken_identifierIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // DELEGATION_TOKEN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.delegation_token = iprot.readString();
-                struct.setDelegation_tokenIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // TOKEN_IDENTIFIER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.token_identifier = iprot.readString();
+                  struct.setToken_identifierIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // DELEGATION_TOKEN
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.delegation_token = iprot.readString();
+                  struct.setDelegation_tokenIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_token_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -230376,6 +245207,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_token_args str
     }
 
     private static class add_token_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_token_argsTupleScheme getScheme() {
         return new add_token_argsTupleScheme();
       }
@@ -230404,15 +245236,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_token_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_token_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);
-        if (incoming.get(0)) {
-          struct.token_identifier = iprot.readString();
-          struct.setToken_identifierIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.delegation_token = iprot.readString();
-          struct.setDelegation_tokenIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.token_identifier = iprot.readString();
+            struct.setToken_identifierIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.delegation_token = iprot.readString();
+            struct.setDelegation_tokenIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -230422,6 +245259,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_token_result implements org.apache.thrift.TBase<add_token_result, add_token_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_token_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_token_result");
 
@@ -230483,10 +245321,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -230523,6 +245363,7 @@ public add_token_result(add_token_result other) {
       this.success = other.success;
     }
 
+    @Override
     public add_token_result deepCopy() {
       return new add_token_result(this);
     }
@@ -230555,6 +245396,7 @@ public void setSuccessIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -230569,6 +245411,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -230579,6 +245422,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -230647,10 +245491,12 @@ public int compareTo(add_token_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -230695,6 +245541,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_token_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_token_resultStandardScheme getScheme() {
         return new add_token_resultStandardScheme();
       }
@@ -230702,33 +245549,40 @@ public add_token_resultStandardScheme getScheme() {
 
     private static class add_token_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_token_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_token_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_token_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -230745,6 +245599,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_token_result s
     }
 
     private static class add_token_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_token_resultTupleScheme getScheme() {
         return new add_token_resultTupleScheme();
       }
@@ -230767,11 +245622,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_token_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_token_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -230781,6 +245641,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_token_args implements org.apache.thrift.TBase<remove_token_args, remove_token_args._Fields>, java.io.Serializable, Cloneable, Comparable<remove_token_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_token_args");
 
@@ -230842,10 +245703,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -230880,6 +245743,7 @@ public remove_token_args(remove_token_args other) {
       }
     }
 
+    @Override
     public remove_token_args deepCopy() {
       return new remove_token_args(this);
     }
@@ -230913,6 +245777,7 @@ public void setToken_identifierIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN_IDENTIFIER:
@@ -230927,6 +245792,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN_IDENTIFIER:
@@ -230937,6 +245803,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -231007,14 +245874,17 @@ public int compareTo(remove_token_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -231057,6 +245927,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class remove_token_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_token_argsStandardScheme getScheme() {
         return new remove_token_argsStandardScheme();
       }
@@ -231064,33 +245935,40 @@ public remove_token_argsStandardScheme getScheme() {
 
     private static class remove_token_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<remove_token_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, remove_token_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TOKEN_IDENTIFIER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.token_identifier = iprot.readString();
-                struct.setToken_identifierIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // TOKEN_IDENTIFIER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.token_identifier = iprot.readString();
+                  struct.setToken_identifierIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, remove_token_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -231107,6 +245985,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, remove_token_args
     }
 
     private static class remove_token_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_token_argsTupleScheme getScheme() {
         return new remove_token_argsTupleScheme();
       }
@@ -231129,11 +246008,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, remove_token_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, remove_token_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.token_identifier = iprot.readString();
-          struct.setToken_identifierIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.token_identifier = iprot.readString();
+            struct.setToken_identifierIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -231143,6 +246027,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_token_result implements org.apache.thrift.TBase<remove_token_result, remove_token_result._Fields>, java.io.Serializable, Cloneable, Comparable<remove_token_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_token_result");
 
@@ -231204,10 +246089,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -231244,6 +246131,7 @@ public remove_token_result(remove_token_result other) {
       this.success = other.success;
     }
 
+    @Override
     public remove_token_result deepCopy() {
       return new remove_token_result(this);
     }
@@ -231276,6 +246164,7 @@ public void setSuccessIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -231290,6 +246179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -231300,6 +246190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -231368,10 +246259,12 @@ public int compareTo(remove_token_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -231416,6 +246309,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class remove_token_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_token_resultStandardScheme getScheme() {
         return new remove_token_resultStandardScheme();
       }
@@ -231423,33 +246317,40 @@ public remove_token_resultStandardScheme getScheme() {
 
     private static class remove_token_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<remove_token_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, remove_token_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, remove_token_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -231466,6 +246367,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, remove_token_resul
     }
 
     private static class remove_token_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_token_resultTupleScheme getScheme() {
         return new remove_token_resultTupleScheme();
       }
@@ -231488,11 +246390,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, remove_token_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, remove_token_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -231502,6 +246409,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_token_args implements org.apache.thrift.TBase<get_token_args, get_token_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_token_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_token_args");
 
@@ -231563,10 +246471,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -231601,6 +246511,7 @@ public get_token_args(get_token_args other) {
       }
     }
 
+    @Override
     public get_token_args deepCopy() {
       return new get_token_args(this);
     }
@@ -231634,6 +246545,7 @@ public void setToken_identifierIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN_IDENTIFIER:
@@ -231648,6 +246560,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN_IDENTIFIER:
@@ -231658,6 +246571,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -231728,14 +246642,17 @@ public int compareTo(get_token_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -231778,6 +246695,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_token_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_token_argsStandardScheme getScheme() {
         return new get_token_argsStandardScheme();
       }
@@ -231785,33 +246703,40 @@ public get_token_argsStandardScheme getScheme() {
 
     private static class get_token_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_token_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_token_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TOKEN_IDENTIFIER
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.token_identifier = iprot.readString();
-                struct.setToken_identifierIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // TOKEN_IDENTIFIER
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.token_identifier = iprot.readString();
+                  struct.setToken_identifierIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_token_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -231828,6 +246753,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_token_args str
     }
 
     private static class get_token_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_token_argsTupleScheme getScheme() {
         return new get_token_argsTupleScheme();
       }
@@ -231850,11 +246776,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_token_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_token_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.token_identifier = iprot.readString();
-          struct.setToken_identifierIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.token_identifier = iprot.readString();
+            struct.setToken_identifierIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -231864,6 +246795,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_token_result implements org.apache.thrift.TBase<get_token_result, get_token_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_token_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_token_result");
 
@@ -231925,10 +246857,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -231963,6 +246897,7 @@ public get_token_result(get_token_result other) {
       }
     }
 
+    @Override
     public get_token_result deepCopy() {
       return new get_token_result(this);
     }
@@ -231996,6 +246931,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -232010,6 +246946,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -232020,6 +246957,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -232090,10 +247028,12 @@ public int compareTo(get_token_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -232140,6 +247080,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_token_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_token_resultStandardScheme getScheme() {
         return new get_token_resultStandardScheme();
       }
@@ -232147,33 +247088,40 @@ public get_token_resultStandardScheme getScheme() {
 
     private static class get_token_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_token_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_token_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.STRING) {
-                struct.success = iprot.readString();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_token_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -232190,6 +247138,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_token_result s
     }
 
     private static class get_token_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_token_resultTupleScheme getScheme() {
         return new get_token_resultTupleScheme();
       }
@@ -232212,11 +247161,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_token_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_token_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.success = iprot.readString();
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -232226,6 +247180,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_token_identifiers_args implements org.apache.thrift.TBase<get_all_token_identifiers_args, get_all_token_identifiers_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_token_identifiers_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_token_identifiers_args");
 
@@ -232283,10 +247238,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -232307,6 +247264,7 @@ public get_all_token_identifiers_args() {
     public get_all_token_identifiers_args(get_all_token_identifiers_args other) {
     }
 
+    @Override
     public get_all_token_identifiers_args deepCopy() {
       return new get_all_token_identifiers_args(this);
     }
@@ -232315,12 +247273,14 @@ public get_all_token_identifiers_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -232328,6 +247288,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -232373,14 +247334,17 @@ public int compareTo(get_all_token_identifiers_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -232416,6 +247380,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_token_identifiers_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_token_identifiers_argsStandardScheme getScheme() {
         return new get_all_token_identifiers_argsStandardScheme();
       }
@@ -232423,25 +247388,32 @@ public get_all_token_identifiers_argsStandardScheme getScheme() {
 
     private static class get_all_token_identifiers_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_token_identifiers_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_token_identifiers_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_token_identifiers_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -232453,6 +247425,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_token_iden
     }
 
     private static class get_all_token_identifiers_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_token_identifiers_argsTupleScheme getScheme() {
         return new get_all_token_identifiers_argsTupleScheme();
       }
@@ -232467,7 +247440,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_token_ident
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_token_identifiers_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -232476,6 +247454,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_token_identifiers_result implements org.apache.thrift.TBase<get_all_token_identifiers_result, get_all_token_identifiers_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_token_identifiers_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_token_identifiers_result");
 
@@ -232537,10 +247516,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -232577,6 +247558,7 @@ public get_all_token_identifiers_result(get_all_token_identifiers_result other)
       }
     }
 
+    @Override
     public get_all_token_identifiers_result deepCopy() {
       return new get_all_token_identifiers_result(this);
     }
@@ -232626,6 +247608,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -232640,6 +247623,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -232650,6 +247634,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -232720,10 +247705,12 @@ public int compareTo(get_all_token_identifiers_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -232770,6 +247757,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_token_identifiers_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_token_identifiers_resultStandardScheme getScheme() {
         return new get_all_token_identifiers_resultStandardScheme();
       }
@@ -232777,43 +247765,50 @@ public get_all_token_identifiers_resultStandardScheme getScheme() {
 
     private static class get_all_token_identifiers_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_token_identifiers_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_token_identifiers_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2226 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2226.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2227;
-                  for (int _i2228 = 0; _i2228 < _list2226.size; ++_i2228)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2227 = iprot.readString();
-                    struct.success.add(_elem2227);
+                    org.apache.thrift.protocol.TList _list2226 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2226.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2227;
+                    for (int _i2228 = 0; _i2228 < _list2226.size; ++_i2228)
+                    {
+                      _elem2227 = iprot.readString();
+                      struct.success.add(_elem2227);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setSuccessIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_token_identifiers_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -232837,6 +247832,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_token_iden
     }
 
     private static class get_all_token_identifiers_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_token_identifiers_resultTupleScheme getScheme() {
         return new get_all_token_identifiers_resultTupleScheme();
       }
@@ -232865,20 +247861,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_token_ident
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_token_identifiers_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2231 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2231.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2232;
-            for (int _i2233 = 0; _i2233 < _list2231.size; ++_i2233)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
             {
-              _elem2232 = iprot.readString();
-              struct.success.add(_elem2232);
+              org.apache.thrift.protocol.TList _list2231 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2231.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2232;
+              for (int _i2233 = 0; _i2233 < _list2231.size; ++_i2233)
+              {
+                _elem2232 = iprot.readString();
+                struct.success.add(_elem2232);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -232888,6 +247889,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_master_key_args implements org.apache.thrift.TBase<add_master_key_args, add_master_key_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_master_key_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_master_key_args");
 
@@ -232949,10 +247951,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -232987,6 +247991,7 @@ public add_master_key_args(add_master_key_args other) {
       }
     }
 
+    @Override
     public add_master_key_args deepCopy() {
       return new add_master_key_args(this);
     }
@@ -233020,6 +248025,7 @@ public void setKeyIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case KEY:
@@ -233034,6 +248040,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case KEY:
@@ -233044,6 +248051,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -233114,14 +248122,17 @@ public int compareTo(add_master_key_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -233164,6 +248175,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_master_key_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_master_key_argsStandardScheme getScheme() {
         return new add_master_key_argsStandardScheme();
       }
@@ -233171,33 +248183,40 @@ public add_master_key_argsStandardScheme getScheme() {
 
     private static class add_master_key_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_master_key_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_master_key_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;
-          }
-          switch (schemeField.id) {
-            case 1: // KEY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.key = iprot.readString();
-                struct.setKeyIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_master_key_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -233214,6 +248233,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_master_key_arg
     }
 
     private static class add_master_key_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_master_key_argsTupleScheme getScheme() {
         return new add_master_key_argsTupleScheme();
       }
@@ -233236,11 +248256,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_master_key_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_master_key_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.key = iprot.readString();
-          struct.setKeyIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -233250,6 +248275,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_master_key_result implements org.apache.thrift.TBase<add_master_key_result, add_master_key_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_master_key_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_master_key_result");
 
@@ -233316,10 +248342,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -233363,6 +248391,7 @@ public add_master_key_result(add_master_key_result other) {
       }
     }
 
+    @Override
     public add_master_key_result deepCopy() {
       return new add_master_key_result(this);
     }
@@ -233420,6 +248449,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -233442,6 +248472,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -233455,6 +248486,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -233548,10 +248580,12 @@ public int compareTo(add_master_key_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -233604,6 +248638,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_master_key_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_master_key_resultStandardScheme getScheme() {
         return new add_master_key_resultStandardScheme();
       }
@@ -233611,42 +248646,49 @@ public add_master_key_resultStandardScheme getScheme() {
 
     private static class add_master_key_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_master_key_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_master_key_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.I32) {
-                struct.success = iprot.readI32();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.success = iprot.readI32();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_master_key_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -233668,6 +248710,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_master_key_res
     }
 
     private static class add_master_key_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_master_key_resultTupleScheme getScheme() {
         return new add_master_key_resultTupleScheme();
       }
@@ -233696,16 +248739,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_master_key_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_master_key_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.success = iprot.readI32();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readI32();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -233715,6 +248763,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_master_key_args implements org.apache.thrift.TBase<update_master_key_args, update_master_key_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_master_key_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_master_key_args");
 
@@ -233781,10 +248830,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -233828,6 +248879,7 @@ public update_master_key_args(update_master_key_args other) {
       }
     }
 
+    @Override
     public update_master_key_args deepCopy() {
       return new update_master_key_args(this);
     }
@@ -233885,6 +248937,7 @@ public void setKeyIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SEQ_NUMBER:
@@ -233907,6 +248960,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SEQ_NUMBER:
@@ -233920,6 +248974,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -234013,14 +249068,17 @@ public int compareTo(update_master_key_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -234069,6 +249127,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_master_key_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_master_key_argsStandardScheme getScheme() {
         return new update_master_key_argsStandardScheme();
       }
@@ -234076,41 +249135,48 @@ public update_master_key_argsStandardScheme getScheme() {
 
     private static class update_master_key_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_master_key_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_master_key_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SEQ_NUMBER
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.seq_number = iprot.readI32();
-                struct.setSeq_numberIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // KEY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.key = iprot.readString();
-                struct.setKeyIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // SEQ_NUMBER
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.seq_number = iprot.readI32();
+                  struct.setSeq_numberIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.key = iprot.readString();
+                  struct.setKeyIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_master_key_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -234130,6 +249196,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_master_key_
     }
 
     private static class update_master_key_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_master_key_argsTupleScheme getScheme() {
         return new update_master_key_argsTupleScheme();
       }
@@ -234158,15 +249225,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_master_key_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_master_key_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);
-        if (incoming.get(0)) {
-          struct.seq_number = iprot.readI32();
-          struct.setSeq_numberIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.key = iprot.readString();
-          struct.setKeyIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.seq_number = iprot.readI32();
+            struct.setSeq_numberIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.key = iprot.readString();
+            struct.setKeyIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -234176,6 +249248,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_master_key_result implements org.apache.thrift.TBase<update_master_key_result, update_master_key_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_master_key_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_master_key_result");
 
@@ -234242,10 +249315,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -234287,6 +249362,7 @@ public update_master_key_result(update_master_key_result other) {
       }
     }
 
+    @Override
     public update_master_key_result deepCopy() {
       return new update_master_key_result(this);
     }
@@ -234345,6 +249421,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -234367,6 +249444,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -234380,6 +249458,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -234475,10 +249554,12 @@ public int compareTo(update_master_key_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -234533,6 +249614,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_master_key_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_master_key_resultStandardScheme getScheme() {
         return new update_master_key_resultStandardScheme();
       }
@@ -234540,43 +249622,50 @@ public update_master_key_resultStandardScheme getScheme() {
 
     private static class update_master_key_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_master_key_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_master_key_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_master_key_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -234598,6 +249687,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_master_key_
     }
 
     private static class update_master_key_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_master_key_resultTupleScheme getScheme() {
         return new update_master_key_resultTupleScheme();
       }
@@ -234626,17 +249716,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_master_key_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_master_key_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -234646,6 +249741,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_master_key_args implements org.apache.thrift.TBase<remove_master_key_args, remove_master_key_args._Fields>, java.io.Serializable, Cloneable, Comparable<remove_master_key_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_master_key_args");
 
@@ -234707,10 +249803,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -234747,6 +249845,7 @@ public remove_master_key_args(remove_master_key_args other) {
       this.key_seq = other.key_seq;
     }
 
+    @Override
     public remove_master_key_args deepCopy() {
       return new remove_master_key_args(this);
     }
@@ -234779,6 +249878,7 @@ public void setKey_seqIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __KEY_SEQ_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case KEY_SEQ:
@@ -234793,6 +249893,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case KEY_SEQ:
@@ -234803,6 +249904,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -234871,14 +249973,17 @@ public int compareTo(remove_master_key_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -234919,6 +250024,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class remove_master_key_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_master_key_argsStandardScheme getScheme() {
         return new remove_master_key_argsStandardScheme();
       }
@@ -234926,33 +250032,40 @@ public remove_master_key_argsStandardScheme getScheme() {
 
     private static class remove_master_key_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<remove_master_key_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, remove_master_key_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;
-          }
-          switch (schemeField.id) {
-            case 1: // KEY_SEQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.key_seq = iprot.readI32();
-                struct.setKey_seqIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // KEY_SEQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                  struct.key_seq = iprot.readI32();
+                  struct.setKey_seqIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, remove_master_key_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -234967,6 +250080,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, remove_master_key_
     }
 
     private static class remove_master_key_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_master_key_argsTupleScheme getScheme() {
         return new remove_master_key_argsTupleScheme();
       }
@@ -234989,11 +250103,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, remove_master_key_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, remove_master_key_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.key_seq = iprot.readI32();
-          struct.setKey_seqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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_seq = iprot.readI32();
+            struct.setKey_seqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -235003,6 +250122,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_master_key_result implements org.apache.thrift.TBase<remove_master_key_result, remove_master_key_result._Fields>, java.io.Serializable, Cloneable, Comparable<remove_master_key_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_master_key_result");
 
@@ -235064,10 +250184,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -235104,6 +250226,7 @@ public remove_master_key_result(remove_master_key_result other) {
       this.success = other.success;
     }
 
+    @Override
     public remove_master_key_result deepCopy() {
       return new remove_master_key_result(this);
     }
@@ -235136,6 +250259,7 @@ public void setSuccessIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -235150,6 +250274,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -235160,6 +250285,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -235228,10 +250354,12 @@ public int compareTo(remove_master_key_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -235276,6 +250404,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class remove_master_key_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_master_key_resultStandardScheme getScheme() {
         return new remove_master_key_resultStandardScheme();
       }
@@ -235283,33 +250412,40 @@ public remove_master_key_resultStandardScheme getScheme() {
 
     private static class remove_master_key_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<remove_master_key_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, remove_master_key_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, remove_master_key_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -235326,6 +250462,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, remove_master_key_
     }
 
     private static class remove_master_key_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_master_key_resultTupleScheme getScheme() {
         return new remove_master_key_resultTupleScheme();
       }
@@ -235348,11 +250485,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, remove_master_key_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, remove_master_key_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -235362,6 +250504,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_master_keys_args implements org.apache.thrift.TBase<get_master_keys_args, get_master_keys_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_master_keys_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_master_keys_args");
 
@@ -235419,10 +250562,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -235443,6 +250588,7 @@ public get_master_keys_args() {
     public get_master_keys_args(get_master_keys_args other) {
     }
 
+    @Override
     public get_master_keys_args deepCopy() {
       return new get_master_keys_args(this);
     }
@@ -235451,12 +250597,14 @@ public get_master_keys_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -235464,6 +250612,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -235509,14 +250658,17 @@ public int compareTo(get_master_keys_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -235552,6 +250704,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_master_keys_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_master_keys_argsStandardScheme getScheme() {
         return new get_master_keys_argsStandardScheme();
       }
@@ -235559,25 +250712,32 @@ public get_master_keys_argsStandardScheme getScheme() {
 
     private static class get_master_keys_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_master_keys_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_master_keys_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_master_keys_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -235589,6 +250749,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_master_keys_ar
     }
 
     private static class get_master_keys_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_master_keys_argsTupleScheme getScheme() {
         return new get_master_keys_argsTupleScheme();
       }
@@ -235603,7 +250764,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_master_keys_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_master_keys_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -235612,6 +250778,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_master_keys_result implements org.apache.thrift.TBase<get_master_keys_result, get_master_keys_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_master_keys_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_master_keys_result");
 
@@ -235673,10 +250840,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -235713,6 +250882,7 @@ public get_master_keys_result(get_master_keys_result other) {
       }
     }
 
+    @Override
     public get_master_keys_result deepCopy() {
       return new get_master_keys_result(this);
     }
@@ -235762,6 +250932,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -235776,6 +250947,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -235786,6 +250958,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -235856,10 +251029,12 @@ public int compareTo(get_master_keys_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -235906,6 +251081,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_master_keys_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_master_keys_resultStandardScheme getScheme() {
         return new get_master_keys_resultStandardScheme();
       }
@@ -235913,43 +251089,50 @@ public get_master_keys_resultStandardScheme getScheme() {
 
     private static class get_master_keys_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_master_keys_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_master_keys_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2234 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2234.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2235;
-                  for (int _i2236 = 0; _i2236 < _list2234.size; ++_i2236)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2235 = iprot.readString();
-                    struct.success.add(_elem2235);
+                    org.apache.thrift.protocol.TList _list2234 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2234.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2235;
+                    for (int _i2236 = 0; _i2236 < _list2234.size; ++_i2236)
+                    {
+                      _elem2235 = iprot.readString();
+                      struct.success.add(_elem2235);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setSuccessIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_master_keys_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -235973,6 +251156,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_master_keys_re
     }
 
     private static class get_master_keys_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_master_keys_resultTupleScheme getScheme() {
         return new get_master_keys_resultTupleScheme();
       }
@@ -236001,20 +251185,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_master_keys_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_master_keys_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2239 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2239.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2240;
-            for (int _i2241 = 0; _i2241 < _list2239.size; ++_i2241)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
             {
-              _elem2240 = iprot.readString();
-              struct.success.add(_elem2240);
+              org.apache.thrift.protocol.TList _list2239 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2239.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2240;
+              for (int _i2241 = 0; _i2241 < _list2239.size; ++_i2241)
+              {
+                _elem2240 = iprot.readString();
+                struct.success.add(_elem2240);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -236024,6 +251213,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_args implements org.apache.thrift.TBase<get_open_txns_args, get_open_txns_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_open_txns_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_open_txns_args");
 
@@ -236081,10 +251271,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -236105,6 +251297,7 @@ public get_open_txns_args() {
     public get_open_txns_args(get_open_txns_args other) {
     }
 
+    @Override
     public get_open_txns_args deepCopy() {
       return new get_open_txns_args(this);
     }
@@ -236113,12 +251306,14 @@ public get_open_txns_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -236126,6 +251321,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -236171,14 +251367,17 @@ public int compareTo(get_open_txns_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -236214,6 +251413,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_open_txns_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_argsStandardScheme getScheme() {
         return new get_open_txns_argsStandardScheme();
       }
@@ -236221,25 +251421,32 @@ public get_open_txns_argsStandardScheme getScheme() {
 
     private static class get_open_txns_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_open_txns_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_open_txns_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -236251,6 +251458,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_args
     }
 
     private static class get_open_txns_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_argsTupleScheme getScheme() {
         return new get_open_txns_argsTupleScheme();
       }
@@ -236265,7 +251473,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_open_txns_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_open_txns_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -236274,6 +251487,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_result implements org.apache.thrift.TBase<get_open_txns_result, get_open_txns_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_open_txns_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_open_txns_result");
 
@@ -236335,10 +251549,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -236373,6 +251589,7 @@ public get_open_txns_result(get_open_txns_result other) {
       }
     }
 
+    @Override
     public get_open_txns_result deepCopy() {
       return new get_open_txns_result(this);
     }
@@ -236406,6 +251623,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -236420,6 +251638,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -236430,6 +251649,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -236500,10 +251720,12 @@ public int compareTo(get_open_txns_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -236553,6 +251775,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_open_txns_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_resultStandardScheme getScheme() {
         return new get_open_txns_resultStandardScheme();
       }
@@ -236560,34 +251783,41 @@ public get_open_txns_resultStandardScheme getScheme() {
 
     private static class get_open_txns_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_open_txns_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_open_txns_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 GetOpenTxnsResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetOpenTxnsResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -236604,6 +251834,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_resu
     }
 
     private static class get_open_txns_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_resultTupleScheme getScheme() {
         return new get_open_txns_resultTupleScheme();
       }
@@ -236626,12 +251857,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_open_txns_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_open_txns_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.success = new GetOpenTxnsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetOpenTxnsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -236641,6 +251877,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_info_args implements org.apache.thrift.TBase<get_open_txns_info_args, get_open_txns_info_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_open_txns_info_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_open_txns_info_args");
 
@@ -236698,10 +251935,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -236722,6 +251961,7 @@ public get_open_txns_info_args() {
     public get_open_txns_info_args(get_open_txns_info_args other) {
     }
 
+    @Override
     public get_open_txns_info_args deepCopy() {
       return new get_open_txns_info_args(this);
     }
@@ -236730,12 +251970,14 @@ public get_open_txns_info_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -236743,6 +251985,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -236788,14 +252031,17 @@ public int compareTo(get_open_txns_info_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -236831,6 +252077,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_open_txns_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_info_argsStandardScheme getScheme() {
         return new get_open_txns_info_argsStandardScheme();
       }
@@ -236838,25 +252085,32 @@ public get_open_txns_info_argsStandardScheme getScheme() {
 
     private static class get_open_txns_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_open_txns_info_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_open_txns_info_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_info_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -236868,6 +252122,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_info
     }
 
     private static class get_open_txns_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_info_argsTupleScheme getScheme() {
         return new get_open_txns_info_argsTupleScheme();
       }
@@ -236882,7 +252137,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_open_txns_info_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_open_txns_info_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -236891,6 +252151,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_info_result implements org.apache.thrift.TBase<get_open_txns_info_result, get_open_txns_info_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_open_txns_info_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_open_txns_info_result");
 
@@ -236952,10 +252213,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -236990,6 +252253,7 @@ public get_open_txns_info_result(get_open_txns_info_result other) {
       }
     }
 
+    @Override
     public get_open_txns_info_result deepCopy() {
       return new get_open_txns_info_result(this);
     }
@@ -237023,6 +252287,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -237037,6 +252302,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -237047,6 +252313,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -237117,10 +252384,12 @@ public int compareTo(get_open_txns_info_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -237170,6 +252439,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_open_txns_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_info_resultStandardScheme getScheme() {
         return new get_open_txns_info_resultStandardScheme();
       }
@@ -237177,34 +252447,41 @@ public get_open_txns_info_resultStandardScheme getScheme() {
 
     private static class get_open_txns_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_open_txns_info_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_open_txns_info_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 GetOpenTxnsInfoResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetOpenTxnsInfoResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_info_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -237221,6 +252498,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_info
     }
 
     private static class get_open_txns_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_info_resultTupleScheme getScheme() {
         return new get_open_txns_info_resultTupleScheme();
       }
@@ -237243,12 +252521,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_open_txns_info_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_open_txns_info_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.success = new GetOpenTxnsInfoResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetOpenTxnsInfoResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -237258,6 +252541,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class open_txns_args implements org.apache.thrift.TBase<open_txns_args, open_txns_args._Fields>, java.io.Serializable, Cloneable, Comparable<open_txns_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("open_txns_args");
 
@@ -237319,10 +252603,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -237357,6 +252643,7 @@ public open_txns_args(open_txns_args other) {
       }
     }
 
+    @Override
     public open_txns_args deepCopy() {
       return new open_txns_args(this);
     }
@@ -237390,6 +252677,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -237404,6 +252692,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -237414,6 +252703,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -237484,14 +252774,17 @@ public int compareTo(open_txns_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -237537,6 +252830,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class open_txns_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public open_txns_argsStandardScheme getScheme() {
         return new open_txns_argsStandardScheme();
       }
@@ -237544,34 +252838,41 @@ public open_txns_argsStandardScheme getScheme() {
 
     private static class open_txns_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<open_txns_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, open_txns_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new OpenTxnRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new OpenTxnRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, open_txns_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -237588,6 +252889,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, open_txns_args str
     }
 
     private static class open_txns_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public open_txns_argsTupleScheme getScheme() {
         return new open_txns_argsTupleScheme();
       }
@@ -237610,12 +252912,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, open_txns_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, open_txns_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 OpenTxnRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 OpenTxnRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -237625,6 +252932,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class open_txns_result implements org.apache.thrift.TBase<open_txns_result, open_txns_result._Fields>, java.io.Serializable, Cloneable, Comparable<open_txns_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("open_txns_result");
 
@@ -237686,10 +252994,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -237724,6 +253034,7 @@ public open_txns_result(open_txns_result other) {
       }
     }
 
+    @Override
     public open_txns_result deepCopy() {
       return new open_txns_result(this);
     }
@@ -237757,6 +253068,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -237771,6 +253083,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -237781,6 +253094,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -237851,10 +253165,12 @@ public int compareTo(open_txns_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -237904,6 +253220,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class open_txns_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public open_txns_resultStandardScheme getScheme() {
         return new open_txns_resultStandardScheme();
       }
@@ -237911,34 +253228,41 @@ public open_txns_resultStandardScheme getScheme() {
 
     private static class open_txns_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<open_txns_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, open_txns_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 OpenTxnsResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 OpenTxnsResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, open_txns_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -237955,6 +253279,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, open_txns_result s
     }
 
     private static class open_txns_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public open_txns_resultTupleScheme getScheme() {
         return new open_txns_resultTupleScheme();
       }
@@ -237977,12 +253302,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, open_txns_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, open_txns_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.success = new OpenTxnsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 OpenTxnsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -237992,6 +253322,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txn_args implements org.apache.thrift.TBase<abort_txn_args, abort_txn_args._Fields>, java.io.Serializable, Cloneable, Comparable<abort_txn_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_txn_args");
 
@@ -238053,10 +253384,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -238091,6 +253424,7 @@ public abort_txn_args(abort_txn_args other) {
       }
     }
 
+    @Override
     public abort_txn_args deepCopy() {
       return new abort_txn_args(this);
     }
@@ -238124,6 +253458,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -238138,6 +253473,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -238148,6 +253484,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -238218,14 +253555,17 @@ public int compareTo(abort_txn_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -238271,6 +253611,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class abort_txn_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txn_argsStandardScheme getScheme() {
         return new abort_txn_argsStandardScheme();
       }
@@ -238278,34 +253619,41 @@ public abort_txn_argsStandardScheme getScheme() {
 
     private static class abort_txn_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<abort_txn_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, abort_txn_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new AbortTxnRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new AbortTxnRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txn_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -238322,6 +253670,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txn_args str
     }
 
     private static class abort_txn_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txn_argsTupleScheme getScheme() {
         return new abort_txn_argsTupleScheme();
       }
@@ -238344,12 +253693,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, abort_txn_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, abort_txn_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 AbortTxnRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AbortTxnRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -238359,6 +253713,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txn_result implements org.apache.thrift.TBase<abort_txn_result, abort_txn_result._Fields>, java.io.Serializable, Cloneable, Comparable<abort_txn_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_txn_result");
 
@@ -238420,10 +253775,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -238458,6 +253815,7 @@ public abort_txn_result(abort_txn_result other) {
       }
     }
 
+    @Override
     public abort_txn_result deepCopy() {
       return new abort_txn_result(this);
     }
@@ -238491,6 +253849,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -238505,6 +253864,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -238515,6 +253875,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -238585,10 +253946,12 @@ public int compareTo(abort_txn_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -238635,6 +253998,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class abort_txn_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txn_resultStandardScheme getScheme() {
         return new abort_txn_resultStandardScheme();
       }
@@ -238642,34 +254006,41 @@ public abort_txn_resultStandardScheme getScheme() {
 
     private static class abort_txn_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<abort_txn_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, abort_txn_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new NoSuchTxnException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new NoSuchTxnException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txn_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -238686,6 +254057,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txn_result s
     }
 
     private static class abort_txn_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txn_resultTupleScheme getScheme() {
         return new abort_txn_resultTupleScheme();
       }
@@ -238708,12 +254080,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, abort_txn_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, abort_txn_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.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -238723,6 +254100,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txns_args implements org.apache.thrift.TBase<abort_txns_args, abort_txns_args._Fields>, java.io.Serializable, Cloneable, Comparable<abort_txns_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_txns_args");
 
@@ -238784,10 +254162,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -238822,6 +254202,7 @@ public abort_txns_args(abort_txns_args other) {
       }
     }
 
+    @Override
     public abort_txns_args deepCopy() {
       return new abort_txns_args(this);
     }
@@ -238855,6 +254236,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -238869,6 +254251,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -238879,6 +254262,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -238949,14 +254333,17 @@ public int compareTo(abort_txns_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -239002,6 +254389,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class abort_txns_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txns_argsStandardScheme getScheme() {
         return new abort_txns_argsStandardScheme();
       }
@@ -239009,34 +254397,41 @@ public abort_txns_argsStandardScheme getScheme() {
 
     private static class abort_txns_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<abort_txns_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, abort_txns_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new AbortTxnsRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new AbortTxnsRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txns_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -239053,6 +254448,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txns_args st
     }
 
     private static class abort_txns_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txns_argsTupleScheme getScheme() {
         return new abort_txns_argsTupleScheme();
       }
@@ -239075,12 +254471,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, abort_txns_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, abort_txns_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 AbortTxnsRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AbortTxnsRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -239090,6 +254491,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_txns_result implements org.apache.thrift.TBase<abort_txns_result, abort_txns_result._Fields>, java.io.Serializable, Cloneable, Comparable<abort_txns_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_txns_result");
 
@@ -239151,10 +254553,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -239189,6 +254593,7 @@ public abort_txns_result(abort_txns_result other) {
       }
     }
 
+    @Override
     public abort_txns_result deepCopy() {
       return new abort_txns_result(this);
     }
@@ -239222,6 +254627,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -239236,6 +254642,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -239246,6 +254653,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -239316,10 +254724,12 @@ public int compareTo(abort_txns_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -239366,6 +254776,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class abort_txns_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txns_resultStandardScheme getScheme() {
         return new abort_txns_resultStandardScheme();
       }
@@ -239373,34 +254784,41 @@ public abort_txns_resultStandardScheme getScheme() {
 
     private static class abort_txns_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<abort_txns_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, abort_txns_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new NoSuchTxnException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new NoSuchTxnException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txns_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -239417,6 +254835,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_txns_result
     }
 
     private static class abort_txns_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public abort_txns_resultTupleScheme getScheme() {
         return new abort_txns_resultTupleScheme();
       }
@@ -239439,12 +254858,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, abort_txns_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, abort_txns_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.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -239454,6 +254878,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class commit_txn_args implements org.apache.thrift.TBase<commit_txn_args, commit_txn_args._Fields>, java.io.Serializable, Cloneable, Comparable<commit_txn_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("commit_txn_args");
 
@@ -239515,10 +254940,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -239553,6 +254980,7 @@ public commit_txn_args(commit_txn_args other) {
       }
     }
 
+    @Override
     public commit_txn_args deepCopy() {
       return new commit_txn_args(this);
     }
@@ -239586,6 +255014,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -239600,6 +255029,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -239610,6 +255040,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -239680,14 +255111,17 @@ public int compareTo(commit_txn_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -239733,6 +255167,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class commit_txn_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public commit_txn_argsStandardScheme getScheme() {
         return new commit_txn_argsStandardScheme();
       }
@@ -239740,34 +255175,41 @@ public commit_txn_argsStandardScheme getScheme() {
 
     private static class commit_txn_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<commit_txn_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, commit_txn_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new CommitTxnRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new CommitTxnRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, commit_txn_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -239784,6 +255226,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, commit_txn_args st
     }
 
     private static class commit_txn_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public commit_txn_argsTupleScheme getScheme() {
         return new commit_txn_argsTupleScheme();
       }
@@ -239806,12 +255249,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, commit_txn_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, commit_txn_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 CommitTxnRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CommitTxnRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -239821,6 +255269,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class commit_txn_result implements org.apache.thrift.TBase<commit_txn_result, commit_txn_result._Fields>, java.io.Serializable, Cloneable, Comparable<commit_txn_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("commit_txn_result");
 
@@ -239887,10 +255336,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -239932,6 +255383,7 @@ public commit_txn_result(commit_txn_result other) {
       }
     }
 
+    @Override
     public commit_txn_result deepCopy() {
       return new commit_txn_result(this);
     }
@@ -239990,6 +255442,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -240012,6 +255465,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -240025,6 +255479,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -240120,10 +255575,12 @@ public int compareTo(commit_txn_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -240178,6 +255635,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class commit_txn_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public commit_txn_resultStandardScheme getScheme() {
         return new commit_txn_resultStandardScheme();
       }
@@ -240185,43 +255643,50 @@ public commit_txn_resultStandardScheme getScheme() {
 
     private static class commit_txn_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<commit_txn_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, commit_txn_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new NoSuchTxnException();
-                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 TxnAbortedException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new NoSuchTxnException();
+                  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 TxnAbortedException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, commit_txn_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -240243,6 +255708,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, commit_txn_result
     }
 
     private static class commit_txn_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public commit_txn_resultTupleScheme getScheme() {
         return new commit_txn_resultTupleScheme();
       }
@@ -240271,17 +255737,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, commit_txn_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, commit_txn_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.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new TxnAbortedException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new TxnAbortedException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -240291,6 +255762,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_txnid_in_conflict_args implements org.apache.thrift.TBase<get_latest_txnid_in_conflict_args, get_latest_txnid_in_conflict_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_latest_txnid_in_conflict_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_latest_txnid_in_conflict_args");
 
@@ -240352,10 +255824,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -240392,6 +255866,7 @@ public get_latest_txnid_in_conflict_args(get_latest_txnid_in_conflict_args other
       this.txnId = other.txnId;
     }
 
+    @Override
     public get_latest_txnid_in_conflict_args deepCopy() {
       return new get_latest_txnid_in_conflict_args(this);
     }
@@ -240424,6 +255899,7 @@ public void setTxnIdIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TXN_ID:
@@ -240438,6 +255914,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TXN_ID:
@@ -240448,6 +255925,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -240516,14 +255994,17 @@ public int compareTo(get_latest_txnid_in_conflict_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -240564,6 +256045,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_latest_txnid_in_conflict_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_txnid_in_conflict_argsStandardScheme getScheme() {
         return new get_latest_txnid_in_conflict_argsStandardScheme();
       }
@@ -240571,33 +256053,40 @@ public get_latest_txnid_in_conflict_argsStandardScheme getScheme() {
 
     private static class get_latest_txnid_in_conflict_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_latest_txnid_in_conflict_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_latest_txnid_in_conflict_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TXN_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.txnId = iprot.readI64();
-                struct.setTxnIdIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // TXN_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.txnId = iprot.readI64();
+                  struct.setTxnIdIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_txnid_in_conflict_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -240612,6 +256101,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_txnid_i
     }
 
     private static class get_latest_txnid_in_conflict_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_txnid_in_conflict_argsTupleScheme getScheme() {
         return new get_latest_txnid_in_conflict_argsTupleScheme();
       }
@@ -240634,11 +256124,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_latest_txnid_in
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_latest_txnid_in_conflict_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.txnId = iprot.readI64();
-          struct.setTxnIdIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.txnId = iprot.readI64();
+            struct.setTxnIdIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -240648,6 +256143,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_txnid_in_conflict_result implements org.apache.thrift.TBase<get_latest_txnid_in_conflict_result, get_latest_txnid_in_conflict_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_latest_txnid_in_conflict_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_latest_txnid_in_conflict_result");
 
@@ -240714,10 +256210,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -240761,6 +256259,7 @@ public get_latest_txnid_in_conflict_result(get_latest_txnid_in_conflict_result o
       }
     }
 
+    @Override
     public get_latest_txnid_in_conflict_result deepCopy() {
       return new get_latest_txnid_in_conflict_result(this);
     }
@@ -240818,6 +256317,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -240840,6 +256340,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -240853,6 +256354,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -240946,10 +256448,12 @@ public int compareTo(get_latest_txnid_in_conflict_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -241002,6 +256506,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_latest_txnid_in_conflict_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_txnid_in_conflict_resultStandardScheme getScheme() {
         return new get_latest_txnid_in_conflict_resultStandardScheme();
       }
@@ -241009,42 +256514,49 @@ public get_latest_txnid_in_conflict_resultStandardScheme getScheme() {
 
     private static class get_latest_txnid_in_conflict_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_latest_txnid_in_conflict_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_latest_txnid_in_conflict_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.I64) {
-                struct.success = iprot.readI64();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.success = iprot.readI64();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_txnid_in_conflict_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -241066,6 +256578,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_txnid_i
     }
 
     private static class get_latest_txnid_in_conflict_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_txnid_in_conflict_resultTupleScheme getScheme() {
         return new get_latest_txnid_in_conflict_resultTupleScheme();
       }
@@ -241094,16 +256607,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_latest_txnid_in
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_latest_txnid_in_conflict_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.success = iprot.readI64();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readI64();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -241113,6 +256631,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class repl_tbl_writeid_state_args implements org.apache.thrift.TBase<repl_tbl_writeid_state_args, repl_tbl_writeid_state_args._Fields>, java.io.Serializable, Cloneable, Comparable<repl_tbl_writeid_state_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("repl_tbl_writeid_state_args");
 
@@ -241174,10 +256693,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -241212,6 +256733,7 @@ public repl_tbl_writeid_state_args(repl_tbl_writeid_state_args other) {
       }
     }
 
+    @Override
     public repl_tbl_writeid_state_args deepCopy() {
       return new repl_tbl_writeid_state_args(this);
     }
@@ -241245,6 +256767,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -241259,6 +256782,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -241269,6 +256793,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -241339,14 +256864,17 @@ public int compareTo(repl_tbl_writeid_state_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -241392,6 +256920,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class repl_tbl_writeid_state_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public repl_tbl_writeid_state_argsStandardScheme getScheme() {
         return new repl_tbl_writeid_state_argsStandardScheme();
       }
@@ -241399,34 +256928,41 @@ public repl_tbl_writeid_state_argsStandardScheme getScheme() {
 
     private static class repl_tbl_writeid_state_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<repl_tbl_writeid_state_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, repl_tbl_writeid_state_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new ReplTblWriteIdStateRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new ReplTblWriteIdStateRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, repl_tbl_writeid_state_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -241443,6 +256979,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, repl_tbl_writeid_s
     }
 
     private static class repl_tbl_writeid_state_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public repl_tbl_writeid_state_argsTupleScheme getScheme() {
         return new repl_tbl_writeid_state_argsTupleScheme();
       }
@@ -241465,12 +257002,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, repl_tbl_writeid_st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, repl_tbl_writeid_state_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 ReplTblWriteIdStateRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ReplTblWriteIdStateRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -241480,6 +257022,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class repl_tbl_writeid_state_result implements org.apache.thrift.TBase<repl_tbl_writeid_state_result, repl_tbl_writeid_state_result._Fields>, java.io.Serializable, Cloneable, Comparable<repl_tbl_writeid_state_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("repl_tbl_writeid_state_result");
 
@@ -241537,10 +257080,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -241561,6 +257106,7 @@ public repl_tbl_writeid_state_result() {
     public repl_tbl_writeid_state_result(repl_tbl_writeid_state_result other) {
     }
 
+    @Override
     public repl_tbl_writeid_state_result deepCopy() {
       return new repl_tbl_writeid_state_result(this);
     }
@@ -241569,12 +257115,14 @@ public repl_tbl_writeid_state_result deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -241582,6 +257130,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -241627,10 +257176,12 @@ public int compareTo(repl_tbl_writeid_state_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -241670,6 +257221,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class repl_tbl_writeid_state_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public repl_tbl_writeid_state_resultStandardScheme getScheme() {
         return new repl_tbl_writeid_state_resultStandardScheme();
       }
@@ -241677,25 +257229,32 @@ public repl_tbl_writeid_state_resultStandardScheme getScheme() {
 
     private static class repl_tbl_writeid_state_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<repl_tbl_writeid_state_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, repl_tbl_writeid_state_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) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, repl_tbl_writeid_state_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -241707,6 +257266,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, repl_tbl_writeid_s
     }
 
     private static class repl_tbl_writeid_state_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public repl_tbl_writeid_state_resultTupleScheme getScheme() {
         return new repl_tbl_writeid_state_resultTupleScheme();
       }
@@ -241721,7 +257281,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, repl_tbl_writeid_st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, repl_tbl_writeid_state_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -241730,6 +257295,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_valid_write_ids_args implements org.apache.thrift.TBase<get_valid_write_ids_args, get_valid_write_ids_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_valid_write_ids_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_valid_write_ids_args");
 
@@ -241791,10 +257357,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -241829,6 +257397,7 @@ public get_valid_write_ids_args(get_valid_write_ids_args other) {
       }
     }
 
+    @Override
     public get_valid_write_ids_args deepCopy() {
       return new get_valid_write_ids_args(this);
     }
@@ -241862,6 +257431,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -241876,6 +257446,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -241886,6 +257457,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -241956,14 +257528,17 @@ public int compareTo(get_valid_write_ids_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -242009,6 +257584,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_valid_write_ids_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_valid_write_ids_argsStandardScheme getScheme() {
         return new get_valid_write_ids_argsStandardScheme();
       }
@@ -242016,34 +257592,41 @@ public get_valid_write_ids_argsStandardScheme getScheme() {
 
     private static class get_valid_write_ids_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_valid_write_ids_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_valid_write_ids_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new GetValidWriteIdsRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new GetValidWriteIdsRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_valid_write_ids_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -242060,6 +257643,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_valid_write_id
     }
 
     private static class get_valid_write_ids_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_valid_write_ids_argsTupleScheme getScheme() {
         return new get_valid_write_ids_argsTupleScheme();
       }
@@ -242082,12 +257666,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_valid_write_ids
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_valid_write_ids_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 GetValidWriteIdsRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetValidWriteIdsRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -242097,6 +257686,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_valid_write_ids_result implements org.apache.thrift.TBase<get_valid_write_ids_result, get_valid_write_ids_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_valid_write_ids_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_valid_write_ids_result");
 
@@ -242168,10 +257758,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -242220,6 +257812,7 @@ public get_valid_write_ids_result(get_valid_write_ids_result other) {
       }
     }
 
+    @Override
     public get_valid_write_ids_result deepCopy() {
       return new get_valid_write_ids_result(this);
     }
@@ -242303,6 +257896,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -242333,6 +257927,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -242349,6 +257944,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -242469,10 +258065,12 @@ public int compareTo(get_valid_write_ids_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -242538,6 +258136,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_valid_write_ids_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_valid_write_ids_resultStandardScheme getScheme() {
         return new get_valid_write_ids_resultStandardScheme();
       }
@@ -242545,52 +258144,59 @@ public get_valid_write_ids_resultStandardScheme getScheme() {
 
     private static class get_valid_write_ids_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_valid_write_ids_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_valid_write_ids_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 GetValidWriteIdsResponse();
-                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 NoSuchTxnException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetValidWriteIdsResponse();
+                  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 NoSuchTxnException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_valid_write_ids_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -242617,6 +258223,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_valid_write_id
     }
 
     private static class get_valid_write_ids_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_valid_write_ids_resultTupleScheme getScheme() {
         return new get_valid_write_ids_resultTupleScheme();
       }
@@ -242651,22 +258258,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_valid_write_ids
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_valid_write_ids_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 GetValidWriteIdsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetValidWriteIdsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -242676,6 +258288,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_ids_to_min_history_args implements org.apache.thrift.TBase<add_write_ids_to_min_history_args, add_write_ids_to_min_history_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_ids_to_min_history_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_ids_to_min_history_args");
 
@@ -242742,10 +258355,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -242792,6 +258407,7 @@ public add_write_ids_to_min_history_args(add_write_ids_to_min_history_args other
       }
     }
 
+    @Override
     public add_write_ids_to_min_history_args deepCopy() {
       return new add_write_ids_to_min_history_args(this);
     }
@@ -242860,6 +258476,7 @@ public void setWriteIdsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TXN_ID:
@@ -242882,6 +258499,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TXN_ID:
@@ -242895,6 +258513,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -242988,14 +258607,17 @@ public int compareTo(add_write_ids_to_min_history_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -243044,6 +258666,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_write_ids_to_min_history_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_ids_to_min_history_argsStandardScheme getScheme() {
         return new add_write_ids_to_min_history_argsStandardScheme();
       }
@@ -243051,53 +258674,60 @@ public add_write_ids_to_min_history_argsStandardScheme getScheme() {
 
     private static class add_write_ids_to_min_history_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_write_ids_to_min_history_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_write_ids_to_min_history_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TXN_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.txnId = iprot.readI64();
-                struct.setTxnIdIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // WRITE_IDS
-              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-                {
-                  org.apache.thrift.protocol.TMap _map2242 = iprot.readMapBegin();
-                  struct.writeIds = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map2242.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key2243;
-                  long _val2244;
-                  for (int _i2245 = 0; _i2245 < _map2242.size; ++_i2245)
+            }
+            switch (schemeField.id) {
+              case 1: // TXN_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.txnId = iprot.readI64();
+                  struct.setTxnIdIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // WRITE_IDS
+                if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                   {
-                    _key2243 = iprot.readString();
-                    _val2244 = iprot.readI64();
-                    struct.writeIds.put(_key2243, _val2244);
+                    org.apache.thrift.protocol.TMap _map2242 = iprot.readMapBegin();
+                    struct.writeIds = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map2242.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _key2243;
+                    long _val2244;
+                    for (int _i2245 = 0; _i2245 < _map2242.size; ++_i2245)
+                    {
+                      _key2243 = iprot.readString();
+                      _val2244 = iprot.readI64();
+                      struct.writeIds.put(_key2243, _val2244);
+                    }
+                    iprot.readMapEnd();
                   }
-                  iprot.readMapEnd();
+                  struct.setWriteIdsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setWriteIdsIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_ids_to_min_history_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -243125,6 +258755,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_ids_to_m
     }
 
     private static class add_write_ids_to_min_history_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_ids_to_min_history_argsTupleScheme getScheme() {
         return new add_write_ids_to_min_history_argsTupleScheme();
       }
@@ -243160,26 +258791,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_write_ids_to_mi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_write_ids_to_min_history_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);
-        if (incoming.get(0)) {
-          struct.txnId = iprot.readI64();
-          struct.setTxnIdIsSet(true);
-        }
-        if (incoming.get(1)) {
-          {
-            org.apache.thrift.protocol.TMap _map2248 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64); 
-            struct.writeIds = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map2248.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key2249;
-            long _val2250;
-            for (int _i2251 = 0; _i2251 < _map2248.size; ++_i2251)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.txnId = iprot.readI64();
+            struct.setTxnIdIsSet(true);
+          }
+          if (incoming.get(1)) {
             {
-              _key2249 = iprot.readString();
-              _val2250 = iprot.readI64();
-              struct.writeIds.put(_key2249, _val2250);
+              org.apache.thrift.protocol.TMap _map2248 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64); 
+              struct.writeIds = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map2248.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _key2249;
+              long _val2250;
+              for (int _i2251 = 0; _i2251 < _map2248.size; ++_i2251)
+              {
+                _key2249 = iprot.readString();
+                _val2250 = iprot.readI64();
+                struct.writeIds.put(_key2249, _val2250);
+              }
             }
+            struct.setWriteIdsIsSet(true);
           }
-          struct.setWriteIdsIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -243189,6 +258825,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_ids_to_min_history_result implements org.apache.thrift.TBase<add_write_ids_to_min_history_result, add_write_ids_to_min_history_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_ids_to_min_history_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_ids_to_min_history_result");
 
@@ -243250,10 +258887,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -243288,6 +258927,7 @@ public add_write_ids_to_min_history_result(add_write_ids_to_min_history_result o
       }
     }
 
+    @Override
     public add_write_ids_to_min_history_result deepCopy() {
       return new add_write_ids_to_min_history_result(this);
     }
@@ -243321,6 +258961,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O2:
@@ -243335,6 +258976,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O2:
@@ -243345,6 +258987,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -243415,10 +259058,12 @@ public int compareTo(add_write_ids_to_min_history_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -243465,6 +259110,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_write_ids_to_min_history_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_ids_to_min_history_resultStandardScheme getScheme() {
         return new add_write_ids_to_min_history_resultStandardScheme();
       }
@@ -243472,34 +259118,41 @@ public add_write_ids_to_min_history_resultStandardScheme getScheme() {
 
     private static class add_write_ids_to_min_history_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_write_ids_to_min_history_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_write_ids_to_min_history_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 1: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_ids_to_min_history_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -243516,6 +259169,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_ids_to_m
     }
 
     private static class add_write_ids_to_min_history_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_ids_to_min_history_resultTupleScheme getScheme() {
         return new add_write_ids_to_min_history_resultTupleScheme();
       }
@@ -243538,12 +259192,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_write_ids_to_mi
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_write_ids_to_min_history_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.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -243553,6 +259212,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class allocate_table_write_ids_args implements org.apache.thrift.TBase<allocate_table_write_ids_args, allocate_table_write_ids_args._Fields>, java.io.Serializable, Cloneable, Comparable<allocate_table_write_ids_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("allocate_table_write_ids_args");
 
@@ -243614,10 +259274,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -243652,6 +259314,7 @@ public allocate_table_write_ids_args(allocate_table_write_ids_args other) {
       }
     }
 
+    @Override
     public allocate_table_write_ids_args deepCopy() {
       return new allocate_table_write_ids_args(this);
     }
@@ -243685,6 +259348,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -243699,6 +259363,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -243709,6 +259374,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -243779,14 +259445,17 @@ public int compareTo(allocate_table_write_ids_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -243832,6 +259501,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class allocate_table_write_ids_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public allocate_table_write_ids_argsStandardScheme getScheme() {
         return new allocate_table_write_ids_argsStandardScheme();
       }
@@ -243839,34 +259509,41 @@ public allocate_table_write_ids_argsStandardScheme getScheme() {
 
     private static class allocate_table_write_ids_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<allocate_table_write_ids_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, allocate_table_write_ids_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new AllocateTableWriteIdsRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new AllocateTableWriteIdsRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, allocate_table_write_ids_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -243883,6 +259560,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, allocate_table_wri
     }
 
     private static class allocate_table_write_ids_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public allocate_table_write_ids_argsTupleScheme getScheme() {
         return new allocate_table_write_ids_argsTupleScheme();
       }
@@ -243905,12 +259583,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, allocate_table_writ
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, allocate_table_write_ids_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 AllocateTableWriteIdsRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AllocateTableWriteIdsRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -243920,6 +259603,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class allocate_table_write_ids_result implements org.apache.thrift.TBase<allocate_table_write_ids_result, allocate_table_write_ids_result._Fields>, java.io.Serializable, Cloneable, Comparable<allocate_table_write_ids_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("allocate_table_write_ids_result");
 
@@ -243996,10 +259680,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -244055,6 +259741,7 @@ public allocate_table_write_ids_result(allocate_table_write_ids_result other) {
       }
     }
 
+    @Override
     public allocate_table_write_ids_result deepCopy() {
       return new allocate_table_write_ids_result(this);
     }
@@ -244163,6 +259850,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -244201,6 +259889,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -244220,6 +259909,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -244365,10 +260055,12 @@ public int compareTo(allocate_table_write_ids_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -244442,6 +260134,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class allocate_table_write_ids_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public allocate_table_write_ids_resultStandardScheme getScheme() {
         return new allocate_table_write_ids_resultStandardScheme();
       }
@@ -244449,61 +260142,68 @@ public allocate_table_write_ids_resultStandardScheme getScheme() {
 
     private static class allocate_table_write_ids_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<allocate_table_write_ids_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, allocate_table_write_ids_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 AllocateTableWriteIdsResponse();
-                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 NoSuchTxnException();
-                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 TxnAbortedException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 AllocateTableWriteIdsResponse();
+                  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 NoSuchTxnException();
+                  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 TxnAbortedException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, allocate_table_write_ids_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -244535,6 +260235,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, allocate_table_wri
     }
 
     private static class allocate_table_write_ids_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public allocate_table_write_ids_resultTupleScheme getScheme() {
         return new allocate_table_write_ids_resultTupleScheme();
       }
@@ -244575,27 +260276,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, allocate_table_writ
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, allocate_table_write_ids_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(4);
-        if (incoming.get(0)) {
-          struct.success = new AllocateTableWriteIdsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new TxnAbortedException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new AllocateTableWriteIdsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new TxnAbortedException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -244605,6 +260311,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_max_allocated_table_write_id_args implements org.apache.thrift.TBase<get_max_allocated_table_write_id_args, get_max_allocated_table_write_id_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_max_allocated_table_write_id_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_max_allocated_table_write_id_args");
 
@@ -244666,10 +260373,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -244704,6 +260413,7 @@ public get_max_allocated_table_write_id_args(get_max_allocated_table_write_id_ar
       }
     }
 
+    @Override
     public get_max_allocated_table_write_id_args deepCopy() {
       return new get_max_allocated_table_write_id_args(this);
     }
@@ -244737,6 +260447,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -244751,6 +260462,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -244761,6 +260473,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -244831,14 +260544,17 @@ public int compareTo(get_max_allocated_table_write_id_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -244884,6 +260600,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_max_allocated_table_write_id_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_max_allocated_table_write_id_argsStandardScheme getScheme() {
         return new get_max_allocated_table_write_id_argsStandardScheme();
       }
@@ -244891,34 +260608,41 @@ public get_max_allocated_table_write_id_argsStandardScheme getScheme() {
 
     private static class get_max_allocated_table_write_id_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_max_allocated_table_write_id_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_max_allocated_table_write_id_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new MaxAllocatedTableWriteIdRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new MaxAllocatedTableWriteIdRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_max_allocated_table_write_id_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -244935,6 +260659,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_max_allocated_
     }
 
     private static class get_max_allocated_table_write_id_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_max_allocated_table_write_id_argsTupleScheme getScheme() {
         return new get_max_allocated_table_write_id_argsTupleScheme();
       }
@@ -244957,12 +260682,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_max_allocated_t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_max_allocated_table_write_id_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 MaxAllocatedTableWriteIdRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 MaxAllocatedTableWriteIdRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -244972,6 +260702,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_max_allocated_table_write_id_result implements org.apache.thrift.TBase<get_max_allocated_table_write_id_result, get_max_allocated_table_write_id_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_max_allocated_table_write_id_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_max_allocated_table_write_id_result");
 
@@ -245038,10 +260769,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -245083,6 +260816,7 @@ public get_max_allocated_table_write_id_result(get_max_allocated_table_write_id_
       }
     }
 
+    @Override
     public get_max_allocated_table_write_id_result deepCopy() {
       return new get_max_allocated_table_write_id_result(this);
     }
@@ -245141,6 +260875,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -245163,6 +260898,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -245176,6 +260912,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -245271,10 +261008,12 @@ public int compareTo(get_max_allocated_table_write_id_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -245332,6 +261071,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_max_allocated_table_write_id_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_max_allocated_table_write_id_resultStandardScheme getScheme() {
         return new get_max_allocated_table_write_id_resultStandardScheme();
       }
@@ -245339,43 +261079,50 @@ public get_max_allocated_table_write_id_resultStandardScheme getScheme() {
 
     private static class get_max_allocated_table_write_id_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_max_allocated_table_write_id_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_max_allocated_table_write_id_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 MaxAllocatedTableWriteIdResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 MaxAllocatedTableWriteIdResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_max_allocated_table_write_id_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -245397,6 +261144,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_max_allocated_
     }
 
     private static class get_max_allocated_table_write_id_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_max_allocated_table_write_id_resultTupleScheme getScheme() {
         return new get_max_allocated_table_write_id_resultTupleScheme();
       }
@@ -245425,17 +261173,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_max_allocated_t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_max_allocated_table_write_id_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.success = new MaxAllocatedTableWriteIdResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new MaxAllocatedTableWriteIdResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -245445,6 +261198,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_write_id_args implements org.apache.thrift.TBase<seed_write_id_args, seed_write_id_args._Fields>, java.io.Serializable, Cloneable, Comparable<seed_write_id_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("seed_write_id_args");
 
@@ -245506,10 +261260,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -245544,6 +261300,7 @@ public seed_write_id_args(seed_write_id_args other) {
       }
     }
 
+    @Override
     public seed_write_id_args deepCopy() {
       return new seed_write_id_args(this);
     }
@@ -245577,6 +261334,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -245591,6 +261349,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -245601,6 +261360,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -245671,14 +261431,17 @@ public int compareTo(seed_write_id_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -245724,6 +261487,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class seed_write_id_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_write_id_argsStandardScheme getScheme() {
         return new seed_write_id_argsStandardScheme();
       }
@@ -245731,34 +261495,41 @@ public seed_write_id_argsStandardScheme getScheme() {
 
     private static class seed_write_id_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<seed_write_id_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, seed_write_id_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new SeedTableWriteIdsRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new SeedTableWriteIdsRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, seed_write_id_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -245775,6 +261546,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, seed_write_id_args
     }
 
     private static class seed_write_id_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_write_id_argsTupleScheme getScheme() {
         return new seed_write_id_argsTupleScheme();
       }
@@ -245797,12 +261569,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, seed_write_id_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, seed_write_id_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 SeedTableWriteIdsRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SeedTableWriteIdsRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -245812,6 +261589,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_write_id_result implements org.apache.thrift.TBase<seed_write_id_result, seed_write_id_result._Fields>, java.io.Serializable, Cloneable, Comparable<seed_write_id_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("seed_write_id_result");
 
@@ -245873,10 +261651,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -245911,6 +261691,7 @@ public seed_write_id_result(seed_write_id_result other) {
       }
     }
 
+    @Override
     public seed_write_id_result deepCopy() {
       return new seed_write_id_result(this);
     }
@@ -245944,6 +261725,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -245958,6 +261740,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -245968,6 +261751,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -246038,10 +261822,12 @@ public int compareTo(seed_write_id_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -246088,6 +261874,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class seed_write_id_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_write_id_resultStandardScheme getScheme() {
         return new seed_write_id_resultStandardScheme();
       }
@@ -246095,34 +261882,41 @@ public seed_write_id_resultStandardScheme getScheme() {
 
     private static class seed_write_id_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<seed_write_id_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, seed_write_id_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, seed_write_id_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -246139,6 +261933,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, seed_write_id_resu
     }
 
     private static class seed_write_id_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_write_id_resultTupleScheme getScheme() {
         return new seed_write_id_resultTupleScheme();
       }
@@ -246161,12 +261956,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, seed_write_id_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, seed_write_id_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -246176,6 +261976,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_txn_id_args implements org.apache.thrift.TBase<seed_txn_id_args, seed_txn_id_args._Fields>, java.io.Serializable, Cloneable, Comparable<seed_txn_id_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("seed_txn_id_args");
 
@@ -246237,10 +262038,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -246275,6 +262078,7 @@ public seed_txn_id_args(seed_txn_id_args other) {
       }
     }
 
+    @Override
     public seed_txn_id_args deepCopy() {
       return new seed_txn_id_args(this);
     }
@@ -246308,6 +262112,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -246322,6 +262127,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -246332,6 +262138,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -246402,14 +262209,17 @@ public int compareTo(seed_txn_id_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -246455,6 +262265,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class seed_txn_id_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_txn_id_argsStandardScheme getScheme() {
         return new seed_txn_id_argsStandardScheme();
       }
@@ -246462,34 +262273,41 @@ public seed_txn_id_argsStandardScheme getScheme() {
 
     private static class seed_txn_id_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<seed_txn_id_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, seed_txn_id_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new SeedTxnIdRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new SeedTxnIdRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, seed_txn_id_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -246506,6 +262324,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, seed_txn_id_args s
     }
 
     private static class seed_txn_id_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_txn_id_argsTupleScheme getScheme() {
         return new seed_txn_id_argsTupleScheme();
       }
@@ -246528,12 +262347,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, seed_txn_id_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, seed_txn_id_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 SeedTxnIdRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SeedTxnIdRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -246543,6 +262367,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class seed_txn_id_result implements org.apache.thrift.TBase<seed_txn_id_result, seed_txn_id_result._Fields>, java.io.Serializable, Cloneable, Comparable<seed_txn_id_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("seed_txn_id_result");
 
@@ -246604,10 +262429,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -246642,6 +262469,7 @@ public seed_txn_id_result(seed_txn_id_result other) {
       }
     }
 
+    @Override
     public seed_txn_id_result deepCopy() {
       return new seed_txn_id_result(this);
     }
@@ -246675,6 +262503,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -246689,6 +262518,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -246699,6 +262529,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -246769,10 +262600,12 @@ public int compareTo(seed_txn_id_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -246819,6 +262652,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class seed_txn_id_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_txn_id_resultStandardScheme getScheme() {
         return new seed_txn_id_resultStandardScheme();
       }
@@ -246826,34 +262660,41 @@ public seed_txn_id_resultStandardScheme getScheme() {
 
     private static class seed_txn_id_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<seed_txn_id_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, seed_txn_id_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, seed_txn_id_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -246870,6 +262711,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, seed_txn_id_result
     }
 
     private static class seed_txn_id_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public seed_txn_id_resultTupleScheme getScheme() {
         return new seed_txn_id_resultTupleScheme();
       }
@@ -246892,12 +262734,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, seed_txn_id_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, seed_txn_id_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -246907,6 +262754,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class lock_args implements org.apache.thrift.TBase<lock_args, lock_args._Fields>, java.io.Serializable, Cloneable, Comparable<lock_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("lock_args");
 
@@ -246968,10 +262816,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -247006,6 +262856,7 @@ public lock_args(lock_args other) {
       }
     }
 
+    @Override
     public lock_args deepCopy() {
       return new lock_args(this);
     }
@@ -247039,6 +262890,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -247053,6 +262905,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -247063,6 +262916,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -247133,14 +262987,17 @@ public int compareTo(lock_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -247186,6 +263043,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class lock_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public lock_argsStandardScheme getScheme() {
         return new lock_argsStandardScheme();
       }
@@ -247193,34 +263051,41 @@ public lock_argsStandardScheme getScheme() {
 
     private static class lock_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<lock_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, lock_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new LockRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new LockRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, lock_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -247237,6 +263102,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, lock_args struct)
     }
 
     private static class lock_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public lock_argsTupleScheme getScheme() {
         return new lock_argsTupleScheme();
       }
@@ -247259,12 +263125,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, lock_args struct) t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, lock_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 LockRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 LockRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -247274,6 +263145,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class lock_result implements org.apache.thrift.TBase<lock_result, lock_result._Fields>, java.io.Serializable, Cloneable, Comparable<lock_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("lock_result");
 
@@ -247345,10 +263217,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -247397,6 +263271,7 @@ public lock_result(lock_result other) {
       }
     }
 
+    @Override
     public lock_result deepCopy() {
       return new lock_result(this);
     }
@@ -247480,6 +263355,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -247510,6 +263386,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -247526,6 +263403,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -247646,10 +263524,12 @@ public int compareTo(lock_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -247715,6 +263595,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class lock_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public lock_resultStandardScheme getScheme() {
         return new lock_resultStandardScheme();
       }
@@ -247722,52 +263603,59 @@ public lock_resultStandardScheme getScheme() {
 
     private static class lock_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<lock_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, lock_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 LockResponse();
-                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 NoSuchTxnException();
-                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 TxnAbortedException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+                  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 NoSuchTxnException();
+                  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 TxnAbortedException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, lock_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -247794,6 +263682,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, lock_result struct
     }
 
     private static class lock_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public lock_resultTupleScheme getScheme() {
         return new lock_resultTupleScheme();
       }
@@ -247828,22 +263717,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, lock_result struct)
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, lock_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 LockResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new TxnAbortedException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new TxnAbortedException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -247853,6 +263747,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class check_lock_args implements org.apache.thrift.TBase<check_lock_args, check_lock_args._Fields>, java.io.Serializable, Cloneable, Comparable<check_lock_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("check_lock_args");
 
@@ -247914,10 +263809,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -247952,6 +263849,7 @@ public check_lock_args(check_lock_args other) {
       }
     }
 
+    @Override
     public check_lock_args deepCopy() {
       return new check_lock_args(this);
     }
@@ -247985,6 +263883,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -247999,6 +263898,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -248009,6 +263909,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -248079,14 +263980,17 @@ public int compareTo(check_lock_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -248132,6 +264036,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class check_lock_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public check_lock_argsStandardScheme getScheme() {
         return new check_lock_argsStandardScheme();
       }
@@ -248139,34 +264044,41 @@ public check_lock_argsStandardScheme getScheme() {
 
     private static class check_lock_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<check_lock_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, check_lock_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new CheckLockRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new CheckLockRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, check_lock_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -248183,6 +264095,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, check_lock_args st
     }
 
     private static class check_lock_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public check_lock_argsTupleScheme getScheme() {
         return new check_lock_argsTupleScheme();
       }
@@ -248205,12 +264118,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, check_lock_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, check_lock_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 CheckLockRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CheckLockRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -248220,6 +264138,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class check_lock_result implements org.apache.thrift.TBase<check_lock_result, check_lock_result._Fields>, java.io.Serializable, Cloneable, Comparable<check_lock_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("check_lock_result");
 
@@ -248296,10 +264215,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -248355,6 +264276,7 @@ public check_lock_result(check_lock_result other) {
       }
     }
 
+    @Override
     public check_lock_result deepCopy() {
       return new check_lock_result(this);
     }
@@ -248463,6 +264385,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -248501,6 +264424,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -248520,6 +264444,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -248665,10 +264590,12 @@ public int compareTo(check_lock_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -248742,6 +264669,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class check_lock_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public check_lock_resultStandardScheme getScheme() {
         return new check_lock_resultStandardScheme();
       }
@@ -248749,61 +264677,68 @@ public check_lock_resultStandardScheme getScheme() {
 
     private static class check_lock_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<check_lock_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, check_lock_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 LockResponse();
-                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 NoSuchTxnException();
-                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 TxnAbortedException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new NoSuchLockException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+                  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 NoSuchTxnException();
+                  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 TxnAbortedException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new NoSuchLockException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, check_lock_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -248835,6 +264770,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, check_lock_result
     }
 
     private static class check_lock_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public check_lock_resultTupleScheme getScheme() {
         return new check_lock_resultTupleScheme();
       }
@@ -248875,27 +264811,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, check_lock_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, check_lock_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(4);
-        if (incoming.get(0)) {
-          struct.success = new LockResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new TxnAbortedException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new NoSuchLockException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new LockResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new TxnAbortedException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new NoSuchLockException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -248905,6 +264846,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class unlock_args implements org.apache.thrift.TBase<unlock_args, unlock_args._Fields>, java.io.Serializable, Cloneable, Comparable<unlock_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("unlock_args");
 
@@ -248966,10 +264908,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -249004,6 +264948,7 @@ public unlock_args(unlock_args other) {
       }
     }
 
+    @Override
     public unlock_args deepCopy() {
       return new unlock_args(this);
     }
@@ -249037,6 +264982,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -249051,6 +264997,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -249061,6 +265008,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -249131,14 +265079,17 @@ public int compareTo(unlock_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -249184,6 +265135,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class unlock_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public unlock_argsStandardScheme getScheme() {
         return new unlock_argsStandardScheme();
       }
@@ -249191,34 +265143,41 @@ public unlock_argsStandardScheme getScheme() {
 
     private static class unlock_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<unlock_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, unlock_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new UnlockRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new UnlockRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, unlock_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -249235,6 +265194,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, unlock_args struct
     }
 
     private static class unlock_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public unlock_argsTupleScheme getScheme() {
         return new unlock_argsTupleScheme();
       }
@@ -249257,12 +265217,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, unlock_args struct)
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, unlock_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 UnlockRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 UnlockRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -249272,6 +265237,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class unlock_result implements org.apache.thrift.TBase<unlock_result, unlock_result._Fields>, java.io.Serializable, Cloneable, Comparable<unlock_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("unlock_result");
 
@@ -249338,10 +265304,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -249383,6 +265351,7 @@ public unlock_result(unlock_result other) {
       }
     }
 
+    @Override
     public unlock_result deepCopy() {
       return new unlock_result(this);
     }
@@ -249441,6 +265410,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -249463,6 +265433,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -249476,6 +265447,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -249571,10 +265543,12 @@ public int compareTo(unlock_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -249629,6 +265603,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class unlock_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public unlock_resultStandardScheme getScheme() {
         return new unlock_resultStandardScheme();
       }
@@ -249636,43 +265611,50 @@ public unlock_resultStandardScheme getScheme() {
 
     private static class unlock_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<unlock_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, unlock_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new NoSuchLockException();
-                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 TxnOpenException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new NoSuchLockException();
+                  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 TxnOpenException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, unlock_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -249694,6 +265676,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, unlock_result stru
     }
 
     private static class unlock_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public unlock_resultTupleScheme getScheme() {
         return new unlock_resultTupleScheme();
       }
@@ -249722,17 +265705,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, unlock_result struc
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, unlock_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.o1 = new NoSuchLockException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new TxnOpenException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchLockException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new TxnOpenException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -249742,6 +265730,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_locks_args implements org.apache.thrift.TBase<show_locks_args, show_locks_args._Fields>, java.io.Serializable, Cloneable, Comparable<show_locks_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("show_locks_args");
 
@@ -249803,10 +265792,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -249841,6 +265832,7 @@ public show_locks_args(show_locks_args other) {
       }
     }
 
+    @Override
     public show_locks_args deepCopy() {
       return new show_locks_args(this);
     }
@@ -249874,6 +265866,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -249888,6 +265881,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -249898,6 +265892,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -249968,14 +265963,17 @@ public int compareTo(show_locks_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -250021,6 +266019,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class show_locks_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_locks_argsStandardScheme getScheme() {
         return new show_locks_argsStandardScheme();
       }
@@ -250028,34 +266027,41 @@ public show_locks_argsStandardScheme getScheme() {
 
     private static class show_locks_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<show_locks_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, show_locks_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new ShowLocksRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new ShowLocksRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, show_locks_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -250072,6 +266078,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, show_locks_args st
     }
 
     private static class show_locks_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_locks_argsTupleScheme getScheme() {
         return new show_locks_argsTupleScheme();
       }
@@ -250094,12 +266101,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, show_locks_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, show_locks_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 ShowLocksRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ShowLocksRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -250109,6 +266121,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_locks_result implements org.apache.thrift.TBase<show_locks_result, show_locks_result._Fields>, java.io.Serializable, Cloneable, Comparable<show_locks_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("show_locks_result");
 
@@ -250170,10 +266183,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -250208,6 +266223,7 @@ public show_locks_result(show_locks_result other) {
       }
     }
 
+    @Override
     public show_locks_result deepCopy() {
       return new show_locks_result(this);
     }
@@ -250241,6 +266257,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -250255,6 +266272,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -250265,6 +266283,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -250335,10 +266354,12 @@ public int compareTo(show_locks_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -250388,6 +266409,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class show_locks_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_locks_resultStandardScheme getScheme() {
         return new show_locks_resultStandardScheme();
       }
@@ -250395,34 +266417,41 @@ public show_locks_resultStandardScheme getScheme() {
 
     private static class show_locks_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<show_locks_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, show_locks_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 ShowLocksResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ShowLocksResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, show_locks_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -250439,6 +266468,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, show_locks_result
     }
 
     private static class show_locks_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_locks_resultTupleScheme getScheme() {
         return new show_locks_resultTupleScheme();
       }
@@ -250461,12 +266491,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, show_locks_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, show_locks_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.success = new ShowLocksResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ShowLocksResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -250476,6 +266511,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_args implements org.apache.thrift.TBase<heartbeat_args, heartbeat_args._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_args");
 
@@ -250537,10 +266573,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -250575,6 +266613,7 @@ public heartbeat_args(heartbeat_args other) {
       }
     }
 
+    @Override
     public heartbeat_args deepCopy() {
       return new heartbeat_args(this);
     }
@@ -250608,6 +266647,7 @@ public void setIdsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case IDS:
@@ -250622,6 +266662,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case IDS:
@@ -250632,6 +266673,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -250702,14 +266744,17 @@ public int compareTo(heartbeat_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -250755,6 +266800,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_argsStandardScheme getScheme() {
         return new heartbeat_argsStandardScheme();
       }
@@ -250762,34 +266808,41 @@ public heartbeat_argsStandardScheme getScheme() {
 
     private static class heartbeat_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_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;
-          }
-          switch (schemeField.id) {
-            case 1: // IDS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ids = new HeartbeatRequest();
-                struct.ids.read(iprot);
-                struct.setIdsIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // IDS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.ids = new HeartbeatRequest();
+                  struct.ids.read(iprot);
+                  struct.setIdsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -250806,6 +266859,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_args str
     }
 
     private static class heartbeat_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_argsTupleScheme getScheme() {
         return new heartbeat_argsTupleScheme();
       }
@@ -250828,12 +266882,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_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.ids = new HeartbeatRequest();
-          struct.ids.read(iprot);
-          struct.setIdsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.ids = new HeartbeatRequest();
+            struct.ids.read(iprot);
+            struct.setIdsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -250843,6 +266902,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_result implements org.apache.thrift.TBase<heartbeat_result, heartbeat_result._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_result");
 
@@ -250914,10 +266974,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -250966,6 +267028,7 @@ public heartbeat_result(heartbeat_result other) {
       }
     }
 
+    @Override
     public heartbeat_result deepCopy() {
       return new heartbeat_result(this);
     }
@@ -251049,6 +267112,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -251079,6 +267143,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -251095,6 +267160,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -251215,10 +267281,12 @@ public int compareTo(heartbeat_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -251281,6 +267349,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_resultStandardScheme getScheme() {
         return new heartbeat_resultStandardScheme();
       }
@@ -251288,52 +267357,59 @@ public heartbeat_resultStandardScheme getScheme() {
 
     private static class heartbeat_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new NoSuchLockException();
-                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 NoSuchTxnException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new TxnAbortedException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new NoSuchLockException();
+                  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 NoSuchTxnException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new TxnAbortedException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -251360,6 +267436,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_result s
     }
 
     private static class heartbeat_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_resultTupleScheme getScheme() {
         return new heartbeat_resultTupleScheme();
       }
@@ -251394,22 +267471,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_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.o1 = new NoSuchLockException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchTxnException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new TxnAbortedException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchLockException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchTxnException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new TxnAbortedException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -251419,6 +267501,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_txn_range_args implements org.apache.thrift.TBase<heartbeat_txn_range_args, heartbeat_txn_range_args._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_txn_range_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_txn_range_args");
 
@@ -251480,10 +267563,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -251518,6 +267603,7 @@ public heartbeat_txn_range_args(heartbeat_txn_range_args other) {
       }
     }
 
+    @Override
     public heartbeat_txn_range_args deepCopy() {
       return new heartbeat_txn_range_args(this);
     }
@@ -251551,6 +267637,7 @@ public void setTxnsIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TXNS:
@@ -251565,6 +267652,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TXNS:
@@ -251575,6 +267663,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -251645,14 +267734,17 @@ public int compareTo(heartbeat_txn_range_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -251698,6 +267790,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_txn_range_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_txn_range_argsStandardScheme getScheme() {
         return new heartbeat_txn_range_argsStandardScheme();
       }
@@ -251705,34 +267798,41 @@ public heartbeat_txn_range_argsStandardScheme getScheme() {
 
     private static class heartbeat_txn_range_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_txn_range_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_txn_range_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;
-          }
-          switch (schemeField.id) {
-            case 1: // TXNS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.txns = new HeartbeatTxnRangeRequest();
-                struct.txns.read(iprot);
-                struct.setTxnsIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // TXNS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.txns = new HeartbeatTxnRangeRequest();
+                  struct.txns.read(iprot);
+                  struct.setTxnsIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_txn_range_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -251749,6 +267849,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_txn_rang
     }
 
     private static class heartbeat_txn_range_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_txn_range_argsTupleScheme getScheme() {
         return new heartbeat_txn_range_argsTupleScheme();
       }
@@ -251771,12 +267872,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_txn_range
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_txn_range_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.txns = new HeartbeatTxnRangeRequest();
-          struct.txns.read(iprot);
-          struct.setTxnsIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.txns = new HeartbeatTxnRangeRequest();
+            struct.txns.read(iprot);
+            struct.setTxnsIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -251786,6 +267892,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_txn_range_result implements org.apache.thrift.TBase<heartbeat_txn_range_result, heartbeat_txn_range_result._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_txn_range_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_txn_range_result");
 
@@ -251847,10 +267954,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -251885,6 +267994,7 @@ public heartbeat_txn_range_result(heartbeat_txn_range_result other) {
       }
     }
 
+    @Override
     public heartbeat_txn_range_result deepCopy() {
       return new heartbeat_txn_range_result(this);
     }
@@ -251918,6 +268028,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -251932,6 +268043,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -251942,6 +268054,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -252012,10 +268125,12 @@ public int compareTo(heartbeat_txn_range_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -252065,6 +268180,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_txn_range_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_txn_range_resultStandardScheme getScheme() {
         return new heartbeat_txn_range_resultStandardScheme();
       }
@@ -252072,34 +268188,41 @@ public heartbeat_txn_range_resultStandardScheme getScheme() {
 
     private static class heartbeat_txn_range_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_txn_range_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_txn_range_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 HeartbeatTxnRangeResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 HeartbeatTxnRangeResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_txn_range_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -252116,6 +268239,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_txn_rang
     }
 
     private static class heartbeat_txn_range_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_txn_range_resultTupleScheme getScheme() {
         return new heartbeat_txn_range_resultTupleScheme();
       }
@@ -252138,12 +268262,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_txn_range
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_txn_range_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.success = new HeartbeatTxnRangeResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 HeartbeatTxnRangeResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -252153,6 +268282,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact_args implements org.apache.thrift.TBase<compact_args, compact_args._Fields>, java.io.Serializable, Cloneable, Comparable<compact_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("compact_args");
 
@@ -252214,10 +268344,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -252252,6 +268384,7 @@ public compact_args(compact_args other) {
       }
     }
 
+    @Override
     public compact_args deepCopy() {
       return new compact_args(this);
     }
@@ -252285,6 +268418,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -252299,6 +268433,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -252309,6 +268444,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -252379,14 +268515,17 @@ public int compareTo(compact_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -252432,6 +268571,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class compact_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact_argsStandardScheme getScheme() {
         return new compact_argsStandardScheme();
       }
@@ -252439,34 +268579,41 @@ public compact_argsStandardScheme getScheme() {
 
     private static class compact_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<compact_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, compact_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new CompactionRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new CompactionRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, compact_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -252483,6 +268630,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, compact_args struc
     }
 
     private static class compact_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact_argsTupleScheme getScheme() {
         return new compact_argsTupleScheme();
       }
@@ -252505,12 +268653,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, compact_args struct
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, compact_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 CompactionRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CompactionRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -252520,6 +268673,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact_result implements org.apache.thrift.TBase<compact_result, compact_result._Fields>, java.io.Serializable, Cloneable, Comparable<compact_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("compact_result");
 
@@ -252577,10 +268731,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -252601,6 +268757,7 @@ public compact_result() {
     public compact_result(compact_result other) {
     }
 
+    @Override
     public compact_result deepCopy() {
       return new compact_result(this);
     }
@@ -252609,12 +268766,14 @@ public compact_result deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -252622,6 +268781,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -252667,10 +268827,12 @@ public int compareTo(compact_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -252710,6 +268872,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class compact_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact_resultStandardScheme getScheme() {
         return new compact_resultStandardScheme();
       }
@@ -252717,25 +268880,32 @@ public compact_resultStandardScheme getScheme() {
 
     private static class compact_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<compact_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, compact_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) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, compact_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -252747,6 +268917,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, compact_result str
     }
 
     private static class compact_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact_resultTupleScheme getScheme() {
         return new compact_resultTupleScheme();
       }
@@ -252761,7 +268932,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, compact_result stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, compact_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -252770,6 +268946,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact2_args implements org.apache.thrift.TBase<compact2_args, compact2_args._Fields>, java.io.Serializable, Cloneable, Comparable<compact2_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("compact2_args");
 
@@ -252831,10 +269008,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -252869,6 +269048,7 @@ public compact2_args(compact2_args other) {
       }
     }
 
+    @Override
     public compact2_args deepCopy() {
       return new compact2_args(this);
     }
@@ -252902,6 +269082,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -252916,6 +269097,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -252926,6 +269108,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -252996,14 +269179,17 @@ public int compareTo(compact2_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -253049,6 +269235,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class compact2_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact2_argsStandardScheme getScheme() {
         return new compact2_argsStandardScheme();
       }
@@ -253056,34 +269243,41 @@ public compact2_argsStandardScheme getScheme() {
 
     private static class compact2_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<compact2_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, compact2_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new CompactionRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new CompactionRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, compact2_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -253100,6 +269294,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, compact2_args stru
     }
 
     private static class compact2_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact2_argsTupleScheme getScheme() {
         return new compact2_argsTupleScheme();
       }
@@ -253122,12 +269317,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, compact2_args struc
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, compact2_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 CompactionRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CompactionRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -253137,6 +269337,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class compact2_result implements org.apache.thrift.TBase<compact2_result, compact2_result._Fields>, java.io.Serializable, Cloneable, Comparable<compact2_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("compact2_result");
 
@@ -253198,10 +269399,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -253236,6 +269439,7 @@ public compact2_result(compact2_result other) {
       }
     }
 
+    @Override
     public compact2_result deepCopy() {
       return new compact2_result(this);
     }
@@ -253269,6 +269473,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -253283,6 +269488,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -253293,6 +269499,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -253363,10 +269570,12 @@ public int compareTo(compact2_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -253416,6 +269625,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class compact2_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact2_resultStandardScheme getScheme() {
         return new compact2_resultStandardScheme();
       }
@@ -253423,34 +269633,41 @@ public compact2_resultStandardScheme getScheme() {
 
     private static class compact2_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<compact2_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, compact2_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 CompactionResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 CompactionResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, compact2_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -253467,6 +269684,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, compact2_result st
     }
 
     private static class compact2_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public compact2_resultTupleScheme getScheme() {
         return new compact2_resultTupleScheme();
       }
@@ -253489,12 +269707,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, compact2_result str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, compact2_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.success = new CompactionResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CompactionResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -253504,6 +269727,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_compact_args implements org.apache.thrift.TBase<show_compact_args, show_compact_args._Fields>, java.io.Serializable, Cloneable, Comparable<show_compact_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("show_compact_args");
 
@@ -253565,10 +269789,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -253603,6 +269829,7 @@ public show_compact_args(show_compact_args other) {
       }
     }
 
+    @Override
     public show_compact_args deepCopy() {
       return new show_compact_args(this);
     }
@@ -253636,6 +269863,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -253650,6 +269878,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -253660,6 +269889,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -253730,14 +269960,17 @@ public int compareTo(show_compact_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -253783,6 +270016,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class show_compact_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_compact_argsStandardScheme getScheme() {
         return new show_compact_argsStandardScheme();
       }
@@ -253790,34 +270024,41 @@ public show_compact_argsStandardScheme getScheme() {
 
     private static class show_compact_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<show_compact_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, show_compact_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new ShowCompactRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new ShowCompactRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, show_compact_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -253834,6 +270075,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, show_compact_args
     }
 
     private static class show_compact_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_compact_argsTupleScheme getScheme() {
         return new show_compact_argsTupleScheme();
       }
@@ -253856,12 +270098,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, show_compact_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, show_compact_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 ShowCompactRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ShowCompactRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -253871,6 +270118,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class show_compact_result implements org.apache.thrift.TBase<show_compact_result, show_compact_result._Fields>, java.io.Serializable, Cloneable, Comparable<show_compact_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("show_compact_result");
 
@@ -253932,10 +270180,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -253970,6 +270220,7 @@ public show_compact_result(show_compact_result other) {
       }
     }
 
+    @Override
     public show_compact_result deepCopy() {
       return new show_compact_result(this);
     }
@@ -254003,6 +270254,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -254017,6 +270269,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -254027,6 +270280,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -254097,10 +270351,12 @@ public int compareTo(show_compact_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -254150,6 +270406,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class show_compact_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_compact_resultStandardScheme getScheme() {
         return new show_compact_resultStandardScheme();
       }
@@ -254157,34 +270414,41 @@ public show_compact_resultStandardScheme getScheme() {
 
     private static class show_compact_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<show_compact_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, show_compact_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 ShowCompactResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ShowCompactResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, show_compact_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -254201,6 +270465,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, show_compact_resul
     }
 
     private static class show_compact_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public show_compact_resultTupleScheme getScheme() {
         return new show_compact_resultTupleScheme();
       }
@@ -254223,12 +270488,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, show_compact_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, show_compact_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.success = new ShowCompactResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ShowCompactResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -254238,6 +270508,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class submit_for_cleanup_args implements org.apache.thrift.TBase<submit_for_cleanup_args, submit_for_cleanup_args._Fields>, java.io.Serializable, Cloneable, Comparable<submit_for_cleanup_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submit_for_cleanup_args");
 
@@ -254309,10 +270580,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -254363,6 +270636,7 @@ public submit_for_cleanup_args(submit_for_cleanup_args other) {
       this.o3 = other.o3;
     }
 
+    @Override
     public submit_for_cleanup_args deepCopy() {
       return new submit_for_cleanup_args(this);
     }
@@ -254444,6 +270718,7 @@ public void setO3IsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __O3_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -254474,6 +270749,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -254490,6 +270766,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -254606,14 +270883,17 @@ public int compareTo(submit_for_cleanup_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -254669,6 +270949,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class submit_for_cleanup_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public submit_for_cleanup_argsStandardScheme getScheme() {
         return new submit_for_cleanup_argsStandardScheme();
       }
@@ -254676,50 +270957,57 @@ public submit_for_cleanup_argsStandardScheme getScheme() {
 
     private static class submit_for_cleanup_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<submit_for_cleanup_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, submit_for_cleanup_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;
-          }
-          switch (schemeField.id) {
-            case 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new CompactionRequest();
-                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.I64) {
-                struct.o2 = iprot.readI64();
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.o3 = iprot.readI64();
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new CompactionRequest();
+                  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.I64) {
+                  struct.o2 = iprot.readI64();
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.o3 = iprot.readI64();
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, submit_for_cleanup_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -254742,6 +271030,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, submit_for_cleanup
     }
 
     private static class submit_for_cleanup_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public submit_for_cleanup_argsTupleScheme getScheme() {
         return new submit_for_cleanup_argsTupleScheme();
       }
@@ -254776,20 +271065,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, submit_for_cleanup_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, submit_for_cleanup_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);
-        if (incoming.get(0)) {
-          struct.o1 = new CompactionRequest();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = iprot.readI64();
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = iprot.readI64();
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new CompactionRequest();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = iprot.readI64();
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = iprot.readI64();
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -254799,6 +271093,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class submit_for_cleanup_result implements org.apache.thrift.TBase<submit_for_cleanup_result, submit_for_cleanup_result._Fields>, java.io.Serializable, Cloneable, Comparable<submit_for_cleanup_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submit_for_cleanup_result");
 
@@ -254865,10 +271160,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -254912,6 +271209,7 @@ public submit_for_cleanup_result(submit_for_cleanup_result other) {
       }
     }
 
+    @Override
     public submit_for_cleanup_result deepCopy() {
       return new submit_for_cleanup_result(this);
     }
@@ -254969,6 +271267,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -254991,6 +271290,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -255004,6 +271304,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -255097,10 +271398,12 @@ public int compareTo(submit_for_cleanup_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -255153,6 +271456,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class submit_for_cleanup_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public submit_for_cleanup_resultStandardScheme getScheme() {
         return new submit_for_cleanup_resultStandardScheme();
       }
@@ -255160,42 +271464,49 @@ public submit_for_cleanup_resultStandardScheme getScheme() {
 
     private static class submit_for_cleanup_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<submit_for_cleanup_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, submit_for_cleanup_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, submit_for_cleanup_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -255217,6 +271528,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, submit_for_cleanup
     }
 
     private static class submit_for_cleanup_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public submit_for_cleanup_resultTupleScheme getScheme() {
         return new submit_for_cleanup_resultTupleScheme();
       }
@@ -255245,16 +271557,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, submit_for_cleanup_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, submit_for_cleanup_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -255264,6 +271581,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_dynamic_partitions_args implements org.apache.thrift.TBase<add_dynamic_partitions_args, add_dynamic_partitions_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_dynamic_partitions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_dynamic_partitions_args");
 
@@ -255325,10 +271643,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -255363,6 +271683,7 @@ public add_dynamic_partitions_args(add_dynamic_partitions_args other) {
       }
     }
 
+    @Override
     public add_dynamic_partitions_args deepCopy() {
       return new add_dynamic_partitions_args(this);
     }
@@ -255396,6 +271717,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -255410,6 +271732,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -255420,6 +271743,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -255490,14 +271814,17 @@ public int compareTo(add_dynamic_partitions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -255543,6 +271870,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_dynamic_partitions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_dynamic_partitions_argsStandardScheme getScheme() {
         return new add_dynamic_partitions_argsStandardScheme();
       }
@@ -255550,34 +271878,41 @@ public add_dynamic_partitions_argsStandardScheme getScheme() {
 
     private static class add_dynamic_partitions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_dynamic_partitions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_dynamic_partitions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new AddDynamicPartitions();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new AddDynamicPartitions();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_dynamic_partitions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -255594,6 +271929,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_dynamic_partit
     }
 
     private static class add_dynamic_partitions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_dynamic_partitions_argsTupleScheme getScheme() {
         return new add_dynamic_partitions_argsTupleScheme();
       }
@@ -255616,12 +271952,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_dynamic_partiti
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_dynamic_partitions_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 AddDynamicPartitions();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AddDynamicPartitions();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -255631,6 +271972,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_dynamic_partitions_result implements org.apache.thrift.TBase<add_dynamic_partitions_result, add_dynamic_partitions_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_dynamic_partitions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_dynamic_partitions_result");
 
@@ -255697,10 +272039,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -255742,6 +272086,7 @@ public add_dynamic_partitions_result(add_dynamic_partitions_result other) {
       }
     }
 
+    @Override
     public add_dynamic_partitions_result deepCopy() {
       return new add_dynamic_partitions_result(this);
     }
@@ -255800,6 +272145,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -255822,6 +272168,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -255835,6 +272182,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -255930,10 +272278,12 @@ public int compareTo(add_dynamic_partitions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -255988,6 +272338,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_dynamic_partitions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_dynamic_partitions_resultStandardScheme getScheme() {
         return new add_dynamic_partitions_resultStandardScheme();
       }
@@ -255995,43 +272346,50 @@ public add_dynamic_partitions_resultStandardScheme getScheme() {
 
     private static class add_dynamic_partitions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_dynamic_partitions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_dynamic_partitions_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new NoSuchTxnException();
-                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 TxnAbortedException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new NoSuchTxnException();
+                  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 TxnAbortedException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_dynamic_partitions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -256053,6 +272411,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_dynamic_partit
     }
 
     private static class add_dynamic_partitions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_dynamic_partitions_resultTupleScheme getScheme() {
         return new add_dynamic_partitions_resultTupleScheme();
       }
@@ -256081,17 +272440,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_dynamic_partiti
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_dynamic_partitions_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.o1 = new NoSuchTxnException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new TxnAbortedException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchTxnException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new TxnAbortedException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -256101,6 +272465,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact_args implements org.apache.thrift.TBase<find_next_compact_args, find_next_compact_args._Fields>, java.io.Serializable, Cloneable, Comparable<find_next_compact_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_next_compact_args");
 
@@ -256162,10 +272527,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -256200,6 +272567,7 @@ public find_next_compact_args(find_next_compact_args other) {
       }
     }
 
+    @Override
     public find_next_compact_args deepCopy() {
       return new find_next_compact_args(this);
     }
@@ -256233,6 +272601,7 @@ public void setWorkerIdIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case WORKER_ID:
@@ -256247,6 +272616,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case WORKER_ID:
@@ -256257,6 +272627,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -256327,14 +272698,17 @@ public int compareTo(find_next_compact_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -256377,6 +272751,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_next_compact_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact_argsStandardScheme getScheme() {
         return new find_next_compact_argsStandardScheme();
       }
@@ -256384,33 +272759,40 @@ public find_next_compact_argsStandardScheme getScheme() {
 
     private static class find_next_compact_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_next_compact_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, find_next_compact_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;
-          }
-          switch (schemeField.id) {
-            case 1: // WORKER_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.workerId = iprot.readString();
-                struct.setWorkerIdIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // WORKER_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.workerId = iprot.readString();
+                  struct.setWorkerIdIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -256427,6 +272809,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact_
     }
 
     private static class find_next_compact_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact_argsTupleScheme getScheme() {
         return new find_next_compact_argsTupleScheme();
       }
@@ -256449,11 +272832,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_next_compact_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, find_next_compact_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.workerId = iprot.readString();
-          struct.setWorkerIdIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.workerId = iprot.readString();
+            struct.setWorkerIdIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -256463,6 +272851,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact_result implements org.apache.thrift.TBase<find_next_compact_result, find_next_compact_result._Fields>, java.io.Serializable, Cloneable, Comparable<find_next_compact_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_next_compact_result");
 
@@ -256529,10 +272918,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -256574,6 +272965,7 @@ public find_next_compact_result(find_next_compact_result other) {
       }
     }
 
+    @Override
     public find_next_compact_result deepCopy() {
       return new find_next_compact_result(this);
     }
@@ -256632,6 +273024,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -256654,6 +273047,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -256667,6 +273061,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -256762,10 +273157,12 @@ public int compareTo(find_next_compact_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -256823,6 +273220,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_next_compact_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact_resultStandardScheme getScheme() {
         return new find_next_compact_resultStandardScheme();
       }
@@ -256830,43 +273228,50 @@ public find_next_compact_resultStandardScheme getScheme() {
 
     private static class find_next_compact_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_next_compact_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, find_next_compact_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 OptionalCompactionInfoStruct();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 OptionalCompactionInfoStruct();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -256888,6 +273293,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact_
     }
 
     private static class find_next_compact_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact_resultTupleScheme getScheme() {
         return new find_next_compact_resultTupleScheme();
       }
@@ -256916,17 +273322,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_next_compact_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, find_next_compact_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.success = new OptionalCompactionInfoStruct();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new OptionalCompactionInfoStruct();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -256936,6 +273347,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact2_args implements org.apache.thrift.TBase<find_next_compact2_args, find_next_compact2_args._Fields>, java.io.Serializable, Cloneable, Comparable<find_next_compact2_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_next_compact2_args");
 
@@ -256997,10 +273409,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -257035,6 +273449,7 @@ public find_next_compact2_args(find_next_compact2_args other) {
       }
     }
 
+    @Override
     public find_next_compact2_args deepCopy() {
       return new find_next_compact2_args(this);
     }
@@ -257068,6 +273483,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -257082,6 +273498,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -257092,6 +273509,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -257162,14 +273580,17 @@ public int compareTo(find_next_compact2_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -257215,6 +273636,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_next_compact2_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact2_argsStandardScheme getScheme() {
         return new find_next_compact2_argsStandardScheme();
       }
@@ -257222,34 +273644,41 @@ public find_next_compact2_argsStandardScheme getScheme() {
 
     private static class find_next_compact2_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_next_compact2_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, find_next_compact2_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new FindNextCompactRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new FindNextCompactRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact2_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -257266,6 +273695,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact2
     }
 
     private static class find_next_compact2_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact2_argsTupleScheme getScheme() {
         return new find_next_compact2_argsTupleScheme();
       }
@@ -257288,12 +273718,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_next_compact2_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, find_next_compact2_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 FindNextCompactRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 FindNextCompactRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -257303,6 +273738,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_next_compact2_result implements org.apache.thrift.TBase<find_next_compact2_result, find_next_compact2_result._Fields>, java.io.Serializable, Cloneable, Comparable<find_next_compact2_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_next_compact2_result");
 
@@ -257369,10 +273805,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -257414,6 +273852,7 @@ public find_next_compact2_result(find_next_compact2_result other) {
       }
     }
 
+    @Override
     public find_next_compact2_result deepCopy() {
       return new find_next_compact2_result(this);
     }
@@ -257472,6 +273911,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -257494,6 +273934,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -257507,6 +273948,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -257602,10 +274044,12 @@ public int compareTo(find_next_compact2_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -257663,6 +274107,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_next_compact2_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact2_resultStandardScheme getScheme() {
         return new find_next_compact2_resultStandardScheme();
       }
@@ -257670,43 +274115,50 @@ public find_next_compact2_resultStandardScheme getScheme() {
 
     private static class find_next_compact2_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_next_compact2_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, find_next_compact2_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 OptionalCompactionInfoStruct();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 OptionalCompactionInfoStruct();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact2_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -257728,6 +274180,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_next_compact2
     }
 
     private static class find_next_compact2_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_next_compact2_resultTupleScheme getScheme() {
         return new find_next_compact2_resultTupleScheme();
       }
@@ -257756,17 +274209,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_next_compact2_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, find_next_compact2_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.success = new OptionalCompactionInfoStruct();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new OptionalCompactionInfoStruct();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -257776,6 +274234,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compactor_state_args implements org.apache.thrift.TBase<update_compactor_state_args, update_compactor_state_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_compactor_state_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_compactor_state_args");
 
@@ -257842,10 +274301,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -257889,6 +274350,7 @@ public update_compactor_state_args(update_compactor_state_args other) {
       this.txn_id = other.txn_id;
     }
 
+    @Override
     public update_compactor_state_args deepCopy() {
       return new update_compactor_state_args(this);
     }
@@ -257946,6 +274408,7 @@ public void setTxn_idIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXN_ID_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CR:
@@ -257968,6 +274431,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CR:
@@ -257981,6 +274445,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -258074,14 +274539,17 @@ public int compareTo(update_compactor_state_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -258133,6 +274601,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_compactor_state_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compactor_state_argsStandardScheme getScheme() {
         return new update_compactor_state_argsStandardScheme();
       }
@@ -258140,42 +274609,49 @@ public update_compactor_state_argsStandardScheme getScheme() {
 
     private static class update_compactor_state_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_compactor_state_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_compactor_state_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cr = new CompactionInfoStruct();
-                struct.cr.read(iprot);
-                struct.setCrIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TXN_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.txn_id = iprot.readI64();
-                struct.setTxn_idIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.cr = new CompactionInfoStruct();
+                  struct.cr.read(iprot);
+                  struct.setCrIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // TXN_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.txn_id = iprot.readI64();
+                  struct.setTxn_idIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_compactor_state_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -258195,6 +274671,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_compactor_s
     }
 
     private static class update_compactor_state_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compactor_state_argsTupleScheme getScheme() {
         return new update_compactor_state_argsTupleScheme();
       }
@@ -258223,16 +274700,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_compactor_st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_compactor_state_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);
-        if (incoming.get(0)) {
-          struct.cr = new CompactionInfoStruct();
-          struct.cr.read(iprot);
-          struct.setCrIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.txn_id = iprot.readI64();
-          struct.setTxn_idIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.cr = new CompactionInfoStruct();
+            struct.cr.read(iprot);
+            struct.setCrIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.txn_id = iprot.readI64();
+            struct.setTxn_idIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -258242,6 +274724,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compactor_state_result implements org.apache.thrift.TBase<update_compactor_state_result, update_compactor_state_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_compactor_state_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_compactor_state_result");
 
@@ -258299,10 +274782,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -258323,6 +274808,7 @@ public update_compactor_state_result() {
     public update_compactor_state_result(update_compactor_state_result other) {
     }
 
+    @Override
     public update_compactor_state_result deepCopy() {
       return new update_compactor_state_result(this);
     }
@@ -258331,12 +274817,14 @@ public update_compactor_state_result deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -258344,6 +274832,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -258389,10 +274878,12 @@ public int compareTo(update_compactor_state_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -258432,6 +274923,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_compactor_state_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compactor_state_resultStandardScheme getScheme() {
         return new update_compactor_state_resultStandardScheme();
       }
@@ -258439,25 +274931,32 @@ public update_compactor_state_resultStandardScheme getScheme() {
 
     private static class update_compactor_state_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_compactor_state_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_compactor_state_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) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_compactor_state_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -258469,6 +274968,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_compactor_s
     }
 
     private static class update_compactor_state_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compactor_state_resultTupleScheme getScheme() {
         return new update_compactor_state_resultTupleScheme();
       }
@@ -258483,7 +274983,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_compactor_st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_compactor_state_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -258492,6 +274997,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_columns_with_stats_args implements org.apache.thrift.TBase<find_columns_with_stats_args, find_columns_with_stats_args._Fields>, java.io.Serializable, Cloneable, Comparable<find_columns_with_stats_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_columns_with_stats_args");
 
@@ -258553,10 +275059,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -258591,6 +275099,7 @@ public find_columns_with_stats_args(find_columns_with_stats_args other) {
       }
     }
 
+    @Override
     public find_columns_with_stats_args deepCopy() {
       return new find_columns_with_stats_args(this);
     }
@@ -258624,6 +275133,7 @@ public void setCrIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CR:
@@ -258638,6 +275148,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CR:
@@ -258648,6 +275159,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -258718,14 +275230,17 @@ public int compareTo(find_columns_with_stats_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -258771,6 +275286,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_columns_with_stats_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_columns_with_stats_argsStandardScheme getScheme() {
         return new find_columns_with_stats_argsStandardScheme();
       }
@@ -258778,34 +275294,41 @@ public find_columns_with_stats_argsStandardScheme getScheme() {
 
     private static class find_columns_with_stats_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_columns_with_stats_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, find_columns_with_stats_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cr = new CompactionInfoStruct();
-                struct.cr.read(iprot);
-                struct.setCrIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.cr = new CompactionInfoStruct();
+                  struct.cr.read(iprot);
+                  struct.setCrIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_columns_with_stats_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -258822,6 +275345,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_columns_with_
     }
 
     private static class find_columns_with_stats_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_columns_with_stats_argsTupleScheme getScheme() {
         return new find_columns_with_stats_argsTupleScheme();
       }
@@ -258844,12 +275368,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_columns_with_s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, find_columns_with_stats_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.cr = new CompactionInfoStruct();
-          struct.cr.read(iprot);
-          struct.setCrIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.cr = new CompactionInfoStruct();
+            struct.cr.read(iprot);
+            struct.setCrIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -258859,6 +275388,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_columns_with_stats_result implements org.apache.thrift.TBase<find_columns_with_stats_result, find_columns_with_stats_result._Fields>, java.io.Serializable, Cloneable, Comparable<find_columns_with_stats_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_columns_with_stats_result");
 
@@ -258920,10 +275450,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -258960,6 +275492,7 @@ public find_columns_with_stats_result(find_columns_with_stats_result other) {
       }
     }
 
+    @Override
     public find_columns_with_stats_result deepCopy() {
       return new find_columns_with_stats_result(this);
     }
@@ -259009,6 +275542,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -259023,6 +275557,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -259033,6 +275568,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -259103,10 +275639,12 @@ public int compareTo(find_columns_with_stats_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -259153,6 +275691,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_columns_with_stats_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_columns_with_stats_resultStandardScheme getScheme() {
         return new find_columns_with_stats_resultStandardScheme();
       }
@@ -259160,43 +275699,50 @@ public find_columns_with_stats_resultStandardScheme getScheme() {
 
     private static class find_columns_with_stats_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_columns_with_stats_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, find_columns_with_stats_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2252 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2252.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2253;
-                  for (int _i2254 = 0; _i2254 < _list2252.size; ++_i2254)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2253 = iprot.readString();
-                    struct.success.add(_elem2253);
+                    org.apache.thrift.protocol.TList _list2252 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2252.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2253;
+                    for (int _i2254 = 0; _i2254 < _list2252.size; ++_i2254)
+                    {
+                      _elem2253 = iprot.readString();
+                      struct.success.add(_elem2253);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                struct.setSuccessIsSet(true);
-              } else { 
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_columns_with_stats_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -259220,6 +275766,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_columns_with_
     }
 
     private static class find_columns_with_stats_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_columns_with_stats_resultTupleScheme getScheme() {
         return new find_columns_with_stats_resultTupleScheme();
       }
@@ -259248,20 +275795,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_columns_with_s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, find_columns_with_stats_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2257 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2257.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2258;
-            for (int _i2259 = 0; _i2259 < _list2257.size; ++_i2259)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
             {
-              _elem2258 = iprot.readString();
-              struct.success.add(_elem2258);
+              org.apache.thrift.protocol.TList _list2257 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2257.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2258;
+              for (int _i2259 = 0; _i2259 < _list2257.size; ++_i2259)
+              {
+                _elem2258 = iprot.readString();
+                struct.success.add(_elem2258);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -259271,6 +275823,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_cleaned_args implements org.apache.thrift.TBase<mark_cleaned_args, mark_cleaned_args._Fields>, java.io.Serializable, Cloneable, Comparable<mark_cleaned_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_cleaned_args");
 
@@ -259332,10 +275885,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -259370,6 +275925,7 @@ public mark_cleaned_args(mark_cleaned_args other) {
       }
     }
 
+    @Override
     public mark_cleaned_args deepCopy() {
       return new mark_cleaned_args(this);
     }
@@ -259403,6 +275959,7 @@ public void setCrIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CR:
@@ -259417,6 +275974,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CR:
@@ -259427,6 +275985,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -259497,14 +276056,17 @@ public int compareTo(mark_cleaned_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -259550,6 +276112,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_cleaned_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_cleaned_argsStandardScheme getScheme() {
         return new mark_cleaned_argsStandardScheme();
       }
@@ -259557,34 +276120,41 @@ public mark_cleaned_argsStandardScheme getScheme() {
 
     private static class mark_cleaned_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_cleaned_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_cleaned_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cr = new CompactionInfoStruct();
-                struct.cr.read(iprot);
-                struct.setCrIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.cr = new CompactionInfoStruct();
+                  struct.cr.read(iprot);
+                  struct.setCrIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_cleaned_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -259601,6 +276171,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_cleaned_args
     }
 
     private static class mark_cleaned_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_cleaned_argsTupleScheme getScheme() {
         return new mark_cleaned_argsTupleScheme();
       }
@@ -259623,12 +276194,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_cleaned_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_cleaned_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.cr = new CompactionInfoStruct();
-          struct.cr.read(iprot);
-          struct.setCrIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.cr = new CompactionInfoStruct();
+            struct.cr.read(iprot);
+            struct.setCrIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -259638,6 +276214,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_cleaned_result implements org.apache.thrift.TBase<mark_cleaned_result, mark_cleaned_result._Fields>, java.io.Serializable, Cloneable, Comparable<mark_cleaned_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_cleaned_result");
 
@@ -259699,10 +276276,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -259737,6 +276316,7 @@ public mark_cleaned_result(mark_cleaned_result other) {
       }
     }
 
+    @Override
     public mark_cleaned_result deepCopy() {
       return new mark_cleaned_result(this);
     }
@@ -259770,6 +276350,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -259784,6 +276365,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -259794,6 +276376,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -259864,10 +276447,12 @@ public int compareTo(mark_cleaned_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -259914,6 +276499,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_cleaned_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_cleaned_resultStandardScheme getScheme() {
         return new mark_cleaned_resultStandardScheme();
       }
@@ -259921,34 +276507,41 @@ public mark_cleaned_resultStandardScheme getScheme() {
 
     private static class mark_cleaned_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_cleaned_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_cleaned_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_cleaned_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -259965,6 +276558,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_cleaned_resul
     }
 
     private static class mark_cleaned_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_cleaned_resultTupleScheme getScheme() {
         return new mark_cleaned_resultTupleScheme();
       }
@@ -259987,12 +276581,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_cleaned_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_cleaned_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -260002,6 +276601,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_compacted_args implements org.apache.thrift.TBase<mark_compacted_args, mark_compacted_args._Fields>, java.io.Serializable, Cloneable, Comparable<mark_compacted_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_compacted_args");
 
@@ -260063,10 +276663,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -260101,6 +276703,7 @@ public mark_compacted_args(mark_compacted_args other) {
       }
     }
 
+    @Override
     public mark_compacted_args deepCopy() {
       return new mark_compacted_args(this);
     }
@@ -260134,6 +276737,7 @@ public void setCrIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CR:
@@ -260148,6 +276752,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CR:
@@ -260158,6 +276763,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -260228,14 +276834,17 @@ public int compareTo(mark_compacted_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -260281,6 +276890,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_compacted_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_compacted_argsStandardScheme getScheme() {
         return new mark_compacted_argsStandardScheme();
       }
@@ -260288,34 +276898,41 @@ public mark_compacted_argsStandardScheme getScheme() {
 
     private static class mark_compacted_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_compacted_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_compacted_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cr = new CompactionInfoStruct();
-                struct.cr.read(iprot);
-                struct.setCrIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.cr = new CompactionInfoStruct();
+                  struct.cr.read(iprot);
+                  struct.setCrIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_compacted_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -260332,6 +276949,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_compacted_arg
     }
 
     private static class mark_compacted_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_compacted_argsTupleScheme getScheme() {
         return new mark_compacted_argsTupleScheme();
       }
@@ -260354,12 +276972,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_compacted_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_compacted_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.cr = new CompactionInfoStruct();
-          struct.cr.read(iprot);
-          struct.setCrIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.cr = new CompactionInfoStruct();
+            struct.cr.read(iprot);
+            struct.setCrIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -260369,6 +276992,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_compacted_result implements org.apache.thrift.TBase<mark_compacted_result, mark_compacted_result._Fields>, java.io.Serializable, Cloneable, Comparable<mark_compacted_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_compacted_result");
 
@@ -260430,10 +277054,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -260468,6 +277094,7 @@ public mark_compacted_result(mark_compacted_result other) {
       }
     }
 
+    @Override
     public mark_compacted_result deepCopy() {
       return new mark_compacted_result(this);
     }
@@ -260501,6 +277128,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -260515,6 +277143,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -260525,6 +277154,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -260595,10 +277225,12 @@ public int compareTo(mark_compacted_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -260645,6 +277277,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_compacted_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_compacted_resultStandardScheme getScheme() {
         return new mark_compacted_resultStandardScheme();
       }
@@ -260652,34 +277285,41 @@ public mark_compacted_resultStandardScheme getScheme() {
 
     private static class mark_compacted_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_compacted_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_compacted_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_compacted_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -260696,6 +277336,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_compacted_res
     }
 
     private static class mark_compacted_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_compacted_resultTupleScheme getScheme() {
         return new mark_compacted_resultTupleScheme();
       }
@@ -260718,12 +277359,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_compacted_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_compacted_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -260733,6 +277379,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_failed_args implements org.apache.thrift.TBase<mark_failed_args, mark_failed_args._Fields>, java.io.Serializable, Cloneable, Comparable<mark_failed_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_failed_args");
 
@@ -260794,10 +277441,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -260832,6 +277481,7 @@ public mark_failed_args(mark_failed_args other) {
       }
     }
 
+    @Override
     public mark_failed_args deepCopy() {
       return new mark_failed_args(this);
     }
@@ -260865,6 +277515,7 @@ public void setCrIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CR:
@@ -260879,6 +277530,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CR:
@@ -260889,6 +277541,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -260959,14 +277612,17 @@ public int compareTo(mark_failed_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -261012,6 +277668,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_failed_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_failed_argsStandardScheme getScheme() {
         return new mark_failed_argsStandardScheme();
       }
@@ -261019,34 +277676,41 @@ public mark_failed_argsStandardScheme getScheme() {
 
     private static class mark_failed_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_failed_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_failed_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cr = new CompactionInfoStruct();
-                struct.cr.read(iprot);
-                struct.setCrIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.cr = new CompactionInfoStruct();
+                  struct.cr.read(iprot);
+                  struct.setCrIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_failed_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -261063,6 +277727,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_failed_args s
     }
 
     private static class mark_failed_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_failed_argsTupleScheme getScheme() {
         return new mark_failed_argsTupleScheme();
       }
@@ -261085,12 +277750,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_failed_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_failed_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.cr = new CompactionInfoStruct();
-          struct.cr.read(iprot);
-          struct.setCrIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.cr = new CompactionInfoStruct();
+            struct.cr.read(iprot);
+            struct.setCrIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -261100,6 +277770,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_failed_result implements org.apache.thrift.TBase<mark_failed_result, mark_failed_result._Fields>, java.io.Serializable, Cloneable, Comparable<mark_failed_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_failed_result");
 
@@ -261161,10 +277832,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -261199,6 +277872,7 @@ public mark_failed_result(mark_failed_result other) {
       }
     }
 
+    @Override
     public mark_failed_result deepCopy() {
       return new mark_failed_result(this);
     }
@@ -261232,6 +277906,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -261246,6 +277921,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -261256,6 +277932,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -261326,10 +278003,12 @@ public int compareTo(mark_failed_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -261376,6 +278055,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_failed_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_failed_resultStandardScheme getScheme() {
         return new mark_failed_resultStandardScheme();
       }
@@ -261383,34 +278063,41 @@ public mark_failed_resultStandardScheme getScheme() {
 
     private static class mark_failed_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_failed_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_failed_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_failed_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -261427,6 +278114,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_failed_result
     }
 
     private static class mark_failed_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_failed_resultTupleScheme getScheme() {
         return new mark_failed_resultTupleScheme();
       }
@@ -261449,12 +278137,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_failed_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_failed_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -261464,6 +278157,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_refused_args implements org.apache.thrift.TBase<mark_refused_args, mark_refused_args._Fields>, java.io.Serializable, Cloneable, Comparable<mark_refused_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_refused_args");
 
@@ -261525,10 +278219,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -261563,6 +278259,7 @@ public mark_refused_args(mark_refused_args other) {
       }
     }
 
+    @Override
     public mark_refused_args deepCopy() {
       return new mark_refused_args(this);
     }
@@ -261596,6 +278293,7 @@ public void setCrIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CR:
@@ -261610,6 +278308,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CR:
@@ -261620,6 +278319,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -261690,14 +278390,17 @@ public int compareTo(mark_refused_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -261743,6 +278446,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_refused_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_refused_argsStandardScheme getScheme() {
         return new mark_refused_argsStandardScheme();
       }
@@ -261750,34 +278454,41 @@ public mark_refused_argsStandardScheme getScheme() {
 
     private static class mark_refused_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_refused_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_refused_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;
-          }
-          switch (schemeField.id) {
-            case 1: // CR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cr = new CompactionInfoStruct();
-                struct.cr.read(iprot);
-                struct.setCrIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // CR
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.cr = new CompactionInfoStruct();
+                  struct.cr.read(iprot);
+                  struct.setCrIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_refused_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -261794,6 +278505,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_refused_args
     }
 
     private static class mark_refused_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_refused_argsTupleScheme getScheme() {
         return new mark_refused_argsTupleScheme();
       }
@@ -261816,12 +278528,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_refused_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_refused_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.cr = new CompactionInfoStruct();
-          struct.cr.read(iprot);
-          struct.setCrIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.cr = new CompactionInfoStruct();
+            struct.cr.read(iprot);
+            struct.setCrIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -261831,6 +278548,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class mark_refused_result implements org.apache.thrift.TBase<mark_refused_result, mark_refused_result._Fields>, java.io.Serializable, Cloneable, Comparable<mark_refused_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mark_refused_result");
 
@@ -261892,10 +278610,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -261930,6 +278650,7 @@ public mark_refused_result(mark_refused_result other) {
       }
     }
 
+    @Override
     public mark_refused_result deepCopy() {
       return new mark_refused_result(this);
     }
@@ -261963,6 +278684,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -261977,6 +278699,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -261987,6 +278710,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -262057,10 +278781,12 @@ public int compareTo(mark_refused_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -262107,6 +278833,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class mark_refused_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_refused_resultStandardScheme getScheme() {
         return new mark_refused_resultStandardScheme();
       }
@@ -262114,34 +278841,41 @@ public mark_refused_resultStandardScheme getScheme() {
 
     private static class mark_refused_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<mark_refused_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, mark_refused_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, mark_refused_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -262158,6 +278892,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, mark_refused_resul
     }
 
     private static class mark_refused_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public mark_refused_resultTupleScheme getScheme() {
         return new mark_refused_resultTupleScheme();
       }
@@ -262180,12 +278915,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, mark_refused_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, mark_refused_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -262195,6 +278935,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compaction_metrics_data_args implements org.apache.thrift.TBase<update_compaction_metrics_data_args, update_compaction_metrics_data_args._Fields>, java.io.Serializable, Cloneable, Comparable<update_compaction_metrics_data_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_compaction_metrics_data_args");
 
@@ -262256,10 +278997,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -262294,6 +279037,7 @@ public update_compaction_metrics_data_args(update_compaction_metrics_data_args o
       }
     }
 
+    @Override
     public update_compaction_metrics_data_args deepCopy() {
       return new update_compaction_metrics_data_args(this);
     }
@@ -262327,6 +279071,7 @@ public void setDataIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DATA:
@@ -262341,6 +279086,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DATA:
@@ -262351,6 +279097,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -262421,14 +279168,17 @@ public int compareTo(update_compaction_metrics_data_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -262474,6 +279224,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_compaction_metrics_data_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compaction_metrics_data_argsStandardScheme getScheme() {
         return new update_compaction_metrics_data_argsStandardScheme();
       }
@@ -262481,34 +279232,41 @@ public update_compaction_metrics_data_argsStandardScheme getScheme() {
 
     private static class update_compaction_metrics_data_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_compaction_metrics_data_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_compaction_metrics_data_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DATA
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.data = new CompactionMetricsDataStruct();
-                struct.data.read(iprot);
-                struct.setDataIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // DATA
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.data = new CompactionMetricsDataStruct();
+                  struct.data.read(iprot);
+                  struct.setDataIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_compaction_metrics_data_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -262525,6 +279283,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_compaction_
     }
 
     private static class update_compaction_metrics_data_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compaction_metrics_data_argsTupleScheme getScheme() {
         return new update_compaction_metrics_data_argsTupleScheme();
       }
@@ -262547,12 +279306,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_compaction_m
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_compaction_metrics_data_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.data = new CompactionMetricsDataStruct();
-          struct.data.read(iprot);
-          struct.setDataIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.data = new CompactionMetricsDataStruct();
+            struct.data.read(iprot);
+            struct.setDataIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -262562,6 +279326,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class update_compaction_metrics_data_result implements org.apache.thrift.TBase<update_compaction_metrics_data_result, update_compaction_metrics_data_result._Fields>, java.io.Serializable, Cloneable, Comparable<update_compaction_metrics_data_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("update_compaction_metrics_data_result");
 
@@ -262628,10 +279393,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -262675,6 +279442,7 @@ public update_compaction_metrics_data_result(update_compaction_metrics_data_resu
       }
     }
 
+    @Override
     public update_compaction_metrics_data_result deepCopy() {
       return new update_compaction_metrics_data_result(this);
     }
@@ -262732,6 +279500,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -262754,6 +279523,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -262767,6 +279537,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -262860,10 +279631,12 @@ public int compareTo(update_compaction_metrics_data_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -262916,6 +279689,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class update_compaction_metrics_data_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compaction_metrics_data_resultStandardScheme getScheme() {
         return new update_compaction_metrics_data_resultStandardScheme();
       }
@@ -262923,42 +279697,49 @@ public update_compaction_metrics_data_resultStandardScheme getScheme() {
 
     private static class update_compaction_metrics_data_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<update_compaction_metrics_data_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, update_compaction_metrics_data_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, update_compaction_metrics_data_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -262980,6 +279761,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, update_compaction_
     }
 
     private static class update_compaction_metrics_data_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public update_compaction_metrics_data_resultTupleScheme getScheme() {
         return new update_compaction_metrics_data_resultTupleScheme();
       }
@@ -263008,16 +279790,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, update_compaction_m
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, update_compaction_metrics_data_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -263027,6 +279814,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_compaction_metrics_data_args implements org.apache.thrift.TBase<remove_compaction_metrics_data_args, remove_compaction_metrics_data_args._Fields>, java.io.Serializable, Cloneable, Comparable<remove_compaction_metrics_data_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_compaction_metrics_data_args");
 
@@ -263088,10 +279876,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -263126,6 +279916,7 @@ public remove_compaction_metrics_data_args(remove_compaction_metrics_data_args o
       }
     }
 
+    @Override
     public remove_compaction_metrics_data_args deepCopy() {
       return new remove_compaction_metrics_data_args(this);
     }
@@ -263159,6 +279950,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -263173,6 +279965,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -263183,6 +279976,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -263253,14 +280047,17 @@ public int compareTo(remove_compaction_metrics_data_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -263306,6 +280103,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class remove_compaction_metrics_data_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_compaction_metrics_data_argsStandardScheme getScheme() {
         return new remove_compaction_metrics_data_argsStandardScheme();
       }
@@ -263313,34 +280111,41 @@ public remove_compaction_metrics_data_argsStandardScheme getScheme() {
 
     private static class remove_compaction_metrics_data_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<remove_compaction_metrics_data_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, remove_compaction_metrics_data_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new CompactionMetricsDataRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new CompactionMetricsDataRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, remove_compaction_metrics_data_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -263357,6 +280162,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, remove_compaction_
     }
 
     private static class remove_compaction_metrics_data_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_compaction_metrics_data_argsTupleScheme getScheme() {
         return new remove_compaction_metrics_data_argsTupleScheme();
       }
@@ -263379,12 +280185,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, remove_compaction_m
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, remove_compaction_metrics_data_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 CompactionMetricsDataRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CompactionMetricsDataRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -263394,6 +280205,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class remove_compaction_metrics_data_result implements org.apache.thrift.TBase<remove_compaction_metrics_data_result, remove_compaction_metrics_data_result._Fields>, java.io.Serializable, Cloneable, Comparable<remove_compaction_metrics_data_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("remove_compaction_metrics_data_result");
 
@@ -263455,10 +280267,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -263493,6 +280307,7 @@ public remove_compaction_metrics_data_result(remove_compaction_metrics_data_resu
       }
     }
 
+    @Override
     public remove_compaction_metrics_data_result deepCopy() {
       return new remove_compaction_metrics_data_result(this);
     }
@@ -263526,6 +280341,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -263540,6 +280356,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -263550,6 +280367,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -263620,10 +280438,12 @@ public int compareTo(remove_compaction_metrics_data_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -263670,6 +280490,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class remove_compaction_metrics_data_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_compaction_metrics_data_resultStandardScheme getScheme() {
         return new remove_compaction_metrics_data_resultStandardScheme();
       }
@@ -263677,34 +280498,41 @@ public remove_compaction_metrics_data_resultStandardScheme getScheme() {
 
     private static class remove_compaction_metrics_data_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<remove_compaction_metrics_data_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, remove_compaction_metrics_data_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, remove_compaction_metrics_data_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -263721,6 +280549,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, remove_compaction_
     }
 
     private static class remove_compaction_metrics_data_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public remove_compaction_metrics_data_resultTupleScheme getScheme() {
         return new remove_compaction_metrics_data_resultTupleScheme();
       }
@@ -263743,12 +280572,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, remove_compaction_m
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, remove_compaction_metrics_data_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -263758,6 +280592,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_hadoop_jobid_args implements org.apache.thrift.TBase<set_hadoop_jobid_args, set_hadoop_jobid_args._Fields>, java.io.Serializable, Cloneable, Comparable<set_hadoop_jobid_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_hadoop_jobid_args");
 
@@ -263824,10 +280659,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -263871,6 +280708,7 @@ public set_hadoop_jobid_args(set_hadoop_jobid_args other) {
       this.cq_id = other.cq_id;
     }
 
+    @Override
     public set_hadoop_jobid_args deepCopy() {
       return new set_hadoop_jobid_args(this);
     }
@@ -263928,6 +280766,7 @@ public void setCq_idIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CQ_ID_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case JOB_ID:
@@ -263950,6 +280789,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case JOB_ID:
@@ -263963,6 +280803,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -264056,14 +280897,17 @@ public int compareTo(set_hadoop_jobid_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -264112,6 +280956,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_hadoop_jobid_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_hadoop_jobid_argsStandardScheme getScheme() {
         return new set_hadoop_jobid_argsStandardScheme();
       }
@@ -264119,41 +280964,48 @@ public set_hadoop_jobid_argsStandardScheme getScheme() {
 
     private static class set_hadoop_jobid_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_hadoop_jobid_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_hadoop_jobid_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;
-          }
-          switch (schemeField.id) {
-            case 1: // JOB_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.jobId = iprot.readString();
-                struct.setJobIdIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 2: // CQ_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.cq_id = iprot.readI64();
-                struct.setCq_idIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // JOB_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.jobId = iprot.readString();
+                  struct.setJobIdIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 2: // CQ_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.cq_id = iprot.readI64();
+                  struct.setCq_idIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_hadoop_jobid_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -264173,6 +281025,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_hadoop_jobid_a
     }
 
     private static class set_hadoop_jobid_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_hadoop_jobid_argsTupleScheme getScheme() {
         return new set_hadoop_jobid_argsTupleScheme();
       }
@@ -264201,15 +281054,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_hadoop_jobid_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_hadoop_jobid_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);
-        if (incoming.get(0)) {
-          struct.jobId = iprot.readString();
-          struct.setJobIdIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.cq_id = iprot.readI64();
-          struct.setCq_idIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.jobId = iprot.readString();
+            struct.setJobIdIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.cq_id = iprot.readI64();
+            struct.setCq_idIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -264219,6 +281077,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_hadoop_jobid_result implements org.apache.thrift.TBase<set_hadoop_jobid_result, set_hadoop_jobid_result._Fields>, java.io.Serializable, Cloneable, Comparable<set_hadoop_jobid_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_hadoop_jobid_result");
 
@@ -264276,10 +281135,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -264300,6 +281161,7 @@ public set_hadoop_jobid_result() {
     public set_hadoop_jobid_result(set_hadoop_jobid_result other) {
     }
 
+    @Override
     public set_hadoop_jobid_result deepCopy() {
       return new set_hadoop_jobid_result(this);
     }
@@ -264308,12 +281170,14 @@ public set_hadoop_jobid_result deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -264321,6 +281185,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -264366,10 +281231,12 @@ public int compareTo(set_hadoop_jobid_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -264409,6 +281276,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_hadoop_jobid_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_hadoop_jobid_resultStandardScheme getScheme() {
         return new set_hadoop_jobid_resultStandardScheme();
       }
@@ -264416,25 +281284,32 @@ public set_hadoop_jobid_resultStandardScheme getScheme() {
 
     private static class set_hadoop_jobid_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_hadoop_jobid_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_hadoop_jobid_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) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_hadoop_jobid_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -264446,6 +281321,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_hadoop_jobid_r
     }
 
     private static class set_hadoop_jobid_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_hadoop_jobid_resultTupleScheme getScheme() {
         return new set_hadoop_jobid_resultTupleScheme();
       }
@@ -264460,7 +281336,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_hadoop_jobid_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_hadoop_jobid_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -264469,6 +281350,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_committed_compaction_info_args implements org.apache.thrift.TBase<get_latest_committed_compaction_info_args, get_latest_committed_compaction_info_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_latest_committed_compaction_info_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_latest_committed_compaction_info_args");
 
@@ -264530,10 +281412,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -264568,6 +281452,7 @@ public get_latest_committed_compaction_info_args(get_latest_committed_compaction
       }
     }
 
+    @Override
     public get_latest_committed_compaction_info_args deepCopy() {
       return new get_latest_committed_compaction_info_args(this);
     }
@@ -264601,6 +281486,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -264615,6 +281501,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -264625,6 +281512,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -264695,14 +281583,17 @@ public int compareTo(get_latest_committed_compaction_info_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -264748,6 +281639,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_latest_committed_compaction_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_committed_compaction_info_argsStandardScheme getScheme() {
         return new get_latest_committed_compaction_info_argsStandardScheme();
       }
@@ -264755,34 +281647,41 @@ public get_latest_committed_compaction_info_argsStandardScheme getScheme() {
 
     private static class get_latest_committed_compaction_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_latest_committed_compaction_info_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_latest_committed_compaction_info_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new GetLatestCommittedCompactionInfoRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new GetLatestCommittedCompactionInfoRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_committed_compaction_info_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -264799,6 +281698,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_committ
     }
 
     private static class get_latest_committed_compaction_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_committed_compaction_info_argsTupleScheme getScheme() {
         return new get_latest_committed_compaction_info_argsTupleScheme();
       }
@@ -264821,12 +281721,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_latest_committe
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_latest_committed_compaction_info_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.rqst = new GetLatestCommittedCompactionInfoRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetLatestCommittedCompactionInfoRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -264836,6 +281741,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_latest_committed_compaction_info_result implements org.apache.thrift.TBase<get_latest_committed_compaction_info_result, get_latest_committed_compaction_info_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_latest_committed_compaction_info_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_latest_committed_compaction_info_result");
 
@@ -264897,10 +281803,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -264935,6 +281843,7 @@ public get_latest_committed_compaction_info_result(get_latest_committed_compacti
       }
     }
 
+    @Override
     public get_latest_committed_compaction_info_result deepCopy() {
       return new get_latest_committed_compaction_info_result(this);
     }
@@ -264968,6 +281877,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -264982,6 +281892,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -264992,6 +281903,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -265062,10 +281974,12 @@ public int compareTo(get_latest_committed_compaction_info_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -265115,6 +282029,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_latest_committed_compaction_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_committed_compaction_info_resultStandardScheme getScheme() {
         return new get_latest_committed_compaction_info_resultStandardScheme();
       }
@@ -265122,34 +282037,41 @@ public get_latest_committed_compaction_info_resultStandardScheme getScheme() {
 
     private static class get_latest_committed_compaction_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_latest_committed_compaction_info_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_latest_committed_compaction_info_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 GetLatestCommittedCompactionInfoResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetLatestCommittedCompactionInfoResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_committed_compaction_info_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -265166,6 +282088,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_latest_committ
     }
 
     private static class get_latest_committed_compaction_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_latest_committed_compaction_info_resultTupleScheme getScheme() {
         return new get_latest_committed_compaction_info_resultTupleScheme();
       }
@@ -265188,12 +282111,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_latest_committe
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_latest_committed_compaction_info_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.success = new GetLatestCommittedCompactionInfoResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetLatestCommittedCompactionInfoResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -265203,6 +282131,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_next_notification_args implements org.apache.thrift.TBase<get_next_notification_args, get_next_notification_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_next_notification_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_next_notification_args");
 
@@ -265264,10 +282193,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -265302,6 +282233,7 @@ public get_next_notification_args(get_next_notification_args other) {
       }
     }
 
+    @Override
     public get_next_notification_args deepCopy() {
       return new get_next_notification_args(this);
     }
@@ -265335,6 +282267,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -265349,6 +282282,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -265359,6 +282293,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -265429,14 +282364,17 @@ public int compareTo(get_next_notification_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -265482,6 +282420,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_next_notification_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_next_notification_argsStandardScheme getScheme() {
         return new get_next_notification_argsStandardScheme();
       }
@@ -265489,34 +282428,41 @@ public get_next_notification_argsStandardScheme getScheme() {
 
     private static class get_next_notification_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_next_notification_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_next_notification_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new NotificationEventRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new NotificationEventRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_next_notification_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -265533,6 +282479,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_next_notificat
     }
 
     private static class get_next_notification_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_next_notification_argsTupleScheme getScheme() {
         return new get_next_notification_argsTupleScheme();
       }
@@ -265555,12 +282502,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_next_notificati
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_next_notification_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 NotificationEventRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 NotificationEventRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -265570,6 +282522,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_next_notification_result implements org.apache.thrift.TBase<get_next_notification_result, get_next_notification_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_next_notification_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_next_notification_result");
 
@@ -265631,10 +282584,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -265669,6 +282624,7 @@ public get_next_notification_result(get_next_notification_result other) {
       }
     }
 
+    @Override
     public get_next_notification_result deepCopy() {
       return new get_next_notification_result(this);
     }
@@ -265702,6 +282658,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -265716,6 +282673,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -265726,6 +282684,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -265796,10 +282755,12 @@ public int compareTo(get_next_notification_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -265849,6 +282810,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_next_notification_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_next_notification_resultStandardScheme getScheme() {
         return new get_next_notification_resultStandardScheme();
       }
@@ -265856,34 +282818,41 @@ public get_next_notification_resultStandardScheme getScheme() {
 
     private static class get_next_notification_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_next_notification_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_next_notification_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 NotificationEventResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 NotificationEventResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_next_notification_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -265900,6 +282869,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_next_notificat
     }
 
     private static class get_next_notification_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_next_notification_resultTupleScheme getScheme() {
         return new get_next_notification_resultTupleScheme();
       }
@@ -265922,12 +282892,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_next_notificati
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_next_notification_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.success = new NotificationEventResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 NotificationEventResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -265937,6 +282912,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_current_notificationEventId_args implements org.apache.thrift.TBase<get_current_notificationEventId_args, get_current_notificationEventId_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_current_notificationEventId_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_current_notificationEventId_args");
 
@@ -265994,10 +282970,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -266018,6 +282996,7 @@ public get_current_notificationEventId_args() {
     public get_current_notificationEventId_args(get_current_notificationEventId_args other) {
     }
 
+    @Override
     public get_current_notificationEventId_args deepCopy() {
       return new get_current_notificationEventId_args(this);
     }
@@ -266026,12 +283005,14 @@ public get_current_notificationEventId_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -266039,6 +283020,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -266084,14 +283066,17 @@ public int compareTo(get_current_notificationEventId_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -266127,6 +283112,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_current_notificationEventId_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_current_notificationEventId_argsStandardScheme getScheme() {
         return new get_current_notificationEventId_argsStandardScheme();
       }
@@ -266134,25 +283120,32 @@ public get_current_notificationEventId_argsStandardScheme getScheme() {
 
     private static class get_current_notificationEventId_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_current_notificationEventId_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_current_notificationEventId_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_current_notificationEventId_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -266164,6 +283157,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_current_notifi
     }
 
     private static class get_current_notificationEventId_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_current_notificationEventId_argsTupleScheme getScheme() {
         return new get_current_notificationEventId_argsTupleScheme();
       }
@@ -266178,7 +283172,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_current_notific
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_current_notificationEventId_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -266187,6 +283186,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_current_notificationEventId_result implements org.apache.thrift.TBase<get_current_notificationEventId_result, get_current_notificationEventId_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_current_notificationEventId_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_current_notificationEventId_result");
 
@@ -266248,10 +283248,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -266286,6 +283288,7 @@ public get_current_notificationEventId_result(get_current_notificationEventId_re
       }
     }
 
+    @Override
     public get_current_notificationEventId_result deepCopy() {
       return new get_current_notificationEventId_result(this);
     }
@@ -266319,6 +283322,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -266333,6 +283337,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -266343,6 +283348,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -266413,10 +283419,12 @@ public int compareTo(get_current_notificationEventId_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -266466,6 +283474,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_current_notificationEventId_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_current_notificationEventId_resultStandardScheme getScheme() {
         return new get_current_notificationEventId_resultStandardScheme();
       }
@@ -266473,34 +283482,41 @@ public get_current_notificationEventId_resultStandardScheme getScheme() {
 
     private static class get_current_notificationEventId_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_current_notificationEventId_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_current_notificationEventId_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 CurrentNotificationEventId();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 CurrentNotificationEventId();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_current_notificationEventId_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -266517,6 +283533,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_current_notifi
     }
 
     private static class get_current_notificationEventId_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_current_notificationEventId_resultTupleScheme getScheme() {
         return new get_current_notificationEventId_resultTupleScheme();
       }
@@ -266539,12 +283556,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_current_notific
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_current_notificationEventId_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.success = new CurrentNotificationEventId();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CurrentNotificationEventId();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -266554,6 +283576,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_notification_events_count_args implements org.apache.thrift.TBase<get_notification_events_count_args, get_notification_events_count_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_notification_events_count_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_notification_events_count_args");
 
@@ -266615,10 +283638,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -266653,6 +283678,7 @@ public get_notification_events_count_args(get_notification_events_count_args oth
       }
     }
 
+    @Override
     public get_notification_events_count_args deepCopy() {
       return new get_notification_events_count_args(this);
     }
@@ -266686,6 +283712,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -266700,6 +283727,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -266710,6 +283738,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -266780,14 +283809,17 @@ public int compareTo(get_notification_events_count_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -266833,6 +283865,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_notification_events_count_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_notification_events_count_argsStandardScheme getScheme() {
         return new get_notification_events_count_argsStandardScheme();
       }
@@ -266840,34 +283873,41 @@ public get_notification_events_count_argsStandardScheme getScheme() {
 
     private static class get_notification_events_count_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_notification_events_count_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_notification_events_count_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new NotificationEventsCountRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new NotificationEventsCountRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_notification_events_count_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -266884,6 +283924,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_notification_e
     }
 
     private static class get_notification_events_count_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_notification_events_count_argsTupleScheme getScheme() {
         return new get_notification_events_count_argsTupleScheme();
       }
@@ -266906,12 +283947,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_notification_ev
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_notification_events_count_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 NotificationEventsCountRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 NotificationEventsCountRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -266921,6 +283967,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_notification_events_count_result implements org.apache.thrift.TBase<get_notification_events_count_result, get_notification_events_count_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_notification_events_count_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_notification_events_count_result");
 
@@ -266982,10 +284029,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -267020,6 +284069,7 @@ public get_notification_events_count_result(get_notification_events_count_result
       }
     }
 
+    @Override
     public get_notification_events_count_result deepCopy() {
       return new get_notification_events_count_result(this);
     }
@@ -267053,6 +284103,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -267067,6 +284118,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -267077,6 +284129,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -267147,10 +284200,12 @@ public int compareTo(get_notification_events_count_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -267200,6 +284255,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_notification_events_count_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_notification_events_count_resultStandardScheme getScheme() {
         return new get_notification_events_count_resultStandardScheme();
       }
@@ -267207,34 +284263,41 @@ public get_notification_events_count_resultStandardScheme getScheme() {
 
     private static class get_notification_events_count_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_notification_events_count_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_notification_events_count_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 NotificationEventsCountResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 NotificationEventsCountResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_notification_events_count_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -267251,6 +284314,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_notification_e
     }
 
     private static class get_notification_events_count_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_notification_events_count_resultTupleScheme getScheme() {
         return new get_notification_events_count_resultTupleScheme();
       }
@@ -267273,12 +284337,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_notification_ev
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_notification_events_count_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.success = new NotificationEventsCountResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 NotificationEventsCountResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -267288,6 +284357,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fire_listener_event_args implements org.apache.thrift.TBase<fire_listener_event_args, fire_listener_event_args._Fields>, java.io.Serializable, Cloneable, Comparable<fire_listener_event_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fire_listener_event_args");
 
@@ -267349,10 +284419,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -267387,6 +284459,7 @@ public fire_listener_event_args(fire_listener_event_args other) {
       }
     }
 
+    @Override
     public fire_listener_event_args deepCopy() {
       return new fire_listener_event_args(this);
     }
@@ -267420,6 +284493,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -267434,6 +284508,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -267444,6 +284519,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -267514,14 +284590,17 @@ public int compareTo(fire_listener_event_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -267567,6 +284646,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class fire_listener_event_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fire_listener_event_argsStandardScheme getScheme() {
         return new fire_listener_event_argsStandardScheme();
       }
@@ -267574,34 +284654,41 @@ public fire_listener_event_argsStandardScheme getScheme() {
 
     private static class fire_listener_event_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<fire_listener_event_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, fire_listener_event_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new FireEventRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new FireEventRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, fire_listener_event_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -267618,6 +284705,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, fire_listener_even
     }
 
     private static class fire_listener_event_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fire_listener_event_argsTupleScheme getScheme() {
         return new fire_listener_event_argsTupleScheme();
       }
@@ -267640,12 +284728,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, fire_listener_event
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, fire_listener_event_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 FireEventRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 FireEventRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -267655,6 +284748,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class fire_listener_event_result implements org.apache.thrift.TBase<fire_listener_event_result, fire_listener_event_result._Fields>, java.io.Serializable, Cloneable, Comparable<fire_listener_event_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fire_listener_event_result");
 
@@ -267716,10 +284810,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -267754,6 +284850,7 @@ public fire_listener_event_result(fire_listener_event_result other) {
       }
     }
 
+    @Override
     public fire_listener_event_result deepCopy() {
       return new fire_listener_event_result(this);
     }
@@ -267787,6 +284884,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -267801,6 +284899,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -267811,6 +284910,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -267881,10 +284981,12 @@ public int compareTo(fire_listener_event_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -267934,6 +285036,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class fire_listener_event_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fire_listener_event_resultStandardScheme getScheme() {
         return new fire_listener_event_resultStandardScheme();
       }
@@ -267941,34 +285044,41 @@ public fire_listener_event_resultStandardScheme getScheme() {
 
     private static class fire_listener_event_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<fire_listener_event_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, fire_listener_event_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 FireEventResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 FireEventResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, fire_listener_event_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -267985,6 +285095,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, fire_listener_even
     }
 
     private static class fire_listener_event_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public fire_listener_event_resultTupleScheme getScheme() {
         return new fire_listener_event_resultTupleScheme();
       }
@@ -268007,12 +285118,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, fire_listener_event
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, fire_listener_event_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.success = new FireEventResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 FireEventResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -268022,6 +285138,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class flushCache_args implements org.apache.thrift.TBase<flushCache_args, flushCache_args._Fields>, java.io.Serializable, Cloneable, Comparable<flushCache_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("flushCache_args");
 
@@ -268079,10 +285196,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -268103,6 +285222,7 @@ public flushCache_args() {
     public flushCache_args(flushCache_args other) {
     }
 
+    @Override
     public flushCache_args deepCopy() {
       return new flushCache_args(this);
     }
@@ -268111,12 +285231,14 @@ public flushCache_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -268124,6 +285246,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -268169,14 +285292,17 @@ public int compareTo(flushCache_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -268212,6 +285338,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class flushCache_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public flushCache_argsStandardScheme getScheme() {
         return new flushCache_argsStandardScheme();
       }
@@ -268219,25 +285346,32 @@ public flushCache_argsStandardScheme getScheme() {
 
     private static class flushCache_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<flushCache_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, flushCache_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, flushCache_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -268249,6 +285383,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, flushCache_args st
     }
 
     private static class flushCache_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public flushCache_argsTupleScheme getScheme() {
         return new flushCache_argsTupleScheme();
       }
@@ -268263,7 +285398,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, flushCache_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, flushCache_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -268272,6 +285412,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class flushCache_result implements org.apache.thrift.TBase<flushCache_result, flushCache_result._Fields>, java.io.Serializable, Cloneable, Comparable<flushCache_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("flushCache_result");
 
@@ -268329,10 +285470,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -268353,6 +285496,7 @@ public flushCache_result() {
     public flushCache_result(flushCache_result other) {
     }
 
+    @Override
     public flushCache_result deepCopy() {
       return new flushCache_result(this);
     }
@@ -268361,12 +285505,14 @@ public flushCache_result deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -268374,6 +285520,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -268419,10 +285566,12 @@ public int compareTo(flushCache_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -268462,6 +285611,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class flushCache_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public flushCache_resultStandardScheme getScheme() {
         return new flushCache_resultStandardScheme();
       }
@@ -268469,25 +285619,32 @@ public flushCache_resultStandardScheme getScheme() {
 
     private static class flushCache_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<flushCache_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, flushCache_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) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, flushCache_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -268499,6 +285656,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, flushCache_result
     }
 
     private static class flushCache_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public flushCache_resultTupleScheme getScheme() {
         return new flushCache_resultTupleScheme();
       }
@@ -268513,7 +285671,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, flushCache_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, flushCache_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -268522,6 +285685,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_args implements org.apache.thrift.TBase<add_write_notification_log_args, add_write_notification_log_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_notification_log_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_notification_log_args");
 
@@ -268583,10 +285747,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -268621,6 +285787,7 @@ public add_write_notification_log_args(add_write_notification_log_args other) {
       }
     }
 
+    @Override
     public add_write_notification_log_args deepCopy() {
       return new add_write_notification_log_args(this);
     }
@@ -268654,6 +285821,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -268668,6 +285836,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -268678,6 +285847,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -268748,14 +285918,17 @@ public int compareTo(add_write_notification_log_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -268801,6 +285974,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_write_notification_log_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_argsStandardScheme getScheme() {
         return new add_write_notification_log_argsStandardScheme();
       }
@@ -268808,34 +285982,41 @@ public add_write_notification_log_argsStandardScheme getScheme() {
 
     private static class add_write_notification_log_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_write_notification_log_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_write_notification_log_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new WriteNotificationLogRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new WriteNotificationLogRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notification_log_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -268852,6 +286033,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notifica
     }
 
     private static class add_write_notification_log_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_argsTupleScheme getScheme() {
         return new add_write_notification_log_argsTupleScheme();
       }
@@ -268874,12 +286056,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_write_notificat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_write_notification_log_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 WriteNotificationLogRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WriteNotificationLogRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -268889,6 +286076,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_result implements org.apache.thrift.TBase<add_write_notification_log_result, add_write_notification_log_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_notification_log_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_notification_log_result");
 
@@ -268950,10 +286138,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -268988,6 +286178,7 @@ public add_write_notification_log_result(add_write_notification_log_result other
       }
     }
 
+    @Override
     public add_write_notification_log_result deepCopy() {
       return new add_write_notification_log_result(this);
     }
@@ -269021,6 +286212,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -269035,6 +286227,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -269045,6 +286238,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -269115,10 +286309,12 @@ public int compareTo(add_write_notification_log_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -269168,6 +286364,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_write_notification_log_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_resultStandardScheme getScheme() {
         return new add_write_notification_log_resultStandardScheme();
       }
@@ -269175,34 +286372,41 @@ public add_write_notification_log_resultStandardScheme getScheme() {
 
     private static class add_write_notification_log_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_write_notification_log_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_write_notification_log_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 WriteNotificationLogResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WriteNotificationLogResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notification_log_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -269219,6 +286423,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notifica
     }
 
     private static class add_write_notification_log_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_resultTupleScheme getScheme() {
         return new add_write_notification_log_resultTupleScheme();
       }
@@ -269241,12 +286446,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_write_notificat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_write_notification_log_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.success = new WriteNotificationLogResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WriteNotificationLogResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -269256,6 +286466,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_in_batch_args implements org.apache.thrift.TBase<add_write_notification_log_in_batch_args, add_write_notification_log_in_batch_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_notification_log_in_batch_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_notification_log_in_batch_args");
 
@@ -269317,10 +286528,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -269355,6 +286568,7 @@ public add_write_notification_log_in_batch_args(add_write_notification_log_in_ba
       }
     }
 
+    @Override
     public add_write_notification_log_in_batch_args deepCopy() {
       return new add_write_notification_log_in_batch_args(this);
     }
@@ -269388,6 +286602,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -269402,6 +286617,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -269412,6 +286628,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -269482,14 +286699,17 @@ public int compareTo(add_write_notification_log_in_batch_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -269535,6 +286755,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_write_notification_log_in_batch_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_in_batch_argsStandardScheme getScheme() {
         return new add_write_notification_log_in_batch_argsStandardScheme();
       }
@@ -269542,34 +286763,41 @@ public add_write_notification_log_in_batch_argsStandardScheme getScheme() {
 
     private static class add_write_notification_log_in_batch_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_write_notification_log_in_batch_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_write_notification_log_in_batch_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new WriteNotificationLogBatchRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new WriteNotificationLogBatchRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notification_log_in_batch_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -269586,6 +286814,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notifica
     }
 
     private static class add_write_notification_log_in_batch_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_in_batch_argsTupleScheme getScheme() {
         return new add_write_notification_log_in_batch_argsTupleScheme();
       }
@@ -269608,12 +286837,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_write_notificat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_write_notification_log_in_batch_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 WriteNotificationLogBatchRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WriteNotificationLogBatchRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -269623,6 +286857,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_in_batch_result implements org.apache.thrift.TBase<add_write_notification_log_in_batch_result, add_write_notification_log_in_batch_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_notification_log_in_batch_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_notification_log_in_batch_result");
 
@@ -269684,10 +286919,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -269722,6 +286959,7 @@ public add_write_notification_log_in_batch_result(add_write_notification_log_in_
       }
     }
 
+    @Override
     public add_write_notification_log_in_batch_result deepCopy() {
       return new add_write_notification_log_in_batch_result(this);
     }
@@ -269755,6 +286993,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -269769,6 +287008,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -269779,6 +287019,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -269849,10 +287090,12 @@ public int compareTo(add_write_notification_log_in_batch_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -269902,6 +287145,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_write_notification_log_in_batch_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_in_batch_resultStandardScheme getScheme() {
         return new add_write_notification_log_in_batch_resultStandardScheme();
       }
@@ -269909,34 +287153,41 @@ public add_write_notification_log_in_batch_resultStandardScheme getScheme() {
 
     private static class add_write_notification_log_in_batch_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_write_notification_log_in_batch_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_write_notification_log_in_batch_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 WriteNotificationLogBatchResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WriteNotificationLogBatchResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notification_log_in_batch_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -269953,6 +287204,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_write_notifica
     }
 
     private static class add_write_notification_log_in_batch_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_write_notification_log_in_batch_resultTupleScheme getScheme() {
         return new add_write_notification_log_in_batch_resultTupleScheme();
       }
@@ -269975,12 +287227,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_write_notificat
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_write_notification_log_in_batch_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.success = new WriteNotificationLogBatchResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WriteNotificationLogBatchResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -269990,6 +287247,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cm_recycle_args implements org.apache.thrift.TBase<cm_recycle_args, cm_recycle_args._Fields>, java.io.Serializable, Cloneable, Comparable<cm_recycle_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cm_recycle_args");
 
@@ -270051,10 +287309,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -270089,6 +287349,7 @@ public cm_recycle_args(cm_recycle_args other) {
       }
     }
 
+    @Override
     public cm_recycle_args deepCopy() {
       return new cm_recycle_args(this);
     }
@@ -270122,6 +287383,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -270136,6 +287398,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -270146,6 +287409,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -270216,14 +287480,17 @@ public int compareTo(cm_recycle_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -270269,6 +287536,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class cm_recycle_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cm_recycle_argsStandardScheme getScheme() {
         return new cm_recycle_argsStandardScheme();
       }
@@ -270276,34 +287544,41 @@ public cm_recycle_argsStandardScheme getScheme() {
 
     private static class cm_recycle_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<cm_recycle_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, cm_recycle_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new CmRecycleRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new CmRecycleRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, cm_recycle_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -270320,6 +287595,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, cm_recycle_args st
     }
 
     private static class cm_recycle_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cm_recycle_argsTupleScheme getScheme() {
         return new cm_recycle_argsTupleScheme();
       }
@@ -270342,12 +287618,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, cm_recycle_args str
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cm_recycle_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 CmRecycleRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CmRecycleRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -270357,6 +287638,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cm_recycle_result implements org.apache.thrift.TBase<cm_recycle_result, cm_recycle_result._Fields>, java.io.Serializable, Cloneable, Comparable<cm_recycle_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cm_recycle_result");
 
@@ -270423,10 +287705,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -270468,6 +287752,7 @@ public cm_recycle_result(cm_recycle_result other) {
       }
     }
 
+    @Override
     public cm_recycle_result deepCopy() {
       return new cm_recycle_result(this);
     }
@@ -270526,6 +287811,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -270548,6 +287834,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -270561,6 +287848,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -270656,10 +287944,12 @@ public int compareTo(cm_recycle_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -270717,6 +288007,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class cm_recycle_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cm_recycle_resultStandardScheme getScheme() {
         return new cm_recycle_resultStandardScheme();
       }
@@ -270724,43 +288015,50 @@ public cm_recycle_resultStandardScheme getScheme() {
 
     private static class cm_recycle_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<cm_recycle_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, cm_recycle_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 CmRecycleResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 CmRecycleResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, cm_recycle_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -270782,6 +288080,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, cm_recycle_result
     }
 
     private static class cm_recycle_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cm_recycle_resultTupleScheme getScheme() {
         return new cm_recycle_resultTupleScheme();
       }
@@ -270810,17 +288109,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, cm_recycle_result s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cm_recycle_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.success = new CmRecycleResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new CmRecycleResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -270830,6 +288134,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_by_expr_args implements org.apache.thrift.TBase<get_file_metadata_by_expr_args, get_file_metadata_by_expr_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_file_metadata_by_expr_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_file_metadata_by_expr_args");
 
@@ -270891,10 +288196,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -270929,6 +288236,7 @@ public get_file_metadata_by_expr_args(get_file_metadata_by_expr_args other) {
       }
     }
 
+    @Override
     public get_file_metadata_by_expr_args deepCopy() {
       return new get_file_metadata_by_expr_args(this);
     }
@@ -270962,6 +288270,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -270976,6 +288285,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -270986,6 +288296,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -271056,14 +288367,17 @@ public int compareTo(get_file_metadata_by_expr_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -271109,6 +288423,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_file_metadata_by_expr_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_by_expr_argsStandardScheme getScheme() {
         return new get_file_metadata_by_expr_argsStandardScheme();
       }
@@ -271116,34 +288431,41 @@ public get_file_metadata_by_expr_argsStandardScheme getScheme() {
 
     private static class get_file_metadata_by_expr_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_file_metadata_by_expr_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_file_metadata_by_expr_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetFileMetadataByExprRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetFileMetadataByExprRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_by_expr_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -271160,6 +288482,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_
     }
 
     private static class get_file_metadata_by_expr_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_by_expr_argsTupleScheme getScheme() {
         return new get_file_metadata_by_expr_argsTupleScheme();
       }
@@ -271182,12 +288505,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_b
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_by_expr_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.req = new GetFileMetadataByExprRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetFileMetadataByExprRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -271197,6 +288525,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_by_expr_result implements org.apache.thrift.TBase<get_file_metadata_by_expr_result, get_file_metadata_by_expr_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_file_metadata_by_expr_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_file_metadata_by_expr_result");
 
@@ -271258,10 +288587,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -271296,6 +288627,7 @@ public get_file_metadata_by_expr_result(get_file_metadata_by_expr_result other)
       }
     }
 
+    @Override
     public get_file_metadata_by_expr_result deepCopy() {
       return new get_file_metadata_by_expr_result(this);
     }
@@ -271329,6 +288661,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -271343,6 +288676,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -271353,6 +288687,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -271423,10 +288758,12 @@ public int compareTo(get_file_metadata_by_expr_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -271476,6 +288813,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_file_metadata_by_expr_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_by_expr_resultStandardScheme getScheme() {
         return new get_file_metadata_by_expr_resultStandardScheme();
       }
@@ -271483,34 +288821,41 @@ public get_file_metadata_by_expr_resultStandardScheme getScheme() {
 
     private static class get_file_metadata_by_expr_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_file_metadata_by_expr_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_file_metadata_by_expr_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 GetFileMetadataByExprResult();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetFileMetadataByExprResult();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_by_expr_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -271527,6 +288872,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_
     }
 
     private static class get_file_metadata_by_expr_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_by_expr_resultTupleScheme getScheme() {
         return new get_file_metadata_by_expr_resultTupleScheme();
       }
@@ -271549,12 +288895,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_b
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_by_expr_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.success = new GetFileMetadataByExprResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetFileMetadataByExprResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -271564,6 +288915,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_args implements org.apache.thrift.TBase<get_file_metadata_args, get_file_metadata_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_file_metadata_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_file_metadata_args");
 
@@ -271625,10 +288977,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -271663,6 +289017,7 @@ public get_file_metadata_args(get_file_metadata_args other) {
       }
     }
 
+    @Override
     public get_file_metadata_args deepCopy() {
       return new get_file_metadata_args(this);
     }
@@ -271696,6 +289051,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -271710,6 +289066,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -271720,6 +289077,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -271790,14 +289148,17 @@ public int compareTo(get_file_metadata_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -271843,6 +289204,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_file_metadata_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_argsStandardScheme getScheme() {
         return new get_file_metadata_argsStandardScheme();
       }
@@ -271850,34 +289212,41 @@ public get_file_metadata_argsStandardScheme getScheme() {
 
     private static class get_file_metadata_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_file_metadata_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_file_metadata_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new GetFileMetadataRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new GetFileMetadataRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -271894,6 +289263,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_
     }
 
     private static class get_file_metadata_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_argsTupleScheme getScheme() {
         return new get_file_metadata_argsTupleScheme();
       }
@@ -271916,12 +289286,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_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.req = new GetFileMetadataRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new GetFileMetadataRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -271931,6 +289306,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_file_metadata_result implements org.apache.thrift.TBase<get_file_metadata_result, get_file_metadata_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_file_metadata_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_file_metadata_result");
 
@@ -271992,10 +289368,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -272030,6 +289408,7 @@ public get_file_metadata_result(get_file_metadata_result other) {
       }
     }
 
+    @Override
     public get_file_metadata_result deepCopy() {
       return new get_file_metadata_result(this);
     }
@@ -272063,6 +289442,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -272077,6 +289457,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -272087,6 +289468,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -272157,10 +289539,12 @@ public int compareTo(get_file_metadata_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -272210,6 +289594,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_file_metadata_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_resultStandardScheme getScheme() {
         return new get_file_metadata_resultStandardScheme();
       }
@@ -272217,34 +289602,41 @@ public get_file_metadata_resultStandardScheme getScheme() {
 
     private static class get_file_metadata_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_file_metadata_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_file_metadata_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 GetFileMetadataResult();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetFileMetadataResult();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -272261,6 +289653,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_file_metadata_
     }
 
     private static class get_file_metadata_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_file_metadata_resultTupleScheme getScheme() {
         return new get_file_metadata_resultTupleScheme();
       }
@@ -272283,12 +289676,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_file_metadata_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.success = new GetFileMetadataResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetFileMetadataResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -272298,6 +289696,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class put_file_metadata_args implements org.apache.thrift.TBase<put_file_metadata_args, put_file_metadata_args._Fields>, java.io.Serializable, Cloneable, Comparable<put_file_metadata_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("put_file_metadata_args");
 
@@ -272359,10 +289758,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -272397,6 +289798,7 @@ public put_file_metadata_args(put_file_metadata_args other) {
       }
     }
 
+    @Override
     public put_file_metadata_args deepCopy() {
       return new put_file_metadata_args(this);
     }
@@ -272430,6 +289832,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -272444,6 +289847,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -272454,6 +289858,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -272524,14 +289929,17 @@ public int compareTo(put_file_metadata_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -272577,6 +289985,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class put_file_metadata_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public put_file_metadata_argsStandardScheme getScheme() {
         return new put_file_metadata_argsStandardScheme();
       }
@@ -272584,34 +289993,41 @@ public put_file_metadata_argsStandardScheme getScheme() {
 
     private static class put_file_metadata_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<put_file_metadata_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, put_file_metadata_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new PutFileMetadataRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new PutFileMetadataRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, put_file_metadata_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -272628,6 +290044,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, put_file_metadata_
     }
 
     private static class put_file_metadata_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public put_file_metadata_argsTupleScheme getScheme() {
         return new put_file_metadata_argsTupleScheme();
       }
@@ -272650,12 +290067,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, put_file_metadata_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, put_file_metadata_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.req = new PutFileMetadataRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new PutFileMetadataRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -272665,6 +290087,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class put_file_metadata_result implements org.apache.thrift.TBase<put_file_metadata_result, put_file_metadata_result._Fields>, java.io.Serializable, Cloneable, Comparable<put_file_metadata_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("put_file_metadata_result");
 
@@ -272726,10 +290149,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -272764,6 +290189,7 @@ public put_file_metadata_result(put_file_metadata_result other) {
       }
     }
 
+    @Override
     public put_file_metadata_result deepCopy() {
       return new put_file_metadata_result(this);
     }
@@ -272797,6 +290223,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -272811,6 +290238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -272821,6 +290249,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -272891,10 +290320,12 @@ public int compareTo(put_file_metadata_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -272944,6 +290375,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class put_file_metadata_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public put_file_metadata_resultStandardScheme getScheme() {
         return new put_file_metadata_resultStandardScheme();
       }
@@ -272951,34 +290383,41 @@ public put_file_metadata_resultStandardScheme getScheme() {
 
     private static class put_file_metadata_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<put_file_metadata_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, put_file_metadata_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 PutFileMetadataResult();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 PutFileMetadataResult();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, put_file_metadata_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -272995,6 +290434,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, put_file_metadata_
     }
 
     private static class put_file_metadata_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public put_file_metadata_resultTupleScheme getScheme() {
         return new put_file_metadata_resultTupleScheme();
       }
@@ -273017,12 +290457,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, put_file_metadata_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, put_file_metadata_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.success = new PutFileMetadataResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 PutFileMetadataResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -273032,6 +290477,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class clear_file_metadata_args implements org.apache.thrift.TBase<clear_file_metadata_args, clear_file_metadata_args._Fields>, java.io.Serializable, Cloneable, Comparable<clear_file_metadata_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("clear_file_metadata_args");
 
@@ -273093,10 +290539,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -273131,6 +290579,7 @@ public clear_file_metadata_args(clear_file_metadata_args other) {
       }
     }
 
+    @Override
     public clear_file_metadata_args deepCopy() {
       return new clear_file_metadata_args(this);
     }
@@ -273164,6 +290613,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -273178,6 +290628,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -273188,6 +290639,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -273258,14 +290710,17 @@ public int compareTo(clear_file_metadata_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -273311,6 +290766,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class clear_file_metadata_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public clear_file_metadata_argsStandardScheme getScheme() {
         return new clear_file_metadata_argsStandardScheme();
       }
@@ -273318,34 +290774,41 @@ public clear_file_metadata_argsStandardScheme getScheme() {
 
     private static class clear_file_metadata_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<clear_file_metadata_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, clear_file_metadata_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new ClearFileMetadataRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new ClearFileMetadataRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, clear_file_metadata_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -273362,6 +290825,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, clear_file_metadat
     }
 
     private static class clear_file_metadata_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public clear_file_metadata_argsTupleScheme getScheme() {
         return new clear_file_metadata_argsTupleScheme();
       }
@@ -273384,12 +290848,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, clear_file_metadata
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, clear_file_metadata_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.req = new ClearFileMetadataRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new ClearFileMetadataRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -273399,6 +290868,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class clear_file_metadata_result implements org.apache.thrift.TBase<clear_file_metadata_result, clear_file_metadata_result._Fields>, java.io.Serializable, Cloneable, Comparable<clear_file_metadata_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("clear_file_metadata_result");
 
@@ -273460,10 +290930,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -273498,6 +290970,7 @@ public clear_file_metadata_result(clear_file_metadata_result other) {
       }
     }
 
+    @Override
     public clear_file_metadata_result deepCopy() {
       return new clear_file_metadata_result(this);
     }
@@ -273531,6 +291004,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -273545,6 +291019,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -273555,6 +291030,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -273625,10 +291101,12 @@ public int compareTo(clear_file_metadata_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -273678,6 +291156,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class clear_file_metadata_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public clear_file_metadata_resultStandardScheme getScheme() {
         return new clear_file_metadata_resultStandardScheme();
       }
@@ -273685,34 +291164,41 @@ public clear_file_metadata_resultStandardScheme getScheme() {
 
     private static class clear_file_metadata_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<clear_file_metadata_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, clear_file_metadata_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 ClearFileMetadataResult();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ClearFileMetadataResult();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, clear_file_metadata_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -273729,6 +291215,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, clear_file_metadat
     }
 
     private static class clear_file_metadata_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public clear_file_metadata_resultTupleScheme getScheme() {
         return new clear_file_metadata_resultTupleScheme();
       }
@@ -273751,12 +291238,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, clear_file_metadata
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, clear_file_metadata_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.success = new ClearFileMetadataResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ClearFileMetadataResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -273766,6 +291258,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cache_file_metadata_args implements org.apache.thrift.TBase<cache_file_metadata_args, cache_file_metadata_args._Fields>, java.io.Serializable, Cloneable, Comparable<cache_file_metadata_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cache_file_metadata_args");
 
@@ -273827,10 +291320,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -273865,6 +291360,7 @@ public cache_file_metadata_args(cache_file_metadata_args other) {
       }
     }
 
+    @Override
     public cache_file_metadata_args deepCopy() {
       return new cache_file_metadata_args(this);
     }
@@ -273898,6 +291394,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -273912,6 +291409,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -273922,6 +291420,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -273992,14 +291491,17 @@ public int compareTo(cache_file_metadata_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -274045,6 +291547,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class cache_file_metadata_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cache_file_metadata_argsStandardScheme getScheme() {
         return new cache_file_metadata_argsStandardScheme();
       }
@@ -274052,34 +291555,41 @@ public cache_file_metadata_argsStandardScheme getScheme() {
 
     private static class cache_file_metadata_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<cache_file_metadata_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, cache_file_metadata_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new CacheFileMetadataRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new CacheFileMetadataRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, cache_file_metadata_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -274096,6 +291606,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, cache_file_metadat
     }
 
     private static class cache_file_metadata_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cache_file_metadata_argsTupleScheme getScheme() {
         return new cache_file_metadata_argsTupleScheme();
       }
@@ -274118,12 +291629,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, cache_file_metadata
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cache_file_metadata_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.req = new CacheFileMetadataRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new CacheFileMetadataRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -274133,6 +291649,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class cache_file_metadata_result implements org.apache.thrift.TBase<cache_file_metadata_result, cache_file_metadata_result._Fields>, java.io.Serializable, Cloneable, Comparable<cache_file_metadata_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cache_file_metadata_result");
 
@@ -274194,10 +291711,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -274232,6 +291751,7 @@ public cache_file_metadata_result(cache_file_metadata_result other) {
       }
     }
 
+    @Override
     public cache_file_metadata_result deepCopy() {
       return new cache_file_metadata_result(this);
     }
@@ -274265,6 +291785,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -274279,6 +291800,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -274289,6 +291811,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -274359,10 +291882,12 @@ public int compareTo(cache_file_metadata_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -274412,6 +291937,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class cache_file_metadata_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cache_file_metadata_resultStandardScheme getScheme() {
         return new cache_file_metadata_resultStandardScheme();
       }
@@ -274419,34 +291945,41 @@ public cache_file_metadata_resultStandardScheme getScheme() {
 
     private static class cache_file_metadata_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<cache_file_metadata_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, cache_file_metadata_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 CacheFileMetadataResult();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 CacheFileMetadataResult();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, cache_file_metadata_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -274463,6 +291996,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, cache_file_metadat
     }
 
     private static class cache_file_metadata_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public cache_file_metadata_resultTupleScheme getScheme() {
         return new cache_file_metadata_resultTupleScheme();
       }
@@ -274485,12 +292019,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, cache_file_metadata
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cache_file_metadata_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.success = new CacheFileMetadataResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 CacheFileMetadataResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -274500,6 +292039,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_metastore_db_uuid_args implements org.apache.thrift.TBase<get_metastore_db_uuid_args, get_metastore_db_uuid_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_metastore_db_uuid_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_metastore_db_uuid_args");
 
@@ -274557,10 +292097,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -274581,6 +292123,7 @@ public get_metastore_db_uuid_args() {
     public get_metastore_db_uuid_args(get_metastore_db_uuid_args other) {
     }
 
+    @Override
     public get_metastore_db_uuid_args deepCopy() {
       return new get_metastore_db_uuid_args(this);
     }
@@ -274589,12 +292132,14 @@ public get_metastore_db_uuid_args deepCopy() {
     public void clear() {
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
@@ -274602,6 +292147,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -274647,14 +292193,17 @@ public int compareTo(get_metastore_db_uuid_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -274690,6 +292239,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_metastore_db_uuid_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_metastore_db_uuid_argsStandardScheme getScheme() {
         return new get_metastore_db_uuid_argsStandardScheme();
       }
@@ -274697,25 +292247,32 @@ public get_metastore_db_uuid_argsStandardScheme getScheme() {
 
     private static class get_metastore_db_uuid_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_metastore_db_uuid_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_metastore_db_uuid_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;
-          }
-          switch (schemeField.id) {
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        iprot.incrementRecursionDepth();
+        try {
+          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) {
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_metastore_db_uuid_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -274727,6 +292284,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_metastore_db_u
     }
 
     private static class get_metastore_db_uuid_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_metastore_db_uuid_argsTupleScheme getScheme() {
         return new get_metastore_db_uuid_argsTupleScheme();
       }
@@ -274741,7 +292299,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_metastore_db_uu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_metastore_db_uuid_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        } finally {
+          prot.decrementRecursionDepth();
+        }
       }
     }
 
@@ -274750,6 +292313,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_metastore_db_uuid_result implements org.apache.thrift.TBase<get_metastore_db_uuid_result, get_metastore_db_uuid_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_metastore_db_uuid_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_metastore_db_uuid_result");
 
@@ -274816,10 +292380,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -274861,6 +292427,7 @@ public get_metastore_db_uuid_result(get_metastore_db_uuid_result other) {
       }
     }
 
+    @Override
     public get_metastore_db_uuid_result deepCopy() {
       return new get_metastore_db_uuid_result(this);
     }
@@ -274919,6 +292486,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -274941,6 +292509,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -274954,6 +292523,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -275049,10 +292619,12 @@ public int compareTo(get_metastore_db_uuid_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -275107,6 +292679,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_metastore_db_uuid_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_metastore_db_uuid_resultStandardScheme getScheme() {
         return new get_metastore_db_uuid_resultStandardScheme();
       }
@@ -275114,42 +292687,49 @@ public get_metastore_db_uuid_resultStandardScheme getScheme() {
 
     private static class get_metastore_db_uuid_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_metastore_db_uuid_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_metastore_db_uuid_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.STRING) {
-                struct.success = iprot.readString();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               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 { 
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.success = iprot.readString();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_metastore_db_uuid_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -275171,6 +292751,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_metastore_db_u
     }
 
     private static class get_metastore_db_uuid_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_metastore_db_uuid_resultTupleScheme getScheme() {
         return new get_metastore_db_uuid_resultTupleScheme();
       }
@@ -275199,16 +292780,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_metastore_db_uu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_metastore_db_uuid_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.success = iprot.readString();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = iprot.readString();
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -275218,6 +292804,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_resource_plan_args implements org.apache.thrift.TBase<create_resource_plan_args, create_resource_plan_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_resource_plan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_resource_plan_args");
 
@@ -275279,10 +292866,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -275317,6 +292906,7 @@ public create_resource_plan_args(create_resource_plan_args other) {
       }
     }
 
+    @Override
     public create_resource_plan_args deepCopy() {
       return new create_resource_plan_args(this);
     }
@@ -275350,6 +292940,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -275364,6 +292955,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -275374,6 +292966,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -275444,14 +293037,17 @@ public int compareTo(create_resource_plan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -275497,6 +293093,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_resource_plan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_resource_plan_argsStandardScheme getScheme() {
         return new create_resource_plan_argsStandardScheme();
       }
@@ -275504,34 +293101,41 @@ public create_resource_plan_argsStandardScheme getScheme() {
 
     private static class create_resource_plan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_resource_plan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_resource_plan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMCreateResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMCreateResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_resource_plan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -275548,6 +293152,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_resource_pl
     }
 
     private static class create_resource_plan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_resource_plan_argsTupleScheme getScheme() {
         return new create_resource_plan_argsTupleScheme();
       }
@@ -275570,12 +293175,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_resource_pla
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_resource_plan_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 WMCreateResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMCreateResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -275585,6 +293195,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_resource_plan_result implements org.apache.thrift.TBase<create_resource_plan_result, create_resource_plan_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_resource_plan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_resource_plan_result");
 
@@ -275661,10 +293272,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -275720,6 +293333,7 @@ public create_resource_plan_result(create_resource_plan_result other) {
       }
     }
 
+    @Override
     public create_resource_plan_result deepCopy() {
       return new create_resource_plan_result(this);
     }
@@ -275828,6 +293442,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -275866,6 +293481,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -275885,6 +293501,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -276030,10 +293647,12 @@ public int compareTo(create_resource_plan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -276107,6 +293726,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_resource_plan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_resource_plan_resultStandardScheme getScheme() {
         return new create_resource_plan_resultStandardScheme();
       }
@@ -276114,61 +293734,68 @@ public create_resource_plan_resultStandardScheme getScheme() {
 
     private static class create_resource_plan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_resource_plan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_resource_plan_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 WMCreateResourcePlanResponse();
-                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 AlreadyExistsException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMCreateResourcePlanResponse();
+                  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 AlreadyExistsException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_resource_plan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -276200,6 +293827,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_resource_pl
     }
 
     private static class create_resource_plan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_resource_plan_resultTupleScheme getScheme() {
         return new create_resource_plan_resultTupleScheme();
       }
@@ -276240,27 +293868,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_resource_pla
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_resource_plan_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMCreateResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMCreateResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -276270,6 +293903,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_resource_plan_args implements org.apache.thrift.TBase<get_resource_plan_args, get_resource_plan_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_resource_plan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_resource_plan_args");
 
@@ -276331,10 +293965,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -276369,6 +294005,7 @@ public get_resource_plan_args(get_resource_plan_args other) {
       }
     }
 
+    @Override
     public get_resource_plan_args deepCopy() {
       return new get_resource_plan_args(this);
     }
@@ -276402,6 +294039,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -276416,6 +294054,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -276426,6 +294065,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -276496,14 +294136,17 @@ public int compareTo(get_resource_plan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -276549,6 +294192,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_resource_plan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_resource_plan_argsStandardScheme getScheme() {
         return new get_resource_plan_argsStandardScheme();
       }
@@ -276556,34 +294200,41 @@ public get_resource_plan_argsStandardScheme getScheme() {
 
     private static class get_resource_plan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_resource_plan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_resource_plan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMGetResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMGetResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_resource_plan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -276600,6 +294251,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_resource_plan_
     }
 
     private static class get_resource_plan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_resource_plan_argsTupleScheme getScheme() {
         return new get_resource_plan_argsTupleScheme();
       }
@@ -276622,12 +294274,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_resource_plan_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_resource_plan_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 WMGetResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMGetResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -276637,6 +294294,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_resource_plan_result implements org.apache.thrift.TBase<get_resource_plan_result, get_resource_plan_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_resource_plan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_resource_plan_result");
 
@@ -276708,10 +294366,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -276760,6 +294420,7 @@ public get_resource_plan_result(get_resource_plan_result other) {
       }
     }
 
+    @Override
     public get_resource_plan_result deepCopy() {
       return new get_resource_plan_result(this);
     }
@@ -276843,6 +294504,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -276873,6 +294535,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -276889,6 +294552,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -277009,10 +294673,12 @@ public int compareTo(get_resource_plan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -277078,6 +294744,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_resource_plan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_resource_plan_resultStandardScheme getScheme() {
         return new get_resource_plan_resultStandardScheme();
       }
@@ -277085,52 +294752,59 @@ public get_resource_plan_resultStandardScheme getScheme() {
 
     private static class get_resource_plan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_resource_plan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_resource_plan_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 WMGetResourcePlanResponse();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMGetResourcePlanResponse();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_resource_plan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -277157,6 +294831,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_resource_plan_
     }
 
     private static class get_resource_plan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_resource_plan_resultTupleScheme getScheme() {
         return new get_resource_plan_resultTupleScheme();
       }
@@ -277191,22 +294866,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_resource_plan_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_resource_plan_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 WMGetResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMGetResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -277216,6 +294896,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_active_resource_plan_args implements org.apache.thrift.TBase<get_active_resource_plan_args, get_active_resource_plan_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_active_resource_plan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_active_resource_plan_args");
 
@@ -277277,10 +294958,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -277315,6 +294998,7 @@ public get_active_resource_plan_args(get_active_resource_plan_args other) {
       }
     }
 
+    @Override
     public get_active_resource_plan_args deepCopy() {
       return new get_active_resource_plan_args(this);
     }
@@ -277348,6 +295032,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -277362,6 +295047,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -277372,6 +295058,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -277442,14 +295129,17 @@ public int compareTo(get_active_resource_plan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -277495,6 +295185,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_active_resource_plan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_active_resource_plan_argsStandardScheme getScheme() {
         return new get_active_resource_plan_argsStandardScheme();
       }
@@ -277502,34 +295193,41 @@ public get_active_resource_plan_argsStandardScheme getScheme() {
 
     private static class get_active_resource_plan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_active_resource_plan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_active_resource_plan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMGetActiveResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMGetActiveResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_active_resource_plan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -277546,6 +295244,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_active_resourc
     }
 
     private static class get_active_resource_plan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_active_resource_plan_argsTupleScheme getScheme() {
         return new get_active_resource_plan_argsTupleScheme();
       }
@@ -277568,12 +295267,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_active_resource
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_active_resource_plan_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 WMGetActiveResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMGetActiveResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -277583,6 +295287,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_active_resource_plan_result implements org.apache.thrift.TBase<get_active_resource_plan_result, get_active_resource_plan_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_active_resource_plan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_active_resource_plan_result");
 
@@ -277649,10 +295354,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -277694,6 +295401,7 @@ public get_active_resource_plan_result(get_active_resource_plan_result other) {
       }
     }
 
+    @Override
     public get_active_resource_plan_result deepCopy() {
       return new get_active_resource_plan_result(this);
     }
@@ -277752,6 +295460,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -277774,6 +295483,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -277787,6 +295497,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -277882,10 +295593,12 @@ public int compareTo(get_active_resource_plan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -277943,6 +295656,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_active_resource_plan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_active_resource_plan_resultStandardScheme getScheme() {
         return new get_active_resource_plan_resultStandardScheme();
       }
@@ -277950,43 +295664,50 @@ public get_active_resource_plan_resultStandardScheme getScheme() {
 
     private static class get_active_resource_plan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_active_resource_plan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_active_resource_plan_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 WMGetActiveResourcePlanResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMGetActiveResourcePlanResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_active_resource_plan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -278008,6 +295729,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_active_resourc
     }
 
     private static class get_active_resource_plan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_active_resource_plan_resultTupleScheme getScheme() {
         return new get_active_resource_plan_resultTupleScheme();
       }
@@ -278036,17 +295758,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_active_resource
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_active_resource_plan_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.success = new WMGetActiveResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new WMGetActiveResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -278056,6 +295783,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_resource_plans_args implements org.apache.thrift.TBase<get_all_resource_plans_args, get_all_resource_plans_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_resource_plans_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_resource_plans_args");
 
@@ -278117,10 +295845,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -278155,6 +295885,7 @@ public get_all_resource_plans_args(get_all_resource_plans_args other) {
       }
     }
 
+    @Override
     public get_all_resource_plans_args deepCopy() {
       return new get_all_resource_plans_args(this);
     }
@@ -278188,6 +295919,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -278202,6 +295934,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -278212,6 +295945,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -278282,14 +296016,17 @@ public int compareTo(get_all_resource_plans_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -278335,6 +296072,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_resource_plans_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_resource_plans_argsStandardScheme getScheme() {
         return new get_all_resource_plans_argsStandardScheme();
       }
@@ -278342,34 +296080,41 @@ public get_all_resource_plans_argsStandardScheme getScheme() {
 
     private static class get_all_resource_plans_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_resource_plans_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_resource_plans_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMGetAllResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMGetAllResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_resource_plans_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -278386,6 +296131,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_resource_p
     }
 
     private static class get_all_resource_plans_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_resource_plans_argsTupleScheme getScheme() {
         return new get_all_resource_plans_argsTupleScheme();
       }
@@ -278408,12 +296154,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_resource_pl
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_resource_plans_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 WMGetAllResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMGetAllResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -278423,6 +296174,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_resource_plans_result implements org.apache.thrift.TBase<get_all_resource_plans_result, get_all_resource_plans_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_resource_plans_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_resource_plans_result");
 
@@ -278489,10 +296241,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -278534,6 +296288,7 @@ public get_all_resource_plans_result(get_all_resource_plans_result other) {
       }
     }
 
+    @Override
     public get_all_resource_plans_result deepCopy() {
       return new get_all_resource_plans_result(this);
     }
@@ -278592,6 +296347,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -278614,6 +296370,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -278627,6 +296384,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -278722,10 +296480,12 @@ public int compareTo(get_all_resource_plans_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -278783,6 +296543,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_resource_plans_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_resource_plans_resultStandardScheme getScheme() {
         return new get_all_resource_plans_resultStandardScheme();
       }
@@ -278790,43 +296551,50 @@ public get_all_resource_plans_resultStandardScheme getScheme() {
 
     private static class get_all_resource_plans_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_resource_plans_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_resource_plans_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 WMGetAllResourcePlanResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMGetAllResourcePlanResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_resource_plans_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -278848,6 +296616,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_resource_p
     }
 
     private static class get_all_resource_plans_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_resource_plans_resultTupleScheme getScheme() {
         return new get_all_resource_plans_resultTupleScheme();
       }
@@ -278876,17 +296645,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_resource_pl
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_resource_plans_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.success = new WMGetAllResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new WMGetAllResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -278896,6 +296670,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_resource_plan_args implements org.apache.thrift.TBase<alter_resource_plan_args, alter_resource_plan_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_resource_plan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_resource_plan_args");
 
@@ -278957,10 +296732,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -278995,6 +296772,7 @@ public alter_resource_plan_args(alter_resource_plan_args other) {
       }
     }
 
+    @Override
     public alter_resource_plan_args deepCopy() {
       return new alter_resource_plan_args(this);
     }
@@ -279028,6 +296806,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -279042,6 +296821,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -279052,6 +296832,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -279122,14 +296903,17 @@ public int compareTo(alter_resource_plan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -279175,6 +296959,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_resource_plan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_resource_plan_argsStandardScheme getScheme() {
         return new alter_resource_plan_argsStandardScheme();
       }
@@ -279182,34 +296967,41 @@ public alter_resource_plan_argsStandardScheme getScheme() {
 
     private static class alter_resource_plan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_resource_plan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_resource_plan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMAlterResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMAlterResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_resource_plan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -279226,6 +297018,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_resource_pla
     }
 
     private static class alter_resource_plan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_resource_plan_argsTupleScheme getScheme() {
         return new alter_resource_plan_argsTupleScheme();
       }
@@ -279248,12 +297041,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_resource_plan
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_resource_plan_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 WMAlterResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMAlterResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -279263,6 +297061,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_resource_plan_result implements org.apache.thrift.TBase<alter_resource_plan_result, alter_resource_plan_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_resource_plan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_resource_plan_result");
 
@@ -279339,10 +297138,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -279398,6 +297199,7 @@ public alter_resource_plan_result(alter_resource_plan_result other) {
       }
     }
 
+    @Override
     public alter_resource_plan_result deepCopy() {
       return new alter_resource_plan_result(this);
     }
@@ -279506,6 +297308,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -279544,6 +297347,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -279563,6 +297367,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -279708,10 +297513,12 @@ public int compareTo(alter_resource_plan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -279785,6 +297592,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_resource_plan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_resource_plan_resultStandardScheme getScheme() {
         return new alter_resource_plan_resultStandardScheme();
       }
@@ -279792,61 +297600,68 @@ public alter_resource_plan_resultStandardScheme getScheme() {
 
     private static class alter_resource_plan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_resource_plan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_resource_plan_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 WMAlterResourcePlanResponse();
-                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 NoSuchObjectException();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMAlterResourcePlanResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_resource_plan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -279878,6 +297693,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_resource_pla
     }
 
     private static class alter_resource_plan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_resource_plan_resultTupleScheme getScheme() {
         return new alter_resource_plan_resultTupleScheme();
       }
@@ -279918,27 +297734,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_resource_plan
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_resource_plan_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMAlterResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMAlterResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -279948,6 +297769,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class validate_resource_plan_args implements org.apache.thrift.TBase<validate_resource_plan_args, validate_resource_plan_args._Fields>, java.io.Serializable, Cloneable, Comparable<validate_resource_plan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("validate_resource_plan_args");
 
@@ -280009,10 +297831,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -280047,6 +297871,7 @@ public validate_resource_plan_args(validate_resource_plan_args other) {
       }
     }
 
+    @Override
     public validate_resource_plan_args deepCopy() {
       return new validate_resource_plan_args(this);
     }
@@ -280080,6 +297905,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -280094,6 +297920,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -280104,6 +297931,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -280174,14 +298002,17 @@ public int compareTo(validate_resource_plan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -280227,6 +298058,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class validate_resource_plan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public validate_resource_plan_argsStandardScheme getScheme() {
         return new validate_resource_plan_argsStandardScheme();
       }
@@ -280234,34 +298066,41 @@ public validate_resource_plan_argsStandardScheme getScheme() {
 
     private static class validate_resource_plan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<validate_resource_plan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, validate_resource_plan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMValidateResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMValidateResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, validate_resource_plan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -280278,6 +298117,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, validate_resource_
     }
 
     private static class validate_resource_plan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public validate_resource_plan_argsTupleScheme getScheme() {
         return new validate_resource_plan_argsTupleScheme();
       }
@@ -280300,12 +298140,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, validate_resource_p
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, validate_resource_plan_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 WMValidateResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMValidateResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -280315,6 +298160,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class validate_resource_plan_result implements org.apache.thrift.TBase<validate_resource_plan_result, validate_resource_plan_result._Fields>, java.io.Serializable, Cloneable, Comparable<validate_resource_plan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("validate_resource_plan_result");
 
@@ -280386,10 +298232,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -280438,6 +298286,7 @@ public validate_resource_plan_result(validate_resource_plan_result other) {
       }
     }
 
+    @Override
     public validate_resource_plan_result deepCopy() {
       return new validate_resource_plan_result(this);
     }
@@ -280521,6 +298370,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -280551,6 +298401,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -280567,6 +298418,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -280687,10 +298539,12 @@ public int compareTo(validate_resource_plan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -280756,6 +298610,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class validate_resource_plan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public validate_resource_plan_resultStandardScheme getScheme() {
         return new validate_resource_plan_resultStandardScheme();
       }
@@ -280763,52 +298618,59 @@ public validate_resource_plan_resultStandardScheme getScheme() {
 
     private static class validate_resource_plan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<validate_resource_plan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, validate_resource_plan_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 WMValidateResourcePlanResponse();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMValidateResourcePlanResponse();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, validate_resource_plan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -280835,6 +298697,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, validate_resource_
     }
 
     private static class validate_resource_plan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public validate_resource_plan_resultTupleScheme getScheme() {
         return new validate_resource_plan_resultTupleScheme();
       }
@@ -280869,22 +298732,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, validate_resource_p
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, validate_resource_plan_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 WMValidateResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMValidateResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -280894,6 +298762,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_resource_plan_args implements org.apache.thrift.TBase<drop_resource_plan_args, drop_resource_plan_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_resource_plan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_resource_plan_args");
 
@@ -280955,10 +298824,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -280993,6 +298864,7 @@ public drop_resource_plan_args(drop_resource_plan_args other) {
       }
     }
 
+    @Override
     public drop_resource_plan_args deepCopy() {
       return new drop_resource_plan_args(this);
     }
@@ -281026,6 +298898,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -281040,6 +298913,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -281050,6 +298924,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -281120,14 +298995,17 @@ public int compareTo(drop_resource_plan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -281173,6 +299051,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_resource_plan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_resource_plan_argsStandardScheme getScheme() {
         return new drop_resource_plan_argsStandardScheme();
       }
@@ -281180,34 +299059,41 @@ public drop_resource_plan_argsStandardScheme getScheme() {
 
     private static class drop_resource_plan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_resource_plan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_resource_plan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMDropResourcePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMDropResourcePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_resource_plan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -281224,6 +299110,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_resource_plan
     }
 
     private static class drop_resource_plan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_resource_plan_argsTupleScheme getScheme() {
         return new drop_resource_plan_argsTupleScheme();
       }
@@ -281246,12 +299133,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_resource_plan_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_resource_plan_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 WMDropResourcePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMDropResourcePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -281261,6 +299153,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_resource_plan_result implements org.apache.thrift.TBase<drop_resource_plan_result, drop_resource_plan_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_resource_plan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_resource_plan_result");
 
@@ -281337,10 +299230,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -281396,6 +299291,7 @@ public drop_resource_plan_result(drop_resource_plan_result other) {
       }
     }
 
+    @Override
     public drop_resource_plan_result deepCopy() {
       return new drop_resource_plan_result(this);
     }
@@ -281504,6 +299400,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -281542,6 +299439,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -281561,6 +299459,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -281706,10 +299605,12 @@ public int compareTo(drop_resource_plan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -281783,6 +299684,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_resource_plan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_resource_plan_resultStandardScheme getScheme() {
         return new drop_resource_plan_resultStandardScheme();
       }
@@ -281790,61 +299692,68 @@ public drop_resource_plan_resultStandardScheme getScheme() {
 
     private static class drop_resource_plan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_resource_plan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_resource_plan_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 WMDropResourcePlanResponse();
-                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 NoSuchObjectException();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMDropResourcePlanResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_resource_plan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -281876,6 +299785,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_resource_plan
     }
 
     private static class drop_resource_plan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_resource_plan_resultTupleScheme getScheme() {
         return new drop_resource_plan_resultTupleScheme();
       }
@@ -281916,27 +299826,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_resource_plan_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_resource_plan_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMDropResourcePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMDropResourcePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -281946,6 +299861,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_trigger_args implements org.apache.thrift.TBase<create_wm_trigger_args, create_wm_trigger_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_wm_trigger_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_wm_trigger_args");
 
@@ -282007,10 +299923,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -282045,6 +299963,7 @@ public create_wm_trigger_args(create_wm_trigger_args other) {
       }
     }
 
+    @Override
     public create_wm_trigger_args deepCopy() {
       return new create_wm_trigger_args(this);
     }
@@ -282078,6 +299997,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -282092,6 +300012,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -282102,6 +300023,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -282172,14 +300094,17 @@ public int compareTo(create_wm_trigger_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -282225,6 +300150,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_wm_trigger_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_trigger_argsStandardScheme getScheme() {
         return new create_wm_trigger_argsStandardScheme();
       }
@@ -282232,34 +300158,41 @@ public create_wm_trigger_argsStandardScheme getScheme() {
 
     private static class create_wm_trigger_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_wm_trigger_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_wm_trigger_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMCreateTriggerRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMCreateTriggerRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_trigger_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -282276,6 +300209,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_trigger_
     }
 
     private static class create_wm_trigger_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_trigger_argsTupleScheme getScheme() {
         return new create_wm_trigger_argsTupleScheme();
       }
@@ -282298,12 +300232,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_wm_trigger_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_wm_trigger_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 WMCreateTriggerRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMCreateTriggerRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -282313,6 +300252,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_trigger_result implements org.apache.thrift.TBase<create_wm_trigger_result, create_wm_trigger_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_wm_trigger_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_wm_trigger_result");
 
@@ -282394,10 +300334,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -282460,6 +300402,7 @@ public create_wm_trigger_result(create_wm_trigger_result other) {
       }
     }
 
+    @Override
     public create_wm_trigger_result deepCopy() {
       return new create_wm_trigger_result(this);
     }
@@ -282593,6 +300536,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -282639,6 +300583,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -282661,6 +300606,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -282831,10 +300777,12 @@ public int compareTo(create_wm_trigger_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -282916,6 +300864,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_wm_trigger_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_trigger_resultStandardScheme getScheme() {
         return new create_wm_trigger_resultStandardScheme();
       }
@@ -282923,70 +300872,77 @@ public create_wm_trigger_resultStandardScheme getScheme() {
 
     private static class create_wm_trigger_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_wm_trigger_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_wm_trigger_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 WMCreateTriggerResponse();
-                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 AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new MetaException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMCreateTriggerResponse();
+                  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 AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new MetaException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_trigger_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -283023,6 +300979,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_trigger_
     }
 
     private static class create_wm_trigger_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_trigger_resultTupleScheme getScheme() {
         return new create_wm_trigger_resultTupleScheme();
       }
@@ -283069,32 +301026,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_wm_trigger_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_wm_trigger_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(5);
-        if (incoming.get(0)) {
-          struct.success = new WMCreateTriggerResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new MetaException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new WMCreateTriggerResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new MetaException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -283104,6 +301066,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_trigger_args implements org.apache.thrift.TBase<alter_wm_trigger_args, alter_wm_trigger_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_wm_trigger_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_wm_trigger_args");
 
@@ -283165,10 +301128,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -283203,6 +301168,7 @@ public alter_wm_trigger_args(alter_wm_trigger_args other) {
       }
     }
 
+    @Override
     public alter_wm_trigger_args deepCopy() {
       return new alter_wm_trigger_args(this);
     }
@@ -283236,6 +301202,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -283250,6 +301217,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -283260,6 +301228,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -283330,14 +301299,17 @@ public int compareTo(alter_wm_trigger_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -283383,6 +301355,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_wm_trigger_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_trigger_argsStandardScheme getScheme() {
         return new alter_wm_trigger_argsStandardScheme();
       }
@@ -283390,34 +301363,41 @@ public alter_wm_trigger_argsStandardScheme getScheme() {
 
     private static class alter_wm_trigger_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_wm_trigger_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_wm_trigger_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMAlterTriggerRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMAlterTriggerRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_trigger_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -283434,6 +301414,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_trigger_a
     }
 
     private static class alter_wm_trigger_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_trigger_argsTupleScheme getScheme() {
         return new alter_wm_trigger_argsTupleScheme();
       }
@@ -283456,12 +301437,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_wm_trigger_ar
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_wm_trigger_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 WMAlterTriggerRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMAlterTriggerRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -283471,6 +301457,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_trigger_result implements org.apache.thrift.TBase<alter_wm_trigger_result, alter_wm_trigger_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_wm_trigger_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_wm_trigger_result");
 
@@ -283547,10 +301534,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -283606,6 +301595,7 @@ public alter_wm_trigger_result(alter_wm_trigger_result other) {
       }
     }
 
+    @Override
     public alter_wm_trigger_result deepCopy() {
       return new alter_wm_trigger_result(this);
     }
@@ -283714,6 +301704,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -283752,6 +301743,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -283771,6 +301763,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -283916,10 +301909,12 @@ public int compareTo(alter_wm_trigger_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -283993,6 +301988,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_wm_trigger_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_trigger_resultStandardScheme getScheme() {
         return new alter_wm_trigger_resultStandardScheme();
       }
@@ -284000,61 +301996,68 @@ public alter_wm_trigger_resultStandardScheme getScheme() {
 
     private static class alter_wm_trigger_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_wm_trigger_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_wm_trigger_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 WMAlterTriggerResponse();
-                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 NoSuchObjectException();
-                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 InvalidObjectException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMAlterTriggerResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidObjectException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_trigger_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -284086,6 +302089,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_trigger_r
     }
 
     private static class alter_wm_trigger_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_trigger_resultTupleScheme getScheme() {
         return new alter_wm_trigger_resultTupleScheme();
       }
@@ -284126,27 +302130,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_wm_trigger_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_wm_trigger_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMAlterTriggerResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMAlterTriggerResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -284156,6 +302165,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_trigger_args implements org.apache.thrift.TBase<drop_wm_trigger_args, drop_wm_trigger_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_wm_trigger_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_wm_trigger_args");
 
@@ -284217,10 +302227,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -284255,6 +302267,7 @@ public drop_wm_trigger_args(drop_wm_trigger_args other) {
       }
     }
 
+    @Override
     public drop_wm_trigger_args deepCopy() {
       return new drop_wm_trigger_args(this);
     }
@@ -284288,6 +302301,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -284302,6 +302316,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -284312,6 +302327,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -284382,14 +302398,17 @@ public int compareTo(drop_wm_trigger_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -284435,6 +302454,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_wm_trigger_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_trigger_argsStandardScheme getScheme() {
         return new drop_wm_trigger_argsStandardScheme();
       }
@@ -284442,34 +302462,41 @@ public drop_wm_trigger_argsStandardScheme getScheme() {
 
     private static class drop_wm_trigger_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_wm_trigger_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_wm_trigger_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMDropTriggerRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMDropTriggerRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_trigger_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -284486,6 +302513,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_trigger_ar
     }
 
     private static class drop_wm_trigger_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_trigger_argsTupleScheme getScheme() {
         return new drop_wm_trigger_argsTupleScheme();
       }
@@ -284508,12 +302536,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_wm_trigger_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_wm_trigger_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 WMDropTriggerRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMDropTriggerRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -284523,6 +302556,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_trigger_result implements org.apache.thrift.TBase<drop_wm_trigger_result, drop_wm_trigger_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_wm_trigger_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_wm_trigger_result");
 
@@ -284599,10 +302633,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -284658,6 +302694,7 @@ public drop_wm_trigger_result(drop_wm_trigger_result other) {
       }
     }
 
+    @Override
     public drop_wm_trigger_result deepCopy() {
       return new drop_wm_trigger_result(this);
     }
@@ -284766,6 +302803,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -284804,6 +302842,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -284823,6 +302862,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -284968,10 +303008,12 @@ public int compareTo(drop_wm_trigger_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -285045,6 +303087,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_wm_trigger_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_trigger_resultStandardScheme getScheme() {
         return new drop_wm_trigger_resultStandardScheme();
       }
@@ -285052,61 +303095,68 @@ public drop_wm_trigger_resultStandardScheme getScheme() {
 
     private static class drop_wm_trigger_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_wm_trigger_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_wm_trigger_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 WMDropTriggerResponse();
-                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 NoSuchObjectException();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMDropTriggerResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_trigger_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -285138,6 +303188,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_trigger_re
     }
 
     private static class drop_wm_trigger_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_trigger_resultTupleScheme getScheme() {
         return new drop_wm_trigger_resultTupleScheme();
       }
@@ -285178,27 +303229,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_wm_trigger_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_wm_trigger_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMDropTriggerResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMDropTriggerResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -285208,6 +303264,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_triggers_for_resourceplan_args implements org.apache.thrift.TBase<get_triggers_for_resourceplan_args, get_triggers_for_resourceplan_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_triggers_for_resourceplan_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_triggers_for_resourceplan_args");
 
@@ -285269,10 +303326,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -285307,6 +303366,7 @@ public get_triggers_for_resourceplan_args(get_triggers_for_resourceplan_args oth
       }
     }
 
+    @Override
     public get_triggers_for_resourceplan_args deepCopy() {
       return new get_triggers_for_resourceplan_args(this);
     }
@@ -285340,6 +303400,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -285354,6 +303415,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -285364,6 +303426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -285434,14 +303497,17 @@ public int compareTo(get_triggers_for_resourceplan_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -285487,6 +303553,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_triggers_for_resourceplan_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_triggers_for_resourceplan_argsStandardScheme getScheme() {
         return new get_triggers_for_resourceplan_argsStandardScheme();
       }
@@ -285494,34 +303561,41 @@ public get_triggers_for_resourceplan_argsStandardScheme getScheme() {
 
     private static class get_triggers_for_resourceplan_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_triggers_for_resourceplan_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_triggers_for_resourceplan_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMGetTriggersForResourePlanRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMGetTriggersForResourePlanRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_triggers_for_resourceplan_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -285538,6 +303612,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_triggers_for_r
     }
 
     private static class get_triggers_for_resourceplan_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_triggers_for_resourceplan_argsTupleScheme getScheme() {
         return new get_triggers_for_resourceplan_argsTupleScheme();
       }
@@ -285560,12 +303635,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_triggers_for_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_triggers_for_resourceplan_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 WMGetTriggersForResourePlanRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMGetTriggersForResourePlanRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -285575,6 +303655,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_triggers_for_resourceplan_result implements org.apache.thrift.TBase<get_triggers_for_resourceplan_result, get_triggers_for_resourceplan_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_triggers_for_resourceplan_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_triggers_for_resourceplan_result");
 
@@ -285646,10 +303727,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -285698,6 +303781,7 @@ public get_triggers_for_resourceplan_result(get_triggers_for_resourceplan_result
       }
     }
 
+    @Override
     public get_triggers_for_resourceplan_result deepCopy() {
       return new get_triggers_for_resourceplan_result(this);
     }
@@ -285781,6 +303865,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -285811,6 +303896,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -285827,6 +303913,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -285947,10 +304034,12 @@ public int compareTo(get_triggers_for_resourceplan_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -286016,6 +304105,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_triggers_for_resourceplan_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_triggers_for_resourceplan_resultStandardScheme getScheme() {
         return new get_triggers_for_resourceplan_resultStandardScheme();
       }
@@ -286023,52 +304113,59 @@ public get_triggers_for_resourceplan_resultStandardScheme getScheme() {
 
     private static class get_triggers_for_resourceplan_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_triggers_for_resourceplan_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_triggers_for_resourceplan_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 WMGetTriggersForResourePlanResponse();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMGetTriggersForResourePlanResponse();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_triggers_for_resourceplan_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -286095,6 +304192,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_triggers_for_r
     }
 
     private static class get_triggers_for_resourceplan_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_triggers_for_resourceplan_resultTupleScheme getScheme() {
         return new get_triggers_for_resourceplan_resultTupleScheme();
       }
@@ -286129,22 +304227,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_triggers_for_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_triggers_for_resourceplan_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 WMGetTriggersForResourePlanResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMGetTriggersForResourePlanResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -286154,6 +304257,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_pool_args implements org.apache.thrift.TBase<create_wm_pool_args, create_wm_pool_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_wm_pool_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_wm_pool_args");
 
@@ -286215,10 +304319,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -286253,6 +304359,7 @@ public create_wm_pool_args(create_wm_pool_args other) {
       }
     }
 
+    @Override
     public create_wm_pool_args deepCopy() {
       return new create_wm_pool_args(this);
     }
@@ -286286,6 +304393,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -286300,6 +304408,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -286310,6 +304419,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -286380,14 +304490,17 @@ public int compareTo(create_wm_pool_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -286433,6 +304546,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_wm_pool_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_pool_argsStandardScheme getScheme() {
         return new create_wm_pool_argsStandardScheme();
       }
@@ -286440,34 +304554,41 @@ public create_wm_pool_argsStandardScheme getScheme() {
 
     private static class create_wm_pool_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_wm_pool_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_wm_pool_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMCreatePoolRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMCreatePoolRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_pool_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -286484,6 +304605,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_pool_arg
     }
 
     private static class create_wm_pool_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_pool_argsTupleScheme getScheme() {
         return new create_wm_pool_argsTupleScheme();
       }
@@ -286506,12 +304628,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_wm_pool_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_wm_pool_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 WMCreatePoolRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMCreatePoolRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -286521,6 +304648,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_wm_pool_result implements org.apache.thrift.TBase<create_wm_pool_result, create_wm_pool_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_wm_pool_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_wm_pool_result");
 
@@ -286602,10 +304730,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -286668,6 +304798,7 @@ public create_wm_pool_result(create_wm_pool_result other) {
       }
     }
 
+    @Override
     public create_wm_pool_result deepCopy() {
       return new create_wm_pool_result(this);
     }
@@ -286801,6 +304932,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -286847,6 +304979,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -286869,6 +305002,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -287039,10 +305173,12 @@ public int compareTo(create_wm_pool_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -287124,6 +305260,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_wm_pool_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_pool_resultStandardScheme getScheme() {
         return new create_wm_pool_resultStandardScheme();
       }
@@ -287131,70 +305268,77 @@ public create_wm_pool_resultStandardScheme getScheme() {
 
     private static class create_wm_pool_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_wm_pool_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_wm_pool_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 WMCreatePoolResponse();
-                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 AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new MetaException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMCreatePoolResponse();
+                  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 AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new MetaException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_pool_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -287231,6 +305375,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_wm_pool_res
     }
 
     private static class create_wm_pool_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_wm_pool_resultTupleScheme getScheme() {
         return new create_wm_pool_resultTupleScheme();
       }
@@ -287277,32 +305422,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_wm_pool_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_wm_pool_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(5);
-        if (incoming.get(0)) {
-          struct.success = new WMCreatePoolResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new MetaException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new WMCreatePoolResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new MetaException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -287312,6 +305462,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_pool_args implements org.apache.thrift.TBase<alter_wm_pool_args, alter_wm_pool_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_wm_pool_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_wm_pool_args");
 
@@ -287373,10 +305524,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -287411,6 +305564,7 @@ public alter_wm_pool_args(alter_wm_pool_args other) {
       }
     }
 
+    @Override
     public alter_wm_pool_args deepCopy() {
       return new alter_wm_pool_args(this);
     }
@@ -287444,6 +305598,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -287458,6 +305613,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -287468,6 +305624,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -287538,14 +305695,17 @@ public int compareTo(alter_wm_pool_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -287591,6 +305751,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_wm_pool_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_pool_argsStandardScheme getScheme() {
         return new alter_wm_pool_argsStandardScheme();
       }
@@ -287598,34 +305759,41 @@ public alter_wm_pool_argsStandardScheme getScheme() {
 
     private static class alter_wm_pool_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_wm_pool_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_wm_pool_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMAlterPoolRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMAlterPoolRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_pool_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -287642,6 +305810,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_pool_args
     }
 
     private static class alter_wm_pool_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_pool_argsTupleScheme getScheme() {
         return new alter_wm_pool_argsTupleScheme();
       }
@@ -287664,12 +305833,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_wm_pool_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_wm_pool_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 WMAlterPoolRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMAlterPoolRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -287679,6 +305853,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_wm_pool_result implements org.apache.thrift.TBase<alter_wm_pool_result, alter_wm_pool_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_wm_pool_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_wm_pool_result");
 
@@ -287760,10 +305935,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -287826,6 +306003,7 @@ public alter_wm_pool_result(alter_wm_pool_result other) {
       }
     }
 
+    @Override
     public alter_wm_pool_result deepCopy() {
       return new alter_wm_pool_result(this);
     }
@@ -287959,6 +306137,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -288005,6 +306184,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -288027,6 +306207,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -288197,10 +306378,12 @@ public int compareTo(alter_wm_pool_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -288282,6 +306465,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_wm_pool_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_pool_resultStandardScheme getScheme() {
         return new alter_wm_pool_resultStandardScheme();
       }
@@ -288289,70 +306473,77 @@ public alter_wm_pool_resultStandardScheme getScheme() {
 
     private static class alter_wm_pool_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_wm_pool_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_wm_pool_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 WMAlterPoolResponse();
-                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 AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new MetaException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMAlterPoolResponse();
+                  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 AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new MetaException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_pool_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -288389,6 +306580,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_wm_pool_resu
     }
 
     private static class alter_wm_pool_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_wm_pool_resultTupleScheme getScheme() {
         return new alter_wm_pool_resultTupleScheme();
       }
@@ -288435,32 +306627,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_wm_pool_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_wm_pool_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(5);
-        if (incoming.get(0)) {
-          struct.success = new WMAlterPoolResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new MetaException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new WMAlterPoolResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new MetaException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -288470,6 +306667,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_pool_args implements org.apache.thrift.TBase<drop_wm_pool_args, drop_wm_pool_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_wm_pool_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_wm_pool_args");
 
@@ -288531,10 +306729,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -288569,6 +306769,7 @@ public drop_wm_pool_args(drop_wm_pool_args other) {
       }
     }
 
+    @Override
     public drop_wm_pool_args deepCopy() {
       return new drop_wm_pool_args(this);
     }
@@ -288602,6 +306803,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -288616,6 +306818,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -288626,6 +306829,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -288696,14 +306900,17 @@ public int compareTo(drop_wm_pool_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -288749,6 +306956,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_wm_pool_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_pool_argsStandardScheme getScheme() {
         return new drop_wm_pool_argsStandardScheme();
       }
@@ -288756,34 +306964,41 @@ public drop_wm_pool_argsStandardScheme getScheme() {
 
     private static class drop_wm_pool_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_wm_pool_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_wm_pool_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMDropPoolRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMDropPoolRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_pool_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -288800,6 +307015,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_pool_args
     }
 
     private static class drop_wm_pool_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_pool_argsTupleScheme getScheme() {
         return new drop_wm_pool_argsTupleScheme();
       }
@@ -288822,12 +307038,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_wm_pool_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_wm_pool_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 WMDropPoolRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMDropPoolRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -288837,6 +307058,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_pool_result implements org.apache.thrift.TBase<drop_wm_pool_result, drop_wm_pool_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_wm_pool_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_wm_pool_result");
 
@@ -288913,10 +307135,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -288972,6 +307196,7 @@ public drop_wm_pool_result(drop_wm_pool_result other) {
       }
     }
 
+    @Override
     public drop_wm_pool_result deepCopy() {
       return new drop_wm_pool_result(this);
     }
@@ -289080,6 +307305,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -289118,6 +307344,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -289137,6 +307364,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -289282,10 +307510,12 @@ public int compareTo(drop_wm_pool_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -289359,6 +307589,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_wm_pool_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_pool_resultStandardScheme getScheme() {
         return new drop_wm_pool_resultStandardScheme();
       }
@@ -289366,61 +307597,68 @@ public drop_wm_pool_resultStandardScheme getScheme() {
 
     private static class drop_wm_pool_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_wm_pool_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_wm_pool_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 WMDropPoolResponse();
-                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 NoSuchObjectException();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMDropPoolResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_pool_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -289452,6 +307690,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_pool_resul
     }
 
     private static class drop_wm_pool_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_pool_resultTupleScheme getScheme() {
         return new drop_wm_pool_resultTupleScheme();
       }
@@ -289492,27 +307731,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_wm_pool_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_wm_pool_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMDropPoolResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMDropPoolResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -289522,6 +307766,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_update_wm_mapping_args implements org.apache.thrift.TBase<create_or_update_wm_mapping_args, create_or_update_wm_mapping_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_or_update_wm_mapping_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_or_update_wm_mapping_args");
 
@@ -289583,10 +307828,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -289621,6 +307868,7 @@ public create_or_update_wm_mapping_args(create_or_update_wm_mapping_args other)
       }
     }
 
+    @Override
     public create_or_update_wm_mapping_args deepCopy() {
       return new create_or_update_wm_mapping_args(this);
     }
@@ -289654,6 +307902,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -289668,6 +307917,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -289678,6 +307928,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -289748,14 +307999,17 @@ public int compareTo(create_or_update_wm_mapping_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -289801,6 +308055,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_or_update_wm_mapping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_update_wm_mapping_argsStandardScheme getScheme() {
         return new create_or_update_wm_mapping_argsStandardScheme();
       }
@@ -289808,34 +308063,41 @@ public create_or_update_wm_mapping_argsStandardScheme getScheme() {
 
     private static class create_or_update_wm_mapping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_or_update_wm_mapping_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_or_update_wm_mapping_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMCreateOrUpdateMappingRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMCreateOrUpdateMappingRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_update_wm_mapping_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -289852,6 +308114,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_update_w
     }
 
     private static class create_or_update_wm_mapping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_update_wm_mapping_argsTupleScheme getScheme() {
         return new create_or_update_wm_mapping_argsTupleScheme();
       }
@@ -289874,12 +308137,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_or_update_wm
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_or_update_wm_mapping_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 WMCreateOrUpdateMappingRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMCreateOrUpdateMappingRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -289889,6 +308157,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_update_wm_mapping_result implements org.apache.thrift.TBase<create_or_update_wm_mapping_result, create_or_update_wm_mapping_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_or_update_wm_mapping_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_or_update_wm_mapping_result");
 
@@ -289970,10 +308239,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -290036,6 +308307,7 @@ public create_or_update_wm_mapping_result(create_or_update_wm_mapping_result oth
       }
     }
 
+    @Override
     public create_or_update_wm_mapping_result deepCopy() {
       return new create_or_update_wm_mapping_result(this);
     }
@@ -290169,6 +308441,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -290215,6 +308488,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -290237,6 +308511,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -290407,10 +308682,12 @@ public int compareTo(create_or_update_wm_mapping_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -290492,6 +308769,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_or_update_wm_mapping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_update_wm_mapping_resultStandardScheme getScheme() {
         return new create_or_update_wm_mapping_resultStandardScheme();
       }
@@ -290499,70 +308777,77 @@ public create_or_update_wm_mapping_resultStandardScheme getScheme() {
 
     private static class create_or_update_wm_mapping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_or_update_wm_mapping_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_or_update_wm_mapping_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 WMCreateOrUpdateMappingResponse();
-                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 AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new MetaException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMCreateOrUpdateMappingResponse();
+                  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 AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new MetaException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_update_wm_mapping_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -290599,6 +308884,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_update_w
     }
 
     private static class create_or_update_wm_mapping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_update_wm_mapping_resultTupleScheme getScheme() {
         return new create_or_update_wm_mapping_resultTupleScheme();
       }
@@ -290645,32 +308931,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_or_update_wm
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_or_update_wm_mapping_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(5);
-        if (incoming.get(0)) {
-          struct.success = new WMCreateOrUpdateMappingResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new MetaException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new WMCreateOrUpdateMappingResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new MetaException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -290680,6 +308971,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_mapping_args implements org.apache.thrift.TBase<drop_wm_mapping_args, drop_wm_mapping_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_wm_mapping_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_wm_mapping_args");
 
@@ -290741,10 +309033,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -290779,6 +309073,7 @@ public drop_wm_mapping_args(drop_wm_mapping_args other) {
       }
     }
 
+    @Override
     public drop_wm_mapping_args deepCopy() {
       return new drop_wm_mapping_args(this);
     }
@@ -290812,6 +309107,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -290826,6 +309122,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -290836,6 +309133,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -290906,14 +309204,17 @@ public int compareTo(drop_wm_mapping_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -290959,6 +309260,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_wm_mapping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_mapping_argsStandardScheme getScheme() {
         return new drop_wm_mapping_argsStandardScheme();
       }
@@ -290966,34 +309268,41 @@ public drop_wm_mapping_argsStandardScheme getScheme() {
 
     private static class drop_wm_mapping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_wm_mapping_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_wm_mapping_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMDropMappingRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMDropMappingRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_mapping_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -291010,6 +309319,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_mapping_ar
     }
 
     private static class drop_wm_mapping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_mapping_argsTupleScheme getScheme() {
         return new drop_wm_mapping_argsTupleScheme();
       }
@@ -291032,12 +309342,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_wm_mapping_arg
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_wm_mapping_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 WMDropMappingRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMDropMappingRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -291047,6 +309362,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_wm_mapping_result implements org.apache.thrift.TBase<drop_wm_mapping_result, drop_wm_mapping_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_wm_mapping_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_wm_mapping_result");
 
@@ -291123,10 +309439,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -291182,6 +309500,7 @@ public drop_wm_mapping_result(drop_wm_mapping_result other) {
       }
     }
 
+    @Override
     public drop_wm_mapping_result deepCopy() {
       return new drop_wm_mapping_result(this);
     }
@@ -291290,6 +309609,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -291328,6 +309648,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -291347,6 +309668,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -291492,10 +309814,12 @@ public int compareTo(drop_wm_mapping_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -291569,6 +309893,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_wm_mapping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_mapping_resultStandardScheme getScheme() {
         return new drop_wm_mapping_resultStandardScheme();
       }
@@ -291576,61 +309901,68 @@ public drop_wm_mapping_resultStandardScheme getScheme() {
 
     private static class drop_wm_mapping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_wm_mapping_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_wm_mapping_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 WMDropMappingResponse();
-                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 NoSuchObjectException();
-                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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMDropMappingResponse();
+                  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 NoSuchObjectException();
+                  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 InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_mapping_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -291662,6 +309994,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_wm_mapping_re
     }
 
     private static class drop_wm_mapping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_wm_mapping_resultTupleScheme getScheme() {
         return new drop_wm_mapping_resultTupleScheme();
       }
@@ -291702,27 +310035,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_wm_mapping_res
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_wm_mapping_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(4);
-        if (incoming.get(0)) {
-          struct.success = new WMDropMappingResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.success = new WMDropMappingResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -291732,6 +310070,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_drop_wm_trigger_to_pool_mapping_args implements org.apache.thrift.TBase<create_or_drop_wm_trigger_to_pool_mapping_args, create_or_drop_wm_trigger_to_pool_mapping_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_or_drop_wm_trigger_to_pool_mapping_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_or_drop_wm_trigger_to_pool_mapping_args");
 
@@ -291793,10 +310132,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -291831,6 +310172,7 @@ public create_or_drop_wm_trigger_to_pool_mapping_args(create_or_drop_wm_trigger_
       }
     }
 
+    @Override
     public create_or_drop_wm_trigger_to_pool_mapping_args deepCopy() {
       return new create_or_drop_wm_trigger_to_pool_mapping_args(this);
     }
@@ -291864,6 +310206,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -291878,6 +310221,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -291888,6 +310232,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -291958,14 +310303,17 @@ public int compareTo(create_or_drop_wm_trigger_to_pool_mapping_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -292011,6 +310359,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_or_drop_wm_trigger_to_pool_mapping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_argsStandardScheme getScheme() {
         return new create_or_drop_wm_trigger_to_pool_mapping_argsStandardScheme();
       }
@@ -292018,34 +310367,41 @@ public create_or_drop_wm_trigger_to_pool_mapping_argsStandardScheme getScheme()
 
     private static class create_or_drop_wm_trigger_to_pool_mapping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_or_drop_wm_trigger_to_pool_mapping_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_or_drop_wm_trigger_to_pool_mapping_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new WMCreateOrDropTriggerToPoolMappingRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new WMCreateOrDropTriggerToPoolMappingRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_drop_wm_trigger_to_pool_mapping_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -292062,6 +310418,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_drop_wm_
     }
 
     private static class create_or_drop_wm_trigger_to_pool_mapping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_argsTupleScheme getScheme() {
         return new create_or_drop_wm_trigger_to_pool_mapping_argsTupleScheme();
       }
@@ -292084,12 +310441,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_or_drop_wm_t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_or_drop_wm_trigger_to_pool_mapping_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 WMCreateOrDropTriggerToPoolMappingRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 WMCreateOrDropTriggerToPoolMappingRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -292099,6 +310461,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_or_drop_wm_trigger_to_pool_mapping_result implements org.apache.thrift.TBase<create_or_drop_wm_trigger_to_pool_mapping_result, create_or_drop_wm_trigger_to_pool_mapping_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_or_drop_wm_trigger_to_pool_mapping_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_or_drop_wm_trigger_to_pool_mapping_result");
 
@@ -292180,10 +310543,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -292246,6 +310611,7 @@ public create_or_drop_wm_trigger_to_pool_mapping_result(create_or_drop_wm_trigge
       }
     }
 
+    @Override
     public create_or_drop_wm_trigger_to_pool_mapping_result deepCopy() {
       return new create_or_drop_wm_trigger_to_pool_mapping_result(this);
     }
@@ -292379,6 +310745,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -292425,6 +310792,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -292447,6 +310815,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -292617,10 +310986,12 @@ public int compareTo(create_or_drop_wm_trigger_to_pool_mapping_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -292702,6 +311073,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_or_drop_wm_trigger_to_pool_mapping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_resultStandardScheme getScheme() {
         return new create_or_drop_wm_trigger_to_pool_mapping_resultStandardScheme();
       }
@@ -292709,70 +311081,77 @@ public create_or_drop_wm_trigger_to_pool_mapping_resultStandardScheme getScheme(
 
     private static class create_or_drop_wm_trigger_to_pool_mapping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_or_drop_wm_trigger_to_pool_mapping_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_or_drop_wm_trigger_to_pool_mapping_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 WMCreateOrDropTriggerToPoolMappingResponse();
-                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 AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new InvalidObjectException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new MetaException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 WMCreateOrDropTriggerToPoolMappingResponse();
+                  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 AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new InvalidObjectException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new MetaException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_drop_wm_trigger_to_pool_mapping_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -292809,6 +311188,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_or_drop_wm_
     }
 
     private static class create_or_drop_wm_trigger_to_pool_mapping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_or_drop_wm_trigger_to_pool_mapping_resultTupleScheme getScheme() {
         return new create_or_drop_wm_trigger_to_pool_mapping_resultTupleScheme();
       }
@@ -292855,32 +311235,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_or_drop_wm_t
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_or_drop_wm_trigger_to_pool_mapping_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(5);
-        if (incoming.get(0)) {
-          struct.success = new WMCreateOrDropTriggerToPoolMappingResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o3 = new InvalidObjectException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.o4 = new MetaException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(5);
+          if (incoming.get(0)) {
+            struct.success = new WMCreateOrDropTriggerToPoolMappingResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o3 = new InvalidObjectException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(4)) {
+            struct.o4 = new MetaException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -292890,6 +311275,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_ischema_args implements org.apache.thrift.TBase<create_ischema_args, create_ischema_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_ischema_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_ischema_args");
 
@@ -292951,10 +311337,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -292989,6 +311377,7 @@ public create_ischema_args(create_ischema_args other) {
       }
     }
 
+    @Override
     public create_ischema_args deepCopy() {
       return new create_ischema_args(this);
     }
@@ -293022,6 +311411,7 @@ public void setSchemaIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEMA:
@@ -293036,6 +311426,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEMA:
@@ -293046,6 +311437,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -293116,14 +311508,17 @@ public int compareTo(create_ischema_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -293169,6 +311564,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_ischema_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_ischema_argsStandardScheme getScheme() {
         return new create_ischema_argsStandardScheme();
       }
@@ -293176,34 +311572,41 @@ public create_ischema_argsStandardScheme getScheme() {
 
     private static class create_ischema_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_ischema_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_ischema_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEMA
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.schema = new ISchema();
-                struct.schema.read(iprot);
-                struct.setSchemaIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEMA
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.schema = new ISchema();
+                  struct.schema.read(iprot);
+                  struct.setSchemaIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_ischema_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -293220,6 +311623,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_ischema_arg
     }
 
     private static class create_ischema_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_ischema_argsTupleScheme getScheme() {
         return new create_ischema_argsTupleScheme();
       }
@@ -293242,12 +311646,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_ischema_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_ischema_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.schema = new ISchema();
-          struct.schema.read(iprot);
-          struct.setSchemaIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.schema = new ISchema();
+            struct.schema.read(iprot);
+            struct.setSchemaIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -293257,6 +311666,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_ischema_result implements org.apache.thrift.TBase<create_ischema_result, create_ischema_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_ischema_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_ischema_result");
 
@@ -293328,10 +311738,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -293380,6 +311792,7 @@ public create_ischema_result(create_ischema_result other) {
       }
     }
 
+    @Override
     public create_ischema_result deepCopy() {
       return new create_ischema_result(this);
     }
@@ -293463,6 +311876,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -293493,6 +311907,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -293509,6 +311924,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -293629,10 +312045,12 @@ public int compareTo(create_ischema_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -293695,6 +312113,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_ischema_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_ischema_resultStandardScheme getScheme() {
         return new create_ischema_resultStandardScheme();
       }
@@ -293702,52 +312121,59 @@ public create_ischema_resultStandardScheme getScheme() {
 
     private static class create_ischema_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_ischema_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, create_ischema_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_ischema_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -293774,6 +312200,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_ischema_res
     }
 
     private static class create_ischema_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_ischema_resultTupleScheme getScheme() {
         return new create_ischema_resultTupleScheme();
       }
@@ -293808,22 +312235,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_ischema_resu
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, create_ischema_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -293833,6 +312265,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_ischema_args implements org.apache.thrift.TBase<alter_ischema_args, alter_ischema_args._Fields>, java.io.Serializable, Cloneable, Comparable<alter_ischema_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_ischema_args");
 
@@ -293894,10 +312327,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -293932,6 +312367,7 @@ public alter_ischema_args(alter_ischema_args other) {
       }
     }
 
+    @Override
     public alter_ischema_args deepCopy() {
       return new alter_ischema_args(this);
     }
@@ -293965,6 +312401,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -293979,6 +312416,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -293989,6 +312427,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -294059,14 +312498,17 @@ public int compareTo(alter_ischema_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -294112,6 +312554,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_ischema_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_ischema_argsStandardScheme getScheme() {
         return new alter_ischema_argsStandardScheme();
       }
@@ -294119,34 +312562,41 @@ public alter_ischema_argsStandardScheme getScheme() {
 
     private static class alter_ischema_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_ischema_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_ischema_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new AlterISchemaRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new AlterISchemaRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_ischema_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -294163,6 +312613,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_ischema_args
     }
 
     private static class alter_ischema_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_ischema_argsTupleScheme getScheme() {
         return new alter_ischema_argsTupleScheme();
       }
@@ -294185,12 +312636,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_ischema_args
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_ischema_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 AlterISchemaRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 AlterISchemaRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -294200,6 +312656,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class alter_ischema_result implements org.apache.thrift.TBase<alter_ischema_result, alter_ischema_result._Fields>, java.io.Serializable, Cloneable, Comparable<alter_ischema_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("alter_ischema_result");
 
@@ -294266,10 +312723,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -294311,6 +312770,7 @@ public alter_ischema_result(alter_ischema_result other) {
       }
     }
 
+    @Override
     public alter_ischema_result deepCopy() {
       return new alter_ischema_result(this);
     }
@@ -294369,6 +312829,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -294391,6 +312852,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -294404,6 +312866,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -294499,10 +312962,12 @@ public int compareTo(alter_ischema_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -294557,6 +313022,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class alter_ischema_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_ischema_resultStandardScheme getScheme() {
         return new alter_ischema_resultStandardScheme();
       }
@@ -294564,43 +313030,50 @@ public alter_ischema_resultStandardScheme getScheme() {
 
     private static class alter_ischema_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<alter_ischema_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, alter_ischema_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, alter_ischema_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -294622,6 +313095,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alter_ischema_resu
     }
 
     private static class alter_ischema_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public alter_ischema_resultTupleScheme getScheme() {
         return new alter_ischema_resultTupleScheme();
       }
@@ -294650,17 +313124,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alter_ischema_resul
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, alter_ischema_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -294670,6 +313149,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_ischema_args implements org.apache.thrift.TBase<get_ischema_args, get_ischema_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_ischema_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_ischema_args");
 
@@ -294731,10 +313211,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -294769,6 +313251,7 @@ public get_ischema_args(get_ischema_args other) {
       }
     }
 
+    @Override
     public get_ischema_args deepCopy() {
       return new get_ischema_args(this);
     }
@@ -294802,6 +313285,7 @@ public void setNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -294816,6 +313300,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -294826,6 +313311,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -294896,14 +313382,17 @@ public int compareTo(get_ischema_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -294949,6 +313438,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_ischema_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_ischema_argsStandardScheme getScheme() {
         return new get_ischema_argsStandardScheme();
       }
@@ -294956,34 +313446,41 @@ public get_ischema_argsStandardScheme getScheme() {
 
     private static class get_ischema_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_ischema_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_ischema_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.name = new ISchemaName();
-                struct.name.read(iprot);
-                struct.setNameIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.name = new ISchemaName();
+                  struct.name.read(iprot);
+                  struct.setNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_ischema_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -295000,6 +313497,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_ischema_args s
     }
 
     private static class get_ischema_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_ischema_argsTupleScheme getScheme() {
         return new get_ischema_argsTupleScheme();
       }
@@ -295022,12 +313520,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_ischema_args st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_ischema_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.name = new ISchemaName();
-          struct.name.read(iprot);
-          struct.setNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.name = new ISchemaName();
+            struct.name.read(iprot);
+            struct.setNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -295037,6 +313540,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_ischema_result implements org.apache.thrift.TBase<get_ischema_result, get_ischema_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_ischema_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_ischema_result");
 
@@ -295108,10 +313612,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -295160,6 +313666,7 @@ public get_ischema_result(get_ischema_result other) {
       }
     }
 
+    @Override
     public get_ischema_result deepCopy() {
       return new get_ischema_result(this);
     }
@@ -295243,6 +313750,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -295273,6 +313781,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -295289,6 +313798,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -295409,10 +313919,12 @@ public int compareTo(get_ischema_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -295478,6 +313990,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_ischema_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_ischema_resultStandardScheme getScheme() {
         return new get_ischema_resultStandardScheme();
       }
@@ -295485,52 +313998,59 @@ public get_ischema_resultStandardScheme getScheme() {
 
     private static class get_ischema_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_ischema_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_ischema_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 ISchema();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ISchema();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_ischema_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -295557,6 +314077,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_ischema_result
     }
 
     private static class get_ischema_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_ischema_resultTupleScheme getScheme() {
         return new get_ischema_resultTupleScheme();
       }
@@ -295591,22 +314112,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_ischema_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_ischema_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 ISchema();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ISchema();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -295616,6 +314142,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_ischema_args implements org.apache.thrift.TBase<drop_ischema_args, drop_ischema_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_ischema_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_ischema_args");
 
@@ -295677,10 +314204,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -295715,6 +314244,7 @@ public drop_ischema_args(drop_ischema_args other) {
       }
     }
 
+    @Override
     public drop_ischema_args deepCopy() {
       return new drop_ischema_args(this);
     }
@@ -295748,6 +314278,7 @@ public void setNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case NAME:
@@ -295762,6 +314293,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case NAME:
@@ -295772,6 +314304,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -295842,14 +314375,17 @@ public int compareTo(drop_ischema_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -295895,6 +314431,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_ischema_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_ischema_argsStandardScheme getScheme() {
         return new drop_ischema_argsStandardScheme();
       }
@@ -295902,34 +314439,41 @@ public drop_ischema_argsStandardScheme getScheme() {
 
     private static class drop_ischema_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_ischema_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_ischema_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;
-          }
-          switch (schemeField.id) {
-            case 1: // NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.name = new ISchemaName();
-                struct.name.read(iprot);
-                struct.setNameIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.name = new ISchemaName();
+                  struct.name.read(iprot);
+                  struct.setNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_ischema_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -295946,6 +314490,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_ischema_args
     }
 
     private static class drop_ischema_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_ischema_argsTupleScheme getScheme() {
         return new drop_ischema_argsTupleScheme();
       }
@@ -295968,12 +314513,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_ischema_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_ischema_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.name = new ISchemaName();
-          struct.name.read(iprot);
-          struct.setNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.name = new ISchemaName();
+            struct.name.read(iprot);
+            struct.setNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -295983,6 +314533,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_ischema_result implements org.apache.thrift.TBase<drop_ischema_result, drop_ischema_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_ischema_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_ischema_result");
 
@@ -296054,10 +314605,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -296106,6 +314659,7 @@ public drop_ischema_result(drop_ischema_result other) {
       }
     }
 
+    @Override
     public drop_ischema_result deepCopy() {
       return new drop_ischema_result(this);
     }
@@ -296189,6 +314743,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -296219,6 +314774,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -296235,6 +314791,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -296355,10 +314912,12 @@ public int compareTo(drop_ischema_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -296421,6 +314980,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_ischema_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_ischema_resultStandardScheme getScheme() {
         return new drop_ischema_resultStandardScheme();
       }
@@ -296428,52 +314988,59 @@ public drop_ischema_resultStandardScheme getScheme() {
 
     private static class drop_ischema_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_ischema_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_ischema_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o2 = new InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_ischema_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -296500,6 +315067,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_ischema_resul
     }
 
     private static class drop_ischema_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_ischema_resultTupleScheme getScheme() {
         return new drop_ischema_resultTupleScheme();
       }
@@ -296534,22 +315102,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_ischema_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_ischema_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -296559,6 +315132,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_schema_version_args implements org.apache.thrift.TBase<add_schema_version_args, add_schema_version_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_schema_version_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_schema_version_args");
 
@@ -296620,10 +315194,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -296658,6 +315234,7 @@ public add_schema_version_args(add_schema_version_args other) {
       }
     }
 
+    @Override
     public add_schema_version_args deepCopy() {
       return new add_schema_version_args(this);
     }
@@ -296691,6 +315268,7 @@ public void setSchemaVersionIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEMA_VERSION:
@@ -296705,6 +315283,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEMA_VERSION:
@@ -296715,6 +315294,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -296785,14 +315365,17 @@ public int compareTo(add_schema_version_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -296838,6 +315421,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_schema_version_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_schema_version_argsStandardScheme getScheme() {
         return new add_schema_version_argsStandardScheme();
       }
@@ -296845,34 +315429,41 @@ public add_schema_version_argsStandardScheme getScheme() {
 
     private static class add_schema_version_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_schema_version_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_schema_version_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEMA_VERSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.schemaVersion = new SchemaVersion();
-                struct.schemaVersion.read(iprot);
-                struct.setSchemaVersionIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEMA_VERSION
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.schemaVersion = new SchemaVersion();
+                  struct.schemaVersion.read(iprot);
+                  struct.setSchemaVersionIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_schema_version_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -296889,6 +315480,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_schema_version
     }
 
     private static class add_schema_version_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_schema_version_argsTupleScheme getScheme() {
         return new add_schema_version_argsTupleScheme();
       }
@@ -296911,12 +315503,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_schema_version_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.schemaVersion = new SchemaVersion();
-          struct.schemaVersion.read(iprot);
-          struct.setSchemaVersionIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.schemaVersion = new SchemaVersion();
+            struct.schemaVersion.read(iprot);
+            struct.setSchemaVersionIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -296926,6 +315523,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_schema_version_result implements org.apache.thrift.TBase<add_schema_version_result, add_schema_version_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_schema_version_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_schema_version_result");
 
@@ -296997,10 +315595,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -297049,6 +315649,7 @@ public add_schema_version_result(add_schema_version_result other) {
       }
     }
 
+    @Override
     public add_schema_version_result deepCopy() {
       return new add_schema_version_result(this);
     }
@@ -297132,6 +315733,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -297162,6 +315764,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -297178,6 +315781,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -297298,10 +315902,12 @@ public int compareTo(add_schema_version_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -297364,6 +315970,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_schema_version_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_schema_version_resultStandardScheme getScheme() {
         return new add_schema_version_resultStandardScheme();
       }
@@ -297371,52 +315978,59 @@ public add_schema_version_resultStandardScheme getScheme() {
 
     private static class add_schema_version_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_schema_version_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_schema_version_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_schema_version_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -297443,6 +316057,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_schema_version
     }
 
     private static class add_schema_version_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_schema_version_resultTupleScheme getScheme() {
         return new add_schema_version_resultTupleScheme();
       }
@@ -297477,22 +316092,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_schema_version_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -297502,6 +316122,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_version_args implements org.apache.thrift.TBase<get_schema_version_args, get_schema_version_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_version_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_version_args");
 
@@ -297563,10 +316184,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -297601,6 +316224,7 @@ public get_schema_version_args(get_schema_version_args other) {
       }
     }
 
+    @Override
     public get_schema_version_args deepCopy() {
       return new get_schema_version_args(this);
     }
@@ -297634,6 +316258,7 @@ public void setSchemaVersionIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEMA_VERSION:
@@ -297648,6 +316273,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEMA_VERSION:
@@ -297658,6 +316284,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -297728,14 +316355,17 @@ public int compareTo(get_schema_version_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -297781,6 +316411,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_version_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_version_argsStandardScheme getScheme() {
         return new get_schema_version_argsStandardScheme();
       }
@@ -297788,34 +316419,41 @@ public get_schema_version_argsStandardScheme getScheme() {
 
     private static class get_schema_version_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_version_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_version_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEMA_VERSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.schemaVersion = new SchemaVersionDescriptor();
-                struct.schemaVersion.read(iprot);
-                struct.setSchemaVersionIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEMA_VERSION
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.schemaVersion = new SchemaVersionDescriptor();
+                  struct.schemaVersion.read(iprot);
+                  struct.setSchemaVersionIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_version_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -297832,6 +316470,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_version
     }
 
     private static class get_schema_version_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_version_argsTupleScheme getScheme() {
         return new get_schema_version_argsTupleScheme();
       }
@@ -297854,12 +316493,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_version_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.schemaVersion = new SchemaVersionDescriptor();
-          struct.schemaVersion.read(iprot);
-          struct.setSchemaVersionIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.schemaVersion = new SchemaVersionDescriptor();
+            struct.schemaVersion.read(iprot);
+            struct.setSchemaVersionIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -297869,6 +316513,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_version_result implements org.apache.thrift.TBase<get_schema_version_result, get_schema_version_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_version_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_version_result");
 
@@ -297940,10 +316585,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -297992,6 +316639,7 @@ public get_schema_version_result(get_schema_version_result other) {
       }
     }
 
+    @Override
     public get_schema_version_result deepCopy() {
       return new get_schema_version_result(this);
     }
@@ -298075,6 +316723,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -298105,6 +316754,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -298121,6 +316771,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -298241,10 +316892,12 @@ public int compareTo(get_schema_version_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -298310,6 +316963,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_version_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_version_resultStandardScheme getScheme() {
         return new get_schema_version_resultStandardScheme();
       }
@@ -298317,52 +316971,59 @@ public get_schema_version_resultStandardScheme getScheme() {
 
     private static class get_schema_version_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_version_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_version_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 SchemaVersion();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 SchemaVersion();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_version_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -298389,6 +317050,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_version
     }
 
     private static class get_schema_version_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_version_resultTupleScheme getScheme() {
         return new get_schema_version_resultTupleScheme();
       }
@@ -298423,22 +317085,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_version_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 SchemaVersion();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SchemaVersion();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -298448,6 +317115,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_latest_version_args implements org.apache.thrift.TBase<get_schema_latest_version_args, get_schema_latest_version_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_latest_version_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_latest_version_args");
 
@@ -298509,10 +317177,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -298547,6 +317217,7 @@ public get_schema_latest_version_args(get_schema_latest_version_args other) {
       }
     }
 
+    @Override
     public get_schema_latest_version_args deepCopy() {
       return new get_schema_latest_version_args(this);
     }
@@ -298580,6 +317251,7 @@ public void setSchemaNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEMA_NAME:
@@ -298594,6 +317266,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEMA_NAME:
@@ -298604,6 +317277,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -298674,14 +317348,17 @@ public int compareTo(get_schema_latest_version_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -298727,6 +317404,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_latest_version_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_latest_version_argsStandardScheme getScheme() {
         return new get_schema_latest_version_argsStandardScheme();
       }
@@ -298734,34 +317412,41 @@ public get_schema_latest_version_argsStandardScheme getScheme() {
 
     private static class get_schema_latest_version_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_latest_version_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_latest_version_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEMA_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.schemaName = new ISchemaName();
-                struct.schemaName.read(iprot);
-                struct.setSchemaNameIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEMA_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.schemaName = new ISchemaName();
+                  struct.schemaName.read(iprot);
+                  struct.setSchemaNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_latest_version_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -298778,6 +317463,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_latest_
     }
 
     private static class get_schema_latest_version_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_latest_version_argsTupleScheme getScheme() {
         return new get_schema_latest_version_argsTupleScheme();
       }
@@ -298800,12 +317486,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_latest_v
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_latest_version_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.schemaName = new ISchemaName();
-          struct.schemaName.read(iprot);
-          struct.setSchemaNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.schemaName = new ISchemaName();
+            struct.schemaName.read(iprot);
+            struct.setSchemaNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -298815,6 +317506,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_latest_version_result implements org.apache.thrift.TBase<get_schema_latest_version_result, get_schema_latest_version_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_latest_version_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_latest_version_result");
 
@@ -298886,10 +317578,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -298938,6 +317632,7 @@ public get_schema_latest_version_result(get_schema_latest_version_result other)
       }
     }
 
+    @Override
     public get_schema_latest_version_result deepCopy() {
       return new get_schema_latest_version_result(this);
     }
@@ -299021,6 +317716,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -299051,6 +317747,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -299067,6 +317764,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -299187,10 +317885,12 @@ public int compareTo(get_schema_latest_version_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -299256,6 +317956,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_latest_version_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_latest_version_resultStandardScheme getScheme() {
         return new get_schema_latest_version_resultStandardScheme();
       }
@@ -299263,52 +317964,59 @@ public get_schema_latest_version_resultStandardScheme getScheme() {
 
     private static class get_schema_latest_version_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_latest_version_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_latest_version_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 SchemaVersion();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 SchemaVersion();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_latest_version_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -299335,6 +318043,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_latest_
     }
 
     private static class get_schema_latest_version_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_latest_version_resultTupleScheme getScheme() {
         return new get_schema_latest_version_resultTupleScheme();
       }
@@ -299369,22 +318078,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_latest_v
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_latest_version_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 SchemaVersion();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SchemaVersion();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -299394,6 +318108,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_all_versions_args implements org.apache.thrift.TBase<get_schema_all_versions_args, get_schema_all_versions_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_all_versions_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_all_versions_args");
 
@@ -299455,10 +318170,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -299493,6 +318210,7 @@ public get_schema_all_versions_args(get_schema_all_versions_args other) {
       }
     }
 
+    @Override
     public get_schema_all_versions_args deepCopy() {
       return new get_schema_all_versions_args(this);
     }
@@ -299526,6 +318244,7 @@ public void setSchemaNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEMA_NAME:
@@ -299540,6 +318259,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEMA_NAME:
@@ -299550,6 +318270,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -299620,14 +318341,17 @@ public int compareTo(get_schema_all_versions_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -299673,6 +318397,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_all_versions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_all_versions_argsStandardScheme getScheme() {
         return new get_schema_all_versions_argsStandardScheme();
       }
@@ -299680,34 +318405,41 @@ public get_schema_all_versions_argsStandardScheme getScheme() {
 
     private static class get_schema_all_versions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_all_versions_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_all_versions_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEMA_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.schemaName = new ISchemaName();
-                struct.schemaName.read(iprot);
-                struct.setSchemaNameIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEMA_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.schemaName = new ISchemaName();
+                  struct.schemaName.read(iprot);
+                  struct.setSchemaNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_all_versions_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -299724,6 +318456,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_all_ver
     }
 
     private static class get_schema_all_versions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_all_versions_argsTupleScheme getScheme() {
         return new get_schema_all_versions_argsTupleScheme();
       }
@@ -299746,12 +318479,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_all_vers
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_all_versions_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.schemaName = new ISchemaName();
-          struct.schemaName.read(iprot);
-          struct.setSchemaNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.schemaName = new ISchemaName();
+            struct.schemaName.read(iprot);
+            struct.setSchemaNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -299761,6 +318499,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schema_all_versions_result implements org.apache.thrift.TBase<get_schema_all_versions_result, get_schema_all_versions_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schema_all_versions_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schema_all_versions_result");
 
@@ -299832,10 +318571,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -299889,6 +318630,7 @@ public get_schema_all_versions_result(get_schema_all_versions_result other) {
       }
     }
 
+    @Override
     public get_schema_all_versions_result deepCopy() {
       return new get_schema_all_versions_result(this);
     }
@@ -299988,6 +318730,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -300018,6 +318761,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -300034,6 +318778,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -300154,10 +318899,12 @@ public int compareTo(get_schema_all_versions_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -300220,6 +318967,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schema_all_versions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_all_versions_resultStandardScheme getScheme() {
         return new get_schema_all_versions_resultStandardScheme();
       }
@@ -300227,62 +318975,69 @@ public get_schema_all_versions_resultStandardScheme getScheme() {
 
     private static class get_schema_all_versions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schema_all_versions_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schema_all_versions_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2260 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<SchemaVersion>(_list2260.size);
-                  @org.apache.thrift.annotation.Nullable SchemaVersion _elem2261;
-                  for (int _i2262 = 0; _i2262 < _list2260.size; ++_i2262)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2261 = new SchemaVersion();
-                    _elem2261.read(iprot);
-                    struct.success.add(_elem2261);
+                    org.apache.thrift.protocol.TList _list2260 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<SchemaVersion>(_list2260.size);
+                    @org.apache.thrift.annotation.Nullable SchemaVersion _elem2261;
+                    for (int _i2262 = 0; _i2262 < _list2260.size; ++_i2262)
+                    {
+                      _elem2261 = new SchemaVersion();
+                      _elem2261.read(iprot);
+                      struct.success.add(_elem2261);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 NoSuchObjectException();
-                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 { 
+                break;
+              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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_all_versions_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -300316,6 +319071,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schema_all_ver
     }
 
     private static class get_schema_all_versions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schema_all_versions_resultTupleScheme getScheme() {
         return new get_schema_all_versions_resultTupleScheme();
       }
@@ -300356,31 +319112,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schema_all_vers
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schema_all_versions_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)) {
-          {
-            org.apache.thrift.protocol.TList _list2265 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<SchemaVersion>(_list2265.size);
-            @org.apache.thrift.annotation.Nullable SchemaVersion _elem2266;
-            for (int _i2267 = 0; _i2267 < _list2265.size; ++_i2267)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
             {
-              _elem2266 = new SchemaVersion();
-              _elem2266.read(iprot);
-              struct.success.add(_elem2266);
+              org.apache.thrift.protocol.TList _list2265 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<SchemaVersion>(_list2265.size);
+              @org.apache.thrift.annotation.Nullable SchemaVersion _elem2266;
+              for (int _i2267 = 0; _i2267 < _list2265.size; ++_i2267)
+              {
+                _elem2266 = new SchemaVersion();
+                _elem2266.read(iprot);
+                struct.success.add(_elem2266);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -300390,6 +319151,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_schema_version_args implements org.apache.thrift.TBase<drop_schema_version_args, drop_schema_version_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_schema_version_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_schema_version_args");
 
@@ -300451,10 +319213,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -300489,6 +319253,7 @@ public drop_schema_version_args(drop_schema_version_args other) {
       }
     }
 
+    @Override
     public drop_schema_version_args deepCopy() {
       return new drop_schema_version_args(this);
     }
@@ -300522,6 +319287,7 @@ public void setSchemaVersionIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEMA_VERSION:
@@ -300536,6 +319302,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEMA_VERSION:
@@ -300546,6 +319313,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -300616,14 +319384,17 @@ public int compareTo(drop_schema_version_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -300669,6 +319440,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_schema_version_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_schema_version_argsStandardScheme getScheme() {
         return new drop_schema_version_argsStandardScheme();
       }
@@ -300676,34 +319448,41 @@ public drop_schema_version_argsStandardScheme getScheme() {
 
     private static class drop_schema_version_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_schema_version_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_schema_version_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEMA_VERSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.schemaVersion = new SchemaVersionDescriptor();
-                struct.schemaVersion.read(iprot);
-                struct.setSchemaVersionIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEMA_VERSION
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.schemaVersion = new SchemaVersionDescriptor();
+                  struct.schemaVersion.read(iprot);
+                  struct.setSchemaVersionIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_schema_version_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -300720,6 +319499,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_schema_versio
     }
 
     private static class drop_schema_version_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_schema_version_argsTupleScheme getScheme() {
         return new drop_schema_version_argsTupleScheme();
       }
@@ -300742,12 +319522,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_schema_version
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_schema_version_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.schemaVersion = new SchemaVersionDescriptor();
-          struct.schemaVersion.read(iprot);
-          struct.setSchemaVersionIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.schemaVersion = new SchemaVersionDescriptor();
+            struct.schemaVersion.read(iprot);
+            struct.setSchemaVersionIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -300757,6 +319542,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_schema_version_result implements org.apache.thrift.TBase<drop_schema_version_result, drop_schema_version_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_schema_version_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_schema_version_result");
 
@@ -300823,10 +319609,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -300868,6 +319656,7 @@ public drop_schema_version_result(drop_schema_version_result other) {
       }
     }
 
+    @Override
     public drop_schema_version_result deepCopy() {
       return new drop_schema_version_result(this);
     }
@@ -300926,6 +319715,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -300948,6 +319738,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -300961,6 +319752,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -301056,10 +319848,12 @@ public int compareTo(drop_schema_version_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -301114,6 +319908,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_schema_version_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_schema_version_resultStandardScheme getScheme() {
         return new drop_schema_version_resultStandardScheme();
       }
@@ -301121,43 +319916,50 @@ public drop_schema_version_resultStandardScheme getScheme() {
 
     private static class drop_schema_version_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_schema_version_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_schema_version_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_schema_version_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -301179,6 +319981,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_schema_versio
     }
 
     private static class drop_schema_version_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_schema_version_resultTupleScheme getScheme() {
         return new drop_schema_version_resultTupleScheme();
       }
@@ -301207,17 +320010,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_schema_version
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_schema_version_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -301227,6 +320035,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schemas_by_cols_args implements org.apache.thrift.TBase<get_schemas_by_cols_args, get_schemas_by_cols_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_schemas_by_cols_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schemas_by_cols_args");
 
@@ -301288,10 +320097,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -301326,6 +320137,7 @@ public get_schemas_by_cols_args(get_schemas_by_cols_args other) {
       }
     }
 
+    @Override
     public get_schemas_by_cols_args deepCopy() {
       return new get_schemas_by_cols_args(this);
     }
@@ -301359,6 +320171,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -301373,6 +320186,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -301383,6 +320197,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -301453,14 +320268,17 @@ public int compareTo(get_schemas_by_cols_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -301506,6 +320324,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schemas_by_cols_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schemas_by_cols_argsStandardScheme getScheme() {
         return new get_schemas_by_cols_argsStandardScheme();
       }
@@ -301513,34 +320332,41 @@ public get_schemas_by_cols_argsStandardScheme getScheme() {
 
     private static class get_schemas_by_cols_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schemas_by_cols_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schemas_by_cols_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new FindSchemasByColsRqst();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new FindSchemasByColsRqst();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schemas_by_cols_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -301557,6 +320383,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schemas_by_col
     }
 
     private static class get_schemas_by_cols_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schemas_by_cols_argsTupleScheme getScheme() {
         return new get_schemas_by_cols_argsTupleScheme();
       }
@@ -301579,12 +320406,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schemas_by_cols
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schemas_by_cols_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 FindSchemasByColsRqst();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 FindSchemasByColsRqst();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -301594,6 +320426,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_schemas_by_cols_result implements org.apache.thrift.TBase<get_schemas_by_cols_result, get_schemas_by_cols_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_schemas_by_cols_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_schemas_by_cols_result");
 
@@ -301660,10 +320493,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -301705,6 +320540,7 @@ public get_schemas_by_cols_result(get_schemas_by_cols_result other) {
       }
     }
 
+    @Override
     public get_schemas_by_cols_result deepCopy() {
       return new get_schemas_by_cols_result(this);
     }
@@ -301763,6 +320599,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -301785,6 +320622,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -301798,6 +320636,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -301893,10 +320732,12 @@ public int compareTo(get_schemas_by_cols_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -301954,6 +320795,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_schemas_by_cols_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schemas_by_cols_resultStandardScheme getScheme() {
         return new get_schemas_by_cols_resultStandardScheme();
       }
@@ -301961,43 +320803,50 @@ public get_schemas_by_cols_resultStandardScheme getScheme() {
 
     private static class get_schemas_by_cols_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_schemas_by_cols_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_schemas_by_cols_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 FindSchemasByColsResp();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 FindSchemasByColsResp();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_schemas_by_cols_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -302019,6 +320868,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_schemas_by_col
     }
 
     private static class get_schemas_by_cols_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_schemas_by_cols_resultTupleScheme getScheme() {
         return new get_schemas_by_cols_resultTupleScheme();
       }
@@ -302047,17 +320897,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_schemas_by_cols
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_schemas_by_cols_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.success = new FindSchemasByColsResp();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new FindSchemasByColsResp();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -302067,6 +320922,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class map_schema_version_to_serde_args implements org.apache.thrift.TBase<map_schema_version_to_serde_args, map_schema_version_to_serde_args._Fields>, java.io.Serializable, Cloneable, Comparable<map_schema_version_to_serde_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("map_schema_version_to_serde_args");
 
@@ -302128,10 +320984,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -302166,6 +321024,7 @@ public map_schema_version_to_serde_args(map_schema_version_to_serde_args other)
       }
     }
 
+    @Override
     public map_schema_version_to_serde_args deepCopy() {
       return new map_schema_version_to_serde_args(this);
     }
@@ -302199,6 +321058,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -302213,6 +321073,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -302223,6 +321084,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -302293,14 +321155,17 @@ public int compareTo(map_schema_version_to_serde_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -302346,6 +321211,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class map_schema_version_to_serde_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public map_schema_version_to_serde_argsStandardScheme getScheme() {
         return new map_schema_version_to_serde_argsStandardScheme();
       }
@@ -302353,34 +321219,41 @@ public map_schema_version_to_serde_argsStandardScheme getScheme() {
 
     private static class map_schema_version_to_serde_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<map_schema_version_to_serde_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, map_schema_version_to_serde_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new MapSchemaVersionToSerdeRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new MapSchemaVersionToSerdeRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, map_schema_version_to_serde_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -302397,6 +321270,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, map_schema_version
     }
 
     private static class map_schema_version_to_serde_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public map_schema_version_to_serde_argsTupleScheme getScheme() {
         return new map_schema_version_to_serde_argsTupleScheme();
       }
@@ -302419,12 +321293,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, map_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, map_schema_version_to_serde_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 MapSchemaVersionToSerdeRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 MapSchemaVersionToSerdeRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -302434,6 +321313,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class map_schema_version_to_serde_result implements org.apache.thrift.TBase<map_schema_version_to_serde_result, map_schema_version_to_serde_result._Fields>, java.io.Serializable, Cloneable, Comparable<map_schema_version_to_serde_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("map_schema_version_to_serde_result");
 
@@ -302500,10 +321380,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -302545,6 +321427,7 @@ public map_schema_version_to_serde_result(map_schema_version_to_serde_result oth
       }
     }
 
+    @Override
     public map_schema_version_to_serde_result deepCopy() {
       return new map_schema_version_to_serde_result(this);
     }
@@ -302603,6 +321486,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -302625,6 +321509,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -302638,6 +321523,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -302733,10 +321619,12 @@ public int compareTo(map_schema_version_to_serde_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -302791,6 +321679,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class map_schema_version_to_serde_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public map_schema_version_to_serde_resultStandardScheme getScheme() {
         return new map_schema_version_to_serde_resultStandardScheme();
       }
@@ -302798,43 +321687,50 @@ public map_schema_version_to_serde_resultStandardScheme getScheme() {
 
     private static class map_schema_version_to_serde_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<map_schema_version_to_serde_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, map_schema_version_to_serde_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, map_schema_version_to_serde_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -302856,6 +321752,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, map_schema_version
     }
 
     private static class map_schema_version_to_serde_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public map_schema_version_to_serde_resultTupleScheme getScheme() {
         return new map_schema_version_to_serde_resultTupleScheme();
       }
@@ -302884,17 +321781,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, map_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, map_schema_version_to_serde_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -302904,6 +321806,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_schema_version_state_args implements org.apache.thrift.TBase<set_schema_version_state_args, set_schema_version_state_args._Fields>, java.io.Serializable, Cloneable, Comparable<set_schema_version_state_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_schema_version_state_args");
 
@@ -302965,10 +321868,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -303003,6 +321908,7 @@ public set_schema_version_state_args(set_schema_version_state_args other) {
       }
     }
 
+    @Override
     public set_schema_version_state_args deepCopy() {
       return new set_schema_version_state_args(this);
     }
@@ -303036,6 +321942,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -303050,6 +321957,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -303060,6 +321968,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -303130,14 +322039,17 @@ public int compareTo(set_schema_version_state_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -303183,6 +322095,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_schema_version_state_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_schema_version_state_argsStandardScheme getScheme() {
         return new set_schema_version_state_argsStandardScheme();
       }
@@ -303190,34 +322103,41 @@ public set_schema_version_state_argsStandardScheme getScheme() {
 
     private static class set_schema_version_state_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_schema_version_state_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_schema_version_state_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new SetSchemaVersionStateRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new SetSchemaVersionStateRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_schema_version_state_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -303234,6 +322154,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_schema_version
     }
 
     private static class set_schema_version_state_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_schema_version_state_argsTupleScheme getScheme() {
         return new set_schema_version_state_argsTupleScheme();
       }
@@ -303256,12 +322177,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_schema_version_state_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 SetSchemaVersionStateRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SetSchemaVersionStateRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -303271,6 +322197,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class set_schema_version_state_result implements org.apache.thrift.TBase<set_schema_version_state_result, set_schema_version_state_result._Fields>, java.io.Serializable, Cloneable, Comparable<set_schema_version_state_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_schema_version_state_result");
 
@@ -303342,10 +322269,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -303394,6 +322323,7 @@ public set_schema_version_state_result(set_schema_version_state_result other) {
       }
     }
 
+    @Override
     public set_schema_version_state_result deepCopy() {
       return new set_schema_version_state_result(this);
     }
@@ -303477,6 +322407,7 @@ public void setO3IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -303507,6 +322438,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -303523,6 +322455,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -303643,10 +322576,12 @@ public int compareTo(set_schema_version_state_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -303709,6 +322644,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class set_schema_version_state_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_schema_version_state_resultStandardScheme getScheme() {
         return new set_schema_version_state_resultStandardScheme();
       }
@@ -303716,52 +322652,59 @@ public set_schema_version_state_resultStandardScheme getScheme() {
 
     private static class set_schema_version_state_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<set_schema_version_state_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, set_schema_version_state_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 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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new MetaException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // O2
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o2 = new InvalidOperationException();
+                  struct.o2.read(iprot);
+                  struct.setO2IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new MetaException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, set_schema_version_state_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -303788,6 +322731,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, set_schema_version
     }
 
     private static class set_schema_version_state_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public set_schema_version_state_resultTupleScheme getScheme() {
         return new set_schema_version_state_resultTupleScheme();
       }
@@ -303822,22 +322766,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, set_schema_version_
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, set_schema_version_state_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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new MetaException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new MetaException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -303847,6 +322796,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_serde_args implements org.apache.thrift.TBase<add_serde_args, add_serde_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_serde_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_serde_args");
 
@@ -303908,10 +322858,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -303946,6 +322898,7 @@ public add_serde_args(add_serde_args other) {
       }
     }
 
+    @Override
     public add_serde_args deepCopy() {
       return new add_serde_args(this);
     }
@@ -303979,6 +322932,7 @@ public void setSerdeIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SERDE:
@@ -303993,6 +322947,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SERDE:
@@ -304003,6 +322958,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -304073,14 +323029,17 @@ public int compareTo(add_serde_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -304126,6 +323085,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_serde_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_serde_argsStandardScheme getScheme() {
         return new add_serde_argsStandardScheme();
       }
@@ -304133,34 +323093,41 @@ public add_serde_argsStandardScheme getScheme() {
 
     private static class add_serde_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_serde_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_serde_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SERDE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.serde = new SerDeInfo();
-                struct.serde.read(iprot);
-                struct.setSerdeIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SERDE
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.serde = new SerDeInfo();
+                  struct.serde.read(iprot);
+                  struct.setSerdeIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_serde_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -304177,6 +323144,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_serde_args str
     }
 
     private static class add_serde_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_serde_argsTupleScheme getScheme() {
         return new add_serde_argsTupleScheme();
       }
@@ -304199,12 +323167,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_serde_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_serde_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.serde = new SerDeInfo();
-          struct.serde.read(iprot);
-          struct.setSerdeIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.serde = new SerDeInfo();
+            struct.serde.read(iprot);
+            struct.setSerdeIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -304214,6 +323187,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_serde_result implements org.apache.thrift.TBase<add_serde_result, add_serde_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_serde_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_serde_result");
 
@@ -304280,10 +323254,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -304325,6 +323301,7 @@ public add_serde_result(add_serde_result other) {
       }
     }
 
+    @Override
     public add_serde_result deepCopy() {
       return new add_serde_result(this);
     }
@@ -304383,6 +323360,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -304405,6 +323383,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -304418,6 +323397,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -304513,10 +323493,12 @@ public int compareTo(add_serde_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -304571,6 +323553,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_serde_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_serde_resultStandardScheme getScheme() {
         return new add_serde_resultStandardScheme();
       }
@@ -304578,43 +323561,50 @@ public add_serde_resultStandardScheme getScheme() {
 
     private static class add_serde_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_serde_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_serde_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new AlreadyExistsException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new AlreadyExistsException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_serde_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -304636,6 +323626,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_serde_result s
     }
 
     private static class add_serde_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_serde_resultTupleScheme getScheme() {
         return new add_serde_resultTupleScheme();
       }
@@ -304664,17 +323655,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_serde_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_serde_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.o1 = new AlreadyExistsException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new AlreadyExistsException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -304684,6 +323680,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_serde_args implements org.apache.thrift.TBase<get_serde_args, get_serde_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_serde_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_serde_args");
 
@@ -304745,10 +323742,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -304783,6 +323782,7 @@ public get_serde_args(get_serde_args other) {
       }
     }
 
+    @Override
     public get_serde_args deepCopy() {
       return new get_serde_args(this);
     }
@@ -304816,6 +323816,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -304830,6 +323831,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -304840,6 +323842,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -304910,14 +323913,17 @@ public int compareTo(get_serde_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -304963,6 +323969,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_serde_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_serde_argsStandardScheme getScheme() {
         return new get_serde_argsStandardScheme();
       }
@@ -304970,34 +323977,41 @@ public get_serde_argsStandardScheme getScheme() {
 
     private static class get_serde_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_serde_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_serde_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new GetSerdeRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new GetSerdeRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_serde_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -305014,6 +324028,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_serde_args str
     }
 
     private static class get_serde_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_serde_argsTupleScheme getScheme() {
         return new get_serde_argsTupleScheme();
       }
@@ -305036,12 +324051,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_serde_args stru
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_serde_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 GetSerdeRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetSerdeRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -305051,6 +324071,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_serde_result implements org.apache.thrift.TBase<get_serde_result, get_serde_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_serde_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_serde_result");
 
@@ -305122,10 +324143,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -305174,6 +324197,7 @@ public get_serde_result(get_serde_result other) {
       }
     }
 
+    @Override
     public get_serde_result deepCopy() {
       return new get_serde_result(this);
     }
@@ -305257,6 +324281,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -305287,6 +324312,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -305303,6 +324329,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -305423,10 +324450,12 @@ public int compareTo(get_serde_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -305492,6 +324521,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_serde_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_serde_resultStandardScheme getScheme() {
         return new get_serde_resultStandardScheme();
       }
@@ -305499,52 +324529,59 @@ public get_serde_resultStandardScheme getScheme() {
 
     private static class get_serde_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_serde_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_serde_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 SerDeInfo();
-                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 NoSuchObjectException();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 SerDeInfo();
+                  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 NoSuchObjectException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_serde_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -305571,6 +324608,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_serde_result s
     }
 
     private static class get_serde_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_serde_resultTupleScheme getScheme() {
         return new get_serde_resultTupleScheme();
       }
@@ -305605,22 +324643,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_serde_result st
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_serde_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 SerDeInfo();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 SerDeInfo();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -305630,6 +324673,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_args implements org.apache.thrift.TBase<get_lock_materialization_rebuild_args, get_lock_materialization_rebuild_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_lock_materialization_rebuild_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_lock_materialization_rebuild_args");
 
@@ -305701,10 +324745,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -305755,6 +324801,7 @@ public get_lock_materialization_rebuild_args(get_lock_materialization_rebuild_ar
       this.txnId = other.txnId;
     }
 
+    @Override
     public get_lock_materialization_rebuild_args deepCopy() {
       return new get_lock_materialization_rebuild_args(this);
     }
@@ -305837,6 +324884,7 @@ public void setTxnIdIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -305867,6 +324915,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -305883,6 +324932,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -306001,14 +325051,17 @@ public int compareTo(get_lock_materialization_rebuild_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -306065,6 +325118,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_lock_materialization_rebuild_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_argsStandardScheme getScheme() {
         return new get_lock_materialization_rebuild_argsStandardScheme();
       }
@@ -306072,49 +325126,56 @@ public get_lock_materialization_rebuild_argsStandardScheme getScheme() {
 
     private static class get_lock_materialization_rebuild_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_lock_materialization_rebuild_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_lock_materialization_rebuild_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tableName = iprot.readString();
-                struct.setTableNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // TXN_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.txnId = iprot.readI64();
-                struct.setTxnIdIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tableName = iprot.readString();
+                  struct.setTableNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // TXN_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.txnId = iprot.readI64();
+                  struct.setTxnIdIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materialization_rebuild_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -306139,6 +325200,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materiali
     }
 
     private static class get_lock_materialization_rebuild_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_argsTupleScheme getScheme() {
         return new get_lock_materialization_rebuild_argsTupleScheme();
       }
@@ -306173,19 +325235,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_lock_materializ
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_lock_materialization_rebuild_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);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tableName = iprot.readString();
-          struct.setTableNameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.txnId = iprot.readI64();
-          struct.setTxnIdIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbName = iprot.readString();
+            struct.setDbNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tableName = iprot.readString();
+            struct.setTableNameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.txnId = iprot.readI64();
+            struct.setTxnIdIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -306195,6 +325262,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_result implements org.apache.thrift.TBase<get_lock_materialization_rebuild_result, get_lock_materialization_rebuild_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_lock_materialization_rebuild_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_lock_materialization_rebuild_result");
 
@@ -306256,10 +325324,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -306294,6 +325364,7 @@ public get_lock_materialization_rebuild_result(get_lock_materialization_rebuild_
       }
     }
 
+    @Override
     public get_lock_materialization_rebuild_result deepCopy() {
       return new get_lock_materialization_rebuild_result(this);
     }
@@ -306327,6 +325398,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -306341,6 +325413,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -306351,6 +325424,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -306421,10 +325495,12 @@ public int compareTo(get_lock_materialization_rebuild_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -306474,6 +325550,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_lock_materialization_rebuild_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_resultStandardScheme getScheme() {
         return new get_lock_materialization_rebuild_resultStandardScheme();
       }
@@ -306481,34 +325558,41 @@ public get_lock_materialization_rebuild_resultStandardScheme getScheme() {
 
     private static class get_lock_materialization_rebuild_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_lock_materialization_rebuild_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_lock_materialization_rebuild_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 LockResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materialization_rebuild_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -306525,6 +325609,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materiali
     }
 
     private static class get_lock_materialization_rebuild_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_resultTupleScheme getScheme() {
         return new get_lock_materialization_rebuild_resultTupleScheme();
       }
@@ -306547,12 +325632,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_lock_materializ
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_lock_materialization_rebuild_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.success = new LockResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -306562,6 +325652,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_args implements org.apache.thrift.TBase<heartbeat_lock_materialization_rebuild_args, heartbeat_lock_materialization_rebuild_args._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_lock_materialization_rebuild_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_lock_materialization_rebuild_args");
 
@@ -306633,10 +325724,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -306687,6 +325780,7 @@ public heartbeat_lock_materialization_rebuild_args(heartbeat_lock_materializatio
       this.txnId = other.txnId;
     }
 
+    @Override
     public heartbeat_lock_materialization_rebuild_args deepCopy() {
       return new heartbeat_lock_materialization_rebuild_args(this);
     }
@@ -306769,6 +325863,7 @@ public void setTxnIdIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DB_NAME:
@@ -306799,6 +325894,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DB_NAME:
@@ -306815,6 +325911,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -306933,14 +326030,17 @@ public int compareTo(heartbeat_lock_materialization_rebuild_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -306997,6 +326097,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_lock_materialization_rebuild_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_argsStandardScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_argsStandardScheme();
       }
@@ -307004,49 +326105,56 @@ public heartbeat_lock_materialization_rebuild_argsStandardScheme getScheme() {
 
     private static class heartbeat_lock_materialization_rebuild_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_lock_materialization_rebuild_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_lock_materialization_rebuild_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;
-          }
-          switch (schemeField.id) {
-            case 1: // DB_NAME
-              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: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tableName = iprot.readString();
-                struct.setTableNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            case 3: // TXN_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.txnId = iprot.readI64();
-                struct.setTxnIdIsSet(true);
-              } else { 
+            }
+            switch (schemeField.id) {
+              case 1: // DB_NAME
+                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: // TABLE_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.tableName = iprot.readString();
+                  struct.setTableNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 3: // TXN_ID
+                if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                  struct.txnId = iprot.readI64();
+                  struct.setTxnIdIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_materialization_rebuild_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -307071,6 +326179,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_mat
     }
 
     private static class heartbeat_lock_materialization_rebuild_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_argsTupleScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_argsTupleScheme();
       }
@@ -307105,19 +326214,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_mate
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_materialization_rebuild_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);
-        if (incoming.get(0)) {
-          struct.dbName = iprot.readString();
-          struct.setDbNameIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.tableName = iprot.readString();
-          struct.setTableNameIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.txnId = iprot.readI64();
-          struct.setTxnIdIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(3);
+          if (incoming.get(0)) {
+            struct.dbName = iprot.readString();
+            struct.setDbNameIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.tableName = iprot.readString();
+            struct.setTableNameIsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.txnId = iprot.readI64();
+            struct.setTxnIdIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -307127,6 +326241,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_result implements org.apache.thrift.TBase<heartbeat_lock_materialization_rebuild_result, heartbeat_lock_materialization_rebuild_result._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_lock_materialization_rebuild_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_lock_materialization_rebuild_result");
 
@@ -307188,10 +326303,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -307228,6 +326345,7 @@ public heartbeat_lock_materialization_rebuild_result(heartbeat_lock_materializat
       this.success = other.success;
     }
 
+    @Override
     public heartbeat_lock_materialization_rebuild_result deepCopy() {
       return new heartbeat_lock_materialization_rebuild_result(this);
     }
@@ -307260,6 +326378,7 @@ public void setSuccessIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -307274,6 +326393,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -307284,6 +326404,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -307352,10 +326473,12 @@ public int compareTo(heartbeat_lock_materialization_rebuild_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -307400,6 +326523,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_lock_materialization_rebuild_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_resultStandardScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_resultStandardScheme();
       }
@@ -307407,33 +326531,40 @@ public heartbeat_lock_materialization_rebuild_resultStandardScheme getScheme() {
 
     private static class heartbeat_lock_materialization_rebuild_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_lock_materialization_rebuild_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_lock_materialization_rebuild_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_materialization_rebuild_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -307450,6 +326581,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_mat
     }
 
     private static class heartbeat_lock_materialization_rebuild_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_resultTupleScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_resultTupleScheme();
       }
@@ -307472,11 +326604,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_mate
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_materialization_rebuild_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -307486,6 +326623,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_req_args implements org.apache.thrift.TBase<get_lock_materialization_rebuild_req_args, get_lock_materialization_rebuild_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_lock_materialization_rebuild_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_lock_materialization_rebuild_req_args");
 
@@ -307547,10 +326685,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -307585,6 +326725,7 @@ public get_lock_materialization_rebuild_req_args(get_lock_materialization_rebuil
       }
     }
 
+    @Override
     public get_lock_materialization_rebuild_req_args deepCopy() {
       return new get_lock_materialization_rebuild_req_args(this);
     }
@@ -307618,6 +326759,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -307632,6 +326774,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -307642,6 +326785,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -307712,14 +326856,17 @@ public int compareTo(get_lock_materialization_rebuild_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -307765,6 +326912,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_lock_materialization_rebuild_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_req_argsStandardScheme getScheme() {
         return new get_lock_materialization_rebuild_req_argsStandardScheme();
       }
@@ -307772,34 +326920,41 @@ public get_lock_materialization_rebuild_req_argsStandardScheme getScheme() {
 
     private static class get_lock_materialization_rebuild_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_lock_materialization_rebuild_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_lock_materialization_rebuild_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new LockMaterializationRebuildRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new LockMaterializationRebuildRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materialization_rebuild_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -307816,6 +326971,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materiali
     }
 
     private static class get_lock_materialization_rebuild_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_req_argsTupleScheme getScheme() {
         return new get_lock_materialization_rebuild_req_argsTupleScheme();
       }
@@ -307838,12 +326994,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_lock_materializ
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_lock_materialization_rebuild_req_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.req = new LockMaterializationRebuildRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new LockMaterializationRebuildRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -307853,6 +327014,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_lock_materialization_rebuild_req_result implements org.apache.thrift.TBase<get_lock_materialization_rebuild_req_result, get_lock_materialization_rebuild_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_lock_materialization_rebuild_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_lock_materialization_rebuild_req_result");
 
@@ -307914,10 +327076,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -307952,6 +327116,7 @@ public get_lock_materialization_rebuild_req_result(get_lock_materialization_rebu
       }
     }
 
+    @Override
     public get_lock_materialization_rebuild_req_result deepCopy() {
       return new get_lock_materialization_rebuild_req_result(this);
     }
@@ -307985,6 +327150,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -307999,6 +327165,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -308009,6 +327176,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -308079,10 +327247,12 @@ public int compareTo(get_lock_materialization_rebuild_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -308132,6 +327302,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_lock_materialization_rebuild_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_req_resultStandardScheme getScheme() {
         return new get_lock_materialization_rebuild_req_resultStandardScheme();
       }
@@ -308139,34 +327310,41 @@ public get_lock_materialization_rebuild_req_resultStandardScheme getScheme() {
 
     private static class get_lock_materialization_rebuild_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_lock_materialization_rebuild_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_lock_materialization_rebuild_req_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 LockResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materialization_rebuild_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -308183,6 +327361,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_lock_materiali
     }
 
     private static class get_lock_materialization_rebuild_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_lock_materialization_rebuild_req_resultTupleScheme getScheme() {
         return new get_lock_materialization_rebuild_req_resultTupleScheme();
       }
@@ -308205,12 +327384,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_lock_materializ
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_lock_materialization_rebuild_req_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.success = new LockResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 LockResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -308220,6 +327404,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_req_args implements org.apache.thrift.TBase<heartbeat_lock_materialization_rebuild_req_args, heartbeat_lock_materialization_rebuild_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_lock_materialization_rebuild_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_lock_materialization_rebuild_req_args");
 
@@ -308281,10 +327466,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -308319,6 +327506,7 @@ public heartbeat_lock_materialization_rebuild_req_args(heartbeat_lock_materializ
       }
     }
 
+    @Override
     public heartbeat_lock_materialization_rebuild_req_args deepCopy() {
       return new heartbeat_lock_materialization_rebuild_req_args(this);
     }
@@ -308352,6 +327540,7 @@ public void setReqIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQ:
@@ -308366,6 +327555,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQ:
@@ -308376,6 +327566,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -308446,14 +327637,17 @@ public int compareTo(heartbeat_lock_materialization_rebuild_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -308499,6 +327693,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_lock_materialization_rebuild_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_req_argsStandardScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_req_argsStandardScheme();
       }
@@ -308506,34 +327701,41 @@ public heartbeat_lock_materialization_rebuild_req_argsStandardScheme getScheme()
 
     private static class heartbeat_lock_materialization_rebuild_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_lock_materialization_rebuild_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_lock_materialization_rebuild_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQ
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.req = new LockMaterializationRebuildRequest();
-                struct.req.read(iprot);
-                struct.setReqIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQ
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.req = new LockMaterializationRebuildRequest();
+                  struct.req.read(iprot);
+                  struct.setReqIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_materialization_rebuild_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -308550,6 +327752,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_mat
     }
 
     private static class heartbeat_lock_materialization_rebuild_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_req_argsTupleScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_req_argsTupleScheme();
       }
@@ -308572,12 +327775,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_mate
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_materialization_rebuild_req_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.req = new LockMaterializationRebuildRequest();
-          struct.req.read(iprot);
-          struct.setReqIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.req = new LockMaterializationRebuildRequest();
+            struct.req.read(iprot);
+            struct.setReqIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -308587,6 +327795,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class heartbeat_lock_materialization_rebuild_req_result implements org.apache.thrift.TBase<heartbeat_lock_materialization_rebuild_req_result, heartbeat_lock_materialization_rebuild_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<heartbeat_lock_materialization_rebuild_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("heartbeat_lock_materialization_rebuild_req_result");
 
@@ -308648,10 +327857,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -308688,6 +327899,7 @@ public heartbeat_lock_materialization_rebuild_req_result(heartbeat_lock_material
       this.success = other.success;
     }
 
+    @Override
     public heartbeat_lock_materialization_rebuild_req_result deepCopy() {
       return new heartbeat_lock_materialization_rebuild_req_result(this);
     }
@@ -308720,6 +327932,7 @@ public void setSuccessIsSet(boolean value) {
       __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -308734,6 +327947,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -308744,6 +327958,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -308812,10 +328027,12 @@ public int compareTo(heartbeat_lock_materialization_rebuild_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -308860,6 +328077,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class heartbeat_lock_materialization_rebuild_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_req_resultStandardScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_req_resultStandardScheme();
       }
@@ -308867,33 +328085,40 @@ public heartbeat_lock_materialization_rebuild_req_resultStandardScheme getScheme
 
     private static class heartbeat_lock_materialization_rebuild_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<heartbeat_lock_materialization_rebuild_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, heartbeat_lock_materialization_rebuild_req_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.BOOL) {
-                struct.success = iprot.readBool();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 0: // SUCCESS
+                if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                  struct.success = iprot.readBool();
+                  struct.setSuccessIsSet(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.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_materialization_rebuild_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -308910,6 +328135,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, heartbeat_lock_mat
     }
 
     private static class heartbeat_lock_materialization_rebuild_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public heartbeat_lock_materialization_rebuild_req_resultTupleScheme getScheme() {
         return new heartbeat_lock_materialization_rebuild_req_resultTupleScheme();
       }
@@ -308932,11 +328158,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_mate
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, heartbeat_lock_materialization_rebuild_req_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.success = iprot.readBool();
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 = iprot.readBool();
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -308946,6 +328177,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_runtime_stats_args implements org.apache.thrift.TBase<add_runtime_stats_args, add_runtime_stats_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_runtime_stats_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_runtime_stats_args");
 
@@ -309007,10 +328239,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -309045,6 +328279,7 @@ public add_runtime_stats_args(add_runtime_stats_args other) {
       }
     }
 
+    @Override
     public add_runtime_stats_args deepCopy() {
       return new add_runtime_stats_args(this);
     }
@@ -309078,6 +328313,7 @@ public void setStatIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case STAT:
@@ -309092,6 +328328,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case STAT:
@@ -309102,6 +328339,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -309172,14 +328410,17 @@ public int compareTo(add_runtime_stats_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -309225,6 +328466,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_runtime_stats_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_runtime_stats_argsStandardScheme getScheme() {
         return new add_runtime_stats_argsStandardScheme();
       }
@@ -309232,34 +328474,41 @@ public add_runtime_stats_argsStandardScheme getScheme() {
 
     private static class add_runtime_stats_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_runtime_stats_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_runtime_stats_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;
-          }
-          switch (schemeField.id) {
-            case 1: // STAT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.stat = new RuntimeStat();
-                struct.stat.read(iprot);
-                struct.setStatIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // STAT
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.stat = new RuntimeStat();
+                  struct.stat.read(iprot);
+                  struct.setStatIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_runtime_stats_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -309276,6 +328525,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_runtime_stats_
     }
 
     private static class add_runtime_stats_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_runtime_stats_argsTupleScheme getScheme() {
         return new add_runtime_stats_argsTupleScheme();
       }
@@ -309298,12 +328548,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_runtime_stats_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_runtime_stats_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.stat = new RuntimeStat();
-          struct.stat.read(iprot);
-          struct.setStatIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.stat = new RuntimeStat();
+            struct.stat.read(iprot);
+            struct.setStatIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -309313,6 +328568,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_runtime_stats_result implements org.apache.thrift.TBase<add_runtime_stats_result, add_runtime_stats_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_runtime_stats_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_runtime_stats_result");
 
@@ -309374,10 +328630,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -309412,6 +328670,7 @@ public add_runtime_stats_result(add_runtime_stats_result other) {
       }
     }
 
+    @Override
     public add_runtime_stats_result deepCopy() {
       return new add_runtime_stats_result(this);
     }
@@ -309445,6 +328704,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -309459,6 +328719,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -309469,6 +328730,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -309539,10 +328801,12 @@ public int compareTo(add_runtime_stats_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -309589,6 +328853,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_runtime_stats_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_runtime_stats_resultStandardScheme getScheme() {
         return new add_runtime_stats_resultStandardScheme();
       }
@@ -309596,34 +328861,41 @@ public add_runtime_stats_resultStandardScheme getScheme() {
 
     private static class add_runtime_stats_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_runtime_stats_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_runtime_stats_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_runtime_stats_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -309640,6 +328912,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_runtime_stats_
     }
 
     private static class add_runtime_stats_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_runtime_stats_resultTupleScheme getScheme() {
         return new add_runtime_stats_resultTupleScheme();
       }
@@ -309662,12 +328935,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_runtime_stats_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_runtime_stats_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -309677,6 +328955,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_runtime_stats_args implements org.apache.thrift.TBase<get_runtime_stats_args, get_runtime_stats_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_runtime_stats_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_runtime_stats_args");
 
@@ -309738,10 +329017,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -309776,6 +329057,7 @@ public get_runtime_stats_args(get_runtime_stats_args other) {
       }
     }
 
+    @Override
     public get_runtime_stats_args deepCopy() {
       return new get_runtime_stats_args(this);
     }
@@ -309809,6 +329091,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -309823,6 +329106,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -309833,6 +329117,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -309903,14 +329188,17 @@ public int compareTo(get_runtime_stats_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -309956,6 +329244,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_runtime_stats_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_runtime_stats_argsStandardScheme getScheme() {
         return new get_runtime_stats_argsStandardScheme();
       }
@@ -309963,34 +329252,41 @@ public get_runtime_stats_argsStandardScheme getScheme() {
 
     private static class get_runtime_stats_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_runtime_stats_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_runtime_stats_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new GetRuntimeStatsRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new GetRuntimeStatsRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_runtime_stats_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -310007,6 +329303,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_runtime_stats_
     }
 
     private static class get_runtime_stats_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_runtime_stats_argsTupleScheme getScheme() {
         return new get_runtime_stats_argsTupleScheme();
       }
@@ -310029,12 +329326,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_runtime_stats_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_runtime_stats_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 GetRuntimeStatsRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetRuntimeStatsRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -310044,6 +329346,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_runtime_stats_result implements org.apache.thrift.TBase<get_runtime_stats_result, get_runtime_stats_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_runtime_stats_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_runtime_stats_result");
 
@@ -310110,10 +329413,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -310160,6 +329465,7 @@ public get_runtime_stats_result(get_runtime_stats_result other) {
       }
     }
 
+    @Override
     public get_runtime_stats_result deepCopy() {
       return new get_runtime_stats_result(this);
     }
@@ -310234,6 +329540,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -310256,6 +329563,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -310269,6 +329577,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -310364,10 +329673,12 @@ public int compareTo(get_runtime_stats_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -310422,6 +329733,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_runtime_stats_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_runtime_stats_resultStandardScheme getScheme() {
         return new get_runtime_stats_resultStandardScheme();
       }
@@ -310429,53 +329741,60 @@ public get_runtime_stats_resultStandardScheme getScheme() {
 
     private static class get_runtime_stats_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_runtime_stats_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_runtime_stats_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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2268 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<RuntimeStat>(_list2268.size);
-                  @org.apache.thrift.annotation.Nullable RuntimeStat _elem2269;
-                  for (int _i2270 = 0; _i2270 < _list2268.size; ++_i2270)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2269 = new RuntimeStat();
-                    _elem2269.read(iprot);
-                    struct.success.add(_elem2269);
+                    org.apache.thrift.protocol.TList _list2268 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<RuntimeStat>(_list2268.size);
+                    @org.apache.thrift.annotation.Nullable RuntimeStat _elem2269;
+                    for (int _i2270 = 0; _i2270 < _list2268.size; ++_i2270)
+                    {
+                      _elem2269 = new RuntimeStat();
+                      _elem2269.read(iprot);
+                      struct.success.add(_elem2269);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_runtime_stats_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -310504,6 +329823,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_runtime_stats_
     }
 
     private static class get_runtime_stats_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_runtime_stats_resultTupleScheme getScheme() {
         return new get_runtime_stats_resultTupleScheme();
       }
@@ -310538,26 +329858,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_runtime_stats_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_runtime_stats_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2273 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<RuntimeStat>(_list2273.size);
-            @org.apache.thrift.annotation.Nullable RuntimeStat _elem2274;
-            for (int _i2275 = 0; _i2275 < _list2273.size; ++_i2275)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2274 = new RuntimeStat();
-              _elem2274.read(iprot);
-              struct.success.add(_elem2274);
+              org.apache.thrift.protocol.TList _list2273 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<RuntimeStat>(_list2273.size);
+              @org.apache.thrift.annotation.Nullable RuntimeStat _elem2274;
+              for (int _i2275 = 0; _i2275 < _list2273.size; ++_i2275)
+              {
+                _elem2274 = new RuntimeStat();
+                _elem2274.read(iprot);
+                struct.success.add(_elem2274);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -310567,6 +329892,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_specs_args implements org.apache.thrift.TBase<get_partitions_with_specs_args, get_partitions_with_specs_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_with_specs_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_with_specs_args");
 
@@ -310628,10 +329954,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -310666,6 +329994,7 @@ public get_partitions_with_specs_args(get_partitions_with_specs_args other) {
       }
     }
 
+    @Override
     public get_partitions_with_specs_args deepCopy() {
       return new get_partitions_with_specs_args(this);
     }
@@ -310699,6 +330028,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -310713,6 +330043,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -310723,6 +330054,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -310793,14 +330125,17 @@ public int compareTo(get_partitions_with_specs_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -310846,6 +330181,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_with_specs_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_specs_argsStandardScheme getScheme() {
         return new get_partitions_with_specs_argsStandardScheme();
       }
@@ -310853,34 +330189,41 @@ public get_partitions_with_specs_argsStandardScheme getScheme() {
 
     private static class get_partitions_with_specs_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_with_specs_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_with_specs_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetPartitionsRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetPartitionsRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_with_specs_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -310897,6 +330240,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_wit
     }
 
     private static class get_partitions_with_specs_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_specs_argsTupleScheme getScheme() {
         return new get_partitions_with_specs_argsTupleScheme();
       }
@@ -310919,12 +330263,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_with
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_with_specs_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 GetPartitionsRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetPartitionsRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -310934,6 +330283,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_partitions_with_specs_result implements org.apache.thrift.TBase<get_partitions_with_specs_result, get_partitions_with_specs_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_partitions_with_specs_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_partitions_with_specs_result");
 
@@ -311000,10 +330350,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -311045,6 +330397,7 @@ public get_partitions_with_specs_result(get_partitions_with_specs_result other)
       }
     }
 
+    @Override
     public get_partitions_with_specs_result deepCopy() {
       return new get_partitions_with_specs_result(this);
     }
@@ -311103,6 +330456,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -311125,6 +330479,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -311138,6 +330493,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -311233,10 +330589,12 @@ public int compareTo(get_partitions_with_specs_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -311294,6 +330652,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_partitions_with_specs_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_specs_resultStandardScheme getScheme() {
         return new get_partitions_with_specs_resultStandardScheme();
       }
@@ -311301,43 +330660,50 @@ public get_partitions_with_specs_resultStandardScheme getScheme() {
 
     private static class get_partitions_with_specs_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_partitions_with_specs_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_partitions_with_specs_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 GetPartitionsResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetPartitionsResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_with_specs_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -311359,6 +330725,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_partitions_wit
     }
 
     private static class get_partitions_with_specs_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_partitions_with_specs_resultTupleScheme getScheme() {
         return new get_partitions_with_specs_resultTupleScheme();
       }
@@ -311387,17 +330754,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_partitions_with
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_partitions_with_specs_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.success = new GetPartitionsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new GetPartitionsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -311407,6 +330779,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_poll_args implements org.apache.thrift.TBase<scheduled_query_poll_args, scheduled_query_poll_args._Fields>, java.io.Serializable, Cloneable, Comparable<scheduled_query_poll_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scheduled_query_poll_args");
 
@@ -311468,10 +330841,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -311506,6 +330881,7 @@ public scheduled_query_poll_args(scheduled_query_poll_args other) {
       }
     }
 
+    @Override
     public scheduled_query_poll_args deepCopy() {
       return new scheduled_query_poll_args(this);
     }
@@ -311539,6 +330915,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -311553,6 +330930,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -311563,6 +330941,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -311633,14 +331012,17 @@ public int compareTo(scheduled_query_poll_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -311686,6 +331068,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class scheduled_query_poll_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_poll_argsStandardScheme getScheme() {
         return new scheduled_query_poll_argsStandardScheme();
       }
@@ -311693,34 +331076,41 @@ public scheduled_query_poll_argsStandardScheme getScheme() {
 
     private static class scheduled_query_poll_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<scheduled_query_poll_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, scheduled_query_poll_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new ScheduledQueryPollRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new ScheduledQueryPollRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_poll_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -311737,6 +331127,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_po
     }
 
     private static class scheduled_query_poll_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_poll_argsTupleScheme getScheme() {
         return new scheduled_query_poll_argsTupleScheme();
       }
@@ -311759,12 +331150,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, scheduled_query_pol
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, scheduled_query_poll_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 ScheduledQueryPollRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ScheduledQueryPollRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -311774,6 +331170,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_poll_result implements org.apache.thrift.TBase<scheduled_query_poll_result, scheduled_query_poll_result._Fields>, java.io.Serializable, Cloneable, Comparable<scheduled_query_poll_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scheduled_query_poll_result");
 
@@ -311840,10 +331237,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -311885,6 +331284,7 @@ public scheduled_query_poll_result(scheduled_query_poll_result other) {
       }
     }
 
+    @Override
     public scheduled_query_poll_result deepCopy() {
       return new scheduled_query_poll_result(this);
     }
@@ -311943,6 +331343,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -311965,6 +331366,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -311978,6 +331380,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -312073,10 +331476,12 @@ public int compareTo(scheduled_query_poll_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -312134,6 +331539,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class scheduled_query_poll_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_poll_resultStandardScheme getScheme() {
         return new scheduled_query_poll_resultStandardScheme();
       }
@@ -312141,43 +331547,50 @@ public scheduled_query_poll_resultStandardScheme getScheme() {
 
     private static class scheduled_query_poll_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<scheduled_query_poll_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, scheduled_query_poll_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 ScheduledQueryPollResponse();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ScheduledQueryPollResponse();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_poll_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -312199,6 +331612,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_po
     }
 
     private static class scheduled_query_poll_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_poll_resultTupleScheme getScheme() {
         return new scheduled_query_poll_resultTupleScheme();
       }
@@ -312227,17 +331641,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, scheduled_query_pol
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, scheduled_query_poll_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.success = new ScheduledQueryPollResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new ScheduledQueryPollResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -312247,6 +331666,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_maintenance_args implements org.apache.thrift.TBase<scheduled_query_maintenance_args, scheduled_query_maintenance_args._Fields>, java.io.Serializable, Cloneable, Comparable<scheduled_query_maintenance_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scheduled_query_maintenance_args");
 
@@ -312308,10 +331728,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -312346,6 +331768,7 @@ public scheduled_query_maintenance_args(scheduled_query_maintenance_args other)
       }
     }
 
+    @Override
     public scheduled_query_maintenance_args deepCopy() {
       return new scheduled_query_maintenance_args(this);
     }
@@ -312379,6 +331802,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -312393,6 +331817,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -312403,6 +331828,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -312473,14 +331899,17 @@ public int compareTo(scheduled_query_maintenance_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -312526,6 +331955,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class scheduled_query_maintenance_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_maintenance_argsStandardScheme getScheme() {
         return new scheduled_query_maintenance_argsStandardScheme();
       }
@@ -312533,34 +331963,41 @@ public scheduled_query_maintenance_argsStandardScheme getScheme() {
 
     private static class scheduled_query_maintenance_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<scheduled_query_maintenance_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, scheduled_query_maintenance_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new ScheduledQueryMaintenanceRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new ScheduledQueryMaintenanceRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_maintenance_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -312577,6 +332014,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_ma
     }
 
     private static class scheduled_query_maintenance_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_maintenance_argsTupleScheme getScheme() {
         return new scheduled_query_maintenance_argsTupleScheme();
       }
@@ -312599,12 +332037,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, scheduled_query_mai
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, scheduled_query_maintenance_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 ScheduledQueryMaintenanceRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 ScheduledQueryMaintenanceRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -312614,6 +332057,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_maintenance_result implements org.apache.thrift.TBase<scheduled_query_maintenance_result, scheduled_query_maintenance_result._Fields>, java.io.Serializable, Cloneable, Comparable<scheduled_query_maintenance_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scheduled_query_maintenance_result");
 
@@ -312690,10 +332134,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -312749,6 +332195,7 @@ public scheduled_query_maintenance_result(scheduled_query_maintenance_result oth
       }
     }
 
+    @Override
     public scheduled_query_maintenance_result deepCopy() {
       return new scheduled_query_maintenance_result(this);
     }
@@ -312857,6 +332304,7 @@ public void setO4IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -312895,6 +332343,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -312914,6 +332363,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -313059,10 +332509,12 @@ public int compareTo(scheduled_query_maintenance_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -313133,6 +332585,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class scheduled_query_maintenance_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_maintenance_resultStandardScheme getScheme() {
         return new scheduled_query_maintenance_resultStandardScheme();
       }
@@ -313140,61 +332593,68 @@ public scheduled_query_maintenance_resultStandardScheme getScheme() {
 
     private static class scheduled_query_maintenance_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<scheduled_query_maintenance_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, scheduled_query_maintenance_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 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;
-            case 3: // O3
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o3 = new AlreadyExistsException();
-                struct.o3.read(iprot);
-                struct.setO3IsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // O4
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o4 = new InvalidInputException();
-                struct.o4.read(iprot);
-                struct.setO4IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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;
+              case 3: // O3
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o3 = new AlreadyExistsException();
+                  struct.o3.read(iprot);
+                  struct.setO3IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 4: // O4
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o4 = new InvalidInputException();
+                  struct.o4.read(iprot);
+                  struct.setO4IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_maintenance_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -313226,6 +332686,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_ma
     }
 
     private static class scheduled_query_maintenance_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_maintenance_resultTupleScheme getScheme() {
         return new scheduled_query_maintenance_resultTupleScheme();
       }
@@ -313266,27 +332727,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, scheduled_query_mai
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, scheduled_query_maintenance_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(4);
-        if (incoming.get(0)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new NoSuchObjectException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.o3 = new AlreadyExistsException();
-          struct.o3.read(iprot);
-          struct.setO3IsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.o4 = new InvalidInputException();
-          struct.o4.read(iprot);
-          struct.setO4IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(4);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new NoSuchObjectException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+          if (incoming.get(2)) {
+            struct.o3 = new AlreadyExistsException();
+            struct.o3.read(iprot);
+            struct.setO3IsSet(true);
+          }
+          if (incoming.get(3)) {
+            struct.o4 = new InvalidInputException();
+            struct.o4.read(iprot);
+            struct.setO4IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -313296,6 +332762,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_progress_args implements org.apache.thrift.TBase<scheduled_query_progress_args, scheduled_query_progress_args._Fields>, java.io.Serializable, Cloneable, Comparable<scheduled_query_progress_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scheduled_query_progress_args");
 
@@ -313357,10 +332824,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -313395,6 +332864,7 @@ public scheduled_query_progress_args(scheduled_query_progress_args other) {
       }
     }
 
+    @Override
     public scheduled_query_progress_args deepCopy() {
       return new scheduled_query_progress_args(this);
     }
@@ -313428,6 +332898,7 @@ public void setInfoIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case INFO:
@@ -313442,6 +332913,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case INFO:
@@ -313452,6 +332924,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -313522,14 +332995,17 @@ public int compareTo(scheduled_query_progress_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -313575,6 +333051,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class scheduled_query_progress_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_progress_argsStandardScheme getScheme() {
         return new scheduled_query_progress_argsStandardScheme();
       }
@@ -313582,34 +333059,41 @@ public scheduled_query_progress_argsStandardScheme getScheme() {
 
     private static class scheduled_query_progress_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<scheduled_query_progress_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, scheduled_query_progress_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;
-          }
-          switch (schemeField.id) {
-            case 1: // INFO
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.info = new ScheduledQueryProgressInfo();
-                struct.info.read(iprot);
-                struct.setInfoIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // INFO
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.info = new ScheduledQueryProgressInfo();
+                  struct.info.read(iprot);
+                  struct.setInfoIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_progress_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -313626,6 +333110,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_pr
     }
 
     private static class scheduled_query_progress_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_progress_argsTupleScheme getScheme() {
         return new scheduled_query_progress_argsTupleScheme();
       }
@@ -313648,12 +333133,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, scheduled_query_pro
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, scheduled_query_progress_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.info = new ScheduledQueryProgressInfo();
-          struct.info.read(iprot);
-          struct.setInfoIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.info = new ScheduledQueryProgressInfo();
+            struct.info.read(iprot);
+            struct.setInfoIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -313663,6 +333153,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class scheduled_query_progress_result implements org.apache.thrift.TBase<scheduled_query_progress_result, scheduled_query_progress_result._Fields>, java.io.Serializable, Cloneable, Comparable<scheduled_query_progress_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scheduled_query_progress_result");
 
@@ -313729,10 +333220,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -313774,6 +333267,7 @@ public scheduled_query_progress_result(scheduled_query_progress_result other) {
       }
     }
 
+    @Override
     public scheduled_query_progress_result deepCopy() {
       return new scheduled_query_progress_result(this);
     }
@@ -313832,6 +333326,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -313854,6 +333349,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -313867,6 +333363,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -313962,10 +333459,12 @@ public int compareTo(scheduled_query_progress_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -314020,6 +333519,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class scheduled_query_progress_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_progress_resultStandardScheme getScheme() {
         return new scheduled_query_progress_resultStandardScheme();
       }
@@ -314027,43 +333527,50 @@ public scheduled_query_progress_resultStandardScheme getScheme() {
 
     private static class scheduled_query_progress_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<scheduled_query_progress_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, scheduled_query_progress_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 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 InvalidOperationException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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 InvalidOperationException();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_progress_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -314085,6 +333592,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, scheduled_query_pr
     }
 
     private static class scheduled_query_progress_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public scheduled_query_progress_resultTupleScheme getScheme() {
         return new scheduled_query_progress_resultTupleScheme();
       }
@@ -314113,17 +333621,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, scheduled_query_pro
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, scheduled_query_progress_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new InvalidOperationException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new InvalidOperationException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -314133,6 +333646,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_scheduled_query_args implements org.apache.thrift.TBase<get_scheduled_query_args, get_scheduled_query_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_scheduled_query_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_scheduled_query_args");
 
@@ -314194,10 +333708,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -314232,6 +333748,7 @@ public get_scheduled_query_args(get_scheduled_query_args other) {
       }
     }
 
+    @Override
     public get_scheduled_query_args deepCopy() {
       return new get_scheduled_query_args(this);
     }
@@ -314265,6 +333782,7 @@ public void setScheduleKeyIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SCHEDULE_KEY:
@@ -314279,6 +333797,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SCHEDULE_KEY:
@@ -314289,6 +333808,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -314359,14 +333879,17 @@ public int compareTo(get_scheduled_query_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -314412,6 +333935,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_scheduled_query_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_scheduled_query_argsStandardScheme getScheme() {
         return new get_scheduled_query_argsStandardScheme();
       }
@@ -314419,34 +333943,41 @@ public get_scheduled_query_argsStandardScheme getScheme() {
 
     private static class get_scheduled_query_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_scheduled_query_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_scheduled_query_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;
-          }
-          switch (schemeField.id) {
-            case 1: // SCHEDULE_KEY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.scheduleKey = new ScheduledQueryKey();
-                struct.scheduleKey.read(iprot);
-                struct.setScheduleKeyIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // SCHEDULE_KEY
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.scheduleKey = new ScheduledQueryKey();
+                  struct.scheduleKey.read(iprot);
+                  struct.setScheduleKeyIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_scheduled_query_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -314463,6 +333994,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_scheduled_quer
     }
 
     private static class get_scheduled_query_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_scheduled_query_argsTupleScheme getScheme() {
         return new get_scheduled_query_argsTupleScheme();
       }
@@ -314485,12 +334017,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_scheduled_query
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_scheduled_query_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.scheduleKey = new ScheduledQueryKey();
-          struct.scheduleKey.read(iprot);
-          struct.setScheduleKeyIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.scheduleKey = new ScheduledQueryKey();
+            struct.scheduleKey.read(iprot);
+            struct.setScheduleKeyIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -314500,6 +334037,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_scheduled_query_result implements org.apache.thrift.TBase<get_scheduled_query_result, get_scheduled_query_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_scheduled_query_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_scheduled_query_result");
 
@@ -314571,10 +334109,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -314623,6 +334163,7 @@ public get_scheduled_query_result(get_scheduled_query_result other) {
       }
     }
 
+    @Override
     public get_scheduled_query_result deepCopy() {
       return new get_scheduled_query_result(this);
     }
@@ -314706,6 +334247,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -314736,6 +334278,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -314752,6 +334295,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -314872,10 +334416,12 @@ public int compareTo(get_scheduled_query_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -314941,6 +334487,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_scheduled_query_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_scheduled_query_resultStandardScheme getScheme() {
         return new get_scheduled_query_resultStandardScheme();
       }
@@ -314948,52 +334495,59 @@ public get_scheduled_query_resultStandardScheme getScheme() {
 
     private static class get_scheduled_query_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_scheduled_query_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_scheduled_query_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 ScheduledQuery();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ScheduledQuery();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_scheduled_query_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -315020,6 +334574,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_scheduled_quer
     }
 
     private static class get_scheduled_query_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_scheduled_query_resultTupleScheme getScheme() {
         return new get_scheduled_query_resultTupleScheme();
       }
@@ -315054,22 +334609,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_scheduled_query
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_scheduled_query_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 ScheduledQuery();
-          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);
+        prot.incrementRecursionDepth();
+        try {
+          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 ScheduledQuery();
+            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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -315079,6 +334639,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_replication_metrics_args implements org.apache.thrift.TBase<add_replication_metrics_args, add_replication_metrics_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_replication_metrics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_replication_metrics_args");
 
@@ -315140,10 +334701,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -315178,6 +334741,7 @@ public add_replication_metrics_args(add_replication_metrics_args other) {
       }
     }
 
+    @Override
     public add_replication_metrics_args deepCopy() {
       return new add_replication_metrics_args(this);
     }
@@ -315211,6 +334775,7 @@ public void setReplicationMetricListIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REPLICATION_METRIC_LIST:
@@ -315225,6 +334790,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REPLICATION_METRIC_LIST:
@@ -315235,6 +334801,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -315305,14 +334872,17 @@ public int compareTo(add_replication_metrics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -315358,6 +334928,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_replication_metrics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_replication_metrics_argsStandardScheme getScheme() {
         return new add_replication_metrics_argsStandardScheme();
       }
@@ -315365,34 +334936,41 @@ public add_replication_metrics_argsStandardScheme getScheme() {
 
     private static class add_replication_metrics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_replication_metrics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_replication_metrics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // REPLICATION_METRIC_LIST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.replicationMetricList = new ReplicationMetricList();
-                struct.replicationMetricList.read(iprot);
-                struct.setReplicationMetricListIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REPLICATION_METRIC_LIST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.replicationMetricList = new ReplicationMetricList();
+                  struct.replicationMetricList.read(iprot);
+                  struct.setReplicationMetricListIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_replication_metrics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -315409,6 +334987,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_replication_me
     }
 
     private static class add_replication_metrics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_replication_metrics_argsTupleScheme getScheme() {
         return new add_replication_metrics_argsTupleScheme();
       }
@@ -315431,12 +335010,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_replication_met
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_replication_metrics_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.replicationMetricList = new ReplicationMetricList();
-          struct.replicationMetricList.read(iprot);
-          struct.setReplicationMetricListIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.replicationMetricList = new ReplicationMetricList();
+            struct.replicationMetricList.read(iprot);
+            struct.setReplicationMetricListIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -315446,6 +335030,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_replication_metrics_result implements org.apache.thrift.TBase<add_replication_metrics_result, add_replication_metrics_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_replication_metrics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_replication_metrics_result");
 
@@ -315507,10 +335092,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -315545,6 +335132,7 @@ public add_replication_metrics_result(add_replication_metrics_result other) {
       }
     }
 
+    @Override
     public add_replication_metrics_result deepCopy() {
       return new add_replication_metrics_result(this);
     }
@@ -315578,6 +335166,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -315592,6 +335181,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -315602,6 +335192,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -315672,10 +335263,12 @@ public int compareTo(add_replication_metrics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -315722,6 +335315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_replication_metrics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_replication_metrics_resultStandardScheme getScheme() {
         return new add_replication_metrics_resultStandardScheme();
       }
@@ -315729,34 +335323,41 @@ public add_replication_metrics_resultStandardScheme getScheme() {
 
     private static class add_replication_metrics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_replication_metrics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, add_replication_metrics_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 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_replication_metrics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -315773,6 +335374,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_replication_me
     }
 
     private static class add_replication_metrics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_replication_metrics_resultTupleScheme getScheme() {
         return new add_replication_metrics_resultTupleScheme();
       }
@@ -315795,12 +335397,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_replication_met
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, add_replication_metrics_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.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -315810,6 +335417,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replication_metrics_args implements org.apache.thrift.TBase<get_replication_metrics_args, get_replication_metrics_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_replication_metrics_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replication_metrics_args");
 
@@ -315871,10 +335479,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -315909,6 +335519,7 @@ public get_replication_metrics_args(get_replication_metrics_args other) {
       }
     }
 
+    @Override
     public get_replication_metrics_args deepCopy() {
       return new get_replication_metrics_args(this);
     }
@@ -315942,6 +335553,7 @@ public void setRqstIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case RQST:
@@ -315956,6 +335568,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case RQST:
@@ -315966,6 +335579,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -316036,14 +335650,17 @@ public int compareTo(get_replication_metrics_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -316089,6 +335706,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_replication_metrics_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replication_metrics_argsStandardScheme getScheme() {
         return new get_replication_metrics_argsStandardScheme();
       }
@@ -316096,34 +335714,41 @@ public get_replication_metrics_argsStandardScheme getScheme() {
 
     private static class get_replication_metrics_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_replication_metrics_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_replication_metrics_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;
-          }
-          switch (schemeField.id) {
-            case 1: // RQST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.rqst = new GetReplicationMetricsRequest();
-                struct.rqst.read(iprot);
-                struct.setRqstIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // RQST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.rqst = new GetReplicationMetricsRequest();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_replication_metrics_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -316140,6 +335765,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replication_me
     }
 
     private static class get_replication_metrics_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replication_metrics_argsTupleScheme getScheme() {
         return new get_replication_metrics_argsTupleScheme();
       }
@@ -316162,12 +335788,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_replication_met
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_replication_metrics_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 GetReplicationMetricsRequest();
-          struct.rqst.read(iprot);
-          struct.setRqstIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetReplicationMetricsRequest();
+            struct.rqst.read(iprot);
+            struct.setRqstIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -316177,6 +335808,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replication_metrics_result implements org.apache.thrift.TBase<get_replication_metrics_result, get_replication_metrics_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_replication_metrics_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replication_metrics_result");
 
@@ -316243,10 +335875,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -316288,6 +335922,7 @@ public get_replication_metrics_result(get_replication_metrics_result other) {
       }
     }
 
+    @Override
     public get_replication_metrics_result deepCopy() {
       return new get_replication_metrics_result(this);
     }
@@ -316346,6 +335981,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -316368,6 +336004,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -316381,6 +336018,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -316476,10 +336114,12 @@ public int compareTo(get_replication_metrics_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -316537,6 +336177,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_replication_metrics_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replication_metrics_resultStandardScheme getScheme() {
         return new get_replication_metrics_resultStandardScheme();
       }
@@ -316544,43 +336185,50 @@ public get_replication_metrics_resultStandardScheme getScheme() {
 
     private static class get_replication_metrics_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_replication_metrics_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_replication_metrics_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 ReplicationMetricList();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ReplicationMetricList();
+                  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;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_replication_metrics_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -316602,6 +336250,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replication_me
     }
 
     private static class get_replication_metrics_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replication_metrics_resultTupleScheme getScheme() {
         return new get_replication_metrics_resultTupleScheme();
       }
@@ -316630,17 +336279,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_replication_met
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_replication_metrics_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.success = new ReplicationMetricList();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new ReplicationMetricList();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -316650,6 +336304,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_req_args implements org.apache.thrift.TBase<get_open_txns_req_args, get_open_txns_req_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_open_txns_req_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_open_txns_req_args");
 
@@ -316711,10 +336366,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -316749,6 +336406,7 @@ public get_open_txns_req_args(get_open_txns_req_args other) {
       }
     }
 
+    @Override
     public get_open_txns_req_args deepCopy() {
       return new get_open_txns_req_args(this);
     }
@@ -316782,6 +336440,7 @@ public void setGetOpenTxnsRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case GET_OPEN_TXNS_REQUEST:
@@ -316796,6 +336455,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case GET_OPEN_TXNS_REQUEST:
@@ -316806,6 +336466,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -316876,14 +336537,17 @@ public int compareTo(get_open_txns_req_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -316929,6 +336593,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_open_txns_req_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_req_argsStandardScheme getScheme() {
         return new get_open_txns_req_argsStandardScheme();
       }
@@ -316936,34 +336601,41 @@ public get_open_txns_req_argsStandardScheme getScheme() {
 
     private static class get_open_txns_req_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_open_txns_req_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_open_txns_req_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;
-          }
-          switch (schemeField.id) {
-            case 1: // GET_OPEN_TXNS_REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.getOpenTxnsRequest = new GetOpenTxnsRequest();
-                struct.getOpenTxnsRequest.read(iprot);
-                struct.setGetOpenTxnsRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // GET_OPEN_TXNS_REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.getOpenTxnsRequest = new GetOpenTxnsRequest();
+                  struct.getOpenTxnsRequest.read(iprot);
+                  struct.setGetOpenTxnsRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_req_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -316980,6 +336652,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_req_
     }
 
     private static class get_open_txns_req_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_req_argsTupleScheme getScheme() {
         return new get_open_txns_req_argsTupleScheme();
       }
@@ -317002,12 +336675,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_open_txns_req_a
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_open_txns_req_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.getOpenTxnsRequest = new GetOpenTxnsRequest();
-          struct.getOpenTxnsRequest.read(iprot);
-          struct.setGetOpenTxnsRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.getOpenTxnsRequest = new GetOpenTxnsRequest();
+            struct.getOpenTxnsRequest.read(iprot);
+            struct.setGetOpenTxnsRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -317017,6 +336695,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_open_txns_req_result implements org.apache.thrift.TBase<get_open_txns_req_result, get_open_txns_req_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_open_txns_req_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_open_txns_req_result");
 
@@ -317078,10 +336757,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -317116,6 +336797,7 @@ public get_open_txns_req_result(get_open_txns_req_result other) {
       }
     }
 
+    @Override
     public get_open_txns_req_result deepCopy() {
       return new get_open_txns_req_result(this);
     }
@@ -317149,6 +336831,7 @@ public void setSuccessIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -317163,6 +336846,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -317173,6 +336857,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -317243,10 +336928,12 @@ public int compareTo(get_open_txns_req_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -317296,6 +336983,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_open_txns_req_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_req_resultStandardScheme getScheme() {
         return new get_open_txns_req_resultStandardScheme();
       }
@@ -317303,34 +336991,41 @@ public get_open_txns_req_resultStandardScheme getScheme() {
 
     private static class get_open_txns_req_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_open_txns_req_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_open_txns_req_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 GetOpenTxnsResponse();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 GetOpenTxnsResponse();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_req_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -317347,6 +337042,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_open_txns_req_
     }
 
     private static class get_open_txns_req_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_open_txns_req_resultTupleScheme getScheme() {
         return new get_open_txns_req_resultTupleScheme();
       }
@@ -317369,12 +337065,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_open_txns_req_r
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_open_txns_req_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.success = new GetOpenTxnsResponse();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetOpenTxnsResponse();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -317384,6 +337085,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure_args implements org.apache.thrift.TBase<create_stored_procedure_args, create_stored_procedure_args._Fields>, java.io.Serializable, Cloneable, Comparable<create_stored_procedure_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_stored_procedure_args");
 
@@ -317445,10 +337147,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -317483,6 +337187,7 @@ public create_stored_procedure_args(create_stored_procedure_args other) {
       }
     }
 
+    @Override
     public create_stored_procedure_args deepCopy() {
       return new create_stored_procedure_args(this);
     }
@@ -317516,6 +337221,7 @@ public void setProcIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case PROC:
@@ -317530,6 +337236,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case PROC:
@@ -317540,6 +337247,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -317610,14 +337318,17 @@ public int compareTo(create_stored_procedure_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -317663,6 +337374,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_stored_procedure_argsStandardScheme getScheme() {
         return new create_stored_procedure_argsStandardScheme();
       }
@@ -317670,34 +337382,41 @@ public create_stored_procedure_argsStandardScheme getScheme() {
 
     private static class create_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_stored_procedure_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // PROC
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.proc = new StoredProcedure();
-                struct.proc.read(iprot);
-                struct.setProcIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // PROC
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.proc = new StoredProcedure();
+                  struct.proc.read(iprot);
+                  struct.setProcIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -317714,6 +337433,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_proc
     }
 
     private static class create_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_stored_procedure_argsTupleScheme getScheme() {
         return new create_stored_procedure_argsTupleScheme();
       }
@@ -317736,12 +337456,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_proce
 
       @Override
       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(1);
-        if (incoming.get(0)) {
-          struct.proc = new StoredProcedure();
-          struct.proc.read(iprot);
-          struct.setProcIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -317751,6 +337476,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure_result implements org.apache.thrift.TBase<create_stored_procedure_result, create_stored_procedure_result._Fields>, java.io.Serializable, Cloneable, Comparable<create_stored_procedure_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_stored_procedure_result");
 
@@ -317817,10 +337543,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -317862,6 +337590,7 @@ public create_stored_procedure_result(create_stored_procedure_result other) {
       }
     }
 
+    @Override
     public create_stored_procedure_result deepCopy() {
       return new create_stored_procedure_result(this);
     }
@@ -317920,6 +337649,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -317942,6 +337672,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -317955,6 +337686,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -318050,10 +337782,12 @@ public int compareTo(create_stored_procedure_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -318108,6 +337842,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class create_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_stored_procedure_resultStandardScheme getScheme() {
         return new create_stored_procedure_resultStandardScheme();
       }
@@ -318115,43 +337850,50 @@ public create_stored_procedure_resultStandardScheme getScheme() {
 
     private static class create_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<create_stored_procedure_result> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            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: // O2
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o2 = new MetaException();
-                struct.o2.read(iprot);
-                struct.setO2IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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: // 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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -318173,6 +337915,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_proc
     }
 
     private static class create_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public create_stored_procedure_resultTupleScheme getScheme() {
         return new create_stored_procedure_resultTupleScheme();
       }
@@ -318201,17 +337944,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_proce
 
       @Override
       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.o1 = new NoSuchObjectException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o2 = new MetaException();
-          struct.o2.read(iprot);
-          struct.setO2IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.o1 = new NoSuchObjectException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o2 = new MetaException();
+            struct.o2.read(iprot);
+            struct.setO2IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -318221,6 +337969,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_args implements org.apache.thrift.TBase<get_stored_procedure_args, get_stored_procedure_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_stored_procedure_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_args");
 
@@ -318282,10 +338031,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -318320,6 +338071,7 @@ public get_stored_procedure_args(get_stored_procedure_args other) {
       }
     }
 
+    @Override
     public get_stored_procedure_args deepCopy() {
       return new get_stored_procedure_args(this);
     }
@@ -318353,6 +338105,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -318367,6 +338120,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -318377,6 +338131,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -318447,14 +338202,17 @@ public int compareTo(get_stored_procedure_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -318500,6 +338258,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_stored_procedure_argsStandardScheme getScheme() {
         return new get_stored_procedure_argsStandardScheme();
       }
@@ -318507,34 +338266,41 @@ public get_stored_procedure_argsStandardScheme getScheme() {
 
     private static class get_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_stored_procedure_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new StoredProcedureRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -318551,6 +338317,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedu
     }
 
     private static class get_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_stored_procedure_argsTupleScheme getScheme() {
         return new get_stored_procedure_argsTupleScheme();
       }
@@ -318573,12 +338340,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedur
 
       @Override
       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)) {
-          struct.request = new StoredProcedureRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -318588,6 +338360,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_result implements org.apache.thrift.TBase<get_stored_procedure_result, get_stored_procedure_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_stored_procedure_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_result");
 
@@ -318659,10 +338432,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -318711,6 +338486,7 @@ public get_stored_procedure_result(get_stored_procedure_result other) {
       }
     }
 
+    @Override
     public get_stored_procedure_result deepCopy() {
       return new get_stored_procedure_result(this);
     }
@@ -318794,6 +338570,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -318824,6 +338601,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -318840,6 +338618,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -318960,10 +338739,12 @@ public int compareTo(get_stored_procedure_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -319029,6 +338810,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_stored_procedure_resultStandardScheme getScheme() {
         return new get_stored_procedure_resultStandardScheme();
       }
@@ -319036,52 +338818,59 @@ public get_stored_procedure_resultStandardScheme getScheme() {
 
     private static class get_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_stored_procedure_result> {
 
+      @Override
       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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -319108,6 +338897,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedu
     }
 
     private static class get_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_stored_procedure_resultTupleScheme getScheme() {
         return new get_stored_procedure_resultTupleScheme();
       }
@@ -319142,22 +338932,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedur
 
       @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);
+        prot.incrementRecursionDepth();
+        try {
+          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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -319167,6 +338962,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_args implements org.apache.thrift.TBase<drop_stored_procedure_args, drop_stored_procedure_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_stored_procedure_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_args");
 
@@ -319228,10 +339024,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -319266,6 +339064,7 @@ public drop_stored_procedure_args(drop_stored_procedure_args other) {
       }
     }
 
+    @Override
     public drop_stored_procedure_args deepCopy() {
       return new drop_stored_procedure_args(this);
     }
@@ -319299,6 +339098,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -319313,6 +339113,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -319323,6 +339124,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -319393,14 +339195,17 @@ public int compareTo(drop_stored_procedure_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -319446,6 +339251,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_stored_procedure_argsStandardScheme getScheme() {
         return new drop_stored_procedure_argsStandardScheme();
       }
@@ -319453,34 +339259,41 @@ public drop_stored_procedure_argsStandardScheme getScheme() {
 
     private static class drop_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_stored_procedure_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new StoredProcedureRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -319497,6 +339310,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_proced
     }
 
     private static class drop_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_stored_procedure_argsTupleScheme getScheme() {
         return new drop_stored_procedure_argsTupleScheme();
       }
@@ -319519,12 +339333,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedu
 
       @Override
       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.request = new StoredProcedureRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -319534,6 +339353,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_result implements org.apache.thrift.TBase<drop_stored_procedure_result, drop_stored_procedure_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_stored_procedure_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_result");
 
@@ -319595,10 +339415,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -319633,6 +339455,7 @@ public drop_stored_procedure_result(drop_stored_procedure_result other) {
       }
     }
 
+    @Override
     public drop_stored_procedure_result deepCopy() {
       return new drop_stored_procedure_result(this);
     }
@@ -319666,6 +339489,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -319680,6 +339504,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -319690,6 +339515,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -319760,10 +339586,12 @@ public int compareTo(drop_stored_procedure_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -319810,6 +339638,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_stored_procedure_resultStandardScheme getScheme() {
         return new drop_stored_procedure_resultStandardScheme();
       }
@@ -319817,34 +339646,41 @@ public drop_stored_procedure_resultStandardScheme getScheme() {
 
     private static class drop_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_stored_procedure_result> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -319861,6 +339697,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_proced
     }
 
     private static class drop_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_stored_procedure_resultTupleScheme getScheme() {
         return new drop_stored_procedure_resultTupleScheme();
       }
@@ -319883,12 +339720,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedu
 
       @Override
       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(1);
-        if (incoming.get(0)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -319898,6 +339740,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @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<get_all_stored_procedures_args, get_all_stored_procedures_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_stored_procedures_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_args");
 
@@ -319959,10 +339802,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -319997,6 +339842,7 @@ public get_all_stored_procedures_args(get_all_stored_procedures_args other) {
       }
     }
 
+    @Override
     public get_all_stored_procedures_args deepCopy() {
       return new get_all_stored_procedures_args(this);
     }
@@ -320030,6 +339876,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -320044,6 +339891,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -320054,6 +339902,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -320124,14 +339973,17 @@ public int compareTo(get_all_stored_procedures_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -320177,6 +340029,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_stored_procedures_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_stored_procedures_argsStandardScheme getScheme() {
         return new get_all_stored_procedures_argsStandardScheme();
       }
@@ -320184,34 +340037,41 @@ public get_all_stored_procedures_argsStandardScheme getScheme() {
 
     private static class get_all_stored_procedures_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_stored_procedures_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new ListStoredProcedureRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new ListStoredProcedureRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -320228,6 +340088,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_pro
     }
 
     private static class get_all_stored_procedures_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_stored_procedures_argsTupleScheme getScheme() {
         return new get_all_stored_procedures_argsTupleScheme();
       }
@@ -320250,12 +340111,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_proc
 
       @Override
       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 ListStoredProcedureRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -320265,6 +340131,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @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<get_all_stored_procedures_result, get_all_stored_procedures_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_stored_procedures_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_result");
 
@@ -320331,10 +340198,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -320378,6 +340247,7 @@ public get_all_stored_procedures_result(get_all_stored_procedures_result other)
       }
     }
 
+    @Override
     public get_all_stored_procedures_result deepCopy() {
       return new get_all_stored_procedures_result(this);
     }
@@ -320452,6 +340322,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -320474,6 +340345,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -320487,6 +340359,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -320582,10 +340455,12 @@ public int compareTo(get_all_stored_procedures_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -320640,6 +340515,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_stored_procedures_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_stored_procedures_resultStandardScheme getScheme() {
         return new get_all_stored_procedures_resultStandardScheme();
       }
@@ -320647,52 +340523,59 @@ public get_all_stored_procedures_resultStandardScheme getScheme() {
 
     private static class get_all_stored_procedures_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_stored_procedures_result> {
 
+      @Override
       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)
-        {
-          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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2276 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2276.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2277;
-                  for (int _i2278 = 0; _i2278 < _list2276.size; ++_i2278)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2277 = iprot.readString();
-                    struct.success.add(_elem2277);
+                    org.apache.thrift.protocol.TList _list2276 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2276.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2277;
+                    for (int _i2278 = 0; _i2278 < _list2276.size; ++_i2278)
+                    {
+                      _elem2277 = iprot.readString();
+                      struct.success.add(_elem2277);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -320721,6 +340604,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_pro
     }
 
     private static class get_all_stored_procedures_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_stored_procedures_resultTupleScheme getScheme() {
         return new get_all_stored_procedures_resultTupleScheme();
       }
@@ -320755,25 +340639,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_proc
 
       @Override
       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(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2281 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2281.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2282;
-            for (int _i2283 = 0; _i2283 < _list2281.size; ++_i2283)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2282 = iprot.readString();
-              struct.success.add(_elem2282);
+              org.apache.thrift.protocol.TList _list2281 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2281.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2282;
+              for (int _i2283 = 0; _i2283 < _list2281.size; ++_i2283)
+              {
+                _elem2282 = iprot.readString();
+                struct.success.add(_elem2282);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -320783,6 +340672,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_args implements org.apache.thrift.TBase<find_package_args, find_package_args._Fields>, java.io.Serializable, Cloneable, Comparable<find_package_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_args");
 
@@ -320844,10 +340734,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -320882,6 +340774,7 @@ public find_package_args(find_package_args other) {
       }
     }
 
+    @Override
     public find_package_args deepCopy() {
       return new find_package_args(this);
     }
@@ -320915,6 +340808,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -320929,6 +340823,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -320939,6 +340834,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -321009,14 +340905,17 @@ public int compareTo(find_package_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -321062,6 +340961,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_package_argsStandardScheme getScheme() {
         return new find_package_argsStandardScheme();
       }
@@ -321069,34 +340969,41 @@ public find_package_argsStandardScheme getScheme() {
 
     private static class find_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_package_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetPackageRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetPackageRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -321113,6 +341020,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_args
     }
 
     private static class find_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_package_argsTupleScheme getScheme() {
         return new find_package_argsTupleScheme();
       }
@@ -321135,12 +341043,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_package_args s
 
       @Override
       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 GetPackageRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -321150,6 +341063,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_result implements org.apache.thrift.TBase<find_package_result, find_package_result._Fields>, java.io.Serializable, Cloneable, Comparable<find_package_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_result");
 
@@ -321221,10 +341135,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -321273,6 +341189,7 @@ public find_package_result(find_package_result other) {
       }
     }
 
+    @Override
     public find_package_result deepCopy() {
       return new find_package_result(this);
     }
@@ -321356,6 +341273,7 @@ public void setO2IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -321386,6 +341304,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -321402,6 +341321,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -321522,10 +341442,12 @@ public int compareTo(find_package_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -321591,6 +341513,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class find_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_package_resultStandardScheme getScheme() {
         return new find_package_resultStandardScheme();
       }
@@ -321598,52 +341521,59 @@ public find_package_resultStandardScheme getScheme() {
 
     private static class find_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<find_package_result> {
 
+      @Override
       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)
-        {
-          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 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();
-                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 { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 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();
+                  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);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -321670,6 +341600,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_resul
     }
 
     private static class find_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public find_package_resultTupleScheme getScheme() {
         return new find_package_resultTupleScheme();
       }
@@ -321704,22 +341635,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, find_package_result
 
       @Override
       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(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);
+        prot.incrementRecursionDepth();
+        try {
+          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 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);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -321729,6 +341665,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_args implements org.apache.thrift.TBase<add_package_args, add_package_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_package_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_args");
 
@@ -321790,10 +341727,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -321828,6 +341767,7 @@ public add_package_args(add_package_args other) {
       }
     }
 
+    @Override
     public add_package_args deepCopy() {
       return new add_package_args(this);
     }
@@ -321861,6 +341801,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -321875,6 +341816,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -321885,6 +341827,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -321955,14 +341898,17 @@ public int compareTo(add_package_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -322008,6 +341954,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_package_argsStandardScheme getScheme() {
         return new add_package_argsStandardScheme();
       }
@@ -322015,34 +341962,41 @@ public add_package_argsStandardScheme getScheme() {
 
     private static class add_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_package_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new AddPackageRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new AddPackageRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -322059,6 +342013,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_args s
     }
 
     private static class add_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_package_argsTupleScheme getScheme() {
         return new add_package_argsTupleScheme();
       }
@@ -322081,12 +342036,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_package_args st
 
       @Override
       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 AddPackageRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.request = new AddPackageRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -322096,6 +342056,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_result implements org.apache.thrift.TBase<add_package_result, add_package_result._Fields>, java.io.Serializable, Cloneable, Comparable<add_package_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_result");
 
@@ -322157,10 +342118,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -322195,6 +342158,7 @@ public add_package_result(add_package_result other) {
       }
     }
 
+    @Override
     public add_package_result deepCopy() {
       return new add_package_result(this);
     }
@@ -322228,6 +342192,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -322242,6 +342207,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -322252,6 +342218,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -322322,10 +342289,12 @@ public int compareTo(add_package_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -322372,6 +342341,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class add_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_package_resultStandardScheme getScheme() {
         return new add_package_resultStandardScheme();
       }
@@ -322379,34 +342349,41 @@ public add_package_resultStandardScheme getScheme() {
 
     private static class add_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<add_package_result> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -322423,6 +342400,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_result
     }
 
     private static class add_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public add_package_resultTupleScheme getScheme() {
         return new add_package_resultTupleScheme();
       }
@@ -322445,12 +342423,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_package_result
 
       @Override
       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(1);
-        if (incoming.get(0)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -322460,6 +342443,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_args implements org.apache.thrift.TBase<get_all_packages_args, get_all_packages_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_packages_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_args");
 
@@ -322521,10 +342505,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -322559,6 +342545,7 @@ public get_all_packages_args(get_all_packages_args other) {
       }
     }
 
+    @Override
     public get_all_packages_args deepCopy() {
       return new get_all_packages_args(this);
     }
@@ -322592,6 +342579,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -322606,6 +342594,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -322616,6 +342605,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -322686,14 +342676,17 @@ public int compareTo(get_all_packages_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -322739,6 +342732,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_packages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_packages_argsStandardScheme getScheme() {
         return new get_all_packages_argsStandardScheme();
       }
@@ -322746,34 +342740,41 @@ public get_all_packages_argsStandardScheme getScheme() {
 
     private static class get_all_packages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_packages_args> {
 
+      @Override
       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)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new ListPackageRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new ListPackageRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -322790,6 +342791,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_a
     }
 
     private static class get_all_packages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_packages_argsTupleScheme getScheme() {
         return new get_all_packages_argsTupleScheme();
       }
@@ -322812,12 +342814,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_ar
 
       @Override
       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 ListPackageRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.request = new ListPackageRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -322827,6 +342834,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_result implements org.apache.thrift.TBase<get_all_packages_result, get_all_packages_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_packages_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_result");
 
@@ -322893,10 +342901,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -322940,6 +342950,7 @@ public get_all_packages_result(get_all_packages_result other) {
       }
     }
 
+    @Override
     public get_all_packages_result deepCopy() {
       return new get_all_packages_result(this);
     }
@@ -323014,6 +343025,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -323036,6 +343048,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -323049,6 +343062,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -323144,10 +343158,12 @@ public int compareTo(get_all_packages_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -323202,6 +343218,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_packages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_packages_resultStandardScheme getScheme() {
         return new get_all_packages_resultStandardScheme();
       }
@@ -323209,52 +343226,59 @@ public get_all_packages_resultStandardScheme getScheme() {
 
     private static class get_all_packages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_packages_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2284 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<java.lang.String>(_list2284.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _elem2285;
-                  for (int _i2286 = 0; _i2286 < _list2284.size; ++_i2286)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2285 = iprot.readString();
-                    struct.success.add(_elem2285);
+                    org.apache.thrift.protocol.TList _list2284 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<java.lang.String>(_list2284.size);
+                    @org.apache.thrift.annotation.Nullable java.lang.String _elem2285;
+                    for (int _i2286 = 0; _i2286 < _list2284.size; ++_i2286)
+                    {
+                      _elem2285 = iprot.readString();
+                      struct.success.add(_elem2285);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -323283,6 +343307,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_r
     }
 
     private static class get_all_packages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_packages_resultTupleScheme getScheme() {
         return new get_all_packages_resultTupleScheme();
       }
@@ -323317,25 +343342,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_re
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2289 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.success = new java.util.ArrayList<java.lang.String>(_list2289.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _elem2290;
-            for (int _i2291 = 0; _i2291 < _list2289.size; ++_i2291)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2290 = iprot.readString();
-              struct.success.add(_elem2290);
+              org.apache.thrift.protocol.TList _list2289 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+              struct.success = new java.util.ArrayList<java.lang.String>(_list2289.size);
+              @org.apache.thrift.annotation.Nullable java.lang.String _elem2290;
+              for (int _i2291 = 0; _i2291 < _list2289.size; ++_i2291)
+              {
+                _elem2290 = iprot.readString();
+                struct.success.add(_elem2290);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -323345,6 +343375,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_args implements org.apache.thrift.TBase<drop_package_args, drop_package_args._Fields>, java.io.Serializable, Cloneable, Comparable<drop_package_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_args");
 
@@ -323406,10 +343437,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -323444,6 +343477,7 @@ public drop_package_args(drop_package_args other) {
       }
     }
 
+    @Override
     public drop_package_args deepCopy() {
       return new drop_package_args(this);
     }
@@ -323477,6 +343511,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -323491,6 +343526,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -323501,6 +343537,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -323571,14 +343608,17 @@ public int compareTo(drop_package_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -323624,6 +343664,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_package_argsStandardScheme getScheme() {
         return new drop_package_argsStandardScheme();
       }
@@ -323631,34 +343672,41 @@ public drop_package_argsStandardScheme getScheme() {
 
     private static class drop_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_package_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new DropPackageRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new DropPackageRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -323675,6 +343723,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_args
     }
 
     private static class drop_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_package_argsTupleScheme getScheme() {
         return new drop_package_argsTupleScheme();
       }
@@ -323697,12 +343746,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_args s
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.request = new DropPackageRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.request = new DropPackageRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -323712,6 +343766,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_result implements org.apache.thrift.TBase<drop_package_result, drop_package_result._Fields>, java.io.Serializable, Cloneable, Comparable<drop_package_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_result");
 
@@ -323773,10 +343828,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -323811,6 +343868,7 @@ public drop_package_result(drop_package_result other) {
       }
     }
 
+    @Override
     public drop_package_result deepCopy() {
       return new drop_package_result(this);
     }
@@ -323844,6 +343902,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case O1:
@@ -323858,6 +343917,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case O1:
@@ -323868,6 +343928,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -323938,10 +343999,12 @@ public int compareTo(drop_package_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -323988,6 +344051,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class drop_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_package_resultStandardScheme getScheme() {
         return new drop_package_resultStandardScheme();
       }
@@ -323995,34 +344059,41 @@ public drop_package_resultStandardScheme getScheme() {
 
     private static class drop_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<drop_package_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -324039,6 +344110,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_resul
     }
 
     private static class drop_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public drop_package_resultTupleScheme getScheme() {
         return new drop_package_resultTupleScheme();
       }
@@ -324061,12 +344133,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_result
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -324076,6 +344153,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_args implements org.apache.thrift.TBase<get_all_write_event_info_args, get_all_write_event_info_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_write_event_info_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_args");
 
@@ -324137,10 +344215,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -324175,6 +344255,7 @@ public get_all_write_event_info_args(get_all_write_event_info_args other) {
       }
     }
 
+    @Override
     public get_all_write_event_info_args deepCopy() {
       return new get_all_write_event_info_args(this);
     }
@@ -324208,6 +344289,7 @@ public void setRequestIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case REQUEST:
@@ -324222,6 +344304,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case REQUEST:
@@ -324232,6 +344315,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -324302,14 +344386,17 @@ public int compareTo(get_all_write_event_info_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -324355,6 +344442,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_write_event_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_write_event_info_argsStandardScheme getScheme() {
         return new get_all_write_event_info_argsStandardScheme();
       }
@@ -324362,34 +344450,41 @@ public get_all_write_event_info_argsStandardScheme getScheme() {
 
     private static class get_all_write_event_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_write_event_info_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // REQUEST
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.request = new GetAllWriteEventInfoRequest();
-                struct.request.read(iprot);
-                struct.setRequestIsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 1: // REQUEST
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.request = new GetAllWriteEventInfoRequest();
+                  struct.request.read(iprot);
+                  struct.setRequestIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -324406,6 +344501,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_even
     }
 
     private static class get_all_write_event_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_write_event_info_argsTupleScheme getScheme() {
         return new get_all_write_event_info_argsTupleScheme();
       }
@@ -324428,12 +344524,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.request = new GetAllWriteEventInfoRequest();
-          struct.request.read(iprot);
-          struct.setRequestIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          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 GetAllWriteEventInfoRequest();
+            struct.request.read(iprot);
+            struct.setRequestIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -324443,6 +344544,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_result implements org.apache.thrift.TBase<get_all_write_event_info_result, get_all_write_event_info_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_all_write_event_info_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_result");
 
@@ -324509,10 +344611,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -324559,6 +344663,7 @@ public get_all_write_event_info_result(get_all_write_event_info_result other) {
       }
     }
 
+    @Override
     public get_all_write_event_info_result deepCopy() {
       return new get_all_write_event_info_result(this);
     }
@@ -324633,6 +344738,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -324655,6 +344761,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -324668,6 +344775,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -324763,10 +344871,12 @@ public int compareTo(get_all_write_event_info_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -324821,6 +344931,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_all_write_event_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_write_event_info_resultStandardScheme getScheme() {
         return new get_all_write_event_info_resultStandardScheme();
       }
@@ -324828,53 +344939,60 @@ public get_all_write_event_info_resultStandardScheme getScheme() {
 
     private static class get_all_write_event_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_all_write_event_info_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          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.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list2292 = iprot.readListBegin();
-                  struct.success = new java.util.ArrayList<WriteEventInfo>(_list2292.size);
-                  @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2293;
-                  for (int _i2294 = 0; _i2294 < _list2292.size; ++_i2294)
+        iprot.incrementRecursionDepth();
+        try {
+          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.LIST) {
                   {
-                    _elem2293 = new WriteEventInfo();
-                    _elem2293.read(iprot);
-                    struct.success.add(_elem2293);
+                    org.apache.thrift.protocol.TList _list2292 = iprot.readListBegin();
+                    struct.success = new java.util.ArrayList<WriteEventInfo>(_list2292.size);
+                    @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2293;
+                    for (int _i2294 = 0; _i2294 < _list2292.size; ++_i2294)
+                    {
+                      _elem2293 = new WriteEventInfo();
+                      _elem2293.read(iprot);
+                      struct.success.add(_elem2293);
+                    }
+                    iprot.readListEnd();
                   }
-                  iprot.readListEnd();
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                 }
-                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 { 
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -324903,6 +345021,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_even
     }
 
     private static class get_all_write_event_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_all_write_event_info_resultTupleScheme getScheme() {
         return new get_all_write_event_info_resultTupleScheme();
       }
@@ -324937,26 +345056,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list2297 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.success = new java.util.ArrayList<WriteEventInfo>(_list2297.size);
-            @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2298;
-            for (int _i2299 = 0; _i2299 < _list2297.size; ++_i2299)
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
             {
-              _elem2298 = new WriteEventInfo();
-              _elem2298.read(iprot);
-              struct.success.add(_elem2298);
+              org.apache.thrift.protocol.TList _list2297 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+              struct.success = new java.util.ArrayList<WriteEventInfo>(_list2297.size);
+              @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2298;
+              for (int _i2299 = 0; _i2299 < _list2297.size; ++_i2299)
+              {
+                _elem2298 = new WriteEventInfo();
+                _elem2298.read(iprot);
+                struct.success.add(_elem2298);
+              }
             }
+            struct.setSuccessIsSet(true);
           }
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -324966,6 +345090,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_args implements org.apache.thrift.TBase<get_replayed_txns_for_policy_args, get_replayed_txns_for_policy_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_replayed_txns_for_policy_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_args");
 
@@ -325027,10 +345152,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -325065,6 +345192,7 @@ public get_replayed_txns_for_policy_args(get_replayed_txns_for_policy_args other
       }
     }
 
+    @Override
     public get_replayed_txns_for_policy_args deepCopy() {
       return new get_replayed_txns_for_policy_args(this);
     }
@@ -325098,6 +345226,7 @@ public void setPolicyNameIsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case POLICY_NAME:
@@ -325112,6 +345241,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case POLICY_NAME:
@@ -325122,6 +345252,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -325192,14 +345323,17 @@ public int compareTo(get_replayed_txns_for_policy_args other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
       scheme(oprot).write(oprot, this);
     }
@@ -325242,6 +345376,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_replayed_txns_for_policy_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replayed_txns_for_policy_argsStandardScheme getScheme() {
         return new get_replayed_txns_for_policy_argsStandardScheme();
       }
@@ -325249,33 +345384,40 @@ public get_replayed_txns_for_policy_argsStandardScheme getScheme() {
 
     private static class get_replayed_txns_for_policy_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_replayed_txns_for_policy_args> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // POLICY_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.policyName = iprot.readString();
-                struct.setPolicyNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
+        iprot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TField schemeField;
+          iprot.readStructBegin();
+          while (true)
+          {
+            schemeField = iprot.readFieldBegin();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
               break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            switch (schemeField.id) {
+              case 1: // POLICY_NAME
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                  struct.policyName = iprot.readString();
+                  struct.setPolicyNameIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -325292,6 +345434,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_
     }
 
     private static class get_replayed_txns_for_policy_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replayed_txns_for_policy_argsTupleScheme getScheme() {
         return new get_replayed_txns_for_policy_argsTupleScheme();
       }
@@ -325314,11 +345457,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.policyName = iprot.readString();
-          struct.setPolicyNameIsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(1);
+          if (incoming.get(0)) {
+            struct.policyName = iprot.readString();
+            struct.setPolicyNameIsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
@@ -325328,6 +345476,7 @@ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.
     }
   }
 
+  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
   @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_result implements org.apache.thrift.TBase<get_replayed_txns_for_policy_result, get_replayed_txns_for_policy_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_replayed_txns_for_policy_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_result");
 
@@ -325394,10 +345543,12 @@ public static _Fields findByName(java.lang.String name) {
         _fieldName = fieldName;
       }
 
+      @Override
       public short getThriftFieldId() {
         return _thriftId;
       }
 
+      @Override
       public java.lang.String getFieldName() {
         return _fieldName;
       }
@@ -325439,6 +345590,7 @@ public get_replayed_txns_for_policy_result(get_replayed_txns_for_policy_result o
       }
     }
 
+    @Override
     public get_replayed_txns_for_policy_result deepCopy() {
       return new get_replayed_txns_for_policy_result(this);
     }
@@ -325497,6 +345649,7 @@ public void setO1IsSet(boolean value) {
       }
     }
 
+    @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
@@ -325519,6 +345672,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
@@ -325532,6 +345686,7 @@ public java.lang.Object getFieldValue(_Fields field) {
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    @Override
     public boolean isSet(_Fields field) {
       if (field == null) {
         throw new java.lang.IllegalArgumentException();
@@ -325627,10 +345782,12 @@ public int compareTo(get_replayed_txns_for_policy_result other) {
     }
 
     @org.apache.thrift.annotation.Nullable
+    @Override
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
       scheme(iprot).read(iprot, this);
     }
@@ -325688,6 +345845,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
     }
 
     private static class get_replayed_txns_for_policy_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replayed_txns_for_policy_resultStandardScheme getScheme() {
         return new get_replayed_txns_for_policy_resultStandardScheme();
       }
@@ -325695,43 +345853,50 @@ public get_replayed_txns_for_policy_resultStandardScheme getScheme() {
 
     private static class get_replayed_txns_for_policy_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<get_replayed_txns_for_policy_result> {
 
+      @Override
       public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          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 ReplayedTxnsForPolicyResult();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // O1
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.o1 = new MetaException();
-                struct.o1.read(iprot);
-                struct.setO1IsSet(true);
-              } else { 
+        iprot.incrementRecursionDepth();
+        try {
+          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 ReplayedTxnsForPolicyResult();
+                  struct.success.read(iprot);
+                  struct.setSuccessIsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              case 1: // O1
+                if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                  struct.o1 = new MetaException();
+                  struct.o1.read(iprot);
+                  struct.setO1IsSet(true);
+                } else { 
+                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                }
+                break;
+              default:
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            iprot.readFieldEnd();
           }
-          iprot.readFieldEnd();
+          iprot.readStructEnd();
+          struct.validate();
+        } finally {
+          iprot.decrementRecursionDepth();
         }
-        iprot.readStructEnd();
-        struct.validate();
       }
 
+      @Override
       public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
@@ -325753,6 +345918,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_
     }
 
     private static class get_replayed_txns_for_policy_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      @Override
       public get_replayed_txns_for_policy_resultTupleScheme getScheme() {
         return new get_replayed_txns_for_policy_resultTupleScheme();
       }
@@ -325781,17 +345947,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_f
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          struct.success = new ReplayedTxnsForPolicyResult();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.o1 = new MetaException();
-          struct.o1.read(iprot);
-          struct.setO1IsSet(true);
+        prot.incrementRecursionDepth();
+        try {
+          org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+          java.util.BitSet incoming = iprot.readBitSet(2);
+          if (incoming.get(0)) {
+            struct.success = new ReplayedTxnsForPolicyResult();
+            struct.success.read(iprot);
+            struct.setSuccessIsSet(true);
+          }
+          if (incoming.get(1)) {
+            struct.o1 = new MetaException();
+            struct.o1.read(iprot);
+            struct.setO1IsSet(true);
+          }
+        } finally {
+          prot.decrementRecursionDepth();
         }
       }
     }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Timestamp.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Timestamp.java
index 4adc0a0e1e68..45ea4e27f2c5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Timestamp.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Timestamp.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Timestamp implements org.apache.thrift.TBase<Timestamp, Timestamp._Fields>, java.io.Serializable, Cloneable, Comparable<Timestamp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Timestamp");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public Timestamp(Timestamp other) {
     this.secondsSinceEpoch = other.secondsSinceEpoch;
   }
 
+  @Override
   public Timestamp deepCopy() {
     return new Timestamp(this);
   }
@@ -141,6 +144,7 @@ public void setSecondsSinceEpochIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SECONDSSINCEEPOCH_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SECONDS_SINCE_EPOCH:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SECONDS_SINCE_EPOCH:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(Timestamp other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TimestampStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TimestampStandardScheme getScheme() {
       return new TimestampStandardScheme();
     }
@@ -292,33 +302,40 @@ public TimestampStandardScheme getScheme() {
 
   private static class TimestampStandardScheme extends org.apache.thrift.scheme.StandardScheme<Timestamp> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Timestamp 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 1: // SECONDS_SINCE_EPOCH
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.secondsSinceEpoch = iprot.readI64();
-              struct.setSecondsSinceEpochIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // SECONDS_SINCE_EPOCH
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.secondsSinceEpoch = iprot.readI64();
+                struct.setSecondsSinceEpochIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Timestamp struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Timestamp struct)
   }
 
   private static class TimestampTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TimestampTupleScheme getScheme() {
       return new TimestampTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Timestamp struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Timestamp struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.secondsSinceEpoch = iprot.readI64();
-      struct.setSecondsSinceEpochIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.secondsSinceEpoch = iprot.readI64();
+        struct.setSecondsSinceEpochIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TimestampColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TimestampColumnStatsData.java
index 0fc71367920b..77fef60e2e59 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TimestampColumnStatsData.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TimestampColumnStatsData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TimestampColumnStatsData implements org.apache.thrift.TBase<TimestampColumnStatsData, TimestampColumnStatsData._Fields>, java.io.Serializable, Cloneable, Comparable<TimestampColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimestampColumnStatsData");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __NUMNULLS_ISSET_ID = 0;
   private static final int __NUMDVS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
+  private static final _Fields[] optionals = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE,_Fields.BIT_VECTORS,_Fields.HISTOGRAM};
   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);
@@ -162,6 +164,7 @@ public TimestampColumnStatsData(TimestampColumnStatsData other) {
     }
   }
 
+  @Override
   public TimestampColumnStatsData deepCopy() {
     return new TimestampColumnStatsData(this);
   }
@@ -334,6 +337,7 @@ public void setHistogramIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOW_VALUE:
@@ -396,6 +400,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOW_VALUE:
@@ -421,6 +426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -612,14 +618,17 @@ public int compareTo(TimestampColumnStatsData other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -718,6 +727,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TimestampColumnStatsDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TimestampColumnStatsDataStandardScheme getScheme() {
       return new TimestampColumnStatsDataStandardScheme();
     }
@@ -725,75 +735,82 @@ public TimestampColumnStatsDataStandardScheme getScheme() {
 
   private static class TimestampColumnStatsDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<TimestampColumnStatsData> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TimestampColumnStatsData 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 1: // LOW_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.lowValue = new Timestamp();
-              struct.lowValue.read(iprot);
-              struct.setLowValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HIGH_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.highValue = new Timestamp();
-              struct.highValue.read(iprot);
-              struct.setHighValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NUM_NULLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numNulls = iprot.readI64();
-              struct.setNumNullsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // LOW_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.lowValue = new Timestamp();
+                struct.lowValue.read(iprot);
+                struct.setLowValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // HIGH_VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.highValue = new Timestamp();
+                struct.highValue.read(iprot);
+                struct.setHighValueIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NUM_NULLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numNulls = iprot.readI64();
+                struct.setNumNullsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // NUM_DVS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.numDVs = iprot.readI64();
+                struct.setNumDVsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // BIT_VECTORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.bitVectors = iprot.readBinary();
+                struct.setBitVectorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // HISTOGRAM
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.histogram = iprot.readBinary();
+                struct.setHistogramIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // NUM_DVS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.numDVs = iprot.readI64();
-              struct.setNumDVsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // BIT_VECTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.bitVectors = iprot.readBinary();
-              struct.setBitVectorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // HISTOGRAM
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.histogram = iprot.readBinary();
-              struct.setHistogramIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TimestampColumnStatsData struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -839,6 +856,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TimestampColumnSta
   }
 
   private static class TimestampColumnStatsDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TimestampColumnStatsDataTupleScheme getScheme() {
       return new TimestampColumnStatsDataTupleScheme();
     }
@@ -881,29 +899,34 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TimestampColumnStat
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TimestampColumnStatsData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.numNulls = iprot.readI64();
-      struct.setNumNullsIsSet(true);
-      struct.numDVs = iprot.readI64();
-      struct.setNumDVsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.lowValue = new Timestamp();
-        struct.lowValue.read(iprot);
-        struct.setLowValueIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.highValue = new Timestamp();
-        struct.highValue.read(iprot);
-        struct.setHighValueIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.bitVectors = iprot.readBinary();
-        struct.setBitVectorsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.histogram = iprot.readBinary();
-        struct.setHistogramIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.numNulls = iprot.readI64();
+        struct.setNumNullsIsSet(true);
+        struct.numDVs = iprot.readI64();
+        struct.setNumDVsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.lowValue = new Timestamp();
+          struct.lowValue.read(iprot);
+          struct.setLowValueIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.highValue = new Timestamp();
+          struct.highValue.read(iprot);
+          struct.setHighValueIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.bitVectors = iprot.readBinary();
+          struct.setBitVectorsIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.histogram = iprot.readBinary();
+          struct.setHistogramIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java
index 60b56a6b0a5c..7f1979ab5e84 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TruncateTableRequest implements org.apache.thrift.TBase<TruncateTableRequest, TruncateTableRequest._Fields>, java.io.Serializable, Cloneable, Comparable<TruncateTableRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TruncateTableRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __WRITEID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PART_NAMES,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.ENVIRONMENT_CONTEXT};
+  private static final _Fields[] optionals = {_Fields.PART_NAMES,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.ENVIRONMENT_CONTEXT};
   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);
@@ -165,6 +167,7 @@ public TruncateTableRequest(TruncateTableRequest other) {
     }
   }
 
+  @Override
   public TruncateTableRequest deepCopy() {
     return new TruncateTableRequest(this);
   }
@@ -338,6 +341,7 @@ public void setEnvironmentContextIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DB_NAME:
@@ -392,6 +396,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DB_NAME:
@@ -417,6 +422,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -612,14 +618,17 @@ public int compareTo(TruncateTableRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -719,6 +728,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TruncateTableRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TruncateTableRequestStandardScheme getScheme() {
       return new TruncateTableRequestStandardScheme();
     }
@@ -726,84 +736,91 @@ public TruncateTableRequestStandardScheme getScheme() {
 
   private static class TruncateTableRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<TruncateTableRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TruncateTableRequest 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 1: // DB_NAME
-            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: // TABLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableName = iprot.readString();
-              struct.setTableNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // PART_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list174 = iprot.readListBegin();
-                struct.partNames = new java.util.ArrayList<java.lang.String>(_list174.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem175;
-                for (int _i176 = 0; _i176 < _list174.size; ++_i176)
+          }
+          switch (schemeField.id) {
+            case 1: // DB_NAME
+              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: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // PART_NAMES
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem175 = iprot.readString();
-                  struct.partNames.add(_elem175);
+                  org.apache.thrift.protocol.TList _list174 = iprot.readListBegin();
+                  struct.partNames = new java.util.ArrayList<java.lang.String>(_list174.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem175;
+                  for (int _i176 = 0; _i176 < _list174.size; ++_i176)
+                  {
+                    _elem175 = iprot.readString();
+                    struct.partNames.add(_elem175);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartNamesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartNamesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // VALID_WRITE_ID_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.validWriteIdList = iprot.readString();
-              struct.setValidWriteIdListIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // ENVIRONMENT_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.environmentContext = new EnvironmentContext();
-              struct.environmentContext.read(iprot);
-              struct.setEnvironmentContextIsSet(true);
-            } else { 
+              break;
+            case 4: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALID_WRITE_ID_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.validWriteIdList = iprot.readString();
+                struct.setValidWriteIdListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // ENVIRONMENT_CONTEXT
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.environmentContext = new EnvironmentContext();
+                struct.environmentContext.read(iprot);
+                struct.setEnvironmentContextIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TruncateTableRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -858,6 +875,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TruncateTableReque
   }
 
   private static class TruncateTableRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TruncateTableRequestTupleScheme getScheme() {
       return new TruncateTableRequestTupleScheme();
     }
@@ -906,37 +924,42 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TruncateTableReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TruncateTableRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tableName = iprot.readString();
-      struct.setTableNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list179 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partNames = new java.util.ArrayList<java.lang.String>(_list179.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem180;
-          for (int _i181 = 0; _i181 < _list179.size; ++_i181)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.dbName = iprot.readString();
+        struct.setDbNameIsSet(true);
+        struct.tableName = iprot.readString();
+        struct.setTableNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
           {
-            _elem180 = iprot.readString();
-            struct.partNames.add(_elem180);
+            org.apache.thrift.protocol.TList _list179 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partNames = new java.util.ArrayList<java.lang.String>(_list179.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem180;
+            for (int _i181 = 0; _i181 < _list179.size; ++_i181)
+            {
+              _elem180 = iprot.readString();
+              struct.partNames.add(_elem180);
+            }
           }
+          struct.setPartNamesIsSet(true);
         }
-        struct.setPartNamesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.writeId = iprot.readI64();
-        struct.setWriteIdIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.validWriteIdList = iprot.readString();
-        struct.setValidWriteIdListIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.environmentContext = new EnvironmentContext();
-        struct.environmentContext.read(iprot);
-        struct.setEnvironmentContextIsSet(true);
+        if (incoming.get(1)) {
+          struct.writeId = iprot.readI64();
+          struct.setWriteIdIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.validWriteIdList = iprot.readString();
+          struct.setValidWriteIdListIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.environmentContext = new EnvironmentContext();
+          struct.environmentContext.read(iprot);
+          struct.setEnvironmentContextIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableResponse.java
index ec29ae6bf490..812625e3b639 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TruncateTableResponse implements org.apache.thrift.TBase<TruncateTableResponse, TruncateTableResponse._Fields>, java.io.Serializable, Cloneable, Comparable<TruncateTableResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TruncateTableResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public TruncateTableResponse() {
   public TruncateTableResponse(TruncateTableResponse other) {
   }
 
+  @Override
   public TruncateTableResponse deepCopy() {
     return new TruncateTableResponse(this);
   }
@@ -97,12 +100,14 @@ public TruncateTableResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(TruncateTableResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TruncateTableResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TruncateTableResponseStandardScheme getScheme() {
       return new TruncateTableResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public TruncateTableResponseStandardScheme getScheme() {
 
   private static class TruncateTableResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<TruncateTableResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TruncateTableResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TruncateTableResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TruncateTableRespo
   }
 
   private static class TruncateTableResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TruncateTableResponseTupleScheme getScheme() {
       return new TruncateTableResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TruncateTableRespon
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TruncateTableResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java
index d1cf1c2f3860..50328e5322b4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TxnAbortedException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TxnAbortedException, TxnAbortedException._Fields>, java.io.Serializable, Cloneable, Comparable<TxnAbortedException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TxnAbortedException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TxnAbortedException(TxnAbortedException other) {
     }
   }
 
+  @Override
   public TxnAbortedException deepCopy() {
     return new TxnAbortedException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TxnAbortedException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TxnAbortedExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnAbortedExceptionStandardScheme getScheme() {
       return new TxnAbortedExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public TxnAbortedExceptionStandardScheme getScheme() {
 
   private static class TxnAbortedExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TxnAbortedException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TxnAbortedException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TxnAbortedException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TxnAbortedExceptio
   }
 
   private static class TxnAbortedExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnAbortedExceptionTupleScheme getScheme() {
       return new TxnAbortedExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TxnAbortedException
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TxnAbortedException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
index 7edd859ade3c..088014528eba 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TxnInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TxnInfo");
 
@@ -113,10 +113,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -128,7 +130,7 @@ public java.lang.String getFieldName() {
   private static final int __STARTEDTIME_ISSET_ID = 2;
   private static final int __LASTHEARTBEATTIME_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.AGENT_INFO,_Fields.HEARTBEAT_COUNT,_Fields.META_INFO,_Fields.STARTED_TIME,_Fields.LAST_HEARTBEAT_TIME};
+  private static final _Fields[] optionals = {_Fields.AGENT_INFO,_Fields.HEARTBEAT_COUNT,_Fields.META_INFO,_Fields.STARTED_TIME,_Fields.LAST_HEARTBEAT_TIME};
   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);
@@ -201,6 +203,7 @@ public TxnInfo(TxnInfo other) {
     this.lastHeartbeatTime = other.lastHeartbeatTime;
   }
 
+  @Override
   public TxnInfo deepCopy() {
     return new TxnInfo(this);
   }
@@ -439,6 +442,7 @@ public void setLastHeartbeatTimeIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTHEARTBEATTIME_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ID:
@@ -517,6 +521,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
@@ -551,6 +556,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -819,14 +825,17 @@ public int compareTo(TxnInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -945,6 +954,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TxnInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnInfoStandardScheme getScheme() {
       return new TxnInfoStandardScheme();
     }
@@ -952,97 +962,104 @@ public TxnInfoStandardScheme getScheme() {
 
   private static class TxnInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TxnInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TxnInfo 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 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.hadoop.hive.metastore.api.TxnState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // USER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.user = iprot.readString();
-              struct.setUserIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // HOSTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hostname = iprot.readString();
-              struct.setHostnameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // AGENT_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.agentInfo = iprot.readString();
-              struct.setAgentInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // HEARTBEAT_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.heartbeatCount = iprot.readI32();
-              struct.setHeartbeatCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // META_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.metaInfo = iprot.readString();
-              struct.setMetaInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 8: // STARTED_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.startedTime = iprot.readI64();
-              struct.setStartedTimeIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.id = iprot.readI64();
+                struct.setIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.state = org.apache.hadoop.hive.metastore.api.TxnState.findByValue(iprot.readI32());
+                struct.setStateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // USER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.user = iprot.readString();
+                struct.setUserIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // HOSTNAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.hostname = iprot.readString();
+                struct.setHostnameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // AGENT_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.agentInfo = iprot.readString();
+                struct.setAgentInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // HEARTBEAT_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.heartbeatCount = iprot.readI32();
+                struct.setHeartbeatCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // META_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.metaInfo = iprot.readString();
+                struct.setMetaInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // STARTED_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.startedTime = iprot.readI64();
+                struct.setStartedTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 9: // LAST_HEARTBEAT_TIME
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lastHeartbeatTime = iprot.readI64();
+                struct.setLastHeartbeatTimeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // LAST_HEARTBEAT_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastHeartbeatTime = iprot.readI64();
-              struct.setLastHeartbeatTimeIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TxnInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1101,6 +1118,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TxnInfo struct) th
   }
 
   private static class TxnInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnInfoTupleScheme getScheme() {
       return new TxnInfoTupleScheme();
     }
@@ -1151,35 +1169,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TxnInfo struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TxnInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.id = iprot.readI64();
-      struct.setIdIsSet(true);
-      struct.state = org.apache.hadoop.hive.metastore.api.TxnState.findByValue(iprot.readI32());
-      struct.setStateIsSet(true);
-      struct.user = iprot.readString();
-      struct.setUserIsSet(true);
-      struct.hostname = iprot.readString();
-      struct.setHostnameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.agentInfo = iprot.readString();
-        struct.setAgentInfoIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.heartbeatCount = iprot.readI32();
-        struct.setHeartbeatCountIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.metaInfo = iprot.readString();
-        struct.setMetaInfoIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.startedTime = iprot.readI64();
-        struct.setStartedTimeIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.lastHeartbeatTime = iprot.readI64();
-        struct.setLastHeartbeatTimeIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.id = iprot.readI64();
+        struct.setIdIsSet(true);
+        struct.state = org.apache.hadoop.hive.metastore.api.TxnState.findByValue(iprot.readI32());
+        struct.setStateIsSet(true);
+        struct.user = iprot.readString();
+        struct.setUserIsSet(true);
+        struct.hostname = iprot.readString();
+        struct.setHostnameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.agentInfo = iprot.readString();
+          struct.setAgentInfoIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.heartbeatCount = iprot.readI32();
+          struct.setHeartbeatCountIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.metaInfo = iprot.readString();
+          struct.setMetaInfoIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.startedTime = iprot.readI64();
+          struct.setStartedTimeIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.lastHeartbeatTime = iprot.readI64();
+          struct.setLastHeartbeatTimeIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java
index 96d661d84693..cdeccd0b11d7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TxnOpenException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TxnOpenException, TxnOpenException._Fields>, java.io.Serializable, Cloneable, Comparable<TxnOpenException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TxnOpenException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public TxnOpenException(TxnOpenException other) {
     }
   }
 
+  @Override
   public TxnOpenException deepCopy() {
     return new TxnOpenException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(TxnOpenException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TxnOpenExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnOpenExceptionStandardScheme getScheme() {
       return new TxnOpenExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public TxnOpenExceptionStandardScheme getScheme() {
 
   private static class TxnOpenExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TxnOpenException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TxnOpenException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TxnOpenException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TxnOpenException s
   }
 
   private static class TxnOpenExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnOpenExceptionTupleScheme getScheme() {
       return new TxnOpenExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TxnOpenException st
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TxnOpenException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java
index 2efd5277dd2d..17a3bb2848a1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TxnState implements org.apache.thrift.TEnum {
   COMMITTED(1),
   ABORTED(2),
@@ -22,6 +22,7 @@ private TxnState(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java
index 88dc46609897..566d44b8e86e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class TxnToWriteId implements org.apache.thrift.TBase<TxnToWriteId, TxnToWriteId._Fields>, java.io.Serializable, Cloneable, Comparable<TxnToWriteId> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TxnToWriteId");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,6 +123,7 @@ public TxnToWriteId(TxnToWriteId other) {
     this.writeId = other.writeId;
   }
 
+  @Override
   public TxnToWriteId deepCopy() {
     return new TxnToWriteId(this);
   }
@@ -177,6 +180,7 @@ public void setWriteIdIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WRITEID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_ID:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_ID:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -303,14 +309,17 @@ public int compareTo(TxnToWriteId other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -363,6 +372,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TxnToWriteIdStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnToWriteIdStandardScheme getScheme() {
       return new TxnToWriteIdStandardScheme();
     }
@@ -370,41 +380,48 @@ public TxnToWriteIdStandardScheme getScheme() {
 
   private static class TxnToWriteIdStandardScheme extends org.apache.thrift.scheme.StandardScheme<TxnToWriteId> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, TxnToWriteId 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 1: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, TxnToWriteId struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -422,6 +439,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TxnToWriteId struc
   }
 
   private static class TxnToWriteIdTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TxnToWriteIdTupleScheme getScheme() {
       return new TxnToWriteIdTupleScheme();
     }
@@ -438,11 +456,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TxnToWriteId struct
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TxnToWriteId struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txnId = iprot.readI64();
-      struct.setTxnIdIsSet(true);
-      struct.writeId = iprot.readI64();
-      struct.setWriteIdIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txnId = iprot.readI64();
+        struct.setTxnIdIsSet(true);
+        struct.writeId = iprot.readI64();
+        struct.setWriteIdIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnType.java
index 8b2aed925c38..d342cd604adc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnType.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum TxnType implements org.apache.thrift.TEnum {
   DEFAULT(0),
   REPL_CREATED(1),
@@ -26,6 +26,7 @@ private TxnType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
index 627ed0a9301d..91405cbe90fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Type implements org.apache.thrift.TBase<Type, Type._Fields>, java.io.Serializable, Cloneable, Comparable<Type> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Type");
 
@@ -84,17 +84,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TYPE1,_Fields.TYPE2,_Fields.FIELDS};
+  private static final _Fields[] optionals = {_Fields.TYPE1,_Fields.TYPE2,_Fields.FIELDS};
   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);
@@ -143,6 +145,7 @@ public Type(Type other) {
     }
   }
 
+  @Override
   public Type deepCopy() {
     return new Type(this);
   }
@@ -267,6 +270,7 @@ public void setFieldsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -305,6 +309,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -324,6 +329,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -469,14 +475,17 @@ public int compareTo(Type other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -549,6 +558,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class TypeStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TypeStandardScheme getScheme() {
       return new TypeStandardScheme();
     }
@@ -556,68 +566,75 @@ public TypeStandardScheme getScheme() {
 
   private static class TypeStandardScheme extends org.apache.thrift.scheme.StandardScheme<Type> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Type 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TYPE1
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.type1 = iprot.readString();
-              struct.setType1IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TYPE2
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.type2 = iprot.readString();
-              struct.setType2IsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // FIELDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list58 = iprot.readListBegin();
-                struct.fields = new java.util.ArrayList<FieldSchema>(_list58.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem59;
-                for (int _i60 = 0; _i60 < _list58.size; ++_i60)
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TYPE1
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.type1 = iprot.readString();
+                struct.setType1IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TYPE2
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.type2 = iprot.readString();
+                struct.setType2IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FIELDS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem59 = new FieldSchema();
-                  _elem59.read(iprot);
-                  struct.fields.add(_elem59);
+                  org.apache.thrift.protocol.TList _list58 = iprot.readListBegin();
+                  struct.fields = new java.util.ArrayList<FieldSchema>(_list58.size);
+                  @org.apache.thrift.annotation.Nullable FieldSchema _elem59;
+                  for (int _i60 = 0; _i60 < _list58.size; ++_i60)
+                  {
+                    _elem59 = new FieldSchema();
+                    _elem59.read(iprot);
+                    struct.fields.add(_elem59);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setFieldsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setFieldsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Type struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -662,6 +679,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Type struct) throw
   }
 
   private static class TypeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public TypeTupleScheme getScheme() {
       return new TypeTupleScheme();
     }
@@ -708,33 +726,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Type struct) throws
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Type struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.type1 = iprot.readString();
-        struct.setType1IsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.type2 = iprot.readString();
-        struct.setType2IsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list63 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.fields = new java.util.ArrayList<FieldSchema>(_list63.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem64;
-          for (int _i65 = 0; _i65 < _list63.size; ++_i65)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.type1 = iprot.readString();
+          struct.setType1IsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.type2 = iprot.readString();
+          struct.setType2IsSet(true);
+        }
+        if (incoming.get(3)) {
           {
-            _elem64 = new FieldSchema();
-            _elem64.read(iprot);
-            struct.fields.add(_elem64);
+            org.apache.thrift.protocol.TList _list63 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.fields = new java.util.ArrayList<FieldSchema>(_list63.size);
+            @org.apache.thrift.annotation.Nullable FieldSchema _elem64;
+            for (int _i65 = 0; _i65 < _list63.size; ++_i65)
+            {
+              _elem64 = new FieldSchema();
+              _elem64.read(iprot);
+              struct.fields.add(_elem64);
+            }
           }
+          struct.setFieldsIsSet(true);
         }
-        struct.setFieldsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java
index 35e8a01d0ee0..9b3f4b1241ff 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UniqueConstraintsRequest implements org.apache.thrift.TBase<UniqueConstraintsRequest, UniqueConstraintsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<UniqueConstraintsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UniqueConstraintsRequest");
 
@@ -79,10 +79,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -131,6 +133,7 @@ public UniqueConstraintsRequest(UniqueConstraintsRequest other) {
     }
   }
 
+  @Override
   public UniqueConstraintsRequest deepCopy() {
     return new UniqueConstraintsRequest(this);
   }
@@ -214,6 +217,7 @@ public void setTbl_nameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CAT_NAME:
@@ -244,6 +248,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CAT_NAME:
@@ -260,6 +265,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -380,14 +386,17 @@ public int compareTo(UniqueConstraintsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -458,6 +467,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UniqueConstraintsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UniqueConstraintsRequestStandardScheme getScheme() {
       return new UniqueConstraintsRequestStandardScheme();
     }
@@ -465,49 +475,56 @@ public UniqueConstraintsRequestStandardScheme getScheme() {
 
   private static class UniqueConstraintsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<UniqueConstraintsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UniqueConstraintsRequest 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 1: // CAT_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catName = iprot.readString();
-              struct.setCatNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // CAT_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catName = iprot.readString();
+                struct.setCatNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db_name = iprot.readString();
+                struct.setDb_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TBL_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tbl_name = iprot.readString();
+                struct.setTbl_nameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UniqueConstraintsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -534,6 +551,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UniqueConstraintsR
   }
 
   private static class UniqueConstraintsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UniqueConstraintsRequestTupleScheme getScheme() {
       return new UniqueConstraintsRequestTupleScheme();
     }
@@ -551,13 +569,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UniqueConstraintsRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UniqueConstraintsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catName = iprot.readString();
-      struct.setCatNameIsSet(true);
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catName = iprot.readString();
+        struct.setCatNameIsSet(true);
+        struct.db_name = iprot.readString();
+        struct.setDb_nameIsSet(true);
+        struct.tbl_name = iprot.readString();
+        struct.setTbl_nameIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java
index 4e265bea1dc8..4c466b8a7a40 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UniqueConstraintsResponse implements org.apache.thrift.TBase<UniqueConstraintsResponse, UniqueConstraintsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<UniqueConstraintsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UniqueConstraintsResponse");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -112,6 +114,7 @@ public UniqueConstraintsResponse(UniqueConstraintsResponse other) {
     }
   }
 
+  @Override
   public UniqueConstraintsResponse deepCopy() {
     return new UniqueConstraintsResponse(this);
   }
@@ -161,6 +164,7 @@ public void setUniqueConstraintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case UNIQUE_CONSTRAINTS:
@@ -175,6 +179,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case UNIQUE_CONSTRAINTS:
@@ -185,6 +190,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -255,14 +261,17 @@ public int compareTo(UniqueConstraintsResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -309,6 +318,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UniqueConstraintsResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UniqueConstraintsResponseStandardScheme getScheme() {
       return new UniqueConstraintsResponseStandardScheme();
     }
@@ -316,44 +326,51 @@ public UniqueConstraintsResponseStandardScheme getScheme() {
 
   private static class UniqueConstraintsResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<UniqueConstraintsResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UniqueConstraintsResponse 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 1: // UNIQUE_CONSTRAINTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list506 = iprot.readListBegin();
-                struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list506.size);
-                @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem507;
-                for (int _i508 = 0; _i508 < _list506.size; ++_i508)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // UNIQUE_CONSTRAINTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem507 = new SQLUniqueConstraint();
-                  _elem507.read(iprot);
-                  struct.uniqueConstraints.add(_elem507);
+                  org.apache.thrift.protocol.TList _list506 = iprot.readListBegin();
+                  struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list506.size);
+                  @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem507;
+                  for (int _i508 = 0; _i508 < _list506.size; ++_i508)
+                  {
+                    _elem507 = new SQLUniqueConstraint();
+                    _elem507.read(iprot);
+                    struct.uniqueConstraints.add(_elem507);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setUniqueConstraintsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setUniqueConstraintsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UniqueConstraintsResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -377,6 +394,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UniqueConstraintsR
   }
 
   private static class UniqueConstraintsResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UniqueConstraintsResponseTupleScheme getScheme() {
       return new UniqueConstraintsResponseTupleScheme();
     }
@@ -398,19 +416,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UniqueConstraintsRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UniqueConstraintsResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list511 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list511.size);
-        @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem512;
-        for (int _i513 = 0; _i513 < _list511.size; ++_i513)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         {
-          _elem512 = new SQLUniqueConstraint();
-          _elem512.read(iprot);
-          struct.uniqueConstraints.add(_elem512);
+          org.apache.thrift.protocol.TList _list511 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list511.size);
+          @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem512;
+          for (int _i513 = 0; _i513 < _list511.size; ++_i513)
+          {
+            _elem512 = new SQLUniqueConstraint();
+            _elem512.read(iprot);
+            struct.uniqueConstraints.add(_elem512);
+          }
         }
+        struct.setUniqueConstraintsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setUniqueConstraintsIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java
index 97fd52660f47..944f406158d3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UnknownDBException extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownDBException, UnknownDBException._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownDBException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownDBException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public UnknownDBException(UnknownDBException other) {
     }
   }
 
+  @Override
   public UnknownDBException deepCopy() {
     return new UnknownDBException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(UnknownDBException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UnknownDBExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnknownDBExceptionStandardScheme getScheme() {
       return new UnknownDBExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public UnknownDBExceptionStandardScheme getScheme() {
 
   private static class UnknownDBExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<UnknownDBException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UnknownDBException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UnknownDBException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UnknownDBException
   }
 
   private static class UnknownDBExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnknownDBExceptionTupleScheme getScheme() {
       return new UnknownDBExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UnknownDBException
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UnknownDBException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java
index 67a79c2de36f..c59f691e806b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UnknownPartitionException extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownPartitionException, UnknownPartitionException._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownPartitionException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownPartitionException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public UnknownPartitionException(UnknownPartitionException other) {
     }
   }
 
+  @Override
   public UnknownPartitionException deepCopy() {
     return new UnknownPartitionException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(UnknownPartitionException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UnknownPartitionExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnknownPartitionExceptionStandardScheme getScheme() {
       return new UnknownPartitionExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public UnknownPartitionExceptionStandardScheme getScheme() {
 
   private static class UnknownPartitionExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<UnknownPartitionException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UnknownPartitionException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UnknownPartitionException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UnknownPartitionEx
   }
 
   private static class UnknownPartitionExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnknownPartitionExceptionTupleScheme getScheme() {
       return new UnknownPartitionExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UnknownPartitionExc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UnknownPartitionException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java
index 68ad6b7fee80..144d98eeb176 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UnknownTableException extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownTableException, UnknownTableException._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownTableException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownTableException");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,6 +109,7 @@ public UnknownTableException(UnknownTableException other) {
     }
   }
 
+  @Override
   public UnknownTableException deepCopy() {
     return new UnknownTableException(this);
   }
@@ -140,6 +143,7 @@ public void setMessageIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
@@ -154,6 +158,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
@@ -164,6 +169,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -234,14 +240,17 @@ public int compareTo(UnknownTableException other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -284,6 +293,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UnknownTableExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnknownTableExceptionStandardScheme getScheme() {
       return new UnknownTableExceptionStandardScheme();
     }
@@ -291,33 +301,40 @@ public UnknownTableExceptionStandardScheme getScheme() {
 
   private static class UnknownTableExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<UnknownTableException> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UnknownTableException 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 1: // MESSAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MESSAGE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.message = iprot.readString();
+                struct.setMessageIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UnknownTableException struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -334,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UnknownTableExcept
   }
 
   private static class UnknownTableExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnknownTableExceptionTupleScheme getScheme() {
       return new UnknownTableExceptionTupleScheme();
     }
@@ -356,11 +374,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UnknownTableExcepti
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UnknownTableException 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.message = iprot.readString();
-        struct.setMessageIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.message = iprot.readString();
+          struct.setMessageIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java
index 4e71f28f3bf9..4d89d53e5863 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UnlockRequest implements org.apache.thrift.TBase<UnlockRequest, UnlockRequest._Fields>, java.io.Serializable, Cloneable, Comparable<UnlockRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnlockRequest");
 
@@ -69,10 +69,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -109,6 +111,7 @@ public UnlockRequest(UnlockRequest other) {
     this.lockid = other.lockid;
   }
 
+  @Override
   public UnlockRequest deepCopy() {
     return new UnlockRequest(this);
   }
@@ -141,6 +144,7 @@ public void setLockidIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOCKID_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCKID:
@@ -155,6 +159,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCKID:
@@ -165,6 +170,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -233,14 +239,17 @@ public int compareTo(UnlockRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -285,6 +294,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UnlockRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnlockRequestStandardScheme getScheme() {
       return new UnlockRequestStandardScheme();
     }
@@ -292,33 +302,40 @@ public UnlockRequestStandardScheme getScheme() {
 
   private static class UnlockRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<UnlockRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UnlockRequest 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 1: // LOCKID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lockid = iprot.readI64();
-              struct.setLockidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // LOCKID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.lockid = iprot.readI64();
+                struct.setLockidIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UnlockRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -333,6 +350,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UnlockRequest stru
   }
 
   private static class UnlockRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UnlockRequestTupleScheme getScheme() {
       return new UnlockRequestTupleScheme();
     }
@@ -348,9 +366,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UnlockRequest struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UnlockRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.lockid = iprot.readI64();
-      struct.setLockidIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.lockid = iprot.readI64();
+        struct.setLockidIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UpdateTransactionalStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UpdateTransactionalStatsRequest.java
index 750c9d3ebbca..bfcd342acfa0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UpdateTransactionalStatsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UpdateTransactionalStatsRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class UpdateTransactionalStatsRequest implements org.apache.thrift.TBase<UpdateTransactionalStatsRequest, UpdateTransactionalStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<UpdateTransactionalStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpdateTransactionalStatsRequest");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -145,6 +147,7 @@ public UpdateTransactionalStatsRequest(UpdateTransactionalStatsRequest other) {
     this.deletedCount = other.deletedCount;
   }
 
+  @Override
   public UpdateTransactionalStatsRequest deepCopy() {
     return new UpdateTransactionalStatsRequest(this);
   }
@@ -249,6 +252,7 @@ public void setDeletedCountIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DELETEDCOUNT_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TABLE_ID:
@@ -287,6 +291,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TABLE_ID:
@@ -306,6 +311,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -443,14 +449,17 @@ public int compareTo(UpdateTransactionalStatsRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -519,6 +528,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class UpdateTransactionalStatsRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UpdateTransactionalStatsRequestStandardScheme getScheme() {
       return new UpdateTransactionalStatsRequestStandardScheme();
     }
@@ -526,57 +536,64 @@ public UpdateTransactionalStatsRequestStandardScheme getScheme() {
 
   private static class UpdateTransactionalStatsRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<UpdateTransactionalStatsRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, UpdateTransactionalStatsRequest 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 1: // TABLE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.tableId = iprot.readI64();
-              struct.setTableIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // INSERT_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.insertCount = iprot.readI64();
-              struct.setInsertCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // UPDATED_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.updatedCount = iprot.readI64();
-              struct.setUpdatedCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // DELETED_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.deletedCount = iprot.readI64();
-              struct.setDeletedCountIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // TABLE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.tableId = iprot.readI64();
+                struct.setTableIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // INSERT_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.insertCount = iprot.readI64();
+                struct.setInsertCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // UPDATED_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.updatedCount = iprot.readI64();
+                struct.setUpdatedCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DELETED_COUNT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.deletedCount = iprot.readI64();
+                struct.setDeletedCountIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, UpdateTransactionalStatsRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -600,6 +617,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UpdateTransactiona
   }
 
   private static class UpdateTransactionalStatsRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public UpdateTransactionalStatsRequestTupleScheme getScheme() {
       return new UpdateTransactionalStatsRequestTupleScheme();
     }
@@ -618,15 +636,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UpdateTransactional
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UpdateTransactionalStatsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.tableId = iprot.readI64();
-      struct.setTableIdIsSet(true);
-      struct.insertCount = iprot.readI64();
-      struct.setInsertCountIsSet(true);
-      struct.updatedCount = iprot.readI64();
-      struct.setUpdatedCountIsSet(true);
-      struct.deletedCount = iprot.readI64();
-      struct.setDeletedCountIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.tableId = iprot.readI64();
+        struct.setTableIdIsSet(true);
+        struct.insertCount = iprot.readI64();
+        struct.setInsertCountIsSet(true);
+        struct.updatedCount = iprot.readI64();
+        struct.setUpdatedCountIsSet(true);
+        struct.deletedCount = iprot.readI64();
+        struct.setDeletedCountIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java
index 566e7f9f9505..b80bbdfef696 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class Version implements org.apache.thrift.TBase<Version, Version._Fields>, java.io.Serializable, Cloneable, Comparable<Version> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Version");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -119,6 +121,7 @@ public Version(Version other) {
     }
   }
 
+  @Override
   public Version deepCopy() {
     return new Version(this);
   }
@@ -177,6 +180,7 @@ public void setCommentsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VERSION:
@@ -199,6 +203,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VERSION:
@@ -212,6 +217,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -307,14 +313,17 @@ public int compareTo(Version other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -365,6 +374,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class VersionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public VersionStandardScheme getScheme() {
       return new VersionStandardScheme();
     }
@@ -372,41 +382,48 @@ public VersionStandardScheme getScheme() {
 
   private static class VersionStandardScheme extends org.apache.thrift.scheme.StandardScheme<Version> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Version 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 1: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.version = iprot.readString();
-              struct.setVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // COMMENTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.comments = iprot.readString();
-              struct.setCommentsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // VERSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.version = iprot.readString();
+                struct.setVersionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // COMMENTS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.comments = iprot.readString();
+                struct.setCommentsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Version struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Version struct) th
   }
 
   private static class VersionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public VersionTupleScheme getScheme() {
       return new VersionTupleScheme();
     }
@@ -456,15 +474,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Version struct) thr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Version 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.version = iprot.readString();
-        struct.setVersionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.comments = iprot.readString();
-        struct.setCommentsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.version = iprot.readString();
+          struct.setVersionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.comments = iprot.readString();
+          struct.setCommentsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java
index 680181eaa321..a39a11e387b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMAlterPoolRequest implements org.apache.thrift.TBase<WMAlterPoolRequest, WMAlterPoolRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMAlterPoolRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMAlterPoolRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.POOL,_Fields.POOL_PATH};
+  private static final _Fields[] optionals = {_Fields.POOL,_Fields.POOL_PATH};
   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);
@@ -111,6 +113,7 @@ public WMAlterPoolRequest(WMAlterPoolRequest other) {
     }
   }
 
+  @Override
   public WMAlterPoolRequest deepCopy() {
     return new WMAlterPoolRequest(this);
   }
@@ -169,6 +172,7 @@ public void setPoolPathIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case POOL:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case POOL:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMAlterPoolRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -364,6 +373,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMAlterPoolRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterPoolRequestStandardScheme getScheme() {
       return new WMAlterPoolRequestStandardScheme();
     }
@@ -371,42 +381,49 @@ public WMAlterPoolRequestStandardScheme getScheme() {
 
   private static class WMAlterPoolRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMAlterPoolRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMAlterPoolRequest 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 1: // POOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.pool = new WMNullablePool();
-              struct.pool.read(iprot);
-              struct.setPoolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolPath = iprot.readString();
-              struct.setPoolPathIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // POOL
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.pool = new WMNullablePool();
+                struct.pool.read(iprot);
+                struct.setPoolIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolPath = iprot.readString();
+                struct.setPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterPoolRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -432,6 +449,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterPoolRequest
   }
 
   private static class WMAlterPoolRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterPoolRequestTupleScheme getScheme() {
       return new WMAlterPoolRequestTupleScheme();
     }
@@ -460,16 +478,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMAlterPoolRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterPoolRequest 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.pool = new WMNullablePool();
-        struct.pool.read(iprot);
-        struct.setPoolIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.poolPath = iprot.readString();
-        struct.setPoolPathIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.pool = new WMNullablePool();
+          struct.pool.read(iprot);
+          struct.setPoolIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.poolPath = iprot.readString();
+          struct.setPoolPathIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java
index 396c57375182..5bae87c8418c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMAlterPoolResponse implements org.apache.thrift.TBase<WMAlterPoolResponse, WMAlterPoolResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMAlterPoolResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMAlterPoolResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMAlterPoolResponse() {
   public WMAlterPoolResponse(WMAlterPoolResponse other) {
   }
 
+  @Override
   public WMAlterPoolResponse deepCopy() {
     return new WMAlterPoolResponse(this);
   }
@@ -97,12 +100,14 @@ public WMAlterPoolResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMAlterPoolResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMAlterPoolResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterPoolResponseStandardScheme getScheme() {
       return new WMAlterPoolResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMAlterPoolResponseStandardScheme getScheme() {
 
   private static class WMAlterPoolResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMAlterPoolResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMAlterPoolResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterPoolResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterPoolRespons
   }
 
   private static class WMAlterPoolResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterPoolResponseTupleScheme getScheme() {
       return new WMAlterPoolResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMAlterPoolResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterPoolResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java
index 14ce05cba6a7..2ab1305ad024 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMAlterResourcePlanRequest implements org.apache.thrift.TBase<WMAlterResourcePlanRequest, WMAlterResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMAlterResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMAlterResourcePlanRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -108,7 +110,7 @@ public java.lang.String getFieldName() {
   private static final int __ISFORCEDEACTIVATE_ISSET_ID = 1;
   private static final int __ISREPLACE_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.RESOURCE_PLAN,_Fields.IS_ENABLE_AND_ACTIVATE,_Fields.IS_FORCE_DEACTIVATE,_Fields.IS_REPLACE,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.RESOURCE_PLAN,_Fields.IS_ENABLE_AND_ACTIVATE,_Fields.IS_FORCE_DEACTIVATE,_Fields.IS_REPLACE,_Fields.NS};
   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);
@@ -150,6 +152,7 @@ public WMAlterResourcePlanRequest(WMAlterResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMAlterResourcePlanRequest deepCopy() {
     return new WMAlterResourcePlanRequest(this);
   }
@@ -305,6 +308,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -359,6 +363,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -384,6 +389,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -579,14 +585,17 @@ public int compareTo(WMAlterResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -674,6 +683,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMAlterResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterResourcePlanRequestStandardScheme getScheme() {
       return new WMAlterResourcePlanRequestStandardScheme();
     }
@@ -681,74 +691,81 @@ public WMAlterResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMAlterResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMAlterResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMAlterResourcePlanRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // RESOURCE_PLAN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.resourcePlan = new WMNullableResourcePlan();
-              struct.resourcePlan.read(iprot);
-              struct.setResourcePlanIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // IS_ENABLE_AND_ACTIVATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isEnableAndActivate = iprot.readBool();
-              struct.setIsEnableAndActivateIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // RESOURCE_PLAN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.resourcePlan = new WMNullableResourcePlan();
+                struct.resourcePlan.read(iprot);
+                struct.setResourcePlanIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // IS_ENABLE_AND_ACTIVATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isEnableAndActivate = iprot.readBool();
+                struct.setIsEnableAndActivateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // IS_FORCE_DEACTIVATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isForceDeactivate = iprot.readBool();
+                struct.setIsForceDeactivateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // IS_REPLACE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isReplace = iprot.readBool();
+                struct.setIsReplaceIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // IS_FORCE_DEACTIVATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isForceDeactivate = iprot.readBool();
-              struct.setIsForceDeactivateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // IS_REPLACE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isReplace = iprot.readBool();
-              struct.setIsReplaceIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -796,6 +813,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterResourcePla
   }
 
   private static class WMAlterResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterResourcePlanRequestTupleScheme getScheme() {
       return new WMAlterResourcePlanRequestTupleScheme();
     }
@@ -848,32 +866,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMAlterResourcePlan
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterResourcePlanRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.resourcePlan = new WMNullableResourcePlan();
-        struct.resourcePlan.read(iprot);
-        struct.setResourcePlanIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.isEnableAndActivate = iprot.readBool();
-        struct.setIsEnableAndActivateIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.isForceDeactivate = iprot.readBool();
-        struct.setIsForceDeactivateIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.isReplace = iprot.readBool();
-        struct.setIsReplaceIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.resourcePlan = new WMNullableResourcePlan();
+          struct.resourcePlan.read(iprot);
+          struct.setResourcePlanIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.isEnableAndActivate = iprot.readBool();
+          struct.setIsEnableAndActivateIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.isForceDeactivate = iprot.readBool();
+          struct.setIsForceDeactivateIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.isReplace = iprot.readBool();
+          struct.setIsReplaceIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java
index f9433820e744..58e01beee073 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMAlterResourcePlanResponse implements org.apache.thrift.TBase<WMAlterResourcePlanResponse, WMAlterResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMAlterResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMAlterResourcePlanResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.FULL_RESOURCE_PLAN};
+  private static final _Fields[] optionals = {_Fields.FULL_RESOURCE_PLAN};
   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);
@@ -101,6 +103,7 @@ public WMAlterResourcePlanResponse(WMAlterResourcePlanResponse other) {
     }
   }
 
+  @Override
   public WMAlterResourcePlanResponse deepCopy() {
     return new WMAlterResourcePlanResponse(this);
   }
@@ -134,6 +137,7 @@ public void setFullResourcePlanIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case FULL_RESOURCE_PLAN:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case FULL_RESOURCE_PLAN:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMAlterResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMAlterResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterResourcePlanResponseStandardScheme getScheme() {
       return new WMAlterResourcePlanResponseStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMAlterResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMAlterResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMAlterResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMAlterResourcePlanResponse 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 1: // FULL_RESOURCE_PLAN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.fullResourcePlan = new WMFullResourcePlan();
-              struct.fullResourcePlan.read(iprot);
-              struct.setFullResourcePlanIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // FULL_RESOURCE_PLAN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.fullResourcePlan = new WMFullResourcePlan();
+                struct.fullResourcePlan.read(iprot);
+                struct.setFullResourcePlanIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterResourcePla
   }
 
   private static class WMAlterResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterResourcePlanResponseTupleScheme getScheme() {
       return new WMAlterResourcePlanResponseTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMAlterResourcePlan
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterResourcePlanResponse 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.fullResourcePlan = new WMFullResourcePlan();
-        struct.fullResourcePlan.read(iprot);
-        struct.setFullResourcePlanIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.fullResourcePlan = new WMFullResourcePlan();
+          struct.fullResourcePlan.read(iprot);
+          struct.setFullResourcePlanIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java
index 73eb6c126d49..45bf7946921c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMAlterTriggerRequest implements org.apache.thrift.TBase<WMAlterTriggerRequest, WMAlterTriggerRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMAlterTriggerRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMAlterTriggerRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TRIGGER};
+  private static final _Fields[] optionals = {_Fields.TRIGGER};
   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);
@@ -101,6 +103,7 @@ public WMAlterTriggerRequest(WMAlterTriggerRequest other) {
     }
   }
 
+  @Override
   public WMAlterTriggerRequest deepCopy() {
     return new WMAlterTriggerRequest(this);
   }
@@ -134,6 +137,7 @@ public void setTriggerIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TRIGGER:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TRIGGER:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMAlterTriggerRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMAlterTriggerRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterTriggerRequestStandardScheme getScheme() {
       return new WMAlterTriggerRequestStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMAlterTriggerRequestStandardScheme getScheme() {
 
   private static class WMAlterTriggerRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMAlterTriggerRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMAlterTriggerRequest 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 1: // TRIGGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.trigger = new WMTrigger();
-              struct.trigger.read(iprot);
-              struct.setTriggerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // TRIGGER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.trigger = new WMTrigger();
+                struct.trigger.read(iprot);
+                struct.setTriggerIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterTriggerRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterTriggerRequ
   }
 
   private static class WMAlterTriggerRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterTriggerRequestTupleScheme getScheme() {
       return new WMAlterTriggerRequestTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMAlterTriggerReque
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterTriggerRequest 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.trigger = new WMTrigger();
-        struct.trigger.read(iprot);
-        struct.setTriggerIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.trigger = new WMTrigger();
+          struct.trigger.read(iprot);
+          struct.setTriggerIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java
index aa9a897afd43..f9b9556800b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMAlterTriggerResponse implements org.apache.thrift.TBase<WMAlterTriggerResponse, WMAlterTriggerResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMAlterTriggerResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMAlterTriggerResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMAlterTriggerResponse() {
   public WMAlterTriggerResponse(WMAlterTriggerResponse other) {
   }
 
+  @Override
   public WMAlterTriggerResponse deepCopy() {
     return new WMAlterTriggerResponse(this);
   }
@@ -97,12 +100,14 @@ public WMAlterTriggerResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMAlterTriggerResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMAlterTriggerResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterTriggerResponseStandardScheme getScheme() {
       return new WMAlterTriggerResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMAlterTriggerResponseStandardScheme getScheme() {
 
   private static class WMAlterTriggerResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMAlterTriggerResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMAlterTriggerResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterTriggerResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMAlterTriggerResp
   }
 
   private static class WMAlterTriggerResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMAlterTriggerResponseTupleScheme getScheme() {
       return new WMAlterTriggerResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMAlterTriggerRespo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterTriggerResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java
index b73ceebb7ea2..2fdee0946f62 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateOrDropTriggerToPoolMappingRequest implements org.apache.thrift.TBase<WMCreateOrDropTriggerToPoolMappingRequest, WMCreateOrDropTriggerToPoolMappingRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateOrDropTriggerToPoolMappingRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateOrDropTriggerToPoolMappingRequest");
 
@@ -89,10 +89,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -101,7 +103,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __DROP_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.TRIGGER_NAME,_Fields.POOL_PATH,_Fields.DROP,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.TRIGGER_NAME,_Fields.POOL_PATH,_Fields.DROP,_Fields.NS};
   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);
@@ -142,6 +144,7 @@ public WMCreateOrDropTriggerToPoolMappingRequest(WMCreateOrDropTriggerToPoolMapp
     }
   }
 
+  @Override
   public WMCreateOrDropTriggerToPoolMappingRequest deepCopy() {
     return new WMCreateOrDropTriggerToPoolMappingRequest(this);
   }
@@ -274,6 +277,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -320,6 +324,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -342,6 +347,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -512,14 +518,17 @@ public int compareTo(WMCreateOrDropTriggerToPoolMappingRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -602,6 +611,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateOrDropTriggerToPoolMappingRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrDropTriggerToPoolMappingRequestStandardScheme getScheme() {
       return new WMCreateOrDropTriggerToPoolMappingRequestStandardScheme();
     }
@@ -609,65 +619,72 @@ public WMCreateOrDropTriggerToPoolMappingRequestStandardScheme getScheme() {
 
   private static class WMCreateOrDropTriggerToPoolMappingRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateOrDropTriggerToPoolMappingRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateOrDropTriggerToPoolMappingRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TRIGGER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.triggerName = iprot.readString();
-              struct.setTriggerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolPath = iprot.readString();
-              struct.setPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // DROP
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.drop = iprot.readBool();
-              struct.setDropIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TRIGGER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.triggerName = iprot.readString();
+                struct.setTriggerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolPath = iprot.readString();
+                struct.setPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DROP
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.drop = iprot.readBool();
+                struct.setDropIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrDropTriggerToPoolMappingRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -712,6 +729,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrDropTrig
   }
 
   private static class WMCreateOrDropTriggerToPoolMappingRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrDropTriggerToPoolMappingRequestTupleScheme getScheme() {
       return new WMCreateOrDropTriggerToPoolMappingRequestTupleScheme();
     }
@@ -758,27 +776,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateOrDropTrigg
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateOrDropTriggerToPoolMappingRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.triggerName = iprot.readString();
-        struct.setTriggerNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.poolPath = iprot.readString();
-        struct.setPoolPathIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.drop = iprot.readBool();
-        struct.setDropIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.triggerName = iprot.readString();
+          struct.setTriggerNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.poolPath = iprot.readString();
+          struct.setPoolPathIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.drop = iprot.readBool();
+          struct.setDropIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java
index 9e7d77552547..60aedf81e2de 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateOrDropTriggerToPoolMappingResponse implements org.apache.thrift.TBase<WMCreateOrDropTriggerToPoolMappingResponse, WMCreateOrDropTriggerToPoolMappingResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateOrDropTriggerToPoolMappingResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateOrDropTriggerToPoolMappingResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMCreateOrDropTriggerToPoolMappingResponse() {
   public WMCreateOrDropTriggerToPoolMappingResponse(WMCreateOrDropTriggerToPoolMappingResponse other) {
   }
 
+  @Override
   public WMCreateOrDropTriggerToPoolMappingResponse deepCopy() {
     return new WMCreateOrDropTriggerToPoolMappingResponse(this);
   }
@@ -97,12 +100,14 @@ public WMCreateOrDropTriggerToPoolMappingResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMCreateOrDropTriggerToPoolMappingResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateOrDropTriggerToPoolMappingResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrDropTriggerToPoolMappingResponseStandardScheme getScheme() {
       return new WMCreateOrDropTriggerToPoolMappingResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMCreateOrDropTriggerToPoolMappingResponseStandardScheme getScheme() {
 
   private static class WMCreateOrDropTriggerToPoolMappingResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateOrDropTriggerToPoolMappingResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateOrDropTriggerToPoolMappingResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrDropTriggerToPoolMappingResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrDropTrig
   }
 
   private static class WMCreateOrDropTriggerToPoolMappingResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrDropTriggerToPoolMappingResponseTupleScheme getScheme() {
       return new WMCreateOrDropTriggerToPoolMappingResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateOrDropTrigg
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateOrDropTriggerToPoolMappingResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java
index 39c398ba2088..7e8f791b7f28 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateOrUpdateMappingRequest implements org.apache.thrift.TBase<WMCreateOrUpdateMappingRequest, WMCreateOrUpdateMappingRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateOrUpdateMappingRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateOrUpdateMappingRequest");
 
@@ -74,10 +74,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -86,7 +88,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __UPDATE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.MAPPING,_Fields.UPDATE};
+  private static final _Fields[] optionals = {_Fields.MAPPING,_Fields.UPDATE};
   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);
@@ -112,6 +114,7 @@ public WMCreateOrUpdateMappingRequest(WMCreateOrUpdateMappingRequest other) {
     this.update = other.update;
   }
 
+  @Override
   public WMCreateOrUpdateMappingRequest deepCopy() {
     return new WMCreateOrUpdateMappingRequest(this);
   }
@@ -169,6 +172,7 @@ public void setUpdateIsSet(boolean value) {
     __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATE_ISSET_ID, value);
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MAPPING:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MAPPING:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMCreateOrUpdateMappingRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -362,6 +371,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateOrUpdateMappingRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrUpdateMappingRequestStandardScheme getScheme() {
       return new WMCreateOrUpdateMappingRequestStandardScheme();
     }
@@ -369,42 +379,49 @@ public WMCreateOrUpdateMappingRequestStandardScheme getScheme() {
 
   private static class WMCreateOrUpdateMappingRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateOrUpdateMappingRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateOrUpdateMappingRequest 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 1: // MAPPING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.mapping = new WMMapping();
-              struct.mapping.read(iprot);
-              struct.setMappingIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // UPDATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.update = iprot.readBool();
-              struct.setUpdateIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // MAPPING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.mapping = new WMMapping();
+                struct.mapping.read(iprot);
+                struct.setMappingIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // UPDATE
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.update = iprot.readBool();
+                struct.setUpdateIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrUpdateMappingRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrUpdateMa
   }
 
   private static class WMCreateOrUpdateMappingRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrUpdateMappingRequestTupleScheme getScheme() {
       return new WMCreateOrUpdateMappingRequestTupleScheme();
     }
@@ -456,16 +474,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateOrUpdateMap
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateOrUpdateMappingRequest 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.mapping = new WMMapping();
-        struct.mapping.read(iprot);
-        struct.setMappingIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.update = iprot.readBool();
-        struct.setUpdateIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.mapping = new WMMapping();
+          struct.mapping.read(iprot);
+          struct.setMappingIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.update = iprot.readBool();
+          struct.setUpdateIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java
index 76e590c6a397..b0084bbdf073 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateOrUpdateMappingResponse implements org.apache.thrift.TBase<WMCreateOrUpdateMappingResponse, WMCreateOrUpdateMappingResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateOrUpdateMappingResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateOrUpdateMappingResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMCreateOrUpdateMappingResponse() {
   public WMCreateOrUpdateMappingResponse(WMCreateOrUpdateMappingResponse other) {
   }
 
+  @Override
   public WMCreateOrUpdateMappingResponse deepCopy() {
     return new WMCreateOrUpdateMappingResponse(this);
   }
@@ -97,12 +100,14 @@ public WMCreateOrUpdateMappingResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMCreateOrUpdateMappingResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateOrUpdateMappingResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrUpdateMappingResponseStandardScheme getScheme() {
       return new WMCreateOrUpdateMappingResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMCreateOrUpdateMappingResponseStandardScheme getScheme() {
 
   private static class WMCreateOrUpdateMappingResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateOrUpdateMappingResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateOrUpdateMappingResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrUpdateMappingResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateOrUpdateMa
   }
 
   private static class WMCreateOrUpdateMappingResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateOrUpdateMappingResponseTupleScheme getScheme() {
       return new WMCreateOrUpdateMappingResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateOrUpdateMap
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateOrUpdateMappingResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java
index 7ef462336a05..4d3f9a09d92f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreatePoolRequest implements org.apache.thrift.TBase<WMCreatePoolRequest, WMCreatePoolRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreatePoolRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreatePoolRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.POOL};
+  private static final _Fields[] optionals = {_Fields.POOL};
   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);
@@ -101,6 +103,7 @@ public WMCreatePoolRequest(WMCreatePoolRequest other) {
     }
   }
 
+  @Override
   public WMCreatePoolRequest deepCopy() {
     return new WMCreatePoolRequest(this);
   }
@@ -134,6 +137,7 @@ public void setPoolIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case POOL:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case POOL:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMCreatePoolRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreatePoolRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreatePoolRequestStandardScheme getScheme() {
       return new WMCreatePoolRequestStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMCreatePoolRequestStandardScheme getScheme() {
 
   private static class WMCreatePoolRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreatePoolRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreatePoolRequest 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 1: // POOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.pool = new WMPool();
-              struct.pool.read(iprot);
-              struct.setPoolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // POOL
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.pool = new WMPool();
+                struct.pool.read(iprot);
+                struct.setPoolIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreatePoolRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreatePoolReques
   }
 
   private static class WMCreatePoolRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreatePoolRequestTupleScheme getScheme() {
       return new WMCreatePoolRequestTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreatePoolRequest
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreatePoolRequest 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.pool = new WMPool();
-        struct.pool.read(iprot);
-        struct.setPoolIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.pool = new WMPool();
+          struct.pool.read(iprot);
+          struct.setPoolIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java
index d9a479692641..366fe37ad575 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreatePoolResponse implements org.apache.thrift.TBase<WMCreatePoolResponse, WMCreatePoolResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreatePoolResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreatePoolResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMCreatePoolResponse() {
   public WMCreatePoolResponse(WMCreatePoolResponse other) {
   }
 
+  @Override
   public WMCreatePoolResponse deepCopy() {
     return new WMCreatePoolResponse(this);
   }
@@ -97,12 +100,14 @@ public WMCreatePoolResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMCreatePoolResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreatePoolResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreatePoolResponseStandardScheme getScheme() {
       return new WMCreatePoolResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMCreatePoolResponseStandardScheme getScheme() {
 
   private static class WMCreatePoolResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreatePoolResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreatePoolResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreatePoolResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreatePoolRespon
   }
 
   private static class WMCreatePoolResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreatePoolResponseTupleScheme getScheme() {
       return new WMCreatePoolResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreatePoolRespons
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreatePoolResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java
index 285b66851350..578080387ee5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateResourcePlanRequest implements org.apache.thrift.TBase<WMCreateResourcePlanRequest, WMCreateResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateResourcePlanRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN,_Fields.COPY_FROM};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN,_Fields.COPY_FROM};
   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);
@@ -111,6 +113,7 @@ public WMCreateResourcePlanRequest(WMCreateResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMCreateResourcePlanRequest deepCopy() {
     return new WMCreateResourcePlanRequest(this);
   }
@@ -169,6 +172,7 @@ public void setCopyFromIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMCreateResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -364,6 +373,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateResourcePlanRequestStandardScheme getScheme() {
       return new WMCreateResourcePlanRequestStandardScheme();
     }
@@ -371,42 +381,49 @@ public WMCreateResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMCreateResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateResourcePlanRequest 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 1: // RESOURCE_PLAN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.resourcePlan = new WMResourcePlan();
-              struct.resourcePlan.read(iprot);
-              struct.setResourcePlanIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // COPY_FROM
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.copyFrom = iprot.readString();
-              struct.setCopyFromIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.resourcePlan = new WMResourcePlan();
+                struct.resourcePlan.read(iprot);
+                struct.setResourcePlanIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // COPY_FROM
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.copyFrom = iprot.readString();
+                struct.setCopyFromIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -432,6 +449,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateResourcePl
   }
 
   private static class WMCreateResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateResourcePlanRequestTupleScheme getScheme() {
       return new WMCreateResourcePlanRequestTupleScheme();
     }
@@ -460,16 +478,21 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateResourcePla
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateResourcePlanRequest 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.resourcePlan = new WMResourcePlan();
-        struct.resourcePlan.read(iprot);
-        struct.setResourcePlanIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.copyFrom = iprot.readString();
-        struct.setCopyFromIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.resourcePlan = new WMResourcePlan();
+          struct.resourcePlan.read(iprot);
+          struct.setResourcePlanIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.copyFrom = iprot.readString();
+          struct.setCopyFromIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java
index 90bd52b82628..3ce37793d4f5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateResourcePlanResponse implements org.apache.thrift.TBase<WMCreateResourcePlanResponse, WMCreateResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateResourcePlanResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMCreateResourcePlanResponse() {
   public WMCreateResourcePlanResponse(WMCreateResourcePlanResponse other) {
   }
 
+  @Override
   public WMCreateResourcePlanResponse deepCopy() {
     return new WMCreateResourcePlanResponse(this);
   }
@@ -97,12 +100,14 @@ public WMCreateResourcePlanResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMCreateResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateResourcePlanResponseStandardScheme getScheme() {
       return new WMCreateResourcePlanResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMCreateResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMCreateResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateResourcePlanResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateResourcePl
   }
 
   private static class WMCreateResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateResourcePlanResponseTupleScheme getScheme() {
       return new WMCreateResourcePlanResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateResourcePla
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateResourcePlanResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java
index a882e0479dfc..c8218a64fe48 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateTriggerRequest implements org.apache.thrift.TBase<WMCreateTriggerRequest, WMCreateTriggerRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateTriggerRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateTriggerRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TRIGGER};
+  private static final _Fields[] optionals = {_Fields.TRIGGER};
   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);
@@ -101,6 +103,7 @@ public WMCreateTriggerRequest(WMCreateTriggerRequest other) {
     }
   }
 
+  @Override
   public WMCreateTriggerRequest deepCopy() {
     return new WMCreateTriggerRequest(this);
   }
@@ -134,6 +137,7 @@ public void setTriggerIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TRIGGER:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TRIGGER:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMCreateTriggerRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateTriggerRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateTriggerRequestStandardScheme getScheme() {
       return new WMCreateTriggerRequestStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMCreateTriggerRequestStandardScheme getScheme() {
 
   private static class WMCreateTriggerRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateTriggerRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateTriggerRequest 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 1: // TRIGGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.trigger = new WMTrigger();
-              struct.trigger.read(iprot);
-              struct.setTriggerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // TRIGGER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.trigger = new WMTrigger();
+                struct.trigger.read(iprot);
+                struct.setTriggerIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateTriggerRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateTriggerReq
   }
 
   private static class WMCreateTriggerRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateTriggerRequestTupleScheme getScheme() {
       return new WMCreateTriggerRequestTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateTriggerRequ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateTriggerRequest 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.trigger = new WMTrigger();
-        struct.trigger.read(iprot);
-        struct.setTriggerIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.trigger = new WMTrigger();
+          struct.trigger.read(iprot);
+          struct.setTriggerIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java
index e015f4cf3807..45153a86db95 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMCreateTriggerResponse implements org.apache.thrift.TBase<WMCreateTriggerResponse, WMCreateTriggerResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMCreateTriggerResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMCreateTriggerResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMCreateTriggerResponse() {
   public WMCreateTriggerResponse(WMCreateTriggerResponse other) {
   }
 
+  @Override
   public WMCreateTriggerResponse deepCopy() {
     return new WMCreateTriggerResponse(this);
   }
@@ -97,12 +100,14 @@ public WMCreateTriggerResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMCreateTriggerResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMCreateTriggerResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateTriggerResponseStandardScheme getScheme() {
       return new WMCreateTriggerResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMCreateTriggerResponseStandardScheme getScheme() {
 
   private static class WMCreateTriggerResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMCreateTriggerResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMCreateTriggerResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateTriggerResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMCreateTriggerRes
   }
 
   private static class WMCreateTriggerResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMCreateTriggerResponseTupleScheme getScheme() {
       return new WMCreateTriggerResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMCreateTriggerResp
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateTriggerResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java
index 10c935018e19..d3921ab87726 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropMappingRequest implements org.apache.thrift.TBase<WMDropMappingRequest, WMDropMappingRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropMappingRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropMappingRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.MAPPING};
+  private static final _Fields[] optionals = {_Fields.MAPPING};
   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);
@@ -101,6 +103,7 @@ public WMDropMappingRequest(WMDropMappingRequest other) {
     }
   }
 
+  @Override
   public WMDropMappingRequest deepCopy() {
     return new WMDropMappingRequest(this);
   }
@@ -134,6 +137,7 @@ public void setMappingIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MAPPING:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MAPPING:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMDropMappingRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropMappingRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropMappingRequestStandardScheme getScheme() {
       return new WMDropMappingRequestStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMDropMappingRequestStandardScheme getScheme() {
 
   private static class WMDropMappingRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropMappingRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropMappingRequest 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 1: // MAPPING
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.mapping = new WMMapping();
-              struct.mapping.read(iprot);
-              struct.setMappingIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // MAPPING
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.mapping = new WMMapping();
+                struct.mapping.read(iprot);
+                struct.setMappingIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropMappingRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropMappingReque
   }
 
   private static class WMDropMappingRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropMappingRequestTupleScheme getScheme() {
       return new WMDropMappingRequestTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropMappingReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropMappingRequest 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.mapping = new WMMapping();
-        struct.mapping.read(iprot);
-        struct.setMappingIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.mapping = new WMMapping();
+          struct.mapping.read(iprot);
+          struct.setMappingIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java
index 71d2c952fb99..a7716325acd9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropMappingResponse implements org.apache.thrift.TBase<WMDropMappingResponse, WMDropMappingResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropMappingResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropMappingResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMDropMappingResponse() {
   public WMDropMappingResponse(WMDropMappingResponse other) {
   }
 
+  @Override
   public WMDropMappingResponse deepCopy() {
     return new WMDropMappingResponse(this);
   }
@@ -97,12 +100,14 @@ public WMDropMappingResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMDropMappingResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropMappingResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropMappingResponseStandardScheme getScheme() {
       return new WMDropMappingResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMDropMappingResponseStandardScheme getScheme() {
 
   private static class WMDropMappingResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropMappingResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropMappingResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropMappingResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropMappingRespo
   }
 
   private static class WMDropMappingResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropMappingResponseTupleScheme getScheme() {
       return new WMDropMappingResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropMappingRespon
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropMappingResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java
index e47e35248c6a..9f03d09ccb91 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropPoolRequest implements org.apache.thrift.TBase<WMDropPoolRequest, WMDropPoolRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropPoolRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropPoolRequest");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.POOL_PATH,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.POOL_PATH,_Fields.NS};
   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);
@@ -121,6 +123,7 @@ public WMDropPoolRequest(WMDropPoolRequest other) {
     }
   }
 
+  @Override
   public WMDropPoolRequest deepCopy() {
     return new WMDropPoolRequest(this);
   }
@@ -204,6 +207,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -234,6 +238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -250,6 +255,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -370,14 +376,17 @@ public int compareTo(WMDropPoolRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -442,6 +451,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropPoolRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropPoolRequestStandardScheme getScheme() {
       return new WMDropPoolRequestStandardScheme();
     }
@@ -449,49 +459,56 @@ public WMDropPoolRequestStandardScheme getScheme() {
 
   private static class WMDropPoolRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropPoolRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropPoolRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolPath = iprot.readString();
-              struct.setPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolPath = iprot.readString();
+                struct.setPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropPoolRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -524,6 +541,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropPoolRequest
   }
 
   private static class WMDropPoolRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropPoolRequestTupleScheme getScheme() {
       return new WMDropPoolRequestTupleScheme();
     }
@@ -558,19 +576,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropPoolRequest s
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropPoolRequest 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.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.poolPath = iprot.readString();
-        struct.setPoolPathIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.poolPath = iprot.readString();
+          struct.setPoolPathIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java
index 2c0a3785afe3..b8792de22635 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropPoolResponse implements org.apache.thrift.TBase<WMDropPoolResponse, WMDropPoolResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropPoolResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropPoolResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMDropPoolResponse() {
   public WMDropPoolResponse(WMDropPoolResponse other) {
   }
 
+  @Override
   public WMDropPoolResponse deepCopy() {
     return new WMDropPoolResponse(this);
   }
@@ -97,12 +100,14 @@ public WMDropPoolResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMDropPoolResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropPoolResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropPoolResponseStandardScheme getScheme() {
       return new WMDropPoolResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMDropPoolResponseStandardScheme getScheme() {
 
   private static class WMDropPoolResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropPoolResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropPoolResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropPoolResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropPoolResponse
   }
 
   private static class WMDropPoolResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropPoolResponseTupleScheme getScheme() {
       return new WMDropPoolResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropPoolResponse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropPoolResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java
index 3cb84447f7a3..b70c8c244d35 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropResourcePlanRequest implements org.apache.thrift.TBase<WMDropResourcePlanRequest, WMDropResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropResourcePlanRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
   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);
@@ -111,6 +113,7 @@ public WMDropResourcePlanRequest(WMDropResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMDropResourcePlanRequest deepCopy() {
     return new WMDropResourcePlanRequest(this);
   }
@@ -169,6 +172,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMDropResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -361,6 +370,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropResourcePlanRequestStandardScheme getScheme() {
       return new WMDropResourcePlanRequestStandardScheme();
     }
@@ -368,41 +378,48 @@ public WMDropResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMDropResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropResourcePlanRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropResourcePlan
   }
 
   private static class WMDropResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropResourcePlanRequestTupleScheme getScheme() {
       return new WMDropResourcePlanRequestTupleScheme();
     }
@@ -456,15 +474,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropResourcePlanR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropResourcePlanRequest 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.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java
index e2090a6ba8b2..6b072c6c7a07 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropResourcePlanResponse implements org.apache.thrift.TBase<WMDropResourcePlanResponse, WMDropResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropResourcePlanResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMDropResourcePlanResponse() {
   public WMDropResourcePlanResponse(WMDropResourcePlanResponse other) {
   }
 
+  @Override
   public WMDropResourcePlanResponse deepCopy() {
     return new WMDropResourcePlanResponse(this);
   }
@@ -97,12 +100,14 @@ public WMDropResourcePlanResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMDropResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropResourcePlanResponseStandardScheme getScheme() {
       return new WMDropResourcePlanResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMDropResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMDropResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropResourcePlanResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropResourcePlan
   }
 
   private static class WMDropResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropResourcePlanResponseTupleScheme getScheme() {
       return new WMDropResourcePlanResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropResourcePlanR
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropResourcePlanResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java
index 125c22f87bc6..9b1c64aba6c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropTriggerRequest implements org.apache.thrift.TBase<WMDropTriggerRequest, WMDropTriggerRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropTriggerRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropTriggerRequest");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.TRIGGER_NAME,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.TRIGGER_NAME,_Fields.NS};
   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);
@@ -121,6 +123,7 @@ public WMDropTriggerRequest(WMDropTriggerRequest other) {
     }
   }
 
+  @Override
   public WMDropTriggerRequest deepCopy() {
     return new WMDropTriggerRequest(this);
   }
@@ -204,6 +207,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -234,6 +238,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -250,6 +255,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -370,14 +376,17 @@ public int compareTo(WMDropTriggerRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -442,6 +451,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropTriggerRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropTriggerRequestStandardScheme getScheme() {
       return new WMDropTriggerRequestStandardScheme();
     }
@@ -449,49 +459,56 @@ public WMDropTriggerRequestStandardScheme getScheme() {
 
   private static class WMDropTriggerRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropTriggerRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropTriggerRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TRIGGER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.triggerName = iprot.readString();
-              struct.setTriggerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TRIGGER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.triggerName = iprot.readString();
+                struct.setTriggerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropTriggerRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -524,6 +541,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropTriggerReque
   }
 
   private static class WMDropTriggerRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropTriggerRequestTupleScheme getScheme() {
       return new WMDropTriggerRequestTupleScheme();
     }
@@ -558,19 +576,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropTriggerReques
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropTriggerRequest 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.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.triggerName = iprot.readString();
-        struct.setTriggerNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.triggerName = iprot.readString();
+          struct.setTriggerNameIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java
index 5ed0bd43ba6e..4bf2a5cafa82 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMDropTriggerResponse implements org.apache.thrift.TBase<WMDropTriggerResponse, WMDropTriggerResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMDropTriggerResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMDropTriggerResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WMDropTriggerResponse() {
   public WMDropTriggerResponse(WMDropTriggerResponse other) {
   }
 
+  @Override
   public WMDropTriggerResponse deepCopy() {
     return new WMDropTriggerResponse(this);
   }
@@ -97,12 +100,14 @@ public WMDropTriggerResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WMDropTriggerResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMDropTriggerResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropTriggerResponseStandardScheme getScheme() {
       return new WMDropTriggerResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WMDropTriggerResponseStandardScheme getScheme() {
 
   private static class WMDropTriggerResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMDropTriggerResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMDropTriggerResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropTriggerResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMDropTriggerRespo
   }
 
   private static class WMDropTriggerResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMDropTriggerResponseTupleScheme getScheme() {
       return new WMDropTriggerResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMDropTriggerRespon
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMDropTriggerResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
index d24867311196..b7392dbbaccd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMFullResourcePlan implements org.apache.thrift.TBase<WMFullResourcePlan, WMFullResourcePlan._Fields>, java.io.Serializable, Cloneable, Comparable<WMFullResourcePlan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMFullResourcePlan");
 
@@ -89,17 +89,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.MAPPINGS,_Fields.TRIGGERS,_Fields.POOL_TRIGGERS};
+  private static final _Fields[] optionals = {_Fields.MAPPINGS,_Fields.TRIGGERS,_Fields.POOL_TRIGGERS};
   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);
@@ -170,6 +172,7 @@ public WMFullResourcePlan(WMFullResourcePlan other) {
     }
   }
 
+  @Override
   public WMFullResourcePlan deepCopy() {
     return new WMFullResourcePlan(this);
   }
@@ -367,6 +370,7 @@ public void setPoolTriggersIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PLAN:
@@ -413,6 +417,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PLAN:
@@ -435,6 +440,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -605,14 +611,17 @@ public int compareTo(WMFullResourcePlan other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -704,6 +713,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMFullResourcePlanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMFullResourcePlanStandardScheme getScheme() {
       return new WMFullResourcePlanStandardScheme();
     }
@@ -711,110 +721,117 @@ public WMFullResourcePlanStandardScheme getScheme() {
 
   private static class WMFullResourcePlanStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMFullResourcePlan> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMFullResourcePlan 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 1: // PLAN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.plan = new WMResourcePlan();
-              struct.plan.read(iprot);
-              struct.setPlanIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // POOLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1296 = iprot.readListBegin();
-                struct.pools = new java.util.ArrayList<WMPool>(_list1296.size);
-                @org.apache.thrift.annotation.Nullable WMPool _elem1297;
-                for (int _i1298 = 0; _i1298 < _list1296.size; ++_i1298)
+          }
+          switch (schemeField.id) {
+            case 1: // PLAN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.plan = new WMResourcePlan();
+                struct.plan.read(iprot);
+                struct.setPlanIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POOLS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1297 = new WMPool();
-                  _elem1297.read(iprot);
-                  struct.pools.add(_elem1297);
+                  org.apache.thrift.protocol.TList _list1296 = iprot.readListBegin();
+                  struct.pools = new java.util.ArrayList<WMPool>(_list1296.size);
+                  @org.apache.thrift.annotation.Nullable WMPool _elem1297;
+                  for (int _i1298 = 0; _i1298 < _list1296.size; ++_i1298)
+                  {
+                    _elem1297 = new WMPool();
+                    _elem1297.read(iprot);
+                    struct.pools.add(_elem1297);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPoolsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPoolsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // MAPPINGS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1299 = iprot.readListBegin();
-                struct.mappings = new java.util.ArrayList<WMMapping>(_list1299.size);
-                @org.apache.thrift.annotation.Nullable WMMapping _elem1300;
-                for (int _i1301 = 0; _i1301 < _list1299.size; ++_i1301)
+              break;
+            case 3: // MAPPINGS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1300 = new WMMapping();
-                  _elem1300.read(iprot);
-                  struct.mappings.add(_elem1300);
+                  org.apache.thrift.protocol.TList _list1299 = iprot.readListBegin();
+                  struct.mappings = new java.util.ArrayList<WMMapping>(_list1299.size);
+                  @org.apache.thrift.annotation.Nullable WMMapping _elem1300;
+                  for (int _i1301 = 0; _i1301 < _list1299.size; ++_i1301)
+                  {
+                    _elem1300 = new WMMapping();
+                    _elem1300.read(iprot);
+                    struct.mappings.add(_elem1300);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setMappingsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setMappingsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TRIGGERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1302 = iprot.readListBegin();
-                struct.triggers = new java.util.ArrayList<WMTrigger>(_list1302.size);
-                @org.apache.thrift.annotation.Nullable WMTrigger _elem1303;
-                for (int _i1304 = 0; _i1304 < _list1302.size; ++_i1304)
+              break;
+            case 4: // TRIGGERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1303 = new WMTrigger();
-                  _elem1303.read(iprot);
-                  struct.triggers.add(_elem1303);
+                  org.apache.thrift.protocol.TList _list1302 = iprot.readListBegin();
+                  struct.triggers = new java.util.ArrayList<WMTrigger>(_list1302.size);
+                  @org.apache.thrift.annotation.Nullable WMTrigger _elem1303;
+                  for (int _i1304 = 0; _i1304 < _list1302.size; ++_i1304)
+                  {
+                    _elem1303 = new WMTrigger();
+                    _elem1303.read(iprot);
+                    struct.triggers.add(_elem1303);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTriggersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTriggersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // POOL_TRIGGERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1305 = iprot.readListBegin();
-                struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1305.size);
-                @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1306;
-                for (int _i1307 = 0; _i1307 < _list1305.size; ++_i1307)
+              break;
+            case 5: // POOL_TRIGGERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1306 = new WMPoolTrigger();
-                  _elem1306.read(iprot);
-                  struct.poolTriggers.add(_elem1306);
+                  org.apache.thrift.protocol.TList _list1305 = iprot.readListBegin();
+                  struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1305.size);
+                  @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1306;
+                  for (int _i1307 = 0; _i1307 < _list1305.size; ++_i1307)
+                  {
+                    _elem1306 = new WMPoolTrigger();
+                    _elem1306.read(iprot);
+                    struct.poolTriggers.add(_elem1306);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPoolTriggersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPoolTriggersIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMFullResourcePlan struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -885,6 +902,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMFullResourcePlan
   }
 
   private static class WMFullResourcePlanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMFullResourcePlanTupleScheme getScheme() {
       return new WMFullResourcePlanTupleScheme();
     }
@@ -945,64 +963,69 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMFullResourcePlan
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMFullResourcePlan struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.plan = new WMResourcePlan();
-      struct.plan.read(iprot);
-      struct.setPlanIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list1316 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.pools = new java.util.ArrayList<WMPool>(_list1316.size);
-        @org.apache.thrift.annotation.Nullable WMPool _elem1317;
-        for (int _i1318 = 0; _i1318 < _list1316.size; ++_i1318)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.plan = new WMResourcePlan();
+        struct.plan.read(iprot);
+        struct.setPlanIsSet(true);
         {
-          _elem1317 = new WMPool();
-          _elem1317.read(iprot);
-          struct.pools.add(_elem1317);
+          org.apache.thrift.protocol.TList _list1316 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.pools = new java.util.ArrayList<WMPool>(_list1316.size);
+          @org.apache.thrift.annotation.Nullable WMPool _elem1317;
+          for (int _i1318 = 0; _i1318 < _list1316.size; ++_i1318)
+          {
+            _elem1317 = new WMPool();
+            _elem1317.read(iprot);
+            struct.pools.add(_elem1317);
+          }
         }
-      }
-      struct.setPoolsIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list1319 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.mappings = new java.util.ArrayList<WMMapping>(_list1319.size);
-          @org.apache.thrift.annotation.Nullable WMMapping _elem1320;
-          for (int _i1321 = 0; _i1321 < _list1319.size; ++_i1321)
+        struct.setPoolsIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
           {
-            _elem1320 = new WMMapping();
-            _elem1320.read(iprot);
-            struct.mappings.add(_elem1320);
+            org.apache.thrift.protocol.TList _list1319 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.mappings = new java.util.ArrayList<WMMapping>(_list1319.size);
+            @org.apache.thrift.annotation.Nullable WMMapping _elem1320;
+            for (int _i1321 = 0; _i1321 < _list1319.size; ++_i1321)
+            {
+              _elem1320 = new WMMapping();
+              _elem1320.read(iprot);
+              struct.mappings.add(_elem1320);
+            }
           }
+          struct.setMappingsIsSet(true);
         }
-        struct.setMappingsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1322 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.triggers = new java.util.ArrayList<WMTrigger>(_list1322.size);
-          @org.apache.thrift.annotation.Nullable WMTrigger _elem1323;
-          for (int _i1324 = 0; _i1324 < _list1322.size; ++_i1324)
+        if (incoming.get(1)) {
           {
-            _elem1323 = new WMTrigger();
-            _elem1323.read(iprot);
-            struct.triggers.add(_elem1323);
+            org.apache.thrift.protocol.TList _list1322 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.triggers = new java.util.ArrayList<WMTrigger>(_list1322.size);
+            @org.apache.thrift.annotation.Nullable WMTrigger _elem1323;
+            for (int _i1324 = 0; _i1324 < _list1322.size; ++_i1324)
+            {
+              _elem1323 = new WMTrigger();
+              _elem1323.read(iprot);
+              struct.triggers.add(_elem1323);
+            }
           }
+          struct.setTriggersIsSet(true);
         }
-        struct.setTriggersIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list1325 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1325.size);
-          @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1326;
-          for (int _i1327 = 0; _i1327 < _list1325.size; ++_i1327)
+        if (incoming.get(2)) {
           {
-            _elem1326 = new WMPoolTrigger();
-            _elem1326.read(iprot);
-            struct.poolTriggers.add(_elem1326);
+            org.apache.thrift.protocol.TList _list1325 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1325.size);
+            @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1326;
+            for (int _i1327 = 0; _i1327 < _list1325.size; ++_i1327)
+            {
+              _elem1326 = new WMPoolTrigger();
+              _elem1326.read(iprot);
+              struct.poolTriggers.add(_elem1326);
+            }
           }
+          struct.setPoolTriggersIsSet(true);
         }
-        struct.setPoolTriggersIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java
index adf82295b19f..229d23d8ae3d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetActiveResourcePlanRequest implements org.apache.thrift.TBase<WMGetActiveResourcePlanRequest, WMGetActiveResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetActiveResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetActiveResourcePlanRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.NS};
   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);
@@ -101,6 +103,7 @@ public WMGetActiveResourcePlanRequest(WMGetActiveResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMGetActiveResourcePlanRequest deepCopy() {
     return new WMGetActiveResourcePlanRequest(this);
   }
@@ -134,6 +137,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NS:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NS:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMGetActiveResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -280,6 +289,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetActiveResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetActiveResourcePlanRequestStandardScheme getScheme() {
       return new WMGetActiveResourcePlanRequestStandardScheme();
     }
@@ -287,33 +297,40 @@ public WMGetActiveResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMGetActiveResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetActiveResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetActiveResourcePlanRequest 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 1: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetActiveResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -332,6 +349,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetActiveResourc
   }
 
   private static class WMGetActiveResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetActiveResourcePlanRequestTupleScheme getScheme() {
       return new WMGetActiveResourcePlanRequestTupleScheme();
     }
@@ -354,11 +372,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetActiveResource
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetActiveResourcePlanRequest 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.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java
index aa4c262cc8bd..e7088628c246 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetActiveResourcePlanResponse implements org.apache.thrift.TBase<WMGetActiveResourcePlanResponse, WMGetActiveResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetActiveResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetActiveResourcePlanResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN};
   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);
@@ -101,6 +103,7 @@ public WMGetActiveResourcePlanResponse(WMGetActiveResourcePlanResponse other) {
     }
   }
 
+  @Override
   public WMGetActiveResourcePlanResponse deepCopy() {
     return new WMGetActiveResourcePlanResponse(this);
   }
@@ -134,6 +137,7 @@ public void setResourcePlanIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMGetActiveResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetActiveResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetActiveResourcePlanResponseStandardScheme getScheme() {
       return new WMGetActiveResourcePlanResponseStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMGetActiveResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMGetActiveResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetActiveResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetActiveResourcePlanResponse 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 1: // RESOURCE_PLAN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.resourcePlan = new WMFullResourcePlan();
-              struct.resourcePlan.read(iprot);
-              struct.setResourcePlanIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.resourcePlan = new WMFullResourcePlan();
+                struct.resourcePlan.read(iprot);
+                struct.setResourcePlanIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetActiveResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetActiveResourc
   }
 
   private static class WMGetActiveResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetActiveResourcePlanResponseTupleScheme getScheme() {
       return new WMGetActiveResourcePlanResponseTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetActiveResource
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetActiveResourcePlanResponse 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.resourcePlan = new WMFullResourcePlan();
-        struct.resourcePlan.read(iprot);
-        struct.setResourcePlanIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.resourcePlan = new WMFullResourcePlan();
+          struct.resourcePlan.read(iprot);
+          struct.setResourcePlanIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java
index 4a7b22ad2575..553438fcf02b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetAllResourcePlanRequest implements org.apache.thrift.TBase<WMGetAllResourcePlanRequest, WMGetAllResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetAllResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetAllResourcePlanRequest");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.NS};
   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);
@@ -101,6 +103,7 @@ public WMGetAllResourcePlanRequest(WMGetAllResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMGetAllResourcePlanRequest deepCopy() {
     return new WMGetAllResourcePlanRequest(this);
   }
@@ -134,6 +137,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NS:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NS:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMGetAllResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -280,6 +289,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetAllResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetAllResourcePlanRequestStandardScheme getScheme() {
       return new WMGetAllResourcePlanRequestStandardScheme();
     }
@@ -287,33 +297,40 @@ public WMGetAllResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMGetAllResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetAllResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetAllResourcePlanRequest 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 1: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetAllResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -332,6 +349,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetAllResourcePl
   }
 
   private static class WMGetAllResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetAllResourcePlanRequestTupleScheme getScheme() {
       return new WMGetAllResourcePlanRequestTupleScheme();
     }
@@ -354,11 +372,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetAllResourcePla
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetAllResourcePlanRequest 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.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
index eb1297df1121..d87dec61f4e2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetAllResourcePlanResponse implements org.apache.thrift.TBase<WMGetAllResourcePlanResponse, WMGetAllResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetAllResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetAllResourcePlanResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLANS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLANS};
   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);
@@ -106,6 +108,7 @@ public WMGetAllResourcePlanResponse(WMGetAllResourcePlanResponse other) {
     }
   }
 
+  @Override
   public WMGetAllResourcePlanResponse deepCopy() {
     return new WMGetAllResourcePlanResponse(this);
   }
@@ -155,6 +158,7 @@ public void setResourcePlansIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLANS:
@@ -169,6 +173,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLANS:
@@ -179,6 +184,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -249,14 +255,17 @@ public int compareTo(WMGetAllResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -301,6 +310,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetAllResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetAllResourcePlanResponseStandardScheme getScheme() {
       return new WMGetAllResourcePlanResponseStandardScheme();
     }
@@ -308,44 +318,51 @@ public WMGetAllResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMGetAllResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetAllResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetAllResourcePlanResponse 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 1: // RESOURCE_PLANS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1328 = iprot.readListBegin();
-                struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1328.size);
-                @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1329;
-                for (int _i1330 = 0; _i1330 < _list1328.size; ++_i1330)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // RESOURCE_PLANS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1329 = new WMResourcePlan();
-                  _elem1329.read(iprot);
-                  struct.resourcePlans.add(_elem1329);
+                  org.apache.thrift.protocol.TList _list1328 = iprot.readListBegin();
+                  struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1328.size);
+                  @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1329;
+                  for (int _i1330 = 0; _i1330 < _list1328.size; ++_i1330)
+                  {
+                    _elem1329 = new WMResourcePlan();
+                    _elem1329.read(iprot);
+                    struct.resourcePlans.add(_elem1329);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setResourcePlansIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setResourcePlansIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetAllResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -371,6 +388,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetAllResourcePl
   }
 
   private static class WMGetAllResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetAllResourcePlanResponseTupleScheme getScheme() {
       return new WMGetAllResourcePlanResponseTupleScheme();
     }
@@ -399,21 +417,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetAllResourcePla
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetAllResourcePlanResponse 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 _list1333 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1333.size);
-          @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1334;
-          for (int _i1335 = 0; _i1335 < _list1333.size; ++_i1335)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1334 = new WMResourcePlan();
-            _elem1334.read(iprot);
-            struct.resourcePlans.add(_elem1334);
+            org.apache.thrift.protocol.TList _list1333 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1333.size);
+            @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1334;
+            for (int _i1335 = 0; _i1335 < _list1333.size; ++_i1335)
+            {
+              _elem1334 = new WMResourcePlan();
+              _elem1334.read(iprot);
+              struct.resourcePlans.add(_elem1334);
+            }
           }
+          struct.setResourcePlansIsSet(true);
         }
-        struct.setResourcePlansIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java
index dfcabbce9f38..d67564266704 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetResourcePlanRequest implements org.apache.thrift.TBase<WMGetResourcePlanRequest, WMGetResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetResourcePlanRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
   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);
@@ -111,6 +113,7 @@ public WMGetResourcePlanRequest(WMGetResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMGetResourcePlanRequest deepCopy() {
     return new WMGetResourcePlanRequest(this);
   }
@@ -169,6 +172,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMGetResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -361,6 +370,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetResourcePlanRequestStandardScheme getScheme() {
       return new WMGetResourcePlanRequestStandardScheme();
     }
@@ -368,41 +378,48 @@ public WMGetResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMGetResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetResourcePlanRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetResourcePlanR
   }
 
   private static class WMGetResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetResourcePlanRequestTupleScheme getScheme() {
       return new WMGetResourcePlanRequestTupleScheme();
     }
@@ -456,15 +474,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetResourcePlanRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetResourcePlanRequest 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.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java
index b0b592a743f1..a8ac93cb8f0d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetResourcePlanResponse implements org.apache.thrift.TBase<WMGetResourcePlanResponse, WMGetResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetResourcePlanResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN};
   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);
@@ -101,6 +103,7 @@ public WMGetResourcePlanResponse(WMGetResourcePlanResponse other) {
     }
   }
 
+  @Override
   public WMGetResourcePlanResponse deepCopy() {
     return new WMGetResourcePlanResponse(this);
   }
@@ -134,6 +137,7 @@ public void setResourcePlanIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN:
@@ -148,6 +152,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN:
@@ -158,6 +163,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -228,14 +234,17 @@ public int compareTo(WMGetResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -283,6 +292,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetResourcePlanResponseStandardScheme getScheme() {
       return new WMGetResourcePlanResponseStandardScheme();
     }
@@ -290,34 +300,41 @@ public WMGetResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMGetResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetResourcePlanResponse 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 1: // RESOURCE_PLAN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.resourcePlan = new WMFullResourcePlan();
-              struct.resourcePlan.read(iprot);
-              struct.setResourcePlanIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.resourcePlan = new WMFullResourcePlan();
+                struct.resourcePlan.read(iprot);
+                struct.setResourcePlanIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -336,6 +353,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetResourcePlanR
   }
 
   private static class WMGetResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetResourcePlanResponseTupleScheme getScheme() {
       return new WMGetResourcePlanResponseTupleScheme();
     }
@@ -358,12 +376,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetResourcePlanRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetResourcePlanResponse 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.resourcePlan = new WMFullResourcePlan();
-        struct.resourcePlan.read(iprot);
-        struct.setResourcePlanIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.resourcePlan = new WMFullResourcePlan();
+          struct.resourcePlan.read(iprot);
+          struct.setResourcePlanIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java
index 0cacaa719919..fc917e173975 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetTriggersForResourePlanRequest implements org.apache.thrift.TBase<WMGetTriggersForResourePlanRequest, WMGetTriggersForResourePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetTriggersForResourePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetTriggersForResourePlanRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
   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);
@@ -111,6 +113,7 @@ public WMGetTriggersForResourePlanRequest(WMGetTriggersForResourePlanRequest oth
     }
   }
 
+  @Override
   public WMGetTriggersForResourePlanRequest deepCopy() {
     return new WMGetTriggersForResourePlanRequest(this);
   }
@@ -169,6 +172,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMGetTriggersForResourePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -361,6 +370,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetTriggersForResourePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetTriggersForResourePlanRequestStandardScheme getScheme() {
       return new WMGetTriggersForResourePlanRequestStandardScheme();
     }
@@ -368,41 +378,48 @@ public WMGetTriggersForResourePlanRequestStandardScheme getScheme() {
 
   private static class WMGetTriggersForResourePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetTriggersForResourePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetTriggersForResourePlanRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetTriggersForResourePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetTriggersForRe
   }
 
   private static class WMGetTriggersForResourePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetTriggersForResourePlanRequestTupleScheme getScheme() {
       return new WMGetTriggersForResourePlanRequestTupleScheme();
     }
@@ -456,15 +474,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetTriggersForRes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetTriggersForResourePlanRequest 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.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
index 8dabf4ca5f17..4266a9c3fb04 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMGetTriggersForResourePlanResponse implements org.apache.thrift.TBase<WMGetTriggersForResourePlanResponse, WMGetTriggersForResourePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMGetTriggersForResourePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMGetTriggersForResourePlanResponse");
 
@@ -69,17 +69,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TRIGGERS};
+  private static final _Fields[] optionals = {_Fields.TRIGGERS};
   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);
@@ -106,6 +108,7 @@ public WMGetTriggersForResourePlanResponse(WMGetTriggersForResourePlanResponse o
     }
   }
 
+  @Override
   public WMGetTriggersForResourePlanResponse deepCopy() {
     return new WMGetTriggersForResourePlanResponse(this);
   }
@@ -155,6 +158,7 @@ public void setTriggersIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TRIGGERS:
@@ -169,6 +173,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TRIGGERS:
@@ -179,6 +184,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -249,14 +255,17 @@ public int compareTo(WMGetTriggersForResourePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -301,6 +310,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMGetTriggersForResourePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetTriggersForResourePlanResponseStandardScheme getScheme() {
       return new WMGetTriggersForResourePlanResponseStandardScheme();
     }
@@ -308,44 +318,51 @@ public WMGetTriggersForResourePlanResponseStandardScheme getScheme() {
 
   private static class WMGetTriggersForResourePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMGetTriggersForResourePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMGetTriggersForResourePlanResponse 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 1: // TRIGGERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1352 = iprot.readListBegin();
-                struct.triggers = new java.util.ArrayList<WMTrigger>(_list1352.size);
-                @org.apache.thrift.annotation.Nullable WMTrigger _elem1353;
-                for (int _i1354 = 0; _i1354 < _list1352.size; ++_i1354)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // TRIGGERS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1353 = new WMTrigger();
-                  _elem1353.read(iprot);
-                  struct.triggers.add(_elem1353);
+                  org.apache.thrift.protocol.TList _list1352 = iprot.readListBegin();
+                  struct.triggers = new java.util.ArrayList<WMTrigger>(_list1352.size);
+                  @org.apache.thrift.annotation.Nullable WMTrigger _elem1353;
+                  for (int _i1354 = 0; _i1354 < _list1352.size; ++_i1354)
+                  {
+                    _elem1353 = new WMTrigger();
+                    _elem1353.read(iprot);
+                    struct.triggers.add(_elem1353);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setTriggersIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setTriggersIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetTriggersForResourePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -371,6 +388,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMGetTriggersForRe
   }
 
   private static class WMGetTriggersForResourePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMGetTriggersForResourePlanResponseTupleScheme getScheme() {
       return new WMGetTriggersForResourePlanResponseTupleScheme();
     }
@@ -399,21 +417,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMGetTriggersForRes
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMGetTriggersForResourePlanResponse 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 _list1357 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-          struct.triggers = new java.util.ArrayList<WMTrigger>(_list1357.size);
-          @org.apache.thrift.annotation.Nullable WMTrigger _elem1358;
-          for (int _i1359 = 0; _i1359 < _list1357.size; ++_i1359)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1358 = new WMTrigger();
-            _elem1358.read(iprot);
-            struct.triggers.add(_elem1358);
+            org.apache.thrift.protocol.TList _list1357 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.triggers = new java.util.ArrayList<WMTrigger>(_list1357.size);
+            @org.apache.thrift.annotation.Nullable WMTrigger _elem1358;
+            for (int _i1359 = 0; _i1359 < _list1357.size; ++_i1359)
+            {
+              _elem1358 = new WMTrigger();
+              _elem1358.read(iprot);
+              struct.triggers.add(_elem1358);
+            }
           }
+          struct.setTriggersIsSet(true);
         }
-        struct.setTriggersIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java
index 7dae9f50e54f..0be681de5283 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMMapping implements org.apache.thrift.TBase<WMMapping, WMMapping._Fields>, java.io.Serializable, Cloneable, Comparable<WMMapping> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMMapping");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ORDERING_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.POOL_PATH,_Fields.ORDERING,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.POOL_PATH,_Fields.ORDERING,_Fields.NS};
   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);
@@ -163,6 +165,7 @@ public WMMapping(WMMapping other) {
     }
   }
 
+  @Override
   public WMMapping deepCopy() {
     return new WMMapping(this);
   }
@@ -320,6 +323,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -374,6 +378,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -399,6 +404,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -594,14 +600,17 @@ public int compareTo(WMMapping other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -700,6 +709,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMMappingStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMMappingStandardScheme getScheme() {
       return new WMMappingStandardScheme();
     }
@@ -707,73 +717,80 @@ public WMMappingStandardScheme getScheme() {
 
   private static class WMMappingStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMMapping> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMMapping 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ENTITY_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.entityType = iprot.readString();
-              struct.setEntityTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // ENTITY_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.entityName = iprot.readString();
-              struct.setEntityNameIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // ENTITY_TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.entityType = iprot.readString();
+                struct.setEntityTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ENTITY_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.entityName = iprot.readString();
+                struct.setEntityNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolPath = iprot.readString();
+                struct.setPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // ORDERING
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.ordering = iprot.readI32();
+                struct.setOrderingIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolPath = iprot.readString();
-              struct.setPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // ORDERING
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ordering = iprot.readI32();
-              struct.setOrderingIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMMapping struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -819,6 +836,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMMapping struct)
   }
 
   private static class WMMappingTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMMappingTupleScheme getScheme() {
       return new WMMappingTupleScheme();
     }
@@ -856,25 +874,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMMapping struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMMapping struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.resourcePlanName = iprot.readString();
-      struct.setResourcePlanNameIsSet(true);
-      struct.entityType = iprot.readString();
-      struct.setEntityTypeIsSet(true);
-      struct.entityName = iprot.readString();
-      struct.setEntityNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.poolPath = iprot.readString();
-        struct.setPoolPathIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ordering = iprot.readI32();
-        struct.setOrderingIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.resourcePlanName = iprot.readString();
+        struct.setResourcePlanNameIsSet(true);
+        struct.entityType = iprot.readString();
+        struct.setEntityTypeIsSet(true);
+        struct.entityName = iprot.readString();
+        struct.setEntityNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.poolPath = iprot.readString();
+          struct.setPoolPathIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ordering = iprot.readI32();
+          struct.setOrderingIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java
index 8df5ac488380..1869c00373e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMNullablePool implements org.apache.thrift.TBase<WMNullablePool, WMNullablePool._Fields>, java.io.Serializable, Cloneable, Comparable<WMNullablePool> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMNullablePool");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -113,7 +115,7 @@ public java.lang.String getFieldName() {
   private static final int __QUERYPARALLELISM_ISSET_ID = 1;
   private static final int __ISSETSCHEDULINGPOLICY_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ALLOC_FRACTION,_Fields.QUERY_PARALLELISM,_Fields.SCHEDULING_POLICY,_Fields.IS_SET_SCHEDULING_POLICY,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.ALLOC_FRACTION,_Fields.QUERY_PARALLELISM,_Fields.SCHEDULING_POLICY,_Fields.IS_SET_SCHEDULING_POLICY,_Fields.NS};
   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);
@@ -169,6 +171,7 @@ public WMNullablePool(WMNullablePool other) {
     }
   }
 
+  @Override
   public WMNullablePool deepCopy() {
     return new WMNullablePool(this);
   }
@@ -349,6 +352,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -411,6 +415,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -439,6 +444,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -659,14 +665,17 @@ public int compareTo(WMNullablePool other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -765,6 +774,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMNullablePoolStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMNullablePoolStandardScheme getScheme() {
       return new WMNullablePoolStandardScheme();
     }
@@ -772,81 +782,88 @@ public WMNullablePoolStandardScheme getScheme() {
 
   private static class WMNullablePoolStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMNullablePool> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMNullablePool 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolPath = iprot.readString();
-              struct.setPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ALLOC_FRACTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.allocFraction = iprot.readDouble();
-              struct.setAllocFractionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // QUERY_PARALLELISM
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.queryParallelism = iprot.readI32();
-              struct.setQueryParallelismIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // SCHEDULING_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schedulingPolicy = iprot.readString();
-              struct.setSchedulingPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // IS_SET_SCHEDULING_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isSetSchedulingPolicy = iprot.readBool();
-              struct.setIsSetSchedulingPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 7: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolPath = iprot.readString();
+                struct.setPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ALLOC_FRACTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.allocFraction = iprot.readDouble();
+                struct.setAllocFractionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // QUERY_PARALLELISM
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.queryParallelism = iprot.readI32();
+                struct.setQueryParallelismIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // SCHEDULING_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schedulingPolicy = iprot.readString();
+                struct.setSchedulingPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // IS_SET_SCHEDULING_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isSetSchedulingPolicy = iprot.readBool();
+                struct.setIsSetSchedulingPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMNullablePool struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -897,6 +914,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMNullablePool str
   }
 
   private static class WMNullablePoolTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMNullablePoolTupleScheme getScheme() {
       return new WMNullablePoolTupleScheme();
     }
@@ -945,31 +963,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMNullablePool stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMNullablePool struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.resourcePlanName = iprot.readString();
-      struct.setResourcePlanNameIsSet(true);
-      struct.poolPath = iprot.readString();
-      struct.setPoolPathIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.allocFraction = iprot.readDouble();
-        struct.setAllocFractionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.queryParallelism = iprot.readI32();
-        struct.setQueryParallelismIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.schedulingPolicy = iprot.readString();
-        struct.setSchedulingPolicyIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.isSetSchedulingPolicy = iprot.readBool();
-        struct.setIsSetSchedulingPolicyIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.resourcePlanName = iprot.readString();
+        struct.setResourcePlanNameIsSet(true);
+        struct.poolPath = iprot.readString();
+        struct.setPoolPathIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(5);
+        if (incoming.get(0)) {
+          struct.allocFraction = iprot.readDouble();
+          struct.setAllocFractionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.queryParallelism = iprot.readI32();
+          struct.setQueryParallelismIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.schedulingPolicy = iprot.readString();
+          struct.setSchedulingPolicyIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.isSetSchedulingPolicy = iprot.readBool();
+          struct.setIsSetSchedulingPolicyIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java
index de894855961e..fb0a8077b274 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMNullableResourcePlan implements org.apache.thrift.TBase<WMNullableResourcePlan, WMNullableResourcePlan._Fields>, java.io.Serializable, Cloneable, Comparable<WMNullableResourcePlan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMNullableResourcePlan");
 
@@ -103,10 +103,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -117,7 +119,7 @@ public java.lang.String getFieldName() {
   private static final int __ISSETQUERYPARALLELISM_ISSET_ID = 1;
   private static final int __ISSETDEFAULTPOOLPATH_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.NAME,_Fields.STATUS,_Fields.QUERY_PARALLELISM,_Fields.IS_SET_QUERY_PARALLELISM,_Fields.DEFAULT_POOL_PATH,_Fields.IS_SET_DEFAULT_POOL_PATH,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.NAME,_Fields.STATUS,_Fields.QUERY_PARALLELISM,_Fields.IS_SET_QUERY_PARALLELISM,_Fields.DEFAULT_POOL_PATH,_Fields.IS_SET_DEFAULT_POOL_PATH,_Fields.NS};
   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);
@@ -164,6 +166,7 @@ public WMNullableResourcePlan(WMNullableResourcePlan other) {
     }
   }
 
+  @Override
   public WMNullableResourcePlan deepCopy() {
     return new WMNullableResourcePlan(this);
   }
@@ -352,6 +355,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -414,6 +418,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -442,6 +447,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -662,14 +668,17 @@ public int compareTo(WMNullableResourcePlan other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -764,6 +773,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMNullableResourcePlanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMNullableResourcePlanStandardScheme getScheme() {
       return new WMNullableResourcePlanStandardScheme();
     }
@@ -771,81 +781,88 @@ public WMNullableResourcePlanStandardScheme getScheme() {
 
   private static class WMNullableResourcePlanStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMNullableResourcePlan> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMNullableResourcePlan 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // QUERY_PARALLELISM
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.queryParallelism = iprot.readI32();
-              struct.setQueryParallelismIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 5: // IS_SET_QUERY_PARALLELISM
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isSetQueryParallelism = iprot.readBool();
-              struct.setIsSetQueryParallelismIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // QUERY_PARALLELISM
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.queryParallelism = iprot.readI32();
+                struct.setQueryParallelismIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // IS_SET_QUERY_PARALLELISM
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isSetQueryParallelism = iprot.readBool();
+                struct.setIsSetQueryParallelismIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // DEFAULT_POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.defaultPoolPath = iprot.readString();
+                struct.setDefaultPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // IS_SET_DEFAULT_POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isSetDefaultPoolPath = iprot.readBool();
+                struct.setIsSetDefaultPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 8: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DEFAULT_POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.defaultPoolPath = iprot.readString();
-              struct.setDefaultPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // IS_SET_DEFAULT_POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isSetDefaultPoolPath = iprot.readBool();
-              struct.setIsSetDefaultPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMNullableResourcePlan struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -900,6 +917,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMNullableResource
   }
 
   private static class WMNullableResourcePlanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMNullableResourcePlanTupleScheme getScheme() {
       return new WMNullableResourcePlanTupleScheme();
     }
@@ -958,35 +976,40 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMNullableResourceP
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMNullableResourcePlan struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
-        struct.setStatusIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.queryParallelism = iprot.readI32();
-        struct.setQueryParallelismIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.isSetQueryParallelism = iprot.readBool();
-        struct.setIsSetQueryParallelismIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.defaultPoolPath = iprot.readString();
-        struct.setDefaultPoolPathIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.isSetDefaultPoolPath = iprot.readBool();
-        struct.setIsSetDefaultPoolPathIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(7);
+        if (incoming.get(0)) {
+          struct.name = iprot.readString();
+          struct.setNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
+          struct.setStatusIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.queryParallelism = iprot.readI32();
+          struct.setQueryParallelismIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.isSetQueryParallelism = iprot.readBool();
+          struct.setIsSetQueryParallelismIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.defaultPoolPath = iprot.readString();
+          struct.setDefaultPoolPathIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.isSetDefaultPoolPath = iprot.readBool();
+          struct.setIsSetDefaultPoolPathIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java
index aca5a3d73b45..6a093bbf627d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMPool implements org.apache.thrift.TBase<WMPool, WMPool._Fields>, java.io.Serializable, Cloneable, Comparable<WMPool> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMPool");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __ALLOCFRACTION_ISSET_ID = 0;
   private static final int __QUERYPARALLELISM_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ALLOC_FRACTION,_Fields.QUERY_PARALLELISM,_Fields.SCHEDULING_POLICY,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.ALLOC_FRACTION,_Fields.QUERY_PARALLELISM,_Fields.SCHEDULING_POLICY,_Fields.NS};
   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);
@@ -160,6 +162,7 @@ public WMPool(WMPool other) {
     }
   }
 
+  @Override
   public WMPool deepCopy() {
     return new WMPool(this);
   }
@@ -316,6 +319,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -370,6 +374,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -395,6 +400,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -590,14 +596,17 @@ public int compareTo(WMPool other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -690,6 +699,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMPoolStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMPoolStandardScheme getScheme() {
       return new WMPoolStandardScheme();
     }
@@ -697,73 +707,80 @@ public WMPoolStandardScheme getScheme() {
 
   private static class WMPoolStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMPool> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMPool 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.poolPath = iprot.readString();
-              struct.setPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // ALLOC_FRACTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.allocFraction = iprot.readDouble();
-              struct.setAllocFractionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.poolPath = iprot.readString();
+                struct.setPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ALLOC_FRACTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+                struct.allocFraction = iprot.readDouble();
+                struct.setAllocFractionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // QUERY_PARALLELISM
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.queryParallelism = iprot.readI32();
+                struct.setQueryParallelismIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // SCHEDULING_POLICY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.schedulingPolicy = iprot.readString();
+                struct.setSchedulingPolicyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // QUERY_PARALLELISM
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.queryParallelism = iprot.readI32();
-              struct.setQueryParallelismIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // SCHEDULING_POLICY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.schedulingPolicy = iprot.readString();
-              struct.setSchedulingPolicyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMPool struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -809,6 +826,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMPool struct) thr
   }
 
   private static class WMPoolTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMPoolTupleScheme getScheme() {
       return new WMPoolTupleScheme();
     }
@@ -851,27 +869,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMPool struct) thro
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMPool struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.resourcePlanName = iprot.readString();
-      struct.setResourcePlanNameIsSet(true);
-      struct.poolPath = iprot.readString();
-      struct.setPoolPathIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.allocFraction = iprot.readDouble();
-        struct.setAllocFractionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.queryParallelism = iprot.readI32();
-        struct.setQueryParallelismIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.schedulingPolicy = iprot.readString();
-        struct.setSchedulingPolicyIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.resourcePlanName = iprot.readString();
+        struct.setResourcePlanNameIsSet(true);
+        struct.poolPath = iprot.readString();
+        struct.setPoolPathIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.allocFraction = iprot.readDouble();
+          struct.setAllocFractionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.queryParallelism = iprot.readI32();
+          struct.setQueryParallelismIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.schedulingPolicy = iprot.readString();
+          struct.setSchedulingPolicyIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java
index 27671db90c2b..52e1f59679e4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum WMPoolSchedulingPolicy implements org.apache.thrift.TEnum {
   FAIR(1),
   FIFO(2);
@@ -21,6 +21,7 @@ private WMPoolSchedulingPolicy(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java
index dd20719c11b0..95f2ac85348e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMPoolTrigger implements org.apache.thrift.TBase<WMPoolTrigger, WMPoolTrigger._Fields>, java.io.Serializable, Cloneable, Comparable<WMPoolTrigger> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMPoolTrigger");
 
@@ -79,17 +79,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.NS};
   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);
@@ -130,6 +132,7 @@ public WMPoolTrigger(WMPoolTrigger other) {
     }
   }
 
+  @Override
   public WMPoolTrigger deepCopy() {
     return new WMPoolTrigger(this);
   }
@@ -213,6 +216,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case POOL:
@@ -243,6 +247,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case POOL:
@@ -259,6 +264,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -379,14 +385,17 @@ public int compareTo(WMPoolTrigger other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -455,6 +464,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMPoolTriggerStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMPoolTriggerStandardScheme getScheme() {
       return new WMPoolTriggerStandardScheme();
     }
@@ -462,49 +472,56 @@ public WMPoolTriggerStandardScheme getScheme() {
 
   private static class WMPoolTriggerStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMPoolTrigger> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMPoolTrigger 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 1: // POOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.pool = iprot.readString();
-              struct.setPoolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TRIGGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.trigger = iprot.readString();
-              struct.setTriggerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // POOL
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.pool = iprot.readString();
+                struct.setPoolIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TRIGGER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.trigger = iprot.readString();
+                struct.setTriggerIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMPoolTrigger struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -533,6 +550,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMPoolTrigger stru
   }
 
   private static class WMPoolTriggerTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMPoolTriggerTupleScheme getScheme() {
       return new WMPoolTriggerTupleScheme();
     }
@@ -557,15 +575,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMPoolTrigger struc
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMPoolTrigger struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.pool = iprot.readString();
-      struct.setPoolIsSet(true);
-      struct.trigger = iprot.readString();
-      struct.setTriggerIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.pool = iprot.readString();
+        struct.setPoolIsSet(true);
+        struct.trigger = iprot.readString();
+        struct.setTriggerIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java
index c1979b6a3efa..0795bba7c6cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMResourcePlan implements org.apache.thrift.TBase<WMResourcePlan, WMResourcePlan._Fields>, java.io.Serializable, Cloneable, Comparable<WMResourcePlan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMResourcePlan");
 
@@ -93,10 +93,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -105,7 +107,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __QUERYPARALLELISM_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.STATUS,_Fields.QUERY_PARALLELISM,_Fields.DEFAULT_POOL_PATH,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.STATUS,_Fields.QUERY_PARALLELISM,_Fields.DEFAULT_POOL_PATH,_Fields.NS};
   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);
@@ -153,6 +155,7 @@ public WMResourcePlan(WMResourcePlan other) {
     }
   }
 
+  @Override
   public WMResourcePlan deepCopy() {
     return new WMResourcePlan(this);
   }
@@ -293,6 +296,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NAME:
@@ -339,6 +343,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
@@ -361,6 +366,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -531,14 +537,17 @@ public int compareTo(WMResourcePlan other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -623,6 +632,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMResourcePlanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMResourcePlanStandardScheme getScheme() {
       return new WMResourcePlanStandardScheme();
     }
@@ -630,65 +640,72 @@ public WMResourcePlanStandardScheme getScheme() {
 
   private static class WMResourcePlanStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMResourcePlan> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMResourcePlan 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 1: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // QUERY_PARALLELISM
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.queryParallelism = iprot.readI32();
-              struct.setQueryParallelismIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.name = iprot.readString();
+                struct.setNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // STATUS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
+                struct.setStatusIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // QUERY_PARALLELISM
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.queryParallelism = iprot.readI32();
+                struct.setQueryParallelismIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // DEFAULT_POOL_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.defaultPoolPath = iprot.readString();
+                struct.setDefaultPoolPathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DEFAULT_POOL_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.defaultPoolPath = iprot.readString();
-              struct.setDefaultPoolPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMResourcePlan struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -731,6 +748,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMResourcePlan str
   }
 
   private static class WMResourcePlanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMResourcePlanTupleScheme getScheme() {
       return new WMResourcePlanTupleScheme();
     }
@@ -772,25 +790,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMResourcePlan stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMResourcePlan struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.name = iprot.readString();
-      struct.setNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
-        struct.setStatusIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.queryParallelism = iprot.readI32();
-        struct.setQueryParallelismIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.defaultPoolPath = iprot.readString();
-        struct.setDefaultPoolPathIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.name = iprot.readString();
+        struct.setNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.status = org.apache.hadoop.hive.metastore.api.WMResourcePlanStatus.findByValue(iprot.readI32());
+          struct.setStatusIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.queryParallelism = iprot.readI32();
+          struct.setQueryParallelismIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.defaultPoolPath = iprot.readString();
+          struct.setDefaultPoolPathIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java
index 4a406105d4b8..b6b58748383c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 public enum WMResourcePlanStatus implements org.apache.thrift.TEnum {
   ACTIVE(1),
   ENABLED(2),
@@ -22,6 +22,7 @@ private WMResourcePlanStatus(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java
index eeaf71693ffd..124b05fba01f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMTrigger implements org.apache.thrift.TBase<WMTrigger, WMTrigger._Fields>, java.io.Serializable, Cloneable, Comparable<WMTrigger> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMTrigger");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,7 +108,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __ISINUNMANAGED_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TRIGGER_EXPRESSION,_Fields.ACTION_EXPRESSION,_Fields.IS_IN_UNMANAGED,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.TRIGGER_EXPRESSION,_Fields.ACTION_EXPRESSION,_Fields.IS_IN_UNMANAGED,_Fields.NS};
   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);
@@ -161,6 +163,7 @@ public WMTrigger(WMTrigger other) {
     }
   }
 
+  @Override
   public WMTrigger deepCopy() {
     return new WMTrigger(this);
   }
@@ -318,6 +321,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -372,6 +376,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -397,6 +402,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -592,14 +598,17 @@ public int compareTo(WMTrigger other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -696,6 +705,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMTriggerStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMTriggerStandardScheme getScheme() {
       return new WMTriggerStandardScheme();
     }
@@ -703,73 +713,80 @@ public WMTriggerStandardScheme getScheme() {
 
   private static class WMTriggerStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMTrigger> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMTrigger 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TRIGGER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.triggerName = iprot.readString();
-              struct.setTriggerNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TRIGGER_EXPRESSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.triggerExpression = iprot.readString();
-              struct.setTriggerExpressionIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // TRIGGER_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.triggerName = iprot.readString();
+                struct.setTriggerNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TRIGGER_EXPRESSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.triggerExpression = iprot.readString();
+                struct.setTriggerExpressionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // ACTION_EXPRESSION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.actionExpression = iprot.readString();
+                struct.setActionExpressionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // IS_IN_UNMANAGED
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.isInUnmanaged = iprot.readBool();
+                struct.setIsInUnmanagedIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ACTION_EXPRESSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.actionExpression = iprot.readString();
-              struct.setActionExpressionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // IS_IN_UNMANAGED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isInUnmanaged = iprot.readBool();
-              struct.setIsInUnmanagedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMTrigger struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -817,6 +834,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMTrigger struct)
   }
 
   private static class WMTriggerTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMTriggerTupleScheme getScheme() {
       return new WMTriggerTupleScheme();
     }
@@ -859,27 +877,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMTrigger struct) t
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMTrigger struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.resourcePlanName = iprot.readString();
-      struct.setResourcePlanNameIsSet(true);
-      struct.triggerName = iprot.readString();
-      struct.setTriggerNameIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.triggerExpression = iprot.readString();
-        struct.setTriggerExpressionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.actionExpression = iprot.readString();
-        struct.setActionExpressionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.isInUnmanaged = iprot.readBool();
-        struct.setIsInUnmanagedIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.resourcePlanName = iprot.readString();
+        struct.setResourcePlanNameIsSet(true);
+        struct.triggerName = iprot.readString();
+        struct.setTriggerNameIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.triggerExpression = iprot.readString();
+          struct.setTriggerExpressionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.actionExpression = iprot.readString();
+          struct.setActionExpressionIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.isInUnmanaged = iprot.readBool();
+          struct.setIsInUnmanagedIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java
index ae435f24c1a2..16bb1208a747 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMValidateResourcePlanRequest implements org.apache.thrift.TBase<WMValidateResourcePlanRequest, WMValidateResourcePlanRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WMValidateResourcePlanRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMValidateResourcePlanRequest");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
+  private static final _Fields[] optionals = {_Fields.RESOURCE_PLAN_NAME,_Fields.NS};
   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);
@@ -111,6 +113,7 @@ public WMValidateResourcePlanRequest(WMValidateResourcePlanRequest other) {
     }
   }
 
+  @Override
   public WMValidateResourcePlanRequest deepCopy() {
     return new WMValidateResourcePlanRequest(this);
   }
@@ -169,6 +172,7 @@ public void setNsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -191,6 +195,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_PLAN_NAME:
@@ -204,6 +209,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -299,14 +305,17 @@ public int compareTo(WMValidateResourcePlanRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -361,6 +370,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMValidateResourcePlanRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMValidateResourcePlanRequestStandardScheme getScheme() {
       return new WMValidateResourcePlanRequestStandardScheme();
     }
@@ -368,41 +378,48 @@ public WMValidateResourcePlanRequestStandardScheme getScheme() {
 
   private static class WMValidateResourcePlanRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMValidateResourcePlanRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMValidateResourcePlanRequest 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 1: // RESOURCE_PLAN_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourcePlanName = iprot.readString();
-              struct.setResourcePlanNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 2: // NS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ns = iprot.readString();
-              struct.setNsIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // RESOURCE_PLAN_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.resourcePlanName = iprot.readString();
+                struct.setResourcePlanNameIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.ns = iprot.readString();
+                struct.setNsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMValidateResourcePlanRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -428,6 +445,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMValidateResource
   }
 
   private static class WMValidateResourcePlanRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMValidateResourcePlanRequestTupleScheme getScheme() {
       return new WMValidateResourcePlanRequestTupleScheme();
     }
@@ -456,15 +474,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMValidateResourceP
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMValidateResourcePlanRequest 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.resourcePlanName = iprot.readString();
-        struct.setResourcePlanNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.ns = iprot.readString();
-        struct.setNsIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.resourcePlanName = iprot.readString();
+          struct.setResourcePlanNameIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.ns = iprot.readString();
+          struct.setNsIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
index 636920f59966..c0100562aebb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WMValidateResourcePlanResponse implements org.apache.thrift.TBase<WMValidateResourcePlanResponse, WMValidateResourcePlanResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WMValidateResourcePlanResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WMValidateResourcePlanResponse");
 
@@ -74,17 +74,19 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.ERRORS,_Fields.WARNINGS};
+  private static final _Fields[] optionals = {_Fields.ERRORS,_Fields.WARNINGS};
   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);
@@ -115,6 +117,7 @@ public WMValidateResourcePlanResponse(WMValidateResourcePlanResponse other) {
     }
   }
 
+  @Override
   public WMValidateResourcePlanResponse deepCopy() {
     return new WMValidateResourcePlanResponse(this);
   }
@@ -205,6 +208,7 @@ public void setWarningsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ERRORS:
@@ -227,6 +231,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ERRORS:
@@ -240,6 +245,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -335,14 +341,17 @@ public int compareTo(WMValidateResourcePlanResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -397,6 +406,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WMValidateResourcePlanResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMValidateResourcePlanResponseStandardScheme getScheme() {
       return new WMValidateResourcePlanResponseStandardScheme();
     }
@@ -404,61 +414,68 @@ public WMValidateResourcePlanResponseStandardScheme getScheme() {
 
   private static class WMValidateResourcePlanResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WMValidateResourcePlanResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WMValidateResourcePlanResponse 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 1: // ERRORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1336 = iprot.readListBegin();
-                struct.errors = new java.util.ArrayList<java.lang.String>(_list1336.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1337;
-                for (int _i1338 = 0; _i1338 < _list1336.size; ++_i1338)
+      iprot.incrementRecursionDepth();
+      try {
+        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 1: // ERRORS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1337 = iprot.readString();
-                  struct.errors.add(_elem1337);
+                  org.apache.thrift.protocol.TList _list1336 = iprot.readListBegin();
+                  struct.errors = new java.util.ArrayList<java.lang.String>(_list1336.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1337;
+                  for (int _i1338 = 0; _i1338 < _list1336.size; ++_i1338)
+                  {
+                    _elem1337 = iprot.readString();
+                    struct.errors.add(_elem1337);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setErrorsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setErrorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WARNINGS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1339 = iprot.readListBegin();
-                struct.warnings = new java.util.ArrayList<java.lang.String>(_list1339.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1340;
-                for (int _i1341 = 0; _i1341 < _list1339.size; ++_i1341)
+              break;
+            case 2: // WARNINGS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1340 = iprot.readString();
-                  struct.warnings.add(_elem1340);
+                  org.apache.thrift.protocol.TList _list1339 = iprot.readListBegin();
+                  struct.warnings = new java.util.ArrayList<java.lang.String>(_list1339.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1340;
+                  for (int _i1341 = 0; _i1341 < _list1339.size; ++_i1341)
+                  {
+                    _elem1340 = iprot.readString();
+                    struct.warnings.add(_elem1340);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setWarningsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setWarningsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WMValidateResourcePlanResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -498,6 +515,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WMValidateResource
   }
 
   private static class WMValidateResourcePlanResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WMValidateResourcePlanResponseTupleScheme getScheme() {
       return new WMValidateResourcePlanResponseTupleScheme();
     }
@@ -538,33 +556,38 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WMValidateResourceP
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WMValidateResourcePlanResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list1346 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.errors = new java.util.ArrayList<java.lang.String>(_list1346.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1347;
-          for (int _i1348 = 0; _i1348 < _list1346.size; ++_i1348)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
           {
-            _elem1347 = iprot.readString();
-            struct.errors.add(_elem1347);
+            org.apache.thrift.protocol.TList _list1346 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.errors = new java.util.ArrayList<java.lang.String>(_list1346.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1347;
+            for (int _i1348 = 0; _i1348 < _list1346.size; ++_i1348)
+            {
+              _elem1347 = iprot.readString();
+              struct.errors.add(_elem1347);
+            }
           }
+          struct.setErrorsIsSet(true);
         }
-        struct.setErrorsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list1349 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.warnings = new java.util.ArrayList<java.lang.String>(_list1349.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1350;
-          for (int _i1351 = 0; _i1351 < _list1349.size; ++_i1351)
+        if (incoming.get(1)) {
           {
-            _elem1350 = iprot.readString();
-            struct.warnings.add(_elem1350);
+            org.apache.thrift.protocol.TList _list1349 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.warnings = new java.util.ArrayList<java.lang.String>(_list1349.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1350;
+            for (int _i1351 = 0; _i1351 < _list1349.size; ++_i1351)
+            {
+              _elem1350 = iprot.readString();
+              struct.warnings.add(_elem1350);
+            }
           }
+          struct.setWarningsIsSet(true);
         }
-        struct.setWarningsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java
index 55763ebf3143..0ed5e5d42a07 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WriteEventInfo implements org.apache.thrift.TBase<WriteEventInfo, WriteEventInfo._Fields>, java.io.Serializable, Cloneable, Comparable<WriteEventInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriteEventInfo");
 
@@ -99,10 +99,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -111,7 +113,7 @@ public java.lang.String getFieldName() {
   // isset id assignments
   private static final int __WRITEID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITION,_Fields.TABLE_OBJ,_Fields.PARTITION_OBJ};
+  private static final _Fields[] optionals = {_Fields.PARTITION,_Fields.TABLE_OBJ,_Fields.PARTITION_OBJ};
   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);
@@ -176,6 +178,7 @@ public WriteEventInfo(WriteEventInfo other) {
     }
   }
 
+  @Override
   public WriteEventInfo deepCopy() {
     return new WriteEventInfo(this);
   }
@@ -358,6 +361,7 @@ public void setPartitionObjIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case WRITE_ID:
@@ -420,6 +424,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case WRITE_ID:
@@ -448,6 +453,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -666,14 +672,17 @@ public int compareTo(WriteEventInfo other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -784,6 +793,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WriteEventInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteEventInfoStandardScheme getScheme() {
       return new WriteEventInfoStandardScheme();
     }
@@ -791,81 +801,88 @@ public WriteEventInfoStandardScheme getScheme() {
 
   private static class WriteEventInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<WriteEventInfo> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WriteEventInfo 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 1: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DATABASE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.database = iprot.readString();
-              struct.setDatabaseIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 3: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table = iprot.readString();
-              struct.setTableIsSet(true);
-            } else { 
+          }
+          switch (schemeField.id) {
+            case 1: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DATABASE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.database = iprot.readString();
+                struct.setDatabaseIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table = iprot.readString();
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // FILES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.files = iprot.readString();
+                struct.setFilesIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // PARTITION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partition = iprot.readString();
+                struct.setPartitionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // TABLE_OBJ
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableObj = iprot.readString();
+                struct.setTableObjIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // PARTITION_OBJ
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.partitionObj = iprot.readString();
+                struct.setPartitionObjIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // FILES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.files = iprot.readString();
-              struct.setFilesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PARTITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partition = iprot.readString();
-              struct.setPartitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // TABLE_OBJ
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableObj = iprot.readString();
-              struct.setTableObjIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // PARTITION_OBJ
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.partitionObj = iprot.readString();
-              struct.setPartitionObjIsSet(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.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WriteEventInfo struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -916,6 +933,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WriteEventInfo str
   }
 
   private static class WriteEventInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteEventInfoTupleScheme getScheme() {
       return new WriteEventInfoTupleScheme();
     }
@@ -954,27 +972,32 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WriteEventInfo stru
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WriteEventInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.writeId = iprot.readI64();
-      struct.setWriteIdIsSet(true);
-      struct.database = iprot.readString();
-      struct.setDatabaseIsSet(true);
-      struct.table = iprot.readString();
-      struct.setTableIsSet(true);
-      struct.files = iprot.readString();
-      struct.setFilesIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.partition = iprot.readString();
-        struct.setPartitionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.tableObj = iprot.readString();
-        struct.setTableObjIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.partitionObj = iprot.readString();
-        struct.setPartitionObjIsSet(true);
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.writeId = iprot.readI64();
+        struct.setWriteIdIsSet(true);
+        struct.database = iprot.readString();
+        struct.setDatabaseIsSet(true);
+        struct.table = iprot.readString();
+        struct.setTableIsSet(true);
+        struct.files = iprot.readString();
+        struct.setFilesIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(3);
+        if (incoming.get(0)) {
+          struct.partition = iprot.readString();
+          struct.setPartitionIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.tableObj = iprot.readString();
+          struct.setTableObjIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.partitionObj = iprot.readString();
+          struct.setPartitionObjIsSet(true);
+        }
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchRequest.java
index c188202b2af8..8aed57704f75 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WriteNotificationLogBatchRequest implements org.apache.thrift.TBase<WriteNotificationLogBatchRequest, WriteNotificationLogBatchRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WriteNotificationLogBatchRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriteNotificationLogBatchRequest");
 
@@ -84,10 +84,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -148,6 +150,7 @@ public WriteNotificationLogBatchRequest(WriteNotificationLogBatchRequest other)
     }
   }
 
+  @Override
   public WriteNotificationLogBatchRequest deepCopy() {
     return new WriteNotificationLogBatchRequest(this);
   }
@@ -272,6 +275,7 @@ public void setRequestListIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case CATALOG:
@@ -310,6 +314,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case CATALOG:
@@ -329,6 +334,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -474,14 +480,17 @@ public int compareTo(WriteNotificationLogBatchRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -564,6 +573,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WriteNotificationLogBatchRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogBatchRequestStandardScheme getScheme() {
       return new WriteNotificationLogBatchRequestStandardScheme();
     }
@@ -571,68 +581,75 @@ public WriteNotificationLogBatchRequestStandardScheme getScheme() {
 
   private static class WriteNotificationLogBatchRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WriteNotificationLogBatchRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WriteNotificationLogBatchRequest 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 1: // CATALOG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.catalog = iprot.readString();
-              struct.setCatalogIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db = iprot.readString();
-              struct.setDbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table = iprot.readString();
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 4: // REQUEST_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1124 = iprot.readListBegin();
-                struct.requestList = new java.util.ArrayList<WriteNotificationLogRequest>(_list1124.size);
-                @org.apache.thrift.annotation.Nullable WriteNotificationLogRequest _elem1125;
-                for (int _i1126 = 0; _i1126 < _list1124.size; ++_i1126)
+          }
+          switch (schemeField.id) {
+            case 1: // CATALOG
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.catalog = iprot.readString();
+                struct.setCatalogIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db = iprot.readString();
+                struct.setDbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table = iprot.readString();
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // REQUEST_LIST
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1125 = new WriteNotificationLogRequest();
-                  _elem1125.read(iprot);
-                  struct.requestList.add(_elem1125);
+                  org.apache.thrift.protocol.TList _list1124 = iprot.readListBegin();
+                  struct.requestList = new java.util.ArrayList<WriteNotificationLogRequest>(_list1124.size);
+                  @org.apache.thrift.annotation.Nullable WriteNotificationLogRequest _elem1125;
+                  for (int _i1126 = 0; _i1126 < _list1124.size; ++_i1126)
+                  {
+                    _elem1125 = new WriteNotificationLogRequest();
+                    _elem1125.read(iprot);
+                    struct.requestList.add(_elem1125);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setRequestListIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setRequestListIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationLogBatchRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -671,6 +688,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationL
   }
 
   private static class WriteNotificationLogBatchRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogBatchRequestTupleScheme getScheme() {
       return new WriteNotificationLogBatchRequestTupleScheme();
     }
@@ -695,25 +713,30 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLogBatchRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.catalog = iprot.readString();
-      struct.setCatalogIsSet(true);
-      struct.db = iprot.readString();
-      struct.setDbIsSet(true);
-      struct.table = iprot.readString();
-      struct.setTableIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list1129 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-        struct.requestList = new java.util.ArrayList<WriteNotificationLogRequest>(_list1129.size);
-        @org.apache.thrift.annotation.Nullable WriteNotificationLogRequest _elem1130;
-        for (int _i1131 = 0; _i1131 < _list1129.size; ++_i1131)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.catalog = iprot.readString();
+        struct.setCatalogIsSet(true);
+        struct.db = iprot.readString();
+        struct.setDbIsSet(true);
+        struct.table = iprot.readString();
+        struct.setTableIsSet(true);
         {
-          _elem1130 = new WriteNotificationLogRequest();
-          _elem1130.read(iprot);
-          struct.requestList.add(_elem1130);
+          org.apache.thrift.protocol.TList _list1129 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.requestList = new java.util.ArrayList<WriteNotificationLogRequest>(_list1129.size);
+          @org.apache.thrift.annotation.Nullable WriteNotificationLogRequest _elem1130;
+          for (int _i1131 = 0; _i1131 < _list1129.size; ++_i1131)
+          {
+            _elem1130 = new WriteNotificationLogRequest();
+            _elem1130.read(iprot);
+            struct.requestList.add(_elem1130);
+          }
         }
+        struct.setRequestListIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
-      struct.setRequestListIsSet(true);
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchResponse.java
index 17801b709975..a2bce896bbce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogBatchResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WriteNotificationLogBatchResponse implements org.apache.thrift.TBase<WriteNotificationLogBatchResponse, WriteNotificationLogBatchResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WriteNotificationLogBatchResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriteNotificationLogBatchResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WriteNotificationLogBatchResponse() {
   public WriteNotificationLogBatchResponse(WriteNotificationLogBatchResponse other) {
   }
 
+  @Override
   public WriteNotificationLogBatchResponse deepCopy() {
     return new WriteNotificationLogBatchResponse(this);
   }
@@ -97,12 +100,14 @@ public WriteNotificationLogBatchResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WriteNotificationLogBatchResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WriteNotificationLogBatchResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogBatchResponseStandardScheme getScheme() {
       return new WriteNotificationLogBatchResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WriteNotificationLogBatchResponseStandardScheme getScheme() {
 
   private static class WriteNotificationLogBatchResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WriteNotificationLogBatchResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WriteNotificationLogBatchResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationLogBatchResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationL
   }
 
   private static class WriteNotificationLogBatchResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogBatchResponseTupleScheme getScheme() {
       return new WriteNotificationLogBatchResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLogBatchResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java
index fb5e59cb17df..ea5e4e408f9d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WriteNotificationLogRequest implements org.apache.thrift.TBase<WriteNotificationLogRequest, WriteNotificationLogRequest._Fields>, java.io.Serializable, Cloneable, Comparable<WriteNotificationLogRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriteNotificationLogRequest");
 
@@ -94,10 +94,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -107,7 +109,7 @@ public java.lang.String getFieldName() {
   private static final int __TXNID_ISSET_ID = 0;
   private static final int __WRITEID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PARTITION_VALS};
+  private static final _Fields[] optionals = {_Fields.PARTITION_VALS};
   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);
@@ -170,6 +172,7 @@ public WriteNotificationLogRequest(WriteNotificationLogRequest other) {
     }
   }
 
+  @Override
   public WriteNotificationLogRequest deepCopy() {
     return new WriteNotificationLogRequest(this);
   }
@@ -342,6 +345,7 @@ public void setPartitionValsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TXN_ID:
@@ -396,6 +400,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TXN_ID:
@@ -421,6 +426,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -612,14 +618,17 @@ public int compareTo(WriteNotificationLogRequest other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -721,6 +730,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WriteNotificationLogRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogRequestStandardScheme getScheme() {
       return new WriteNotificationLogRequestStandardScheme();
     }
@@ -728,84 +738,91 @@ public WriteNotificationLogRequestStandardScheme getScheme() {
 
   private static class WriteNotificationLogRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<WriteNotificationLogRequest> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WriteNotificationLogRequest 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 1: // TXN_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.txnId = iprot.readI64();
-              struct.setTxnIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // DB
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db = iprot.readString();
-              struct.setDbIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table = iprot.readString();
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // FILE_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.fileInfo = new InsertEventRequestData();
-              struct.fileInfo.read(iprot);
-              struct.setFileInfoIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
+      iprot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
             break;
-          case 6: // PARTITION_VALS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list1116 = iprot.readListBegin();
-                struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1116.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1117;
-                for (int _i1118 = 0; _i1118 < _list1116.size; ++_i1118)
+          }
+          switch (schemeField.id) {
+            case 1: // TXN_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.txnId = iprot.readI64();
+                struct.setTxnIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // WRITE_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.writeId = iprot.readI64();
+                struct.setWriteIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // DB
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.db = iprot.readString();
+                struct.setDbIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 4: // TABLE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.table = iprot.readString();
+                struct.setTableIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // FILE_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.fileInfo = new InsertEventRequestData();
+                struct.fileInfo.read(iprot);
+                struct.setFileInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // PARTITION_VALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  _elem1117 = iprot.readString();
-                  struct.partitionVals.add(_elem1117);
+                  org.apache.thrift.protocol.TList _list1116 = iprot.readListBegin();
+                  struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1116.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem1117;
+                  for (int _i1118 = 0; _i1118 < _list1116.size; ++_i1118)
+                  {
+                    _elem1117 = iprot.readString();
+                    struct.partitionVals.add(_elem1117);
+                  }
+                  iprot.readListEnd();
                 }
-                iprot.readListEnd();
+                struct.setPartitionValsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
-              struct.setPartitionValsIsSet(true);
-            } else { 
+              break;
+            default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationLogRequest struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -852,6 +869,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationL
   }
 
   private static class WriteNotificationLogRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogRequestTupleScheme getScheme() {
       return new WriteNotificationLogRequestTupleScheme();
     }
@@ -885,31 +903,36 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLogRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.txnId = iprot.readI64();
-      struct.setTxnIdIsSet(true);
-      struct.writeId = iprot.readI64();
-      struct.setWriteIdIsSet(true);
-      struct.db = iprot.readString();
-      struct.setDbIsSet(true);
-      struct.table = iprot.readString();
-      struct.setTableIsSet(true);
-      struct.fileInfo = new InsertEventRequestData();
-      struct.fileInfo.read(iprot);
-      struct.setFileInfoIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list1121 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-          struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1121.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1122;
-          for (int _i1123 = 0; _i1123 < _list1121.size; ++_i1123)
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        struct.txnId = iprot.readI64();
+        struct.setTxnIdIsSet(true);
+        struct.writeId = iprot.readI64();
+        struct.setWriteIdIsSet(true);
+        struct.db = iprot.readString();
+        struct.setDbIsSet(true);
+        struct.table = iprot.readString();
+        struct.setTableIsSet(true);
+        struct.fileInfo = new InsertEventRequestData();
+        struct.fileInfo.read(iprot);
+        struct.setFileInfoIsSet(true);
+        java.util.BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
           {
-            _elem1122 = iprot.readString();
-            struct.partitionVals.add(_elem1122);
+            org.apache.thrift.protocol.TList _list1121 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.partitionVals = new java.util.ArrayList<java.lang.String>(_list1121.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem1122;
+            for (int _i1123 = 0; _i1123 < _list1121.size; ++_i1123)
+            {
+              _elem1122 = iprot.readString();
+              struct.partitionVals.add(_elem1122);
+            }
           }
+          struct.setPartitionValsIsSet(true);
         }
-        struct.setPartitionValsIsSet(true);
+      } finally {
+        prot.decrementRecursionDepth();
       }
     }
   }
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java
index 65c7e53e8794..d344790408b7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,7 +7,7 @@
 package org.apache.hadoop.hive.metastore.api;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.23.0)")
 @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class WriteNotificationLogResponse implements org.apache.thrift.TBase<WriteNotificationLogResponse, WriteNotificationLogResponse._Fields>, java.io.Serializable, Cloneable, Comparable<WriteNotificationLogResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriteNotificationLogResponse");
 
@@ -65,10 +65,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -89,6 +91,7 @@ public WriteNotificationLogResponse() {
   public WriteNotificationLogResponse(WriteNotificationLogResponse other) {
   }
 
+  @Override
   public WriteNotificationLogResponse deepCopy() {
     return new WriteNotificationLogResponse(this);
   }
@@ -97,12 +100,14 @@ public WriteNotificationLogResponse deepCopy() {
   public void clear() {
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
@@ -110,6 +115,7 @@ public java.lang.Object getFieldValue(_Fields field) {
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
@@ -155,14 +161,17 @@ public int compareTo(WriteNotificationLogResponse other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -198,6 +207,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class WriteNotificationLogResponseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogResponseStandardScheme getScheme() {
       return new WriteNotificationLogResponseStandardScheme();
     }
@@ -205,25 +215,32 @@ public WriteNotificationLogResponseStandardScheme getScheme() {
 
   private static class WriteNotificationLogResponseStandardScheme extends org.apache.thrift.scheme.StandardScheme<WriteNotificationLogResponse> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, WriteNotificationLogResponse 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) {
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+      iprot.incrementRecursionDepth();
+      try {
+        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) {
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
         }
-        iprot.readFieldEnd();
+        iprot.readStructEnd();
+        struct.validate();
+      } finally {
+        iprot.decrementRecursionDepth();
       }
-      iprot.readStructEnd();
-      struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationLogResponse struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -235,6 +252,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WriteNotificationL
   }
 
   private static class WriteNotificationLogResponseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public WriteNotificationLogResponseTupleScheme getScheme() {
       return new WriteNotificationLogResponseTupleScheme();
     }
@@ -249,7 +267,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WriteNotificationLogResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      prot.incrementRecursionDepth();
+      try {
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      } finally {
+        prot.decrementRecursionDepth();
+      }
     }
   }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java
index 58ccb3f7376f..25a7e9e47045 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookServiceClient.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookServiceClient.php
new file mode 100644
index 000000000000..65fe6063fe61
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookServiceClient.php
@@ -0,0 +1,722 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookServiceClient implements \FacebookServiceIf
+{
+    protected $input_ = null;
+    protected $output_ = null;
+
+    protected $seqid_ = 0;
+
+    public function __construct($input, $output = null)
+    {
+        $this->input_ = $input;
+        $this->output_ = $output ? $output : $input;
+    }
+
+
+    public function getName()
+    {
+        $this->send_getName();
+        return $this->recv_getName();
+    }
+
+    public function send_getName()
+    {
+        $args = new \FacebookService_getName_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getName',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getName', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getName()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getName_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getName_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getName failed: unknown result");
+    }
+
+    public function getVersion()
+    {
+        $this->send_getVersion();
+        return $this->recv_getVersion();
+    }
+
+    public function send_getVersion()
+    {
+        $args = new \FacebookService_getVersion_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getVersion',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getVersion', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getVersion()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getVersion_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getVersion_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getVersion failed: unknown result");
+    }
+
+    public function getStatus()
+    {
+        $this->send_getStatus();
+        return $this->recv_getStatus();
+    }
+
+    public function send_getStatus()
+    {
+        $args = new \FacebookService_getStatus_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getStatus',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getStatus', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getStatus()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getStatus_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getStatus_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getStatus failed: unknown result");
+    }
+
+    public function getStatusDetails()
+    {
+        $this->send_getStatusDetails();
+        return $this->recv_getStatusDetails();
+    }
+
+    public function send_getStatusDetails()
+    {
+        $args = new \FacebookService_getStatusDetails_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getStatusDetails',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getStatusDetails', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getStatusDetails()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getStatusDetails_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getStatusDetails_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getStatusDetails failed: unknown result");
+    }
+
+    public function getCounters()
+    {
+        $this->send_getCounters();
+        return $this->recv_getCounters();
+    }
+
+    public function send_getCounters()
+    {
+        $args = new \FacebookService_getCounters_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getCounters',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getCounters', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getCounters()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getCounters_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getCounters_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getCounters failed: unknown result");
+    }
+
+    public function getCounter($key)
+    {
+        $this->send_getCounter($key);
+        return $this->recv_getCounter();
+    }
+
+    public function send_getCounter($key)
+    {
+        $args = new \FacebookService_getCounter_args();
+        $args->key = $key;
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getCounter',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getCounter', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getCounter()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getCounter_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getCounter_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getCounter failed: unknown result");
+    }
+
+    public function setOption($key, $value)
+    {
+        $this->send_setOption($key, $value);
+        $this->recv_setOption();
+    }
+
+    public function send_setOption($key, $value)
+    {
+        $args = new \FacebookService_setOption_args();
+        $args->key = $key;
+        $args->value = $value;
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'setOption',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('setOption', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_setOption()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_setOption_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_setOption_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        return;
+    }
+
+    public function getOption($key)
+    {
+        $this->send_getOption($key);
+        return $this->recv_getOption();
+    }
+
+    public function send_getOption($key)
+    {
+        $args = new \FacebookService_getOption_args();
+        $args->key = $key;
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getOption',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getOption', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getOption()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getOption_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getOption_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getOption failed: unknown result");
+    }
+
+    public function getOptions()
+    {
+        $this->send_getOptions();
+        return $this->recv_getOptions();
+    }
+
+    public function send_getOptions()
+    {
+        $args = new \FacebookService_getOptions_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getOptions',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getOptions', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getOptions()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getOptions_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getOptions_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getOptions failed: unknown result");
+    }
+
+    public function getCpuProfile($profileDurationInSec)
+    {
+        $this->send_getCpuProfile($profileDurationInSec);
+        return $this->recv_getCpuProfile();
+    }
+
+    public function send_getCpuProfile($profileDurationInSec)
+    {
+        $args = new \FacebookService_getCpuProfile_args();
+        $args->profileDurationInSec = $profileDurationInSec;
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'getCpuProfile',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('getCpuProfile', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_getCpuProfile()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_getCpuProfile_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_getCpuProfile_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("getCpuProfile failed: unknown result");
+    }
+
+    public function aliveSince()
+    {
+        $this->send_aliveSince();
+        return $this->recv_aliveSince();
+    }
+
+    public function send_aliveSince()
+    {
+        $args = new \FacebookService_aliveSince_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'aliveSince',
+                TMessageType::CALL,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('aliveSince', TMessageType::CALL, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function recv_aliveSince()
+    {
+        $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+        if ($bin_accel) {
+            $result = thrift_protocol_read_binary(
+                $this->input_,
+                '\FacebookService_aliveSince_result',
+                $this->input_->isStrictRead()
+            );
+        } else {
+            $rseqid = 0;
+            $fname = null;
+            $mtype = 0;
+
+            $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+            if ($mtype == TMessageType::EXCEPTION) {
+                $x = new TApplicationException();
+                $x->read($this->input_);
+                $this->input_->readMessageEnd();
+                throw $x;
+            }
+            $result = new \FacebookService_aliveSince_result();
+            $result->read($this->input_);
+            $this->input_->readMessageEnd();
+        }
+        if ($result->success !== null) {
+            return $result->success;
+        }
+        throw new \Exception("aliveSince failed: unknown result");
+    }
+
+    public function reinitialize()
+    {
+        $this->send_reinitialize();
+    }
+
+    public function send_reinitialize()
+    {
+        $args = new \FacebookService_reinitialize_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'reinitialize',
+                TMessageType::ONEWAY,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('reinitialize', TMessageType::ONEWAY, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+
+    public function shutdown()
+    {
+        $this->send_shutdown();
+    }
+
+    public function send_shutdown()
+    {
+        $args = new \FacebookService_shutdown_args();
+        $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+        if ($bin_accel) {
+            thrift_protocol_write_binary(
+                $this->output_,
+                'shutdown',
+                TMessageType::ONEWAY,
+                $args,
+                $this->seqid_,
+                $this->output_->isStrictWrite()
+            );
+        } else {
+            $this->output_->writeMessageBegin('shutdown', TMessageType::ONEWAY, $this->seqid_);
+            $args->write($this->output_);
+            $this->output_->writeMessageEnd();
+            $this->output_->getTransport()->flush();
+        }
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookServiceIf.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookServiceIf.php
new file mode 100644
index 000000000000..ef413994b5e8
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookServiceIf.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+/**
+ * Standard base service
+ */
+interface FacebookServiceIf
+{
+    /**
+     * Returns a descriptive name of the service
+     * 
+     * @return string
+     */
+    public function getName();
+    /**
+     * Returns the version of the service
+     * 
+     * @return string
+     */
+    public function getVersion();
+    /**
+     * Gets the status of this service
+     * 
+     * @return int Common status reporting mechanism across all services
+     * 
+     */
+    public function getStatus();
+    /**
+     * User friendly description of status, such as why the service is in
+     * the dead or warning state, or what is being started or stopped.
+     * 
+     * @return string
+     */
+    public function getStatusDetails();
+    /**
+     * Gets the counters for this service
+     * 
+     * @return array
+     */
+    public function getCounters();
+    /**
+     * Gets the value of a single counter
+     * 
+     * @param string $key
+     * @return int
+     */
+    public function getCounter($key);
+    /**
+     * Sets an option
+     * 
+     * @param string $key
+     * @param string $value
+     */
+    public function setOption($key, $value);
+    /**
+     * Gets an option
+     * 
+     * @param string $key
+     * @return string
+     */
+    public function getOption($key);
+    /**
+     * Gets all options
+     * 
+     * @return array
+     */
+    public function getOptions();
+    /**
+     * Returns a CPU profile over the given time interval (client and server
+     * must agree on the profile format).
+     * 
+     * @param int $profileDurationInSec
+     * @return string
+     */
+    public function getCpuProfile($profileDurationInSec);
+    /**
+     * Returns the unix time that the server has been running since
+     * 
+     * @return int
+     */
+    public function aliveSince();
+    /**
+     * Tell the server to reload its configuration, reopen log files, etc
+     * 
+     */
+    public function reinitialize();
+    /**
+     * Suggest a shutdown to the server
+     * 
+     */
+    public function shutdown();
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_aliveSince_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_aliveSince_args.php
new file mode 100644
index 000000000000..803f979c98fc
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_aliveSince_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_aliveSince_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_aliveSince_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_aliveSince_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_aliveSince_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_aliveSince_result.php
new file mode 100644
index 000000000000..df3ad6cd7d3c
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_aliveSince_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_aliveSince_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::I64,
+        ),
+    );
+
+    /**
+     * @var int
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_aliveSince_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::I64) {
+                        $xfer += $input->readI64($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_aliveSince_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::I64, 0);
+            $xfer += $output->writeI64($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounter_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounter_args.php
new file mode 100644
index 000000000000..2a66415ad5d5
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounter_args.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getCounter_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        1 => array(
+            'var' => 'key',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $key = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['key'])) {
+                $this->key = $vals['key'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getCounter_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 1:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->key);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getCounter_args');
+        if ($this->key !== null) {
+            $xfer += $output->writeFieldBegin('key', TType::STRING, 1);
+            $xfer += $output->writeString($this->key);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounter_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounter_result.php
new file mode 100644
index 000000000000..05320e48f8a6
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounter_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getCounter_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::I64,
+        ),
+    );
+
+    /**
+     * @var int
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getCounter_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::I64) {
+                        $xfer += $input->readI64($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getCounter_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::I64, 0);
+            $xfer += $output->writeI64($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounters_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounters_args.php
new file mode 100644
index 000000000000..a10b92357c07
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounters_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getCounters_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getCounters_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getCounters_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounters_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounters_result.php
new file mode 100644
index 000000000000..093f127432ba
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCounters_result.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getCounters_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::MAP,
+            'ktype' => TType::STRING,
+            'vtype' => TType::I64,
+            'key' => array(
+                'type' => TType::STRING,
+            ),
+            'val' => array(
+                'type' => TType::I64,
+                ),
+        ),
+    );
+
+    /**
+     * @var array
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getCounters_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::MAP) {
+                        $this->success = array();
+                        $_size0 = 0;
+                        $_ktype1 = 0;
+                        $_vtype2 = 0;
+                        $xfer += $input->readMapBegin($_ktype1, $_vtype2, $_size0);
+                        for ($_i4 = 0; $_i4 < $_size0; ++$_i4) {
+                            $key5 = '';
+                            $val6 = 0;
+                            $xfer += $input->readString($key5);
+                            $xfer += $input->readI64($val6);
+                            $this->success[$key5] = $val6;
+                        }
+                        $xfer += $input->readMapEnd();
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getCounters_result');
+        if ($this->success !== null) {
+            if (!is_array($this->success)) {
+                throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+            }
+            $xfer += $output->writeFieldBegin('success', TType::MAP, 0);
+            $output->writeMapBegin(TType::STRING, TType::I64, count($this->success));
+            foreach ($this->success as $kiter7 => $viter8) {
+                $xfer += $output->writeString($kiter7);
+                $xfer += $output->writeI64($viter8);
+            }
+            $output->writeMapEnd();
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCpuProfile_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCpuProfile_args.php
new file mode 100644
index 000000000000..7ffa734ae980
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCpuProfile_args.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getCpuProfile_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        1 => array(
+            'var' => 'profileDurationInSec',
+            'isRequired' => false,
+            'type' => TType::I32,
+        ),
+    );
+
+    /**
+     * @var int
+     */
+    public $profileDurationInSec = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['profileDurationInSec'])) {
+                $this->profileDurationInSec = $vals['profileDurationInSec'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getCpuProfile_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 1:
+                    if ($ftype == TType::I32) {
+                        $xfer += $input->readI32($this->profileDurationInSec);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getCpuProfile_args');
+        if ($this->profileDurationInSec !== null) {
+            $xfer += $output->writeFieldBegin('profileDurationInSec', TType::I32, 1);
+            $xfer += $output->writeI32($this->profileDurationInSec);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCpuProfile_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCpuProfile_result.php
new file mode 100644
index 000000000000..5d9cca396330
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getCpuProfile_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getCpuProfile_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getCpuProfile_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getCpuProfile_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+            $xfer += $output->writeString($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getName_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getName_args.php
new file mode 100644
index 000000000000..b83e59f1c1c7
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getName_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getName_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getName_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getName_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getName_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getName_result.php
new file mode 100644
index 000000000000..344ca7f3c6e8
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getName_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getName_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getName_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getName_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+            $xfer += $output->writeString($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOption_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOption_args.php
new file mode 100644
index 000000000000..31c847d232ce
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOption_args.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getOption_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        1 => array(
+            'var' => 'key',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $key = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['key'])) {
+                $this->key = $vals['key'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getOption_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 1:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->key);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getOption_args');
+        if ($this->key !== null) {
+            $xfer += $output->writeFieldBegin('key', TType::STRING, 1);
+            $xfer += $output->writeString($this->key);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOption_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOption_result.php
new file mode 100644
index 000000000000..0edb6ac08be3
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOption_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getOption_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getOption_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getOption_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+            $xfer += $output->writeString($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOptions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOptions_args.php
new file mode 100644
index 000000000000..57b63a23bad1
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOptions_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getOptions_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getOptions_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getOptions_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOptions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOptions_result.php
new file mode 100644
index 000000000000..534e82a02b3f
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getOptions_result.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getOptions_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::MAP,
+            'ktype' => TType::STRING,
+            'vtype' => TType::STRING,
+            'key' => array(
+                'type' => TType::STRING,
+            ),
+            'val' => array(
+                'type' => TType::STRING,
+                ),
+        ),
+    );
+
+    /**
+     * @var array
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getOptions_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::MAP) {
+                        $this->success = array();
+                        $_size9 = 0;
+                        $_ktype10 = 0;
+                        $_vtype11 = 0;
+                        $xfer += $input->readMapBegin($_ktype10, $_vtype11, $_size9);
+                        for ($_i13 = 0; $_i13 < $_size9; ++$_i13) {
+                            $key14 = '';
+                            $val15 = '';
+                            $xfer += $input->readString($key14);
+                            $xfer += $input->readString($val15);
+                            $this->success[$key14] = $val15;
+                        }
+                        $xfer += $input->readMapEnd();
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getOptions_result');
+        if ($this->success !== null) {
+            if (!is_array($this->success)) {
+                throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+            }
+            $xfer += $output->writeFieldBegin('success', TType::MAP, 0);
+            $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
+            foreach ($this->success as $kiter16 => $viter17) {
+                $xfer += $output->writeString($kiter16);
+                $xfer += $output->writeString($viter17);
+            }
+            $output->writeMapEnd();
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatusDetails_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatusDetails_args.php
new file mode 100644
index 000000000000..e2989e2ca5af
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatusDetails_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getStatusDetails_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getStatusDetails_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getStatusDetails_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatusDetails_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatusDetails_result.php
new file mode 100644
index 000000000000..adeaf3f68280
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatusDetails_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getStatusDetails_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getStatusDetails_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getStatusDetails_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+            $xfer += $output->writeString($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatus_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatus_args.php
new file mode 100644
index 000000000000..d90e01b8d2e3
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatus_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getStatus_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getStatus_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getStatus_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatus_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatus_result.php
new file mode 100644
index 000000000000..673d0d881372
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getStatus_result.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getStatus_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::I32,
+            'class' => '\fb_status',
+        ),
+    );
+
+    /**
+     * @var int
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getStatus_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::I32) {
+                        $xfer += $input->readI32($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getStatus_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::I32, 0);
+            $xfer += $output->writeI32($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getVersion_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getVersion_args.php
new file mode 100644
index 000000000000..70f369eb0765
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getVersion_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getVersion_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getVersion_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getVersion_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getVersion_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getVersion_result.php
new file mode 100644
index 000000000000..82dfef8aed0d
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_getVersion_result.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_getVersion_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        0 => array(
+            'var' => 'success',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $success = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['success'])) {
+                $this->success = $vals['success'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_getVersion_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 0:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->success);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_getVersion_result');
+        if ($this->success !== null) {
+            $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+            $xfer += $output->writeString($this->success);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_reinitialize_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_reinitialize_args.php
new file mode 100644
index 000000000000..c10592db1683
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_reinitialize_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_reinitialize_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_reinitialize_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_reinitialize_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_setOption_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_setOption_args.php
new file mode 100644
index 000000000000..22608526fdc6
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_setOption_args.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_setOption_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+        1 => array(
+            'var' => 'key',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+        2 => array(
+            'var' => 'value',
+            'isRequired' => false,
+            'type' => TType::STRING,
+        ),
+    );
+
+    /**
+     * @var string
+     */
+    public $key = null;
+    /**
+     * @var string
+     */
+    public $value = null;
+
+    public function __construct($vals = null)
+    {
+        if (is_array($vals)) {
+            if (isset($vals['key'])) {
+                $this->key = $vals['key'];
+            }
+            if (isset($vals['value'])) {
+                $this->value = $vals['value'];
+            }
+        }
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_setOption_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                case 1:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->key);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                case 2:
+                    if ($ftype == TType::STRING) {
+                        $xfer += $input->readString($this->value);
+                    } else {
+                        $xfer += $input->skip($ftype);
+                    }
+                    break;
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_setOption_args');
+        if ($this->key !== null) {
+            $xfer += $output->writeFieldBegin('key', TType::STRING, 1);
+            $xfer += $output->writeString($this->key);
+            $xfer += $output->writeFieldEnd();
+        }
+        if ($this->value !== null) {
+            $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
+            $xfer += $output->writeString($this->value);
+            $xfer += $output->writeFieldEnd();
+        }
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_setOption_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_setOption_result.php
new file mode 100644
index 000000000000..8430fdd732c3
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_setOption_result.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_setOption_result
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_setOption_result';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_setOption_result');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_shutdown_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_shutdown_args.php
new file mode 100644
index 000000000000..1a16635bf7f1
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/FacebookService_shutdown_args.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+class FacebookService_shutdown_args
+{
+    static public $isValidate = false;
+
+    static public $_TSPEC = array(
+    );
+
+
+    public function __construct()
+    {
+    }
+
+    public function getName()
+    {
+        return 'FacebookService_shutdown_args';
+    }
+
+
+    public function read($input)
+    {
+        $xfer = 0;
+        $fname = null;
+        $ftype = 0;
+        $fid = 0;
+        $xfer += $input->readStructBegin($fname);
+        while (true) {
+            $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+            if ($ftype == TType::STOP) {
+                break;
+            }
+            switch ($fid) {
+                default:
+                    $xfer += $input->skip($ftype);
+                    break;
+            }
+            $xfer += $input->readFieldEnd();
+        }
+        $xfer += $input->readStructEnd();
+        return $xfer;
+    }
+
+    public function write($output)
+    {
+        $xfer = 0;
+        $xfer += $output->writeStructBegin('FacebookService_shutdown_args');
+        $xfer += $output->writeFieldStop();
+        $xfer += $output->writeStructEnd();
+        return $xfer;
+    }
+}
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/fb_status.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/fb_status.php
new file mode 100644
index 000000000000..d6a47b1fd494
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/fb_status.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Autogenerated by Thrift Compiler (0.23.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+/**
+ * Common status reporting mechanism across all services
+ */
+final class fb_status
+{
+    const DEAD = 0;
+
+    const STARTING = 1;
+
+    const ALIVE = 2;
+
+    const STOPPING = 3;
+
+    const STOPPED = 4;
+
+    const WARNING = 5;
+
+    static public $__names = array(
+        0 => 'DEAD',
+        1 => 'STARTING',
+        2 => 'ALIVE',
+        3 => 'STOPPING',
+        4 => 'STOPPED',
+        5 => 'WARNING',
+    );
+}
+
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactResponse.php
index 6f5cb88b86d2..78ec210e5df3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionRequest.php
index ff412cd2fd80..f7940f973761 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionResponseElement.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionResponseElement.php
index 7f1bef282b94..0e7d65785655 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionResponseElement.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortCompactionResponseElement.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnRequest.php
index 399aeaf626ce..40e08c00641e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnsRequest.php
index 9945b761e6fe..3ffbb0ac11dd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AbortTxnsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddCheckConstraintRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddCheckConstraintRequest.php
index a476895ed7c3..c5ea4f9c8698 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddCheckConstraintRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddCheckConstraintRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDefaultConstraintRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDefaultConstraintRequest.php
index 9031f1ed3e36..521577d93f67 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDefaultConstraintRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDefaultConstraintRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDynamicPartitions.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDynamicPartitions.php
index cae2a6cf901a..74c43604ce64 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDynamicPartitions.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddDynamicPartitions.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddForeignKeyRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddForeignKeyRequest.php
index 7666d8155957..10d61135759d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddForeignKeyRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddForeignKeyRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddNotNullConstraintRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddNotNullConstraintRequest.php
index 7a468154951e..a95d35615f6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddNotNullConstraintRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddNotNullConstraintRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPackageRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPackageRequest.php
index 10429fb8c0a6..4039971a7c0f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPackageRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPackageRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsRequest.php
index 28e987a5ccb9..02eadb2a235c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsResult.php
index 4694f88b8e8f..1f94d2a35241 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPartitionsResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPrimaryKeyRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPrimaryKeyRequest.php
index 59e751077cce..2d209bb537fe 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPrimaryKeyRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddPrimaryKeyRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddUniqueConstraintRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddUniqueConstraintRequest.php
index 389c6f45d3b2..d2a4c55ff3d9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddUniqueConstraintRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AddUniqueConstraintRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AggrStats.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AggrStats.php
index 0d6d216e229a..182f1c4e1d3f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AggrStats.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AggrStats.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php
index 4db095dfa259..64ef13cd1e94 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsResponse.php
index e55e9b4dc118..1de3e753ddd7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsRequest.php
index 944ce93bfb10..1d02c6631826 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsResponse.php
index 5a126b83b0ba..1b119b3add69 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlreadyExistsException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlreadyExistsException.php
index 18d1c63da14a..0fba2306deb1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlreadyExistsException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlreadyExistsException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterCatalogRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterCatalogRequest.php
index 312525bf8e46..bc432edb91be 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterCatalogRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterCatalogRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDataConnectorRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDataConnectorRequest.php
index 691fe5523e69..b0436293073c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDataConnectorRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDataConnectorRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDatabaseRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDatabaseRequest.php
index f73d3289efb1..0eb42c0b8631 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDatabaseRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterDatabaseRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterISchemaRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterISchemaRequest.php
index 8ad6839dbad9..6956d5e1e166 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterISchemaRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterISchemaRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php
index ac194efc9a24..44943a56af55 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsResponse.php
index a176626fad4a..18d86ba64561 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php
index deadcbfd4401..b32570eeee5e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableResponse.php
index 1d5b96cf19ec..bfafa66cd376 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AppendPartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AppendPartitionsRequest.php
index 71b5208e8845..9c2c9e372856 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AppendPartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AppendPartitionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AsyncOperationResp.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AsyncOperationResp.php
index c26c2be14760..26cc7d983ded 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AsyncOperationResp.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AsyncOperationResp.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BasicTxnInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BasicTxnInfo.php
index 982b6a10d258..7f8ddbe41e4e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BasicTxnInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BasicTxnInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BinaryColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BinaryColumnStatsData.php
index 45b0bb39c1ae..3cfb9b88162f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BinaryColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BinaryColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BooleanColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BooleanColumnStatsData.php
index 9b5cafc5314a..04fd52c6de0c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BooleanColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/BooleanColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataRequest.php
index be84beb13d53..fb90f5ff8fb0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataResult.php
index 1a5080533726..4f840f28ea90 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CacheFileMetadataResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Catalog.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Catalog.php
index 577a43dcc85d..7324e23d3197 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Catalog.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Catalog.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php
index 84c0f42de747..c0ea7cfc041c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsResponse.php
index ef45732dc03e..7da5db51e7cb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckLockRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckLockRequest.php
index 0656e96bbdfe..77d2e1d666eb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckLockRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckLockRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataRequest.php
index be4747d69a92..6772e0f99fd2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataResult.php
index 77053b641b40..269ce9f7cd26 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClearFileMetadataResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapabilities.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapabilities.php
index b7aafe3143de..530ce5129d97 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapabilities.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapabilities.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapability.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapability.php
index 94a32277f33a..9d48a676f756 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapability.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ClientCapability.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleRequest.php
index 3abd11d92cee..6720d58454ee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleResponse.php
index 3a2efb8b53f5..e160e16acdbd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CmRecycleResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatistics.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatistics.php
index 21a6480e8eca..6848566fd37f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatistics.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatistics.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsData.php
index bb08328f855d..68dbcd0ff742 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsDesc.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsDesc.php
index df874fe10489..f0a8d484b4e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsDesc.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsDesc.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsObj.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsObj.php
index e9b72d260b52..46f323e03ef2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsObj.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ColumnStatisticsObj.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnKeyValue.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnKeyValue.php
index 9c5149787ea9..2018b85c14fd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnKeyValue.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnKeyValue.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnRequest.php
index e1cecdac355c..45504b73a78e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CommitTxnRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionAbortedException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionAbortedException.php
index 0f5d992c294a..ce835edb6fd0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionAbortedException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionAbortedException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionInfoStruct.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionInfoStruct.php
index 338e1cb962b8..0dd2f2f32443 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionInfoStruct.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionInfoStruct.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataRequest.php
index e7fce8f5ae34..3a6463e1a22f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataResponse.php
index ff1be53f0f50..315f5a7ae3d6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataStruct.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataStruct.php
index 0bf69abf2a7d..0b0617697013 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataStruct.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsDataStruct.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsMetricType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsMetricType.php
index 789ae808e869..4de07230b130 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsMetricType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionMetricsMetricType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionRequest.php
index 2625552184f4..2c3f65680010 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionResponse.php
index 7d66f299d112..c896e5a8ba91 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionType.php
index 4cf4d405fa8b..3d5a97acaec1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CompactionType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ConfigValSecurityException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ConfigValSecurityException.php
index 47bd5404f73f..6b893a3cc8b0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ConfigValSecurityException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ConfigValSecurityException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Constant.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Constant.php
index a9f2c3b77727..b420c30856d9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Constant.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Constant.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateCatalogRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateCatalogRequest.php
index b5d607039867..29fd80d22197 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateCatalogRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateCatalogRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDataConnectorRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDataConnectorRequest.php
index fddcd0831d53..86d6a9abf5e2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDataConnectorRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDataConnectorRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDatabaseRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDatabaseRequest.php
index 663e3d6e048e..1ac86a5ce202 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDatabaseRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateDatabaseRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php
index be5bc4804db4..c3a612c40413 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreationMetadata.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreationMetadata.php
index 44ecbca2528f..e7781590276f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreationMetadata.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreationMetadata.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CurrentNotificationEventId.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CurrentNotificationEventId.php
index 0f669679e26e..150528997823 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CurrentNotificationEventId.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CurrentNotificationEventId.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataConnector.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataConnector.php
index e37b194a3b48..6927c60a43c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataConnector.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataConnector.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataOperationType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataOperationType.php
index 0ffbcd3bd664..e289b047ec42 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataOperationType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DataOperationType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Database.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Database.php
index 1001e1255669..c804a13030c0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Database.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Database.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DatabaseType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DatabaseType.php
index 927fb9893409..2500670877b7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DatabaseType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DatabaseType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Date.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Date.php
index ff6900114ec9..af1aa9736cef 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Date.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Date.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DateColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DateColumnStatsData.php
index 49607f8565e9..05cc630a3d66 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DateColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DateColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Decimal.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Decimal.php
index 2d058216cf77..b6576bd07438 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Decimal.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Decimal.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DecimalColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DecimalColumnStatsData.php
index 94c94cc3dd9d..269f4eea59f4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DecimalColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DecimalColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php
index 6955eb8b8ec8..78f9aed9d187 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsResponse.php
index 0f86ec9b87f6..3b4c313dbccd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DeleteColumnStatisticsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DeleteColumnStatisticsRequest.php
index ab5761fcc509..dd495e994eb2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DeleteColumnStatisticsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DeleteColumnStatisticsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DoubleColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DoubleColumnStatsData.php
index cb18d8282585..bdb476ba0ab3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DoubleColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DoubleColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropCatalogRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropCatalogRequest.php
index aa304ef54d7a..0475a38e6cf3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropCatalogRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropCatalogRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropConstraintRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropConstraintRequest.php
index 72bb1002846b..180f9a45333d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropConstraintRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropConstraintRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDataConnectorRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDataConnectorRequest.php
index d7c369931f9b..250e42ab848b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDataConnectorRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDataConnectorRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDatabaseRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDatabaseRequest.php
index 587627137958..fe32f8b679c2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDatabaseRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropDatabaseRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPackageRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPackageRequest.php
index 14d3cc2cf43a..92ffad7d7603 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPackageRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPackageRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionRequest.php
index 4cf594ba3359..2d387973de49 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsExpr.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsExpr.php
index f38294a6e305..85764f220178 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsExpr.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsExpr.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsRequest.php
index 0ef83dbd0595..0de0967824bb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsResult.php
index 4e991f599ade..76eee6935bd2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropPartitionsResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropTableRequest.php
index f346453428a6..0dcf430674e3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DropTableRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EnvironmentContext.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EnvironmentContext.php
index ef1f7a7fd2e7..5f5bf7816210 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EnvironmentContext.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EnvironmentContext.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EventRequestType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EventRequestType.php
index 710d194e0685..155687b29550 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EventRequestType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/EventRequestType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php
index 0b3bb087aba7..4643c54f18ef 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FieldSchema.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FieldSchema.php
index 07b620fc59ca..2572470ca783 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FieldSchema.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FieldSchema.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadata.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadata.php
index 753824021007..2e46532c7f6e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadata.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadata.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadataExprType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadataExprType.php
index dd83d4ca968c..5bd4859d99c2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadataExprType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FileMetadataExprType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindNextCompactRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindNextCompactRequest.php
index 07869fc61c7d..623096dc249e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindNextCompactRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindNextCompactRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
index fc29d1dbb39b..6ec0bf58d373 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsRqst.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsRqst.php
index f9edb9be335f..1f5470ae7b8f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsRqst.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsRqst.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequest.php
index 8adc93ed1260..123c05c95dc2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequestData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequestData.php
index f723880694c8..1d916044b68e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequestData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventRequestData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventResponse.php
index 6f6684f195a3..f76528b650e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FireEventResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php
index f0c7b85f4cdf..5d747e009c21 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysResponse.php
index 211c6f49f81b..18d552df8fad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Function.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Function.php
index 5e0366cd6533..53d0e74d8c24 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Function.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Function.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FunctionType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FunctionType.php
index 69578cbb7bbe..292fc5d21f46 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FunctionType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FunctionType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllFunctionsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllFunctionsResponse.php
index a34e4c9e5da4..5ef4e439b3f6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllFunctionsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllFunctionsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllWriteEventInfoRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllWriteEventInfoRequest.php
index 83e44cfb021d..fcb5ed780ea0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllWriteEventInfoRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetAllWriteEventInfoRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogRequest.php
index ec3505962f9a..3cf85f64e98e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogResponse.php
index fd8922450968..7dfd751fd341 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogsResponse.php
index aec46a1a8fd9..4f2056b6dbeb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetCatalogsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDataConnectorRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDataConnectorRequest.php
index eabc3df1c419..66e3452cba4b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDataConnectorRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDataConnectorRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsRequest.php
index d9d47f1dfb5a..1dfbefc8b113 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsResponse.php
index c3922041e903..1e231ebe9458 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseObjectsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php
index 291ed28d0e1d..d39a2b0a3fdc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsRequest.php
index 9bb6b34f8560..57b0efe7f0c7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsResponse.php
index bfe9c4090bae..31631d2c4142 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFieldsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprRequest.php
index 9ab80212c924..5858a4fc766c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprResult.php
index fe80220e9012..795b559482f3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataRequest.php
index edbc0e088100..f4e99dbd6fc4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataResult.php
index 8132a39bc295..254163e8b443 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFileMetadataResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsRequest.php
index 92db2676641f..fb33da87a329 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsResponse.php
index c9e9e7444694..48220957ec86 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetFunctionsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoRequest.php
index 35c534cd2be8..30f285de22ec 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoResponse.php
index 36617b6aee22..d1cffe78fe1f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetLatestCommittedCompactionInfoResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsInfoResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsInfoResponse.php
index be274b94dd92..2471ca7b4d8a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsInfoResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsInfoResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsRequest.php
index cc52fabc1db4..d54f353e0178 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsResponse.php
index 30a48f8a40ab..ae0a8c3c8d5f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetOpenTxnsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPackageRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPackageRequest.php
index f3c6a45c9db7..f47e55ff9bc8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPackageRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPackageRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsRequest.php
index aef7a7b838cb..5c59efc8f2d4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsResponse.php
index 1375d0d2a2a7..b67a9d6201c1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionNamesPsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionRequest.php
index 2a5589928711..ff30dc83afed 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionResponse.php
index 96b11e5a9e72..d368e9e564ed 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByFilterRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByFilterRequest.php
index 348ae509ffdf..4080916c6b89 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByFilterRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByFilterRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesRequest.php
index a6f193c5ae44..e49e09f5dbcd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesResult.php
index 24712fff41cb..f82deeb8b347 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsByNamesResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsFilterSpec.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsFilterSpec.php
index b06705018738..f60f5a421e70 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsFilterSpec.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsFilterSpec.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthRequest.php
index dbdd7856d888..cf49acd7a8e4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthResponse.php
index 3fb8f54f4c44..5be0ceb5cfce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsPsWithAuthResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsRequest.php
index 284ac336adfd..fc10574f77a4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsResponse.php
index edd73ca47072..3e05f7ea2d19 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPartitionsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleRequest.php
index f42240d2a7d7..bc5b4740c1b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleResponse.php
index a4dafda520f5..de343ffbf80d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php
index 878c6adc813b..a249035d176a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetReplicationMetricsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetReplicationMetricsRequest.php
index c86df01e6368..fa01ec7fd489 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetReplicationMetricsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetReplicationMetricsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalRequest.php
index d55917b0348b..ae0a6c30942d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalResponse.php
index e56afd441341..a85df1c2daad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRuntimeStatsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRuntimeStatsRequest.php
index 8e7f614b2c84..368006abf8ca 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRuntimeStatsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetRuntimeStatsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaRequest.php
index 89d2fc225f8f..1bceab505ebd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaResponse.php
index 2d919179b2f8..0bd65ceee9e3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSchemaResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSerdeRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSerdeRequest.php
index 37229fb2a68d..5ec3fdacf0dd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSerdeRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetSerdeRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php
index a967cf9245a3..fd38e93962e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableResult.php
index f8972b0f69ed..d7f379ce9884 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php
index bc8329935d4c..98c370c3d68d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequestFields.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequestFields.php
index 14ffbcc59437..794025ab1d2c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequestFields.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequestFields.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
index 8d1e423ef01d..b11c50e4cf94 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php
index 8b12f20ea40b..23fbf2a4ebdc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsRequest.php
index d9b5ef31da33..44b24abf3f77 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsResponse.php
index fe9ff4da7805..52066a933568 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetValidWriteIdsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeRequest.php
index 9bb7a0be0923..0bb9ac1f99df 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeResponse.php
index 79f792d1aec8..93b44ee0a559 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokePrivilegeResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleRequest.php
index 321435c2da83..c869a70e2ef8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleResponse.php
index 165bfb232dd4..32380e45feeb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeRoleResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeType.php
index a4d635430c58..cbae7c9dfb11 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GrantRevokeType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatRequest.php
index 4828330952b4..e6c166352130 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeRequest.php
index 974063f92ad9..b0b5075188e9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeResponse.php
index 7be9692effff..bf6044fb38a8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectPrivilege.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectPrivilege.php
index 8b440ccaf2c0..91c6c2331b98 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectPrivilege.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectPrivilege.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectRef.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectRef.php
index 6fbe2142f3d1..12b9331a15c7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectRef.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectRef.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectType.php
index a3cf28fc5301..fb442e54b623 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/HiveObjectType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchema.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchema.php
index 7f276805b1e4..622f25037fea 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchema.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchema.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchemaName.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchemaName.php
index df772bc8029e..a2f33ee6a0d7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchemaName.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ISchemaName.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InsertEventRequestData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InsertEventRequestData.php
index fc0b51ea981b..ddaf7ec6a798 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InsertEventRequestData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InsertEventRequestData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidInputException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidInputException.php
index d478972ae5b1..85336f90bb7c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidInputException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidInputException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidObjectException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidObjectException.php
index f4e974d3ce27..521329a63bd5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidObjectException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidObjectException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidOperationException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidOperationException.php
index 246e1e722179..e4cc16b22c95 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidOperationException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidOperationException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidPartitionException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidPartitionException.php
index e46516b50780..76064b6bc79a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidPartitionException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/InvalidPartitionException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListPackageRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListPackageRequest.php
index 7344e3a1c088..4375df937ab0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListPackageRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListPackageRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListStoredProcedureRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListStoredProcedureRequest.php
index be461cd91973..0d9dbd7c17fd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListStoredProcedureRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ListStoredProcedureRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockComponent.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockComponent.php
index 9a1143f36454..20d28e3188fa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockComponent.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockComponent.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockLevel.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockLevel.php
index f2b7008e129a..e547790413d5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockLevel.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockLevel.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockMaterializationRebuildRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockMaterializationRebuildRequest.php
index e8eb26d00aac..ca9a6e4bd02a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockMaterializationRebuildRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockMaterializationRebuildRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockRequest.php
index bed7690f15cc..41a0ce6eb3a6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockResponse.php
index 24a91b75d257..00b914f07aa6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockState.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockState.php
index 933c6fecbf32..b71f29cef220 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockState.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockState.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockType.php
index 37be01578cd0..01b1c58ac847 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LockType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LongColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LongColumnStatsData.php
index 5dd2d8320e3c..d8ae441050f6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LongColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/LongColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MapSchemaVersionToSerdeRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MapSchemaVersionToSerdeRequest.php
index 7f8fce07a6ba..364231aa06af 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MapSchemaVersionToSerdeRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MapSchemaVersionToSerdeRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Materialization.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Materialization.php
index b47052a6f5f7..3863002cae6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Materialization.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Materialization.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdRequest.php
index 26adcc36bf86..c1fb23599fff 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdResponse.php
index 04867e781f11..13191b044bd3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MaxAllocatedTableWriteIdResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetaException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetaException.php
index a2b5e8fdd4ea..28ff106cce8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetaException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetaException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetadataPpdResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetadataPpdResult.php
index 60a99721aadf..3797c7add1d3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetadataPpdResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/MetadataPpdResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchCompactionException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchCompactionException.php
index 7002a0702e96..9d3e238bb5b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchCompactionException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchCompactionException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchLockException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchLockException.php
index fed12956ad43..ca8c841e10dd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchLockException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchLockException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchObjectException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchObjectException.php
index ffa3c2318aa1..682248d575c1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchObjectException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchObjectException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchTxnException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchTxnException.php
index 0ae90a69278e..216506c12687 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchTxnException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NoSuchTxnException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php
index 2360bdf297b5..be4752563e6c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsResponse.php
index f0254e652548..65747e703a02 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEvent.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEvent.php
index eea868755e79..6884476bef03 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEvent.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEvent.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventRequest.php
index b8717ba912d3..7e6dc4041dee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventResponse.php
index 432d6fbe282e..eec5289ecc5c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountRequest.php
index 07fe55cc5355..584b63c40c0b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountResponse.php
index c2dc335a027b..d5cac1fef417 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotificationEventsCountResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ObjectDictionary.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ObjectDictionary.php
index 97bbed6e5452..ba22c7192660 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ObjectDictionary.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ObjectDictionary.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnRequest.php
index 586521f9ba1d..712f995f82cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnsResponse.php
index 47e329cd504c..71dc45e5b571 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OpenTxnsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OptionalCompactionInfoStruct.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OptionalCompactionInfoStruct.php
index d955d9d1b100..97bc1062c529 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OptionalCompactionInfoStruct.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/OptionalCompactionInfoStruct.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Order.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Order.php
index 0ea6b7422f62..15d96d3747df 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Order.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Order.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Package.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Package.php
index 49fba184dfe8..000b51777f35 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Package.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Package.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Partition.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Partition.php
index 1c1c23fca1c8..6e70b97d3744 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Partition.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Partition.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionEventType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionEventType.php
index 25dd31f274ab..20491313b0b4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionEventType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionEventType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionFilterMode.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionFilterMode.php
index df1168eadd95..e62beafc3b8e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionFilterMode.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionFilterMode.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionListComposingSpec.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionListComposingSpec.php
index 5b04d83676dd..cf3dc4a49666 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionListComposingSpec.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionListComposingSpec.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpec.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpec.php
index afbcee416e1b..2a42fdb8b37e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpec.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpec.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpecWithSharedSD.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpecWithSharedSD.php
index 6af16ebf7786..b2cc72062d16 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpecWithSharedSD.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionSpecWithSharedSD.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRequest.php
index 10def834b514..c01ed265399c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesResponse.php
index a79a4e5ff7d6..712da1f26e2b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRow.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRow.php
index 312f5fb47f5c..0a4823a3edae 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRow.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionValuesRow.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionWithoutSD.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionWithoutSD.php
index ef94234166bc..6e03d408f6f0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionWithoutSD.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionWithoutSD.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprRequest.php
index 23c31bfd8a33..aa9c1de0566d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprResult.php
index cd881f1beab4..2df69383b8b4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsByExprResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsRequest.php
index a6167887646f..21fa8324c4d4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsResponse.php
index 24fa07533fd6..f07da24b6890 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsSpecByExprResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsSpecByExprResult.php
index 4e4039185f12..1f85d4e0268b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsSpecByExprResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsSpecByExprResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsRequest.php
index 72bf02732610..6931ea053cc3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsResult.php
index 9b911c92c87c..996f69dbd9d4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PartitionsStatsResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php
index b6e478a34afa..5ed4d4b37f43 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysResponse.php
index 00a26a703b34..a1f9e0a7558b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalPrivilegeSet.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalPrivilegeSet.php
index 00d4e1309d32..732a1a43a255 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalPrivilegeSet.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalPrivilegeSet.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalType.php
index 941701d3cda5..7bcfd438e926 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrincipalType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeBag.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeBag.php
index 1c842fe976ab..3bff77e079b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeBag.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeBag.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeGrantInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeGrantInfo.php
index 82a4e805622f..ea14d0b58c28 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeGrantInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrivilegeGrantInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetRequest.php
index a13ffc9f54ab..b081e8e8c07b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetResponse.php
index 79853b7c7a50..947ffb78259f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertyGetResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertySetRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertySetRequest.php
index e97573273cff..dc7a7ff2da06 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertySetRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PropertySetRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataRequest.php
index 1c38080abada..d8f1def80656 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataResult.php
index b0ea4b4b2c6d..8d412ef90576 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PutFileMetadataResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/QueryState.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/QueryState.php
index c844c8595938..47c5b15c9c1c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/QueryState.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/QueryState.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php
index 15ea00cfb866..71490650691b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionResponse.php
index 2d0dbe2c45a5..2905cbcc79a2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplLastIdInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplLastIdInfo.php
index 8ff78fe4e03a..77122c4312b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplLastIdInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplLastIdInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplTblWriteIdStateRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplTblWriteIdStateRequest.php
index 4f3445967df1..cc7abc72d1a8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplTblWriteIdStateRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplTblWriteIdStateRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplayedTxnsForPolicyResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplayedTxnsForPolicyResult.php
index a27c7a401fab..66b73207443b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplayedTxnsForPolicyResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplayedTxnsForPolicyResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetricList.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetricList.php
index ebf6ed33dea2..39b058e98e6d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetricList.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetricList.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetrics.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetrics.php
index 270c30aea5dc..0020f8010b6f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetrics.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ReplicationMetrics.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RequestPartsSpec.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RequestPartsSpec.php
index a8f6fdaf9dab..b0e66bce7579 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RequestPartsSpec.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RequestPartsSpec.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceType.php
index f470161e6106..70f56d331ca3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceUri.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceUri.php
index ed7072a6ec27..a29f83084822 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceUri.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ResourceUri.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Role.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Role.php
index 0a17ce24b81c..7b64abe18734 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Role.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Role.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RolePrincipalGrant.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RolePrincipalGrant.php
index 7bd9aa45cea4..d37ed1355218 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RolePrincipalGrant.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RolePrincipalGrant.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RuntimeStat.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RuntimeStat.php
index 356f37fab456..f7fc7ecd38fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RuntimeStat.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RuntimeStat.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLAllTableConstraints.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLAllTableConstraints.php
index aadde6d1fd2a..026fbfa97072 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLAllTableConstraints.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLAllTableConstraints.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLCheckConstraint.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLCheckConstraint.php
index 2767da99b4b7..a9c0944a0d9a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLCheckConstraint.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLCheckConstraint.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLDefaultConstraint.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLDefaultConstraint.php
index 925cbc835a2e..4a87fc5936c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLDefaultConstraint.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLDefaultConstraint.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLForeignKey.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLForeignKey.php
index a5a91e924d10..747b0df6dbd5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLForeignKey.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLForeignKey.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLNotNullConstraint.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLNotNullConstraint.php
index 2c4c7b5d6b45..f0c3d941a3c0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLNotNullConstraint.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLNotNullConstraint.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLPrimaryKey.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLPrimaryKey.php
index 4465b608c5ae..afd153fb4c35 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLPrimaryKey.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLPrimaryKey.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLUniqueConstraint.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLUniqueConstraint.php
index 376ab296d08b..942000cc45dd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLUniqueConstraint.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SQLUniqueConstraint.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQuery.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQuery.php
index a6e6fdf4fa2a..5c6dd920da86 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQuery.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQuery.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryKey.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryKey.php
index f15f4620078c..b600838f8a47 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryKey.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryKey.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequest.php
index 090f92892517..9aa5fe6ab115 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequestType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequestType.php
index 11ce7cdf3734..864e2af87a5c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequestType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryMaintenanceRequestType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollRequest.php
index eef5655b1880..e4e59cde15a0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollResponse.php
index 06a8d5d99001..4b79ce42e962 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryPollResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryProgressInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryProgressInfo.php
index f114eb04ac4c..2c7f8684ef2e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryProgressInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ScheduledQueryProgressInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Schema.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Schema.php
index 473dcced994a..49a8f071df1e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Schema.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Schema.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaCompatibility.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaCompatibility.php
index 5b358406daf5..e3ddbce67700 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaCompatibility.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaCompatibility.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaType.php
index 475d406725e7..56d742dda8fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaValidation.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaValidation.php
index ace401288805..c9ffcec52544 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaValidation.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaValidation.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php
index ff70f6f6eae1..c327a6989c21 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionDescriptor.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionDescriptor.php
index e62ac1d6cd7f..463fb1d18643 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionDescriptor.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionDescriptor.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionState.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionState.php
index 460034f0713e..f54fdb4f9c4a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionState.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersionState.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTableWriteIdsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTableWriteIdsRequest.php
index 47402ef283a6..82cca9e67ee8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTableWriteIdsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTableWriteIdsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTxnIdRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTxnIdRequest.php
index 7220e83f18d9..29a672b2f620 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTxnIdRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SeedTxnIdRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerDeInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerDeInfo.php
index 13218d345bbd..c0dc0fa86745 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerDeInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerDeInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerdeType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerdeType.php
index 2397e1172414..3698a514c9b4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerdeType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SerdeType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsRequest.php
index 71557335d488..7ba7fda3859d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsResponse.php
index 4246c6db97d7..0bde0345cb69 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetPartitionsStatsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetSchemaVersionStateRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetSchemaVersionStateRequest.php
index aabcd37b00d0..8f03c47cd91a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetSchemaVersionStateRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SetSchemaVersionStateRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactRequest.php
index 543e1c9749e0..4475574cef36 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponse.php
index 72d8ad68a7f7..fadf85416615 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponseElement.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponseElement.php
index a6a8f0967d90..2634590e677a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponseElement.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowCompactResponseElement.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksRequest.php
index 92f5a3984cc9..f8b8b51267cd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponse.php
index 5e221df4d28c..9b7d40ee47cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponseElement.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponseElement.php
index 042fc77d7658..65be28cc77aa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponseElement.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ShowLocksResponseElement.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SkewedInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SkewedInfo.php
index 091ee9dcdcc7..f0e0ea14e950 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SkewedInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SkewedInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SourceTable.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SourceTable.php
index 9cbd2b815364..8d09d3c1b8ee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SourceTable.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SourceTable.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StorageDescriptor.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StorageDescriptor.php
index 814415b1e96b..078e2c4f4d51 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StorageDescriptor.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StorageDescriptor.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedure.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedure.php
index 6e321a9c6ea4..ba2631c579ab 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedure.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedure.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedureRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedureRequest.php
index cfeb26ca367a..fc85ff087154 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedureRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StoredProcedureRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StringColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StringColumnStatsData.php
index 455bed6d28ff..403223692951 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StringColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/StringColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Table.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Table.php
index 0cb77944721b..e2c69ef3d254 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Table.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Table.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableMeta.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableMeta.php
index 9370945ba8b8..6f989c181092 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableMeta.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableMeta.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableParamsUpdate.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableParamsUpdate.php
index f20e0bc93a94..1dd8ba7205ce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableParamsUpdate.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableParamsUpdate.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsRequest.php
index 1c1ce9501e46..b960d5a4dbdf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsResult.php
index 5bfee3a603e6..c926a73c56fa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableStatsResult.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableValidWriteIds.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableValidWriteIds.php
index 91a2202e0e60..8c242a0b5cad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableValidWriteIds.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TableValidWriteIds.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreClient.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreClient.php
index a05cf7baac96..83d4ef16b1fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreClient.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreClient.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreIf.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreIf.php
index 15ec8d874614..f041e94b57d0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreIf.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreIf.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_args.php
index 9b21186e3b97..ceed00cab0ee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_result.php
index 025e7a0c64a3..65b642477e5d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_Compactions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_args.php
index 579af8e3e0bd..47e350908034 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_result.php
index 07c03b1b9745..310d3ec1065b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txn_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_args.php
index 7639e55ce214..802132dfd60a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_result.php
index 723ec52f878e..0cb438b0163e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_abort_txns_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_args.php
index 3dc807fdcb8b..8d12b0cd34e1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_result.php
index dfc432c9018c..5b582b0d8d35 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_check_constraint_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_args.php
index 0d413c0b6886..e5d0440f5e35 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_result.php
index e0b59ba95e46..d20ad0f2258b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_default_constraint_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_args.php
index edba1091e018..9ec31a5d7775 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_result.php
index c5f272ebbae8..cc86c1b44c64 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_dynamic_partitions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_args.php
index e99fe49f3036..11dac8773504 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_result.php
index 1487aae11586..7c61d147bcaa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_foreign_key_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_args.php
index d17ebef9f8d2..b7cf72a3b6f7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_result.php
index 49503388463c..4b70e6abfe6d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_master_key_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_args.php
index 12ef20437c9f..d8cf688cfc51 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_result.php
index 2adbb3c5134e..3648b26f995e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_not_null_constraint_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_args.php
index 80433294c61b..ffc55dadc41a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_result.php
index 65d8abb876d6..3c56d9c9be59 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_package_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_args.php
index 205458c74f1e..6e35c41ac33c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_result.php
index 805767aabaa6..52d14ded1e97 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_args.php
index 85747d4fca96..2ffec13eaf76 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_result.php
index f67c115c35e3..5621d0be1f23 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partition_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_args.php
index 078441596a7f..2ed3c819dbf7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_args.php
index d8bda1e6af5a..1a1e0788766a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_result.php
index 2d4f351eeb02..109c3fd36c60 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_args.php
index c5bb079295a8..e1a4271f915b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_result.php
index 352905ab9349..c5258d7e93b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_result.php
index bac096ee3e80..996cd8fff793 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_args.php
index f3d427268520..9d9ee7b86b0a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_result.php
index 5e29e59c911a..2c00463c3a8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_primary_key_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_args.php
index 9a33cbb45da5..bf9f9e504ff8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_result.php
index f8687140f865..e1bdec374c8e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_replication_metrics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_args.php
index 2aa9591f290e..275044afde9e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_result.php
index b9d2cfa2749a..581d61da8be0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_runtime_stats_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_args.php
index feb560f46215..fb53cf9f6787 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_result.php
index e09a889b9a1b..263381d2d234 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_schema_version_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_args.php
index c2c7fdbc7b7d..ebc4fa29a0f7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_result.php
index 7d809a82aece..730c013bf88a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_serde_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_args.php
index a52205d896ca..2af363b39e08 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_result.php
index ea0cb8fd458e..e591646e2761 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_token_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_args.php
index b6f285377f6f..38971ba7f7f0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_result.php
index a510386e20a2..df3341bdc9ec 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_unique_constraint_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_args.php
index 3861cac0a5de..f2b7c43e5c48 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_result.php
index 1368fc944621..e24579e82357 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_ids_to_min_history_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_args.php
index 8a5cbb8edcdf..31db1855d887 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_args.php
index 31eafa5f4ca9..b52e6a864c7c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_result.php
index 6b9cb6cde825..3f225ae1551a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_in_batch_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_result.php
index 7aefe71f6cad..bf5ffd7eaf63 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_write_notification_log_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_args.php
index 2db1bf835bf6..cb510d83c20e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_result.php
index 7e7abe039628..14a43ff5a055 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_allocate_table_write_ids_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_args.php
index b953dcdb444c..b23bd6a3a1e4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_result.php
index 3e42df31c814..d5466365d4de 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_catalog_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_args.php
index 41bc79c82664..4004371c502f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_args.php
index 6902e699f7e0..5f11a38d3d68 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_result.php
index e21068850166..4796325a2fa4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_result.php
index f7141194feb9..8f954063037d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_database_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_args.php
index a309f510e015..223a6dd29d30 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_result.php
index 10e7d74e34a5..d7e1f93f868d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_dataconnector_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_args.php
index 31441534a302..0dbd929b4c89 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_result.php
index 33e743127a14..4622df3d9296 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_function_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_args.php
index 65098342c136..6e5851ff3f2a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_result.php
index 99c1a3f70e2c..2a3cbf0aa3fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_ischema_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_args.php
index d6aa9b65ee28..ef14b1f8e669 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_result.php
index 0a1507b70a8c..8e12eb093be8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_args.php
index 9e01be5e5b74..b8c031aae1fd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_result.php
index 8c1ce52f338c..5566a6ef86c6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partition_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_args.php
index 0f5f93d54a17..5754236203b6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_args.php
index 80ffff4f82ed..2b483a859345 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_result.php
index bf3bdd5b1ea4..9daeeb0015c1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_result.php
index 6ae13616a989..3e8e91a1f060 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_args.php
index f1b768aa1c7f..72f5c117fdb3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_result.php
index 399b355384a7..f477f1fe7bd7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_args.php
index 00ebc192f1fb..26b820a0fed0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_result.php
index f68b5a975f4f..fdc77e2f0abe 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_resource_plan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_args.php
index 08881564c8e8..9e599a644b9c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_args.php
index 5a699642a9fe..53906cdc85b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_result.php
index bb04bd5101ff..7f3fe252ed39 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_result.php
index 4b7ffe96e79e..f3c961e97190 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_args.php
index 3f71b455f543..5e66ec06847d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_result.php
index f9bf3fe95013..d0c90b75ea38 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_cascade_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_args.php
index 6faf9ed2a7e5..215510c751a7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_result.php
index 80fcf72e16c8..1a067bff099f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_table_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_args.php
index 4c744f681333..4377bb8a2d8e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_result.php
index d177f0043d14..2c39b08cb931 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_pool_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_args.php
index 6194a3f127c6..d68567962467 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_result.php
index 3945adfd9e67..226e8667658e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_wm_trigger_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_args.php
index 279e12a48de8..5d655cb89b9f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_args.php
index 050187fff8b2..fcac234b632e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_result.php
index d22279e7e4e8..af9a51d462f4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_args.php
index 51fe05ef1693..9284fd7c252c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_result.php
index b872cdde0ff4..3caba6bbbf75 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_by_name_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_args.php
index ec159dc72977..89b9a16605da 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_result.php
index e1351142abd1..5b232e9534a3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_result.php
index 938d05017e6a..2f8d60143697 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_args.php
index a3c8c052ee99..afb532accdef 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_result.php
index 9f72c6aa3bc3..773d28b1c17c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_args.php
index 2d1d4a24eb29..b6f4049406ce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_result.php
index 055b9473b2ae..8c6acad106c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cache_file_metadata_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_args.php
index fb9a039b92c1..7f9bbc8cb0b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_result.php
index 4cc61f3d5417..537a2fb05204 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cancel_delegation_token_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_args.php
index 09bc7db7b3eb..cddae8dcc133 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_result.php
index f1827ae25742..37b4f3412e82 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_check_lock_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_args.php
index 09e5b8fd8a95..8be25acd6213 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_result.php
index 2b757312310b..3798824451c6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_clear_file_metadata_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_args.php
index 34cc5cbbf924..0851c331e45f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_result.php
index 9926accbfaca..7e3c3d67f0e9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_cm_recycle_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_args.php
index cda9516e4736..1a4cf2fc1382 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_result.php
index 7b1f6ef1212f..5ff16491e2e6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_commit_txn_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_args.php
index 4c03987fb956..653da3c19a95 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_result.php
index 908704164680..4bcc1a69d7c5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact2_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_args.php
index e1861dcd4614..f70764156ccb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_result.php
index a076e267123d..d5ca9fcdce45 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_compact_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_args.php
index ab1f9adb0dc6..97bdfca23f13 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_result.php
index 3f1f5375910b..cc75b49d4b95 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_catalog_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_args.php
index 0ad754d03038..9d3376378717 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_args.php
index f8b9c1f5faea..2a5940cb5411 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_result.php
index c53908fd0cdd..fa183a7cc528 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_result.php
index a9fb90afb968..829686492e98 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_database_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_args.php
index 8ff4d7e992d2..6adbf91a5c34 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_result.php
index 35e46844a2d2..22adaa264669 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_dataconnector_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_args.php
index eaa0e34ba499..2e13f1b90e27 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_result.php
index 98fca6cbbf55..b06f0abdb55a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_function_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_args.php
index ce0ae323d2c7..12a939e27eda 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_result.php
index 92eac9e57d74..11788aad82b4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_ischema_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args.php
index 3c7288b4d20f..af731f5e717f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result.php
index a2d050cb8b89..3c4d4240d8d2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_drop_wm_trigger_to_pool_mapping_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_args.php
index 5028ace455f6..ed766a59f0b6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_result.php
index c9cc6af13112..cb97c3d52dd2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_or_update_wm_mapping_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_args.php
index 16c56907c123..2b2e73f364bc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_result.php
index dfac8312f4c8..5927b5e4cc15 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_resource_plan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_args.php
index d7b83920c283..d5c7088c8dcf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_result.php
index da6a6d9d1763..d020d45d64a5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_role_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_args.php
index 8809a9497fa0..731d0beb2884 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_result.php
index 1d25167d2eda..35fb3d2a0842 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_stored_procedure_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_args.php
index d8a6048c2dbe..069e2a8d0a0d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_args.php
index 769718aa765d..28ed7204da69 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_result.php
index f2a0129d1870..af34f480aca4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_result.php
index 2212c6a6b15d..3d611ecc144d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_args.php
index 983687cd7cf5..2c32438e5156 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_result.php
index 53b39b663014..808e403cbc37 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_args.php
index 047645d6bb03..5c896329107f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_result.php
index 022114eb3f1d..26ab6043783c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_args.php
index 11d109f331d0..ab6b73a9cc7f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_result.php
index 710e9fa90dd8..f89918591d0f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_type_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_args.php
index a5b3434bf460..818d11a9e85f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_result.php
index ac488ade9f78..3442a3a07c7c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_pool_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_args.php
index f6a5f5f6078e..309dfbe4c9e6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_result.php
index 255b467feb7e..d84d16e3d0ed 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_wm_trigger_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_args.php
index 71d35b9a32d1..e9821f1726c7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_result.php
index b51bdd000a5a..6afe271ed8e8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_column_statistics_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_args.php
index 0c1d106281eb..efe0b5efd870 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_result.php
index 597a1607f984..f3a9412bfb53 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_partition_column_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_args.php
index 6880d4f4b87e..82aaf8292cee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_result.php
index 446ba4185695..2ff3227e8ba5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_delete_table_column_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_args.php
index 7505fdd4cc8b..f510aa6c23a0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_result.php
index ed05f0998752..47069caaf552 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_catalog_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_args.php
index b4a5cd70b5a7..8c08d5c136f1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_result.php
index 972a8e37c8ca..8f1cef2834be 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_constraint_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_args.php
index 904d4ed8649d..62bdd1a4b322 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_args.php
index 45886cb12890..17e7bfe1a81e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_result.php
index fe32f538ef75..7f8e8d3d4e28 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_result.php
index 1736826dfdb9..47787ce2cf83 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_database_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_args.php
index c6d18acfa95b..ed5f5e9b5402 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_result.php
index bfa5f45594d9..a6911ac86ca0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_dataconnector_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_args.php
index 07a6a9d45470..da45be973b3a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_result.php
index a8f846018318..96f40b9304a6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_function_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_args.php
index 68a3f88eeda9..8bbd0e75e172 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_result.php
index 70701e322186..c375335f897d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_ischema_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_args.php
index fe1877156bcf..d8bc22bb249b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_result.php
index 2046e4eee535..44d30996619b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_package_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_args.php
index 60092195a076..997172416b6e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_args.php
index e9638addddfb..0bd6a514f76b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_result.php
index 2c6b5eb324d2..890841648f12 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args.php
index ee6048670f81..c7b4bf3925b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result.php
index c424d480a526..1a0633c679ee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_by_name_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_args.php
index f87887e57f36..23829e6ff14a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_result.php
index f44807182001..21dd9ff581ab 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_result.php
index c4a2b714347f..4649aec77dcd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_args.php
index 0169b0661626..11f34639610f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_result.php
index 9fd3c9db4fb5..5653c24c78b2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_args.php
index 87bab3b2112f..0d454199b87b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_result.php
index 21d8aff24514..e0bf715d0a95 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partitions_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_args.php
index d0239a5ba11d..63b6e5c37d00 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_result.php
index ccc5dba72feb..1a344edb9f57 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_resource_plan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_args.php
index ac78393a6a2e..da9aa1808797 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_result.php
index 6df905fada40..da5355a6feee 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_role_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_args.php
index 6e5ef48570c0..ee516b396639 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_result.php
index ed56fecb80e6..6f6606587849 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_schema_version_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_args.php
index 743c0cf3d8aa..525c474b1678 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_result.php
index 64184a8fe649..3202fc23c1ae 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_stored_procedure_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_args.php
index 517fc098385c..d8755bd97271 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_args.php
index d20e0e0ecf15..dea2e568d12c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_result.php
index 75cc649bb909..5e2d088ac906 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_result.php
index 854cf72912ea..5b131a277d4e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_args.php
index 04a28600c770..2dadc7121328 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_result.php
index 0e4c28b35327..2528742f5685 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_table_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_args.php
index a1a439a815c3..51ada0ca05aa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_result.php
index a01d52e52c35..d53df9df17d3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_type_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_args.php
index c57b0fe1cb65..097d97e3a6a7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_result.php
index afe37e1dcec5..60e0de48d387 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_mapping_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_args.php
index cea13119edbe..e477e8faf50d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_result.php
index b06b823b15ea..e08d8b2b72d2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_pool_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_args.php
index 7da19380b540..36fef380af4e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_result.php
index f71dedc6cfd7..d796a18efe6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_wm_trigger_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_args.php
index 05756a9483ae..19846213fa70 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_result.php
index 8ee331d657db..c7cf6bb862ef 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_args.php
index a928993ac668..4f593a974b90 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_result.php
index ae6b0a40ea43..eef4670ed25a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_args.php
index 31852ce91920..1e501388d2cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_result.php
index ace4088cb001..176277eff063 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fetch_partition_names_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_args.php
index 9d6cca9888e1..4ab926e7c77f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_result.php
index b6dd1515ab1c..c74338faca16 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_columns_with_stats_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_args.php
index aac46168f3fa..7e061cc6e1d5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_result.php
index 8936c1d77e05..ee71c991f340 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact2_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_args.php
index 8c8304a8f1db..63c81c6fa9e4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_result.php
index d622b37dc6e6..336f9cdcd41d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_next_compact_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_args.php
index 9780de276bd1..12ba6b9a4004 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_result.php
index 31cc755dc973..3e1ac44b95a2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_find_package_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_args.php
index d284478794d6..afd8d693307b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_result.php
index bd94d19fd5cf..dbe845601704 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_fire_listener_event_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_args.php
index bb5962460bdb..42d237f114ed 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_result.php
index 1276db14c531..f5ee0433d259 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_flushCache_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_args.php
index 34a85be98089..c40c0bf796e0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_result.php
index 9abd42fbdd69..4a3d80db81fc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_getMetaConf_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_args.php
index 490f2cacc8c0..6bb8c0647133 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_result.php
index b1f31974755f..8d5cecc67a18 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_active_resource_plan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_args.php
index 4339926198ee..7b41e48724c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_result.php
index b706dd441f48..fb5d53ca76b5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_aggr_stats_for_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_args.php
index 84bb8c74dcca..6b67e8643724 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_result.php
index 5245c58ae050..0f95682b64f7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_args.php
index 525d4614e839..9dcb2d84fcb9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_result.php
index 7c5c10d4f777..24ff9439958f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_functions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args.php
index dadf6adaa262..3ebb2d9670d9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result.php
index 87cf04b8c965..3cd9fcebec74 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_materialized_view_objects_for_rewriting_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_args.php
index 59cc5d64df30..0b842175d617 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_result.php
index 70e988c76dcd..de93465afadf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_packages_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_args.php
index ddf1615dffd4..812bb63b0f6c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_result.php
index 80f38d79ae7f..b9ca4c1fc698 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_resource_plans_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_args.php
index fd73d7ec5aaa..de6680b82b01 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_result.php
index 4cf5aab037d0..d80696204063 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_stored_procedures_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_args.php
index 925d766bab15..4cd6762270d9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_result.php
index 7ff9b1f3f50d..8b9304312c6a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_table_constraints_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_args.php
index 9fc81e002e1a..51ae6b81df28 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_result.php
index eede4443d891..270c455be2a6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_args.php
index 6c57d0372191..1dcd122860b9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_result.php
index aa7bd383f748..8623346e67f5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_args.php
index 6e531558f2df..da9f1f8744bd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_result.php
index 8e9e5e44c318..b54623ef9a19 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_write_event_info_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_args.php
index 26f65b472c74..49ca17f8a711 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_result.php
index 655e068ec419..b46be6272458 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalog_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_args.php
index b8a29f67f174..1eab6da7136f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_result.php
index ee2cb6ce3c49..bb7e8fac5688 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_catalogs_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_args.php
index d983b4ec2455..29cd2ddec875 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_result.php
index 502c94515122..cf7b94324743 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_check_constraints_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_args.php
index ed8944c9b419..54ef8afc4227 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_result.php
index e31dff7eb6ad..91c67d2afc7a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_config_value_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_args.php
index c517804d2c62..6c7b646d37e2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_result.php
index 6367c1223db5..c604392d72ad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_current_notificationEventId_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_args.php
index d175bf25e650..946b1ebcb6ba 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_args.php
index fd928e38bac5..07b680a5a8d7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_result.php
index 9eb1bcd54cdb..646074a254c9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_result.php
index 1237fa536be6..6b351c29b3a3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_database_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_args.php
index de5c42ebe600..48873ce14c4c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_args.php
index 96d875d26860..a82ad866b4a6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_result.php
index 7f3885c24e2c..71f9dea0c199 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_result.php
index bb9831455282..6dcf79799eba 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_args.php
index 39e8d4a558cc..b09b35071f80 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_result.php
index 9ac2fa0a783f..d0eae9156a8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnector_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_args.php
index 9c4f99b6aaba..600aed4a2c11 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_result.php
index 562f8adc8ead..1f2db967c294 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_dataconnectors_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_args.php
index 9c5490bd85a7..287d3d71cbc6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_result.php
index e051c8ddd081..c9c4b026a984 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_default_constraints_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_args.php
index 2b294aaef6b4..aac5725ef954 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_result.php
index 3a484c6e06d4..dde545ff853a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_delegation_token_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_args.php
index 647c1bfcf294..a4894a85ddaf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_args.php
index 57a038d28315..b2e1aa24f265 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_result.php
index 1879e5d27bd4..a68f8765a87c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_result.php
index 25f63f73d131..5bb52b7c8fb8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_args.php
index 4a7c8a91370a..cdc91ddff7ea 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_result.php
index cf05033888ab..7f8a1ecff64c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_args.php
index c87b6d8e70fc..5a8885e6896d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_args.php
index 9277a973323b..afc282f7385b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_result.php
index 7e04e29e9ec4..823bdd9a31b5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_by_expr_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_result.php
index 493f1c30388c..60ad9292ba18 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_file_metadata_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_args.php
index 193a356e8248..b06063a3e79b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_result.php
index ddabe0dff7fc..877bcdfd0820 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_foreign_keys_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_args.php
index 5ed1462a5ef8..102f5e282303 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_result.php
index ecf7e78447ba..78ee93002fff 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_function_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_args.php
index e1423206d6e1..2506d5dd6f08 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_args.php
index 1568ad118842..4a86d7193a84 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_result.php
index e9f3d2ee16fa..e2a9d9770537 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_result.php
index 4b990d587979..5b14b38dbce2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_args.php
index 3fb4230a9fa8..455247d269d0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_result.php
index 77a3cf3ca477..d5691022f4eb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_ischema_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_args.php
index 2b2ab2f5628d..fe7149ab1fc8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_result.php
index 303d2bb06794..f3318bdeae6a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_committed_compaction_info_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_args.php
index a6621c9ce543..9b946025fa93 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_result.php
index eaa989573ce8..1e81b89cca48 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_latest_txnid_in_conflict_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_args.php
index c7cced962096..16e1ad2c2875 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_args.php
index dc31b917a1d0..0cb861253714 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_result.php
index 9b20be5ab292..d20f8cfd0875 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_result.php
index 58e8f0625517..94f4f943275b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_lock_materialization_rebuild_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_args.php
index 6c047c0569df..eb2c2b6e7e49 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_result.php
index 294a2b33647b..fa97efed7901 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_args.php
index 52399253861d..f05ea33d5fa8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_result.php
index 492b2fd6d54d..17e2d8865dad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialization_invalidation_info_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_args.php
index ea4008059f19..f27507965407 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_result.php
index 69fb00f45105..ec05ba5d21a7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_args.php
index 3eff41bab1fa..b6ee72a2c9a9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_result.php
index 2baf1a326faf..a7793788c74c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_max_allocated_table_write_id_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_args.php
index 64a78456c56a..33b4a6a7bd3b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_result.php
index 793cdefa194e..436dc72d126e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_metastore_db_uuid_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_args.php
index a3c8c79db5a1..b499ddc5ae0a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_result.php
index 988c5659e639..675bda414a7b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_next_notification_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_args.php
index 8a24e4aa31d2..08b47bac6989 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_result.php
index e7cb33d971ea..295d262bafd9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_not_null_constraints_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_args.php
index 88882cf07149..f78d0b24fec9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_result.php
index 49000d23c627..8e12c11a3499 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_notification_events_count_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_args.php
index 4a1c496b9493..4489e29a494e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_result.php
index 53ca5394cf63..a2e8374a4553 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_num_partitions_by_filter_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_args.php
index feb007741320..9792ed2cbe2f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_args.php
index c2a71792796e..34ac25f61ef9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_result.php
index 7a98a10ea9f0..120265371ce6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_info_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_args.php
index c79d9c05d4c9..3ad66b2fab26 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_result.php
index 32c98f027c3f..2a7ffa66aaf8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_result.php
index f626a7f83e8a..8c7fa06c59a9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_open_txns_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_args.php
index 4b7f398dcf3f..f1aa5352ec17 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_result.php
index 6178e7d051ff..524b59ce0e91 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_args.php
index 40934093d8a3..ee81a9e5c9a9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_args.php
index a891512c9a85..37b076e02051 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_result.php
index 6fa3e8ce77d7..6858cf917ebd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_by_name_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_args.php
index 50f071d83c9b..5b4df8729f7b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_result.php
index f66f23a6b705..41347945362c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_column_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_args.php
index dc0b982bbaa3..8fa28427485c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_args.php
index 5d1f803f20cd..52ba248e1f5c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_args.php
index b019d4b93652..97ae49ff065d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_result.php
index 2d4770b2ade3..c179491ba50e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_result.php
index ab3179292f38..dc8349067014 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_args.php
index 20a31781b11e..266ab17be892 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_result.php
index da39a206c3af..2bb1fb084abe 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_result.php
index c18a1c31a769..5351501d451d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_args.php
index a88bd361f79e..92b295b2167d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_result.php
index 9176d77b5705..8eea1d01d0a4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_result.php
index 2c215a94eafd..aab34d2e7155 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_args.php
index b873f7161170..2c5956a1df29 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_result.php
index abe7e74122fc..d335ac83b713 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_values_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_args.php
index 5b283c967c5a..3e05f1bda4a1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_result.php
index 72780ce083e9..674acec6d307 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_args.php
index 26d7faadbd24..99ac2bf740c8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_args.php
index 320b67e2413a..f9786a88331a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_result.php
index f847f58f19ba..6450863748e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_expr_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_args.php
index a778ab6392ab..605616f59036 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_args.php
index 98925ab90045..3af04ee3b4fa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_result.php
index a32bc0692c91..cd92a0300129 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_result.php
index 49102422d6c6..45b5b556fac3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_args.php
index 263cd743ddac..d2e55eefc879 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_args.php
index 94246431628d..3a48d91bff8b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_result.php
index 66cde01a895c..a198142550e3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_result.php
index bf61a5a57fa5..586773600a1c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_args.php
index 8536a9920889..316e0c044e77 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_result.php
index f7935059a585..62334b5f4f22 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_args.php
index 4f1cc8fe5687..1c27e4faffa2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_args.php
index 84d2a759911d..3afc80713fc0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_result.php
index bbae3481ebfb..4612e1624eb7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_result.php
index 5404438aba49..ddd5bd2ee6a1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_args.php
index e82b4b6de267..84b472ae0ae9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_result.php
index 986c7213047c..6401e89a2652 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_args.php
index 2b180ba59e59..d1317be43d6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_result.php
index 41d0ff43ec52..f839ef05ead3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_result.php
index 5054ea1df939..7ce1a9a7a994 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_args.php
index 8d54bc33b424..ce0f5305b65a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_result.php
index 5d9f12dc6502..e695067ae17e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_spec_by_expr_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_args.php
index 92d15503e973..f47c16576c6f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_result.php
index 7ffdc6268dbf..45302e67fdb7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_statistics_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_args.php
index 3a8c53ed27e5..df2dce17d0fe 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_result.php
index 5446e349df32..b31a3bdcc7ae 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_args.php
index 4770ae2de561..d6d9a0cff53a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_result.php
index d39a5c280e88..ef580f3c7d39 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_specs_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_args.php
index bb776210595b..292d58cd5490 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_result.php
index acc1313bb7c6..4db4259f6e03 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_primary_keys_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_args.php
index e07eaa726c97..3c378931d7cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_result.php
index bd572c53788a..0fee71e05522 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_principals_in_role_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_args.php
index a3e6c412808b..f608a40ce45a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_result.php
index 72ee675a2a9f..3fe7b7734f96 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_args.php
index 5e7d76162c01..412a45df3b1c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_result.php
index 194ab07cb8c1..282f8adc169f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_properties_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_args.php
index a4d38e4fb846..a841238de991 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_result.php
index ac4be794d3eb..d112f4a8da63 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replayed_txns_for_policy_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_args.php
index a4168e7e2784..dfc8b635ed90 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_result.php
index d49eaf21355d..304d44b84360 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_replication_metrics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_args.php
index dca41a0f96be..5179f48d14aa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_result.php
index d8a3656d960e..991aa80ac2e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_resource_plan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_args.php
index aa3432351e2e..315329c7db02 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_result.php
index b67f47fe132f..a6dfe7a5f080 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_grants_for_principal_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_args.php
index 721dace921fe..75664b5bc706 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_result.php
index 17c57891e437..4856a6e7fa8c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_args.php
index 5f8672acd91f..5b2dd89d4866 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_result.php
index ba7650860dd2..e54c4ded3bd2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_args.php
index b28a5e90c02a..2cda9047e819 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_result.php
index e1a68da07af1..bcbc5cb7cce0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_scheduled_query_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_args.php
index 439b4db8768c..6b7b67e3600b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_result.php
index 492aeb460c35..c4f68d4f337c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_args.php
index 5df61ccd4f09..a406d015b589 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_args.php
index acc2273e9bef..2e80f18835d3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_result.php
index 838bc73c4f95..3d12d7e76194 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_latest_version_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_args.php
index e074d6844e64..42c7a904747e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_result.php
index 74bc238353d3..a418f07434cb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_result.php
index ca69aa6c216e..4a571f44cb5e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_args.php
index 74b3bc00bd79..87138bfbee22 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_result.php
index 4183bd3ff3ba..1c11b38581f7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_version_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_args.php
index f1c9aa32229f..fb555e62e937 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_result.php
index 79be290ab185..d0adc8474ea6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_args.php
index e0b5b6338563..5825c1122cad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_result.php
index 77d44d73cbc3..5b86ec38b954 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schemas_by_cols_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_args.php
index 0bed42a0bc54..b7ac403e6ec7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_result.php
index e29b18edd773..4c470d8acebd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_serde_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_args.php
index e29afc734ae7..a44dcaaf95f9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_result.php
index 4bc0d811a7e6..a734df93707f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_stored_procedure_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_args.php
index c2e90e1fdc2d..081a2047f908 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_result.php
index 21210786f884..218adf674f88 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_column_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_args.php
index e6f73272acf2..536a66c707fc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_result.php
index 953ee364adf7..fb2428403ff4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_args.php
index 20404f25b850..092f9b45d63c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_result.php
index 80b60cb3c5fc..f8c7db325e89 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_args.php
index 8882c31979f0..2fbd1ce9a202 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_result.php
index 72c53fb8b715..7c5062e6ece2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_args.php
index 10ed7fd9834d..9f45a6f2bd76 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_result.php
index 2197fa523b4c..b547d6a86bcb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_args.php
index 965d5e9298f5..7176a1ad8ded 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_result.php
index c3c54703ea8c..ccfc6cb7d46c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_statistics_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_args.php
index 62580a29497b..715236bfbd94 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_args.php
index 3281e1f2fcc2..43f6313404d8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_result.php
index 9cd183423bda..b0d5cdcabdcc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_args.php
index 489c68f64b88..3f94f508a39c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_result.php
index a6eccf9b3991..d0dee898e8f0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_ext_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_result.php
index 2cfc47c77df1..161e9a5e6409 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_args.php
index 49bdd8c53a6a..68aa38d0d8cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_result.php
index dce325169890..617127d8bedd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_token_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_args.php
index 0e835a07d55a..918d9e66ec6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_result.php
index bdea1b24a01c..3f2beb2440c4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_triggers_for_resourceplan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_args.php
index c37e065b87bb..e38bacc6df37 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_result.php
index 38be58acd6b7..340a0037aa1b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_args.php
index 606bd267a06c..8f7800e71c2f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_result.php
index 5fe98113061d..93b6def221c1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_args.php
index 679cdab976b4..1bba4e39bd21 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_result.php
index 0171801c1611..6dfbac6a407f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_unique_constraints_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_args.php
index f1cd0c71c89e..3ee0f5b79f43 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_result.php
index f001b9249e0f..3e6358fbcf9d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_valid_write_ids_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_args.php
index 1abc060f2c7a..14a4d32870a4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_result.php
index e73bb025a1a5..041b6935242b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_privileges_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_args.php
index 0bf0b28c5013..d1e0de0589bd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_result.php
index 1b33db4e6645..837af1602a2c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_privileges_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_args.php
index e1cfe9b7e875..9d6de8e202b1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_result.php
index 476d05e8a420..41a9abffa6ef 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_revoke_role_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_args.php
index 6356704ca0c2..a80e27a05feb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_result.php
index c7877e17f48f..3fccd2ea68c4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_grant_role_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_args.php
index b112178f9f5f..f613823d71be 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args.php
index 246c5ec355f5..f029350e6b42 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args.php
index 9a4773bfb7b7..ca3fa2867827 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result.php
index be3f95b64bdb..4a0f9059c5ef 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result.php
index 89f24e5ac9e2..14ec6a3584fe 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_lock_materialization_rebuild_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_result.php
index 2cf0c9089a62..903b03ade504 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_args.php
index 5e672d80a918..2afffba300a9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_result.php
index 62af843a8e73..b7324b682f99 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_heartbeat_txn_range_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_args.php
index df0216977484..28a3a8de2921 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_result.php
index d51751f14c44..4f42da358ac4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_args.php
index 48452a858072..69fbc2caf0b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_result.php
index 75ae622e6883..efa8e01d57e7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_args.php
index 2b9457b15a8c..9317cc8c4648 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_result.php
index c581891aeaad..f673aceeda76 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_args.php
index 2838547b097f..9b7c8e834d27 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_result.php
index 645cd60e9b90..aa56859c94a8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_lock_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_args.php
index effa3e87be42..95cd05997b9e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_result.php
index db5f90a311f2..6e6035f04a19 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_map_schema_version_to_serde_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_args.php
index d068504c687c..34b0085ac4d7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_result.php
index 0aa13b464652..9b7ca8016031 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_args.php
index 2d9a8eb34bce..282c1652a26d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_result.php
index bb969f8c8a59..15441a77152a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_cleaned_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_args.php
index 4c1784ed80f8..36c5e6c8f629 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_result.php
index d988e5d2d164..039a59a5ea31 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_compacted_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_args.php
index 8dcec07f3926..d96ac6a21933 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_result.php
index 4ba061aa183b..0bf8b68b4819 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_failed_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_args.php
index 04d4615b6fd6..7039c33a5575 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_result.php
index 8ae8d108dabf..29bc7958e9a5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_mark_refused_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_args.php
index 43213280de96..855f902fd340 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_result.php
index a37a08d55f02..1bc3b999e74e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_open_txns_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_args.php
index e000e49e575d..689e7df82715 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_result.php
index b58f144bd30a..ad804d9e66f3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_args.php
index 1e6ff4763a47..ac4a5f37b408 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_result.php
index 14955d532f76..a430e7a3abb2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_args.php
index 364443aeb3fc..fd7b7cd8d0a4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_result.php
index a462ac725f4d..b92211dcabc7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_args.php
index 312011b7cde9..85d606ba1dec 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_result.php
index 2413d41b949d..783c67c4e30a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_put_file_metadata_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_args.php
index 516daa30cd93..8895f2fe2807 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_result.php
index 0625399a0376..aa133bd6c977 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_refresh_privileges_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_args.php
index 18c159a26f50..367c13643cad 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_result.php
index aaf0432636cc..b57838e8737e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_compaction_metrics_data_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_args.php
index b768c1367bda..4ed762308c01 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_result.php
index fb0a8f19e52f..299b71b36c84 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_master_key_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_args.php
index 682391b56456..709f1d526ccc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_result.php
index cadc5bef7d5c..d97d553162fb 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_remove_token_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_args.php
index 8146d4e91466..8ad4540491d1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_args.php
index 961320956db1..22f1c5b9f93a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_result.php
index 99f054c314ce..f22c891a277d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_result.php
index f2a25fbeeef3..75969f41789e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_args.php
index 8c2e3fcd857e..db4d260f3b61 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_result.php
index 6f73dcb0ed85..0eae1dff3674 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_renew_delegation_token_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_args.php
index a6639292313c..25a6a7dd05f1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_result.php
index 6a0e57a18551..5e6ccbcf6bd9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_repl_tbl_writeid_state_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_args.php
index b29a939ee2cb..fa9e5b5bfe18 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_result.php
index 76fd049ae976..bdb0fdc6a91b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_privileges_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_args.php
index e497b7d545a0..63a25cc59182 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_result.php
index d512ddf278ce..088dedde0581 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_revoke_role_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_args.php
index aca0ce9788dd..3706675e651a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_result.php
index 5dec9665c287..36c7381306b6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_maintenance_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_args.php
index 32c28d9cd246..df3bd58fddb8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_result.php
index f028f1a9582e..075b7de2a971 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_poll_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_args.php
index 3789b9c56478..153dc1c5e899 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_result.php
index 856b6af496aa..8bfa2fbb85f4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_scheduled_query_progress_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_args.php
index e5e57441488a..00a6d64fc9c2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_result.php
index c3999cb5c264..bda3f7389a2e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_txn_id_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_args.php
index 6418ab6a13b1..d49b5ff08a1c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_result.php
index 341525d27cae..1725e9c6b4da 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_seed_write_id_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_args.php
index ec1ad007dc69..433e16099356 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_result.php
index 206a35332d94..82bba085f5e3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_setMetaConf_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_args.php
index 75497494fc5c..807ee72e4d34 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_result.php
index f8754fe8dae3..5921325a056b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_aggr_stats_for_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_args.php
index 7f3ba3efe40f..f5659aa44280 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_result.php
index 6eedbc396f75..2c45a8441773 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_hadoop_jobid_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_args.php
index e3221d27f5cd..c0d44742934d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_result.php
index f2d9ebbac156..1da550b0f25c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_properties_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_args.php
index 4c97bc17fb59..2966e23db16c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_result.php
index a90933b97c6d..15d8868d2142 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_schema_version_state_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_args.php
index 7894f7d40e87..b0e48ff5b876 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_result.php
index e635fd1735b0..8f19bb627096 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_args.php
index 2dca61c7268a..7e892a7c69a0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_result.php
index 0d36dbfc3109..adba03ee8478 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_compact_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_args.php
index ea6220f762f9..f4de6006941d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_result.php
index 3023a01f283d..824c883dcc96 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_show_locks_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_args.php
index 299134fb5542..aed13b97d113 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_result.php
index 5e0abd8b8f7f..709daaa1c03f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_submit_for_cleanup_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_args.php
index 7f0529daf7ef..69e0ae497145 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_result.php
index 012d3b205717..de82714f18f9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_translate_table_dryrun_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_args.php
index 37ccf5c63778..5628a585da4a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_args.php
index b0da5b899a21..42fb735a1daa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_result.php
index 5b74dfc5fd93..51ec20b143a5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_result.php
index 51ede37c0430..a0efe1bd2498 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_args.php
index 17edd88ecdbe..25cf81f8456a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_result.php
index a76cac88f28d..01f345c4a19c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_unlock_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_args.php
index f6b6b2e4f60b..51ee593df7a0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_result.php
index b114f3babd59..2b406ecdf67c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compaction_metrics_data_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_args.php
index 36ca2df5fe36..4cea21524520 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_result.php
index fdbfc1440fdf..d6398cf4c84d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_compactor_state_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_args.php
index 1cf7a88bd87b..9cb0c2e09cb8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_result.php
index cbe734cbd67a..ca12aeaf02a7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_creation_metadata_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_args.php
index 0227de1595cb..adfc6b73881e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_result.php
index c374e5148187..51cf7203337c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_master_key_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_args.php
index 6150684beb53..6147c50a2b7e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_args.php
index 4f0f3c405c13..2af394eca508 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_result.php
index 8b7d473bec49..127f88c0e3f0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_result.php
index 4f200193edba..9e6d7e66440c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_partition_column_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_args.php
index 495f65a06357..00dca4f919ce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_args.php
index b52f59e8286e..f4864e2bb827 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_result.php
index 48e4733002a9..07b41b030be6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_req_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_result.php
index 138efedf8b3a..c6baa3b6dfb3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_column_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_args.php
index f50b74cb20e0..9bee42c8925b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_result.php
index f2dbde720f02..39ba710b03ce 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_table_params_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_args.php
index eb6c2ca9bbb6..d5dcb727c96a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_result.php
index e6d130596bd9..d06c2417a488 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_update_transaction_statistics_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_args.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_args.php
index 65039df25fc8..eb2d9861c799 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_args.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_args.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_result.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_result.php
index 3cbed7302ea7..02ee90f7b961 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_result.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_validate_resource_plan_result.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Timestamp.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Timestamp.php
index 6abd70247899..a587c770f39e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Timestamp.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Timestamp.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TimestampColumnStatsData.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TimestampColumnStatsData.php
index 2ce03a68513f..3ee4240f1c49 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TimestampColumnStatsData.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TimestampColumnStatsData.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableRequest.php
index ed1aeed751fb..899893c96bbf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableResponse.php
index fb31d6a8ac0e..ad43a0b20471 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TruncateTableResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnAbortedException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnAbortedException.php
index ed0954082372..432d7ab96783 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnAbortedException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnAbortedException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnInfo.php
index b90763fd9b68..952f5972b928 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnOpenException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnOpenException.php
index ec0f62b88d69..98538f91a643 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnOpenException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnOpenException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnState.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnState.php
index dff022464ab3..4830e60fdbe0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnState.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnState.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnToWriteId.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnToWriteId.php
index 3a6e0c12e4fa..178dcb572119 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnToWriteId.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnToWriteId.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnType.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnType.php
index 6183e577df28..2cb7d581be4b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnType.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/TxnType.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Type.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Type.php
index 428428bb7af0..e2a83c291d0a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Type.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Type.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php
index d6aa90f3a637..521b424f3350 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsResponse.php
index 71e74776996a..2d289a0f8124 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownDBException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownDBException.php
index 49287f9a1cb6..96e76af5f23b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownDBException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownDBException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownPartitionException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownPartitionException.php
index 6be88a76f1ca..6fd07aec97e1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownPartitionException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownPartitionException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownTableException.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownTableException.php
index d5f4ae7469af..0b70a926f087 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownTableException.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnknownTableException.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnlockRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnlockRequest.php
index 72e2d4ffbf44..b11ca16bb430 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnlockRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UnlockRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UpdateTransactionalStatsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UpdateTransactionalStatsRequest.php
index fa7fd98c6597..7e481d3cc689 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UpdateTransactionalStatsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UpdateTransactionalStatsRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Version.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Version.php
index 6bd197b9ede4..c9085c1061dc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Version.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Version.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolRequest.php
index 0f60895be640..1e3507ac1834 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolResponse.php
index 1610985cf661..c0b8be93f4dc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterPoolResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanRequest.php
index 51da896011f5..1d7d8173a54e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanResponse.php
index e56ebaad58e0..a0973ec1debf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerRequest.php
index 6fb9ce8a6ca4..5669290449b3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerResponse.php
index 14ed20ece24b..556a09f57df6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMAlterTriggerResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingRequest.php
index 86f1cd98616d..91a44ed39733 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingResponse.php
index 972ebe0e61a9..68fe578c3cb1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrDropTriggerToPoolMappingResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingRequest.php
index 4751d6e5b633..c25bd8d3469c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingResponse.php
index a86d3425f013..afd236178517 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateOrUpdateMappingResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolRequest.php
index 631cce6077d0..fd308304625d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolResponse.php
index 80779976c113..9d35e21b3e58 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreatePoolResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanRequest.php
index 003ec75bd56f..6e522876a978 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanResponse.php
index c8612f5af708..1363b1941373 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerRequest.php
index fb5ca2651dae..c4aabd0d7448 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerResponse.php
index ee9821cf428c..1e8dcbc784f6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMCreateTriggerResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingRequest.php
index 8963b2ec7e40..2a4bcc4a7b22 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingResponse.php
index ea4a0093da2f..ab5bf4f3f18a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropMappingResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolRequest.php
index 1876fa6d54ff..87ce5b7a632c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolResponse.php
index f16466954718..bd10167ac7a9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropPoolResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanRequest.php
index 05a0eef636fb..fc466c33cf1b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanResponse.php
index ca058f2df42e..65765de914d7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerRequest.php
index b9453dc4ff37..6d2e0da27ca2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerResponse.php
index 6c068db174aa..bac289480d0e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMDropTriggerResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
index 1bdfa37271ee..f0adbba305d4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanRequest.php
index e4a67bdb6a9b..b94fd383dc17 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanResponse.php
index 8f3ccaac9b3e..5a877cda60d7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetActiveResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanRequest.php
index f6ad9d2df7a6..302d59f777a2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
index c903b2d82372..9a52e5ac3dc9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanRequest.php
index 9fb38cfd00de..685b1388b1c1 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanResponse.php
index 862da089218f..8e9d43f96387 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanRequest.php
index aeb7bbc10832..6a5641f94126 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
index 021374515b0c..0df233d9783e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMMapping.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMMapping.php
index 918903b0fd9b..ed565a10da99 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMMapping.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMMapping.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullablePool.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullablePool.php
index 53837cf8b4dc..fc3e73dc000a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullablePool.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullablePool.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullableResourcePlan.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullableResourcePlan.php
index 9c33beea54a6..5ae7ba854e9e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullableResourcePlan.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMNullableResourcePlan.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPool.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPool.php
index 340c644e83dc..55f11450d0d4 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPool.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPool.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolSchedulingPolicy.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolSchedulingPolicy.php
index 81a31e2b92f9..fad93e10afd2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolSchedulingPolicy.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolSchedulingPolicy.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolTrigger.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolTrigger.php
index f74b041f7fea..fb4ae4b8c433 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolTrigger.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMPoolTrigger.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlan.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlan.php
index 2c8857c4321f..8960b53557aa 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlan.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlan.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlanStatus.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlanStatus.php
index a1cb5be77842..95a923f7c9f7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlanStatus.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMResourcePlanStatus.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMTrigger.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMTrigger.php
index efdee7041ac0..5b42342439a5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMTrigger.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMTrigger.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanRequest.php
index b56c5494860c..120fd2e4d8e2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
index a4bdeeb4fd0d..56152e688b1b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteEventInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteEventInfo.php
index f66adc5f23d6..c65f2bb2f8bd 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteEventInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteEventInfo.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchRequest.php
index 6e37a6ab8665..5e658c7b7b83 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchResponse.php
index a9281f03255e..a06565955a63 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogBatchResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogRequest.php
index 58a8f31a9d67..6410099c6d6b 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogRequest.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogResponse.php
index fd3c5baf4d15..ef870a9ab2a0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WriteNotificationLogResponse.php
@@ -2,7 +2,7 @@
 namespace metastore;
 
 /**
- * Autogenerated by Thrift Compiler (0.16.0)
+ * Autogenerated by Thrift Compiler (0.23.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/FacebookService-remote b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/FacebookService-remote
new file mode 100755
index 000000000000..23ddf74907cf
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/FacebookService-remote
@@ -0,0 +1,201 @@
+#!/usr/bin/env python
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+import sys
+import pprint
+if sys.version_info[0] > 2:
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
+from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
+from thrift.protocol.TBinaryProtocol import TBinaryProtocol
+
+from fb303 import FacebookService
+from fb303.ttypes import *
+
+if len(sys.argv) <= 1 or sys.argv[1] == '--help':
+    print('')
+    print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] [-novalidate] [-ca_certs certs] [-keyfile keyfile] [-certfile certfile] function [arg1 [arg2...]]')
+    print('')
+    print('Functions:')
+    print('  string getName()')
+    print('  string getVersion()')
+    print('  fb_status getStatus()')
+    print('  string getStatusDetails()')
+    print('   getCounters()')
+    print('  i64 getCounter(string key)')
+    print('  void setOption(string key, string value)')
+    print('  string getOption(string key)')
+    print('   getOptions()')
+    print('  string getCpuProfile(i32 profileDurationInSec)')
+    print('  i64 aliveSince()')
+    print('  void reinitialize()')
+    print('  void shutdown()')
+    print('')
+    sys.exit(0)
+
+pp = pprint.PrettyPrinter(indent=2)
+host = 'localhost'
+port = 9090
+uri = ''
+framed = False
+ssl = False
+validate = True
+ca_certs = None
+keyfile = None
+certfile = None
+http = False
+argi = 1
+
+if sys.argv[argi] == '-h':
+    parts = sys.argv[argi + 1].split(':')
+    host = parts[0]
+    if len(parts) > 1:
+        port = int(parts[1])
+    argi += 2
+
+if sys.argv[argi] == '-u':
+    url = urlparse(sys.argv[argi + 1])
+    parts = url[1].split(':')
+    host = parts[0]
+    if len(parts) > 1:
+        port = int(parts[1])
+    else:
+        port = 80
+    uri = url[2]
+    if url[4]:
+        uri += '?%s' % url[4]
+    http = True
+    argi += 2
+
+if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
+    framed = True
+    argi += 1
+
+if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':
+    ssl = True
+    argi += 1
+
+if sys.argv[argi] == '-novalidate':
+    validate = False
+    argi += 1
+
+if sys.argv[argi] == '-ca_certs':
+    ca_certs = sys.argv[argi+1]
+    argi += 2
+
+if sys.argv[argi] == '-keyfile':
+    keyfile = sys.argv[argi+1]
+    argi += 2
+
+if sys.argv[argi] == '-certfile':
+    certfile = sys.argv[argi+1]
+    argi += 2
+
+cmd = sys.argv[argi]
+args = sys.argv[argi + 1:]
+
+if http:
+    transport = THttpClient.THttpClient(host, port, uri)
+else:
+    if ssl:
+        socket = TSSLSocket.TSSLSocket(host, port, validate=validate, ca_certs=ca_certs, keyfile=keyfile, certfile=certfile)
+    else:
+        socket = TSocket.TSocket(host, port)
+    if framed:
+        transport = TTransport.TFramedTransport(socket)
+    else:
+        transport = TTransport.TBufferedTransport(socket)
+protocol = TBinaryProtocol(transport)
+client = FacebookService.Client(protocol)
+transport.open()
+
+if cmd == 'getName':
+    if len(args) != 0:
+        print('getName requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.getName())
+
+elif cmd == 'getVersion':
+    if len(args) != 0:
+        print('getVersion requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.getVersion())
+
+elif cmd == 'getStatus':
+    if len(args) != 0:
+        print('getStatus requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.getStatus())
+
+elif cmd == 'getStatusDetails':
+    if len(args) != 0:
+        print('getStatusDetails requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.getStatusDetails())
+
+elif cmd == 'getCounters':
+    if len(args) != 0:
+        print('getCounters requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.getCounters())
+
+elif cmd == 'getCounter':
+    if len(args) != 1:
+        print('getCounter requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.getCounter(args[0],))
+
+elif cmd == 'setOption':
+    if len(args) != 2:
+        print('setOption requires 2 args')
+        sys.exit(1)
+    pp.pprint(client.setOption(args[0], args[1],))
+
+elif cmd == 'getOption':
+    if len(args) != 1:
+        print('getOption requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.getOption(args[0],))
+
+elif cmd == 'getOptions':
+    if len(args) != 0:
+        print('getOptions requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.getOptions())
+
+elif cmd == 'getCpuProfile':
+    if len(args) != 1:
+        print('getCpuProfile requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.getCpuProfile(eval(args[0]),))
+
+elif cmd == 'aliveSince':
+    if len(args) != 0:
+        print('aliveSince requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.aliveSince())
+
+elif cmd == 'reinitialize':
+    if len(args) != 0:
+        print('reinitialize requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.reinitialize())
+
+elif cmd == 'shutdown':
+    if len(args) != 0:
+        print('shutdown requires 0 args')
+        sys.exit(1)
+    pp.pprint(client.shutdown())
+
+else:
+    print('Unrecognized method %s' % cmd)
+    sys.exit(1)
+
+transport.close()
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/FacebookService.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/FacebookService.py
new file mode 100644
index 000000000000..1a1fe0c6a571
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/FacebookService.py
@@ -0,0 +1,2206 @@
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+from uuid import UUID
+
+import sys
+import logging
+from .ttypes import *
+from thrift.Thrift import TProcessor
+from thrift.transport import TTransport
+all_structs = []
+
+
+class Iface(object):
+    """
+    Standard base service
+
+    """
+    def getName(self):
+        """
+        Returns a descriptive name of the service
+
+        """
+        pass
+
+    def getVersion(self):
+        """
+        Returns the version of the service
+
+        """
+        pass
+
+    def getStatus(self):
+        """
+        Gets the status of this service
+
+        """
+        pass
+
+    def getStatusDetails(self):
+        """
+        User friendly description of status, such as why the service is in
+        the dead or warning state, or what is being started or stopped.
+
+        """
+        pass
+
+    def getCounters(self):
+        """
+        Gets the counters for this service
+
+        """
+        pass
+
+    def getCounter(self, key):
+        """
+        Gets the value of a single counter
+
+        Parameters:
+         - key
+
+        """
+        pass
+
+    def setOption(self, key, value):
+        """
+        Sets an option
+
+        Parameters:
+         - key
+         - value
+
+        """
+        pass
+
+    def getOption(self, key):
+        """
+        Gets an option
+
+        Parameters:
+         - key
+
+        """
+        pass
+
+    def getOptions(self):
+        """
+        Gets all options
+
+        """
+        pass
+
+    def getCpuProfile(self, profileDurationInSec):
+        """
+        Returns a CPU profile over the given time interval (client and server
+        must agree on the profile format).
+
+        Parameters:
+         - profileDurationInSec
+
+        """
+        pass
+
+    def aliveSince(self):
+        """
+        Returns the unix time that the server has been running since
+
+        """
+        pass
+
+    def reinitialize(self):
+        """
+        Tell the server to reload its configuration, reopen log files, etc
+
+        """
+        pass
+
+    def shutdown(self):
+        """
+        Suggest a shutdown to the server
+
+        """
+        pass
+
+
+class Client(Iface):
+    """
+    Standard base service
+
+    """
+    def __init__(self, iprot, oprot=None):
+        self._iprot = self._oprot = iprot
+        if oprot is not None:
+            self._oprot = oprot
+        self._seqid = 0
+
+    def getName(self):
+        """
+        Returns a descriptive name of the service
+
+        """
+        self.send_getName()
+        return self.recv_getName()
+
+    def send_getName(self):
+        self._oprot.writeMessageBegin('getName', TMessageType.CALL, self._seqid)
+        args = getName_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getName(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getName_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getName failed: unknown result")
+
+    def getVersion(self):
+        """
+        Returns the version of the service
+
+        """
+        self.send_getVersion()
+        return self.recv_getVersion()
+
+    def send_getVersion(self):
+        self._oprot.writeMessageBegin('getVersion', TMessageType.CALL, self._seqid)
+        args = getVersion_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getVersion(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getVersion_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getVersion failed: unknown result")
+
+    def getStatus(self):
+        """
+        Gets the status of this service
+
+        """
+        self.send_getStatus()
+        return self.recv_getStatus()
+
+    def send_getStatus(self):
+        self._oprot.writeMessageBegin('getStatus', TMessageType.CALL, self._seqid)
+        args = getStatus_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getStatus(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getStatus_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getStatus failed: unknown result")
+
+    def getStatusDetails(self):
+        """
+        User friendly description of status, such as why the service is in
+        the dead or warning state, or what is being started or stopped.
+
+        """
+        self.send_getStatusDetails()
+        return self.recv_getStatusDetails()
+
+    def send_getStatusDetails(self):
+        self._oprot.writeMessageBegin('getStatusDetails', TMessageType.CALL, self._seqid)
+        args = getStatusDetails_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getStatusDetails(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getStatusDetails_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getStatusDetails failed: unknown result")
+
+    def getCounters(self):
+        """
+        Gets the counters for this service
+
+        """
+        self.send_getCounters()
+        return self.recv_getCounters()
+
+    def send_getCounters(self):
+        self._oprot.writeMessageBegin('getCounters', TMessageType.CALL, self._seqid)
+        args = getCounters_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getCounters(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getCounters_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getCounters failed: unknown result")
+
+    def getCounter(self, key):
+        """
+        Gets the value of a single counter
+
+        Parameters:
+         - key
+
+        """
+        self.send_getCounter(key)
+        return self.recv_getCounter()
+
+    def send_getCounter(self, key):
+        self._oprot.writeMessageBegin('getCounter', TMessageType.CALL, self._seqid)
+        args = getCounter_args()
+        args.key = key
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getCounter(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getCounter_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getCounter failed: unknown result")
+
+    def setOption(self, key, value):
+        """
+        Sets an option
+
+        Parameters:
+         - key
+         - value
+
+        """
+        self.send_setOption(key, value)
+        self.recv_setOption()
+
+    def send_setOption(self, key, value):
+        self._oprot.writeMessageBegin('setOption', TMessageType.CALL, self._seqid)
+        args = setOption_args()
+        args.key = key
+        args.value = value
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_setOption(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = setOption_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        return
+
+    def getOption(self, key):
+        """
+        Gets an option
+
+        Parameters:
+         - key
+
+        """
+        self.send_getOption(key)
+        return self.recv_getOption()
+
+    def send_getOption(self, key):
+        self._oprot.writeMessageBegin('getOption', TMessageType.CALL, self._seqid)
+        args = getOption_args()
+        args.key = key
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getOption(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getOption_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getOption failed: unknown result")
+
+    def getOptions(self):
+        """
+        Gets all options
+
+        """
+        self.send_getOptions()
+        return self.recv_getOptions()
+
+    def send_getOptions(self):
+        self._oprot.writeMessageBegin('getOptions', TMessageType.CALL, self._seqid)
+        args = getOptions_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getOptions(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getOptions_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getOptions failed: unknown result")
+
+    def getCpuProfile(self, profileDurationInSec):
+        """
+        Returns a CPU profile over the given time interval (client and server
+        must agree on the profile format).
+
+        Parameters:
+         - profileDurationInSec
+
+        """
+        self.send_getCpuProfile(profileDurationInSec)
+        return self.recv_getCpuProfile()
+
+    def send_getCpuProfile(self, profileDurationInSec):
+        self._oprot.writeMessageBegin('getCpuProfile', TMessageType.CALL, self._seqid)
+        args = getCpuProfile_args()
+        args.profileDurationInSec = profileDurationInSec
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getCpuProfile(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getCpuProfile_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getCpuProfile failed: unknown result")
+
+    def aliveSince(self):
+        """
+        Returns the unix time that the server has been running since
+
+        """
+        self.send_aliveSince()
+        return self.recv_aliveSince()
+
+    def send_aliveSince(self):
+        self._oprot.writeMessageBegin('aliveSince', TMessageType.CALL, self._seqid)
+        args = aliveSince_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_aliveSince(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = aliveSince_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "aliveSince failed: unknown result")
+
+    def reinitialize(self):
+        """
+        Tell the server to reload its configuration, reopen log files, etc
+
+        """
+        self.send_reinitialize()
+
+    def send_reinitialize(self):
+        self._oprot.writeMessageBegin('reinitialize', TMessageType.ONEWAY, self._seqid)
+        args = reinitialize_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def shutdown(self):
+        """
+        Suggest a shutdown to the server
+
+        """
+        self.send_shutdown()
+
+    def send_shutdown(self):
+        self._oprot.writeMessageBegin('shutdown', TMessageType.ONEWAY, self._seqid)
+        args = shutdown_args()
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+
+class Processor(Iface, TProcessor):
+    def __init__(self, handler):
+        self._handler = handler
+        self._processMap = {}
+        self._processMap["getName"] = Processor.process_getName
+        self._processMap["getVersion"] = Processor.process_getVersion
+        self._processMap["getStatus"] = Processor.process_getStatus
+        self._processMap["getStatusDetails"] = Processor.process_getStatusDetails
+        self._processMap["getCounters"] = Processor.process_getCounters
+        self._processMap["getCounter"] = Processor.process_getCounter
+        self._processMap["setOption"] = Processor.process_setOption
+        self._processMap["getOption"] = Processor.process_getOption
+        self._processMap["getOptions"] = Processor.process_getOptions
+        self._processMap["getCpuProfile"] = Processor.process_getCpuProfile
+        self._processMap["aliveSince"] = Processor.process_aliveSince
+        self._processMap["reinitialize"] = Processor.process_reinitialize
+        self._processMap["shutdown"] = Processor.process_shutdown
+        self._on_message_begin = None
+
+    def on_message_begin(self, func):
+        self._on_message_begin = func
+
+    def process(self, iprot, oprot):
+        (name, type, seqid) = iprot.readMessageBegin()
+        if self._on_message_begin:
+            self._on_message_begin(name, type, seqid)
+        if name not in self._processMap:
+            iprot.skip(TType.STRUCT)
+            iprot.readMessageEnd()
+            x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
+            oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
+            x.write(oprot)
+            oprot.writeMessageEnd()
+            oprot.trans.flush()
+            return
+        else:
+            self._processMap[name](self, seqid, iprot, oprot)
+        return True
+
+    def process_getName(self, seqid, iprot, oprot):
+        args = getName_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getName_result()
+        try:
+            result.success = self._handler.getName()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getName", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getVersion(self, seqid, iprot, oprot):
+        args = getVersion_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getVersion_result()
+        try:
+            result.success = self._handler.getVersion()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getVersion", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getStatus(self, seqid, iprot, oprot):
+        args = getStatus_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getStatus_result()
+        try:
+            result.success = self._handler.getStatus()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getStatus", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getStatusDetails(self, seqid, iprot, oprot):
+        args = getStatusDetails_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getStatusDetails_result()
+        try:
+            result.success = self._handler.getStatusDetails()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getStatusDetails", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getCounters(self, seqid, iprot, oprot):
+        args = getCounters_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getCounters_result()
+        try:
+            result.success = self._handler.getCounters()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getCounters", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getCounter(self, seqid, iprot, oprot):
+        args = getCounter_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getCounter_result()
+        try:
+            result.success = self._handler.getCounter(args.key)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getCounter", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_setOption(self, seqid, iprot, oprot):
+        args = setOption_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = setOption_result()
+        try:
+            self._handler.setOption(args.key, args.value)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("setOption", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getOption(self, seqid, iprot, oprot):
+        args = getOption_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getOption_result()
+        try:
+            result.success = self._handler.getOption(args.key)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getOption", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getOptions(self, seqid, iprot, oprot):
+        args = getOptions_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getOptions_result()
+        try:
+            result.success = self._handler.getOptions()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getOptions", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getCpuProfile(self, seqid, iprot, oprot):
+        args = getCpuProfile_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getCpuProfile_result()
+        try:
+            result.success = self._handler.getCpuProfile(args.profileDurationInSec)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getCpuProfile", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_aliveSince(self, seqid, iprot, oprot):
+        args = aliveSince_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = aliveSince_result()
+        try:
+            result.success = self._handler.aliveSince()
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("aliveSince", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_reinitialize(self, seqid, iprot, oprot):
+        args = reinitialize_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        try:
+            self._handler.reinitialize()
+        except TTransport.TTransportException:
+            raise
+        except Exception:
+            logging.exception('Exception in oneway handler')
+
+    def process_shutdown(self, seqid, iprot, oprot):
+        args = shutdown_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        try:
+            self._handler.shutdown()
+        except TTransport.TTransportException:
+            raise
+        except Exception:
+            logging.exception('Exception in oneway handler')
+
+# HELPER FUNCTIONS AND STRUCTURES
+
+
+class getName_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getName_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getName_args)
+getName_args.thrift_spec = (
+)
+
+
+class getName_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getName_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getName_result)
+getName_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
+
+
+class getVersion_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getVersion_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getVersion_args)
+getVersion_args.thrift_spec = (
+)
+
+
+class getVersion_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getVersion_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getVersion_result)
+getVersion_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
+
+
+class getStatus_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getStatus_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getStatus_args)
+getStatus_args.thrift_spec = (
+)
+
+
+class getStatus_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.I32:
+                    self.success = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getStatus_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.I32, 0)
+            oprot.writeI32(self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getStatus_result)
+getStatus_result.thrift_spec = (
+    (0, TType.I32, 'success', None, None, ),  # 0
+)
+
+
+class getStatusDetails_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getStatusDetails_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getStatusDetails_args)
+getStatusDetails_args.thrift_spec = (
+)
+
+
+class getStatusDetails_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getStatusDetails_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getStatusDetails_result)
+getStatusDetails_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
+
+
+class getCounters_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getCounters_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getCounters_args)
+getCounters_args.thrift_spec = (
+)
+
+
+class getCounters_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.MAP:
+                    self.success = {}
+                    (_ktype1, _vtype2, _size0) = iprot.readMapBegin()
+                    for _i4 in range(_size0):
+                        _key5 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        _val6 = iprot.readI64()
+                        self.success[_key5] = _val6
+                    iprot.readMapEnd()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getCounters_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.MAP, 0)
+            oprot.writeMapBegin(TType.STRING, TType.I64, len(self.success))
+            for kiter7, viter8 in self.success.items():
+                oprot.writeString(kiter7.encode('utf-8') if sys.version_info[0] == 2 else kiter7)
+                oprot.writeI64(viter8)
+            oprot.writeMapEnd()
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getCounters_result)
+getCounters_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I64, None, False), None, ),  # 0
+)
+
+
+class getCounter_args(object):
+    """
+    Attributes:
+     - key
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, key = None,):
+        self.key = key
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.key = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getCounter_args')
+        if self.key is not None:
+            oprot.writeFieldBegin('key', TType.STRING, 1)
+            oprot.writeString(self.key.encode('utf-8') if sys.version_info[0] == 2 else self.key)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getCounter_args)
+getCounter_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'key', 'UTF8', None, ),  # 1
+)
+
+
+class getCounter_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.I64:
+                    self.success = iprot.readI64()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getCounter_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.I64, 0)
+            oprot.writeI64(self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getCounter_result)
+getCounter_result.thrift_spec = (
+    (0, TType.I64, 'success', None, None, ),  # 0
+)
+
+
+class setOption_args(object):
+    """
+    Attributes:
+     - key
+     - value
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, key = None, value = None,):
+        self.key = key
+        self.value = value
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.key = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.value = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('setOption_args')
+        if self.key is not None:
+            oprot.writeFieldBegin('key', TType.STRING, 1)
+            oprot.writeString(self.key.encode('utf-8') if sys.version_info[0] == 2 else self.key)
+            oprot.writeFieldEnd()
+        if self.value is not None:
+            oprot.writeFieldBegin('value', TType.STRING, 2)
+            oprot.writeString(self.value.encode('utf-8') if sys.version_info[0] == 2 else self.value)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(setOption_args)
+setOption_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'key', 'UTF8', None, ),  # 1
+    (2, TType.STRING, 'value', 'UTF8', None, ),  # 2
+)
+
+
+class setOption_result(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('setOption_result')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(setOption_result)
+setOption_result.thrift_spec = (
+)
+
+
+class getOption_args(object):
+    """
+    Attributes:
+     - key
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, key = None,):
+        self.key = key
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.key = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getOption_args')
+        if self.key is not None:
+            oprot.writeFieldBegin('key', TType.STRING, 1)
+            oprot.writeString(self.key.encode('utf-8') if sys.version_info[0] == 2 else self.key)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getOption_args)
+getOption_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'key', 'UTF8', None, ),  # 1
+)
+
+
+class getOption_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getOption_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getOption_result)
+getOption_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
+
+
+class getOptions_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getOptions_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getOptions_args)
+getOptions_args.thrift_spec = (
+)
+
+
+class getOptions_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.MAP:
+                    self.success = {}
+                    (_ktype10, _vtype11, _size9) = iprot.readMapBegin()
+                    for _i13 in range(_size9):
+                        _key14 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        _val15 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.success[_key14] = _val15
+                    iprot.readMapEnd()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getOptions_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.MAP, 0)
+            oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
+            for kiter16, viter17 in self.success.items():
+                oprot.writeString(kiter16.encode('utf-8') if sys.version_info[0] == 2 else kiter16)
+                oprot.writeString(viter17.encode('utf-8') if sys.version_info[0] == 2 else viter17)
+            oprot.writeMapEnd()
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getOptions_result)
+getOptions_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+)
+
+
+class getCpuProfile_args(object):
+    """
+    Attributes:
+     - profileDurationInSec
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, profileDurationInSec = None,):
+        self.profileDurationInSec = profileDurationInSec
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.I32:
+                    self.profileDurationInSec = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getCpuProfile_args')
+        if self.profileDurationInSec is not None:
+            oprot.writeFieldBegin('profileDurationInSec', TType.I32, 1)
+            oprot.writeI32(self.profileDurationInSec)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getCpuProfile_args)
+getCpuProfile_args.thrift_spec = (
+    None,  # 0
+    (1, TType.I32, 'profileDurationInSec', None, None, ),  # 1
+)
+
+
+class getCpuProfile_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getCpuProfile_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getCpuProfile_result)
+getCpuProfile_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
+
+
+class aliveSince_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('aliveSince_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(aliveSince_args)
+aliveSince_args.thrift_spec = (
+)
+
+
+class aliveSince_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+    thrift_spec = None
+
+
+    def __init__(self, success = None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.I64:
+                    self.success = iprot.readI64()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('aliveSince_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.I64, 0)
+            oprot.writeI64(self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(aliveSince_result)
+aliveSince_result.thrift_spec = (
+    (0, TType.I64, 'success', None, None, ),  # 0
+)
+
+
+class reinitialize_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('reinitialize_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(reinitialize_args)
+reinitialize_args.thrift_spec = (
+)
+
+
+class shutdown_args(object):
+    thrift_spec = None
+
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        self.validate()
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('shutdown_args')
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(shutdown_args)
+shutdown_args.thrift_spec = (
+)
+fix_spec(all_structs)
+del all_structs
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/__init__.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/__init__.py
new file mode 100644
index 000000000000..14c89e0d3997
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/__init__.py
@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'FacebookService']
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/constants.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/constants.py
new file mode 100644
index 000000000000..4c25e111aa7c
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/constants.py
@@ -0,0 +1,15 @@
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+from uuid import UUID
+
+import sys
+from .ttypes import *
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/ttypes.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/ttypes.py
new file mode 100644
index 000000000000..090e4d3d0813
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/fb303/ttypes.py
@@ -0,0 +1,50 @@
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+from uuid import UUID
+
+import sys
+
+from thrift.transport import TTransport
+all_structs = []
+
+
+class fb_status(object):
+    """
+    Common status reporting mechanism across all services
+
+    """
+    DEAD = 0
+    STARTING = 1
+    ALIVE = 2
+    STOPPING = 3
+    STOPPED = 4
+    WARNING = 5
+
+    _VALUES_TO_NAMES = {
+        0: "DEAD",
+        1: "STARTING",
+        2: "ALIVE",
+        3: "STOPPING",
+        4: "STOPPED",
+        5: "WARNING",
+    }
+
+    _NAMES_TO_VALUES = {
+        "DEAD": 0,
+        "STARTING": 1,
+        "ALIVE": 2,
+        "STOPPING": 3,
+        "STOPPED": 4,
+        "WARNING": 5,
+    }
+fix_spec(all_structs)
+del all_structs
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
index c0d3b6f80cc8..3f1d8bb862b1 100755
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
index a49cc3280ea0..4e116ee59385 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 import fb303.FacebookService
@@ -21287,9 +21288,10 @@ class abort_Compactions_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -21313,6 +21315,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21350,9 +21353,10 @@ class abort_Compactions_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -21376,6 +21380,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21412,9 +21417,10 @@ class getMetaConf_args(object):
      - key
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, key=None,):
+    def __init__(self, key = None,):
         self.key = key
 
     def read(self, iprot):
@@ -21437,6 +21443,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21475,9 +21482,10 @@ class getMetaConf_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -21506,6 +21514,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21548,9 +21557,10 @@ class setMetaConf_args(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, key=None, value=None,):
+    def __init__(self, key = None, value = None,):
         self.key = key
         self.value = value
 
@@ -21579,6 +21589,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21621,9 +21632,10 @@ class setMetaConf_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -21646,6 +21658,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21683,9 +21696,10 @@ class create_catalog_args(object):
      - catalog
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalog=None,):
+    def __init__(self, catalog = None,):
         self.catalog = catalog
 
     def read(self, iprot):
@@ -21709,6 +21723,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21748,9 +21763,10 @@ class create_catalog_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -21785,6 +21801,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21832,9 +21849,10 @@ class alter_catalog_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -21858,6 +21876,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21897,9 +21916,10 @@ class alter_catalog_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -21934,6 +21954,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21981,9 +22002,10 @@ class get_catalog_args(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None,):
+    def __init__(self, catName = None,):
         self.catName = catName
 
     def read(self, iprot):
@@ -22007,6 +22029,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22046,9 +22069,10 @@ class get_catalog_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -22084,6 +22108,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22125,6 +22150,7 @@ def __ne__(self, other):
 
 
 class get_catalogs_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -22142,6 +22168,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22174,9 +22201,10 @@ class get_catalogs_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -22206,6 +22234,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22247,9 +22276,10 @@ class drop_catalog_args(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None,):
+    def __init__(self, catName = None,):
         self.catName = catName
 
     def read(self, iprot):
@@ -22273,6 +22303,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22312,9 +22343,10 @@ class drop_catalog_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -22349,6 +22381,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22396,9 +22429,10 @@ class create_database_args(object):
      - database
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, database=None,):
+    def __init__(self, database = None,):
         self.database = database
 
     def read(self, iprot):
@@ -22422,6 +22456,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22461,9 +22496,10 @@ class create_database_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -22498,6 +22534,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22545,9 +22582,10 @@ class create_database_req_args(object):
      - createDatabaseRequest
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, createDatabaseRequest=None,):
+    def __init__(self, createDatabaseRequest = None,):
         self.createDatabaseRequest = createDatabaseRequest
 
     def read(self, iprot):
@@ -22571,6 +22609,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22610,9 +22649,10 @@ class create_database_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -22647,6 +22687,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22694,9 +22735,10 @@ class get_database_args(object):
      - name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None,):
+    def __init__(self, name = None,):
         self.name = name
 
     def read(self, iprot):
@@ -22719,6 +22761,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22758,9 +22801,10 @@ class get_database_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -22796,6 +22840,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22842,9 +22887,10 @@ class get_database_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -22868,6 +22914,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22907,9 +22954,10 @@ class get_database_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -22945,6 +22993,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22993,9 +23042,10 @@ class drop_database_args(object):
      - cascade
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, deleteData=None, cascade=None,):
+    def __init__(self, name = None, deleteData = None, cascade = None,):
         self.name = name
         self.deleteData = deleteData
         self.cascade = cascade
@@ -23030,6 +23080,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23079,9 +23130,10 @@ class drop_database_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -23116,6 +23168,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23163,9 +23216,10 @@ class drop_database_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -23189,6 +23243,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23229,9 +23284,10 @@ class drop_database_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -23273,6 +23329,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23324,9 +23381,10 @@ class get_databases_args(object):
      - pattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, pattern=None,):
+    def __init__(self, pattern = None,):
         self.pattern = pattern
 
     def read(self, iprot):
@@ -23349,6 +23407,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23387,9 +23446,10 @@ class get_databases_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -23423,6 +23483,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23462,6 +23523,7 @@ def __ne__(self, other):
 
 
 class get_all_databases_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -23479,6 +23541,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23511,9 +23574,10 @@ class get_all_databases_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -23547,6 +23611,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23591,9 +23656,10 @@ class get_databases_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -23617,6 +23683,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23655,9 +23722,10 @@ class get_databases_req_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -23687,6 +23755,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23729,9 +23798,10 @@ class alter_database_args(object):
      - db
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, db=None,):
+    def __init__(self, dbname = None, db = None,):
         self.dbname = dbname
         self.db = db
 
@@ -23761,6 +23831,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23804,9 +23875,10 @@ class alter_database_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -23835,6 +23907,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23877,9 +23950,10 @@ class alter_database_req_args(object):
      - alterDbReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, alterDbReq=None,):
+    def __init__(self, alterDbReq = None,):
         self.alterDbReq = alterDbReq
 
     def read(self, iprot):
@@ -23903,6 +23977,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23941,9 +24016,10 @@ class alter_database_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -23972,6 +24048,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24014,9 +24091,10 @@ class create_dataconnector_req_args(object):
      - connectorReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, connectorReq=None,):
+    def __init__(self, connectorReq = None,):
         self.connectorReq = connectorReq
 
     def read(self, iprot):
@@ -24040,6 +24118,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24079,9 +24158,10 @@ class create_dataconnector_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -24116,6 +24196,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24163,9 +24244,10 @@ class get_dataconnector_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -24189,6 +24271,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24228,9 +24311,10 @@ class get_dataconnector_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -24266,6 +24350,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24312,9 +24397,10 @@ class drop_dataconnector_req_args(object):
      - dropDcReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dropDcReq=None,):
+    def __init__(self, dropDcReq = None,):
         self.dropDcReq = dropDcReq
 
     def read(self, iprot):
@@ -24338,6 +24424,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24377,9 +24464,10 @@ class drop_dataconnector_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -24414,6 +24502,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24456,6 +24545,7 @@ def __ne__(self, other):
 
 
 class get_dataconnectors_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24473,6 +24563,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24505,9 +24596,10 @@ class get_dataconnectors_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -24541,6 +24633,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24585,9 +24678,10 @@ class alter_dataconnector_req_args(object):
      - alterReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, alterReq=None,):
+    def __init__(self, alterReq = None,):
         self.alterReq = alterReq
 
     def read(self, iprot):
@@ -24611,6 +24705,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24649,9 +24744,10 @@ class alter_dataconnector_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -24680,6 +24776,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24722,9 +24819,10 @@ class get_type_args(object):
      - name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None,):
+    def __init__(self, name = None,):
         self.name = name
 
     def read(self, iprot):
@@ -24747,6 +24845,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24786,9 +24885,10 @@ class get_type_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -24824,6 +24924,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24870,9 +24971,10 @@ class create_type_args(object):
      - type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, type=None,):
+    def __init__(self, type = None,):
         self.type = type
 
     def read(self, iprot):
@@ -24896,6 +24998,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24936,9 +25039,10 @@ class create_type_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -24979,6 +25083,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25030,9 +25135,10 @@ class drop_type_args(object):
      - type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, type=None,):
+    def __init__(self, type = None,):
         self.type = type
 
     def read(self, iprot):
@@ -25055,6 +25161,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25094,9 +25201,10 @@ class drop_type_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -25131,6 +25239,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25177,9 +25286,10 @@ class get_type_all_args(object):
      - name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None,):
+    def __init__(self, name = None,):
         self.name = name
 
     def read(self, iprot):
@@ -25202,6 +25312,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25240,9 +25351,10 @@ class get_type_all_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o2=None,):
+    def __init__(self, success = None, o2 = None,):
         self.success = success
         self.o2 = o2
 
@@ -25278,6 +25390,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25324,9 +25437,10 @@ class get_fields_args(object):
      - table_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, table_name=None,):
+    def __init__(self, db_name = None, table_name = None,):
         self.db_name = db_name
         self.table_name = table_name
 
@@ -25355,6 +25469,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25400,9 +25515,10 @@ class get_fields_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -25449,6 +25565,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25505,9 +25622,10 @@ class get_fields_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, table_name=None, environment_context=None,):
+    def __init__(self, db_name = None, table_name = None, environment_context = None,):
         self.db_name = db_name
         self.table_name = table_name
         self.environment_context = environment_context
@@ -25543,6 +25661,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25593,9 +25712,10 @@ class get_fields_with_environment_context_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -25642,6 +25762,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25696,9 +25817,10 @@ class get_fields_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -25722,6 +25844,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25762,9 +25885,10 @@ class get_fields_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -25806,6 +25930,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25858,9 +25983,10 @@ class get_schema_args(object):
      - table_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, table_name=None,):
+    def __init__(self, db_name = None, table_name = None,):
         self.db_name = db_name
         self.table_name = table_name
 
@@ -25889,6 +26015,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25934,9 +26061,10 @@ class get_schema_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -25983,6 +26111,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26039,9 +26168,10 @@ class get_schema_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, table_name=None, environment_context=None,):
+    def __init__(self, db_name = None, table_name = None, environment_context = None,):
         self.db_name = db_name
         self.table_name = table_name
         self.environment_context = environment_context
@@ -26077,6 +26207,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26127,9 +26258,10 @@ class get_schema_with_environment_context_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -26176,6 +26308,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26230,9 +26363,10 @@ class get_schema_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -26256,6 +26390,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26296,9 +26431,10 @@ class get_schema_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -26340,6 +26476,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26391,9 +26528,10 @@ class create_table_args(object):
      - tbl
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tbl=None,):
+    def __init__(self, tbl = None,):
         self.tbl = tbl
 
     def read(self, iprot):
@@ -26417,6 +26555,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26457,9 +26596,10 @@ class create_table_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -26500,6 +26640,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26553,9 +26694,10 @@ class create_table_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tbl=None, environment_context=None,):
+    def __init__(self, tbl = None, environment_context = None,):
         self.tbl = tbl
         self.environment_context = environment_context
 
@@ -26586,6 +26728,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26631,9 +26774,10 @@ class create_table_with_environment_context_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -26674,6 +26818,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26732,9 +26877,10 @@ class create_table_with_constraints_args(object):
      - checkConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tbl=None, primaryKeys=None, foreignKeys=None, uniqueConstraints=None, notNullConstraints=None, defaultConstraints=None, checkConstraints=None,):
+    def __init__(self, tbl = None, primaryKeys = None, foreignKeys = None, uniqueConstraints = None, notNullConstraints = None, defaultConstraints = None, checkConstraints = None,):
         self.tbl = tbl
         self.primaryKeys = primaryKeys
         self.foreignKeys = foreignKeys
@@ -26830,6 +26976,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26918,9 +27065,10 @@ class create_table_with_constraints_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -26961,6 +27109,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27013,9 +27162,10 @@ class create_table_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -27039,6 +27189,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27079,9 +27230,10 @@ class create_table_req_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -27122,6 +27274,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27174,9 +27327,10 @@ class drop_constraint_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -27200,6 +27354,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27238,9 +27393,10 @@ class drop_constraint_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o3=None,):
+    def __init__(self, o1 = None, o3 = None,):
         self.o1 = o1
         self.o3 = o3
 
@@ -27269,6 +27425,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27311,9 +27468,10 @@ class add_primary_key_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -27337,6 +27495,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27375,9 +27534,10 @@ class add_primary_key_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -27406,6 +27566,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27448,9 +27609,10 @@ class add_foreign_key_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -27474,6 +27636,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27512,9 +27675,10 @@ class add_foreign_key_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -27543,6 +27707,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27585,9 +27750,10 @@ class add_unique_constraint_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -27611,6 +27777,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27649,9 +27816,10 @@ class add_unique_constraint_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -27680,6 +27848,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27722,9 +27891,10 @@ class add_not_null_constraint_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -27748,6 +27918,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27786,9 +27957,10 @@ class add_not_null_constraint_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -27817,6 +27989,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27859,9 +28032,10 @@ class add_default_constraint_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -27885,6 +28059,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27923,9 +28098,10 @@ class add_default_constraint_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -27954,6 +28130,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27996,9 +28173,10 @@ class add_check_constraint_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -28022,6 +28200,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28060,9 +28239,10 @@ class add_check_constraint_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -28091,6 +28271,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28133,9 +28314,10 @@ class translate_table_dryrun_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -28159,6 +28341,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28200,9 +28383,10 @@ class translate_table_dryrun_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -28250,6 +28434,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28308,9 +28493,10 @@ class drop_table_args(object):
      - deleteData
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, name=None, deleteData=None,):
+    def __init__(self, dbname = None, name = None, deleteData = None,):
         self.dbname = dbname
         self.name = name
         self.deleteData = deleteData
@@ -28345,6 +28531,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28393,9 +28580,10 @@ class drop_table_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o3=None,):
+    def __init__(self, o1 = None, o3 = None,):
         self.o1 = o1
         self.o3 = o3
 
@@ -28424,6 +28612,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28469,9 +28658,10 @@ class drop_table_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, name=None, deleteData=None, environment_context=None,):
+    def __init__(self, dbname = None, name = None, deleteData = None, environment_context = None,):
         self.dbname = dbname
         self.name = name
         self.deleteData = deleteData
@@ -28513,6 +28703,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28566,9 +28757,10 @@ class drop_table_with_environment_context_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o3=None,):
+    def __init__(self, o1 = None, o3 = None,):
         self.o1 = o1
         self.o3 = o3
 
@@ -28597,6 +28789,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28639,9 +28832,10 @@ class drop_table_req_args(object):
      - dropTableReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dropTableReq=None,):
+    def __init__(self, dropTableReq = None,):
         self.dropTableReq = dropTableReq
 
     def read(self, iprot):
@@ -28665,6 +28859,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28704,9 +28899,10 @@ class drop_table_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o3 = o3
@@ -28742,6 +28938,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28790,9 +28987,10 @@ class truncate_table_args(object):
      - partNames
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, partNames=None,):
+    def __init__(self, dbName = None, tableName = None, partNames = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.partNames = partNames
@@ -28832,6 +29030,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28882,9 +29081,10 @@ class truncate_table_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -28907,6 +29107,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28944,9 +29145,10 @@ class truncate_table_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -28970,6 +29172,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29008,9 +29211,10 @@ class truncate_table_req_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29040,6 +29244,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29082,9 +29287,10 @@ class get_tables_args(object):
      - pattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, pattern=None,):
+    def __init__(self, db_name = None, pattern = None,):
         self.db_name = db_name
         self.pattern = pattern
 
@@ -29113,6 +29319,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29156,9 +29363,10 @@ class get_tables_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29192,6 +29400,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29238,9 +29447,10 @@ class get_tables_by_type_args(object):
      - tableType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, pattern=None, tableType=None,):
+    def __init__(self, db_name = None, pattern = None, tableType = None,):
         self.db_name = db_name
         self.pattern = pattern
         self.tableType = tableType
@@ -29275,6 +29485,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29323,9 +29534,10 @@ class get_tables_by_type_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29359,6 +29571,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29398,6 +29611,7 @@ def __ne__(self, other):
 
 
 class get_all_materialized_view_objects_for_rewriting_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -29415,6 +29629,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29447,9 +29662,10 @@ class get_all_materialized_view_objects_for_rewriting_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29484,6 +29700,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29528,9 +29745,10 @@ class get_materialized_views_for_rewriting_args(object):
      - db_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None,):
+    def __init__(self, db_name = None,):
         self.db_name = db_name
 
     def read(self, iprot):
@@ -29553,6 +29771,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29591,9 +29810,10 @@ class get_materialized_views_for_rewriting_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29627,6 +29847,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29673,9 +29894,10 @@ class get_table_meta_args(object):
      - tbl_types
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_patterns=None, tbl_patterns=None, tbl_types=None,):
+    def __init__(self, db_patterns = None, tbl_patterns = None, tbl_types = None,):
         self.db_patterns = db_patterns
         self.tbl_patterns = tbl_patterns
         self.tbl_types = tbl_types
@@ -29715,6 +29937,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29766,9 +29989,10 @@ class get_table_meta_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29803,6 +30027,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29847,9 +30072,10 @@ class get_all_tables_args(object):
      - db_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None,):
+    def __init__(self, db_name = None,):
         self.db_name = db_name
 
     def read(self, iprot):
@@ -29872,6 +30098,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29910,9 +30137,10 @@ class get_all_tables_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -29946,6 +30174,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29990,9 +30219,10 @@ class get_tables_ext_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -30016,6 +30246,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30054,9 +30285,10 @@ class get_tables_ext_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -30091,6 +30323,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30135,9 +30368,10 @@ class get_table_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -30161,6 +30395,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30200,9 +30435,10 @@ class get_table_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -30238,6 +30474,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30284,9 +30521,10 @@ class get_table_objects_by_name_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -30310,6 +30548,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30350,9 +30589,10 @@ class get_table_objects_by_name_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -30394,6 +30634,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30446,9 +30687,10 @@ class get_materialization_invalidation_info_args(object):
      - validTxnList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, creation_metadata=None, validTxnList=None,):
+    def __init__(self, creation_metadata = None, validTxnList = None,):
         self.creation_metadata = creation_metadata
         self.validTxnList = validTxnList
 
@@ -30478,6 +30720,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30523,9 +30766,10 @@ class get_materialization_invalidation_info_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -30567,6 +30811,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30621,9 +30866,10 @@ class update_creation_metadata_args(object):
      - creation_metadata
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbname=None, tbl_name=None, creation_metadata=None,):
+    def __init__(self, catName = None, dbname = None, tbl_name = None, creation_metadata = None,):
         self.catName = catName
         self.dbname = dbname
         self.tbl_name = tbl_name
@@ -30665,6 +30911,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30719,9 +30966,10 @@ class update_creation_metadata_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -30756,6 +31004,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30805,9 +31054,10 @@ class get_table_names_by_filter_args(object):
      - max_tables
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, filter=None, max_tables=-1,):
+    def __init__(self, dbname = None, filter = None, max_tables = -1,):
         self.dbname = dbname
         self.filter = filter
         self.max_tables = max_tables
@@ -30842,6 +31092,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30892,9 +31143,10 @@ class get_table_names_by_filter_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -30940,6 +31192,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30996,9 +31249,10 @@ class alter_table_args(object):
      - new_tbl
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tbl_name=None, new_tbl=None,):
+    def __init__(self, dbname = None, tbl_name = None, new_tbl = None,):
         self.dbname = dbname
         self.tbl_name = tbl_name
         self.new_tbl = new_tbl
@@ -31034,6 +31288,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31082,9 +31337,10 @@ class alter_table_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -31113,6 +31369,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31158,9 +31415,10 @@ class alter_table_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tbl_name=None, new_tbl=None, environment_context=None,):
+    def __init__(self, dbname = None, tbl_name = None, new_tbl = None, environment_context = None,):
         self.dbname = dbname
         self.tbl_name = tbl_name
         self.new_tbl = new_tbl
@@ -31203,6 +31461,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31256,9 +31515,10 @@ class alter_table_with_environment_context_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -31287,6 +31547,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31332,9 +31593,10 @@ class alter_table_with_cascade_args(object):
      - cascade
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tbl_name=None, new_tbl=None, cascade=None,):
+    def __init__(self, dbname = None, tbl_name = None, new_tbl = None, cascade = None,):
         self.dbname = dbname
         self.tbl_name = tbl_name
         self.new_tbl = new_tbl
@@ -31376,6 +31638,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31429,9 +31692,10 @@ class alter_table_with_cascade_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -31460,6 +31724,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31502,9 +31767,10 @@ class alter_table_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -31528,6 +31794,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31567,9 +31834,10 @@ class alter_table_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -31605,6 +31873,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31651,9 +31920,10 @@ class update_table_params_args(object):
      - updates
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, updates=None,):
+    def __init__(self, updates = None,):
         self.updates = updates
 
     def read(self, iprot):
@@ -31682,6 +31952,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31722,9 +31993,10 @@ class update_table_params_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -31747,6 +32019,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31784,9 +32057,10 @@ class add_partition_args(object):
      - new_part
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, new_part=None,):
+    def __init__(self, new_part = None,):
         self.new_part = new_part
 
     def read(self, iprot):
@@ -31810,6 +32084,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31850,9 +32125,10 @@ class add_partition_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -31894,6 +32170,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31946,9 +32223,10 @@ class add_partition_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, new_part=None, environment_context=None,):
+    def __init__(self, new_part = None, environment_context = None,):
         self.new_part = new_part
         self.environment_context = environment_context
 
@@ -31979,6 +32257,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32024,9 +32303,10 @@ class add_partition_with_environment_context_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -32068,6 +32348,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32119,9 +32400,10 @@ class add_partitions_args(object):
      - new_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, new_parts=None,):
+    def __init__(self, new_parts = None,):
         self.new_parts = new_parts
 
     def read(self, iprot):
@@ -32150,6 +32432,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32193,9 +32476,10 @@ class add_partitions_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -32236,6 +32520,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32287,9 +32572,10 @@ class add_partitions_pspec_args(object):
      - new_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, new_parts=None,):
+    def __init__(self, new_parts = None,):
         self.new_parts = new_parts
 
     def read(self, iprot):
@@ -32318,6 +32604,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32361,9 +32648,10 @@ class add_partitions_pspec_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -32404,6 +32692,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32457,9 +32746,10 @@ class append_partition_args(object):
      - part_vals
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -32499,6 +32789,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32552,9 +32843,10 @@ class append_partition_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -32596,6 +32888,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32647,9 +32940,10 @@ class add_partitions_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -32673,6 +32967,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32713,9 +33008,10 @@ class add_partitions_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -32757,6 +33053,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32811,9 +33108,10 @@ class append_partition_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, environment_context=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, environment_context = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -32860,6 +33158,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32918,9 +33217,10 @@ class append_partition_with_environment_context_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -32962,6 +33262,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33013,9 +33314,10 @@ class append_partition_req_args(object):
      - appendPartitionsReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, appendPartitionsReq=None,):
+    def __init__(self, appendPartitionsReq = None,):
         self.appendPartitionsReq = appendPartitionsReq
 
     def read(self, iprot):
@@ -33039,6 +33341,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33079,9 +33382,10 @@ class append_partition_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -33123,6 +33427,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33176,9 +33481,10 @@ class append_partition_by_name_args(object):
      - part_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -33213,6 +33519,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33263,9 +33570,10 @@ class append_partition_by_name_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -33307,6 +33615,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33361,9 +33670,10 @@ class append_partition_by_name_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None, environment_context=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None, environment_context = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -33405,6 +33715,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33460,9 +33771,10 @@ class append_partition_by_name_with_environment_context_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -33504,6 +33816,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33558,9 +33871,10 @@ class drop_partition_args(object):
      - deleteData
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, deleteData=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, deleteData = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -33606,6 +33920,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33663,9 +33978,10 @@ class drop_partition_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -33700,6 +34016,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33750,9 +34067,10 @@ class drop_partition_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, deleteData=None, environment_context=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, deleteData = None, environment_context = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -33805,6 +34123,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33867,9 +34186,10 @@ class drop_partition_with_environment_context_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -33904,6 +34224,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33950,9 +34271,10 @@ class drop_partition_req_args(object):
      - dropPartitionReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dropPartitionReq=None,):
+    def __init__(self, dropPartitionReq = None,):
         self.dropPartitionReq = dropPartitionReq
 
     def read(self, iprot):
@@ -33976,6 +34298,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34015,9 +34338,10 @@ class drop_partition_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -34052,6 +34376,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34101,9 +34426,10 @@ class drop_partition_by_name_args(object):
      - deleteData
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None, deleteData=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None, deleteData = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -34144,6 +34470,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34198,9 +34525,10 @@ class drop_partition_by_name_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -34235,6 +34563,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34285,9 +34614,10 @@ class drop_partition_by_name_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None, deleteData=None, environment_context=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None, deleteData = None, environment_context = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -34335,6 +34665,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34394,9 +34725,10 @@ class drop_partition_by_name_with_environment_context_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -34431,6 +34763,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34477,9 +34810,10 @@ class drop_partitions_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -34503,6 +34837,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34542,9 +34877,10 @@ class drop_partitions_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -34580,6 +34916,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34628,9 +34965,10 @@ class get_partition_args(object):
      - part_vals
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -34670,6 +35008,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34722,9 +35061,10 @@ class get_partition_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -34760,6 +35100,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34806,9 +35147,10 @@ class get_partition_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -34832,6 +35174,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34871,9 +35214,10 @@ class get_partition_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -34909,6 +35253,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -34959,9 +35304,10 @@ class exchange_partition_args(object):
      - dest_table_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitionSpecs=None, source_db=None, source_table_name=None, dest_db=None, dest_table_name=None,):
+    def __init__(self, partitionSpecs = None, source_db = None, source_table_name = None, dest_db = None, dest_table_name = None,):
         self.partitionSpecs = partitionSpecs
         self.source_db = source_db
         self.source_table_name = source_table_name
@@ -35014,6 +35360,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35079,9 +35426,10 @@ class exchange_partition_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -35129,6 +35477,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35189,9 +35538,10 @@ class exchange_partitions_args(object):
      - dest_table_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitionSpecs=None, source_db=None, source_table_name=None, dest_db=None, dest_table_name=None,):
+    def __init__(self, partitionSpecs = None, source_db = None, source_table_name = None, dest_db = None, dest_table_name = None,):
         self.partitionSpecs = partitionSpecs
         self.source_db = source_db
         self.source_table_name = source_table_name
@@ -35244,6 +35594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35309,9 +35660,10 @@ class exchange_partitions_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -35364,6 +35716,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35427,9 +35780,10 @@ class get_partition_with_auth_args(object):
      - group_names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, user_name=None, group_names=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, user_name = None, group_names = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -35486,6 +35840,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35551,9 +35906,10 @@ class get_partition_with_auth_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -35589,6 +35945,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35637,9 +35994,10 @@ class get_partition_by_name_args(object):
      - part_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -35674,6 +36032,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35723,9 +36082,10 @@ class get_partition_by_name_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -35761,6 +36121,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35809,9 +36170,10 @@ class get_partitions_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.max_parts = max_parts
@@ -35846,6 +36208,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35895,9 +36258,10 @@ class get_partitions_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -35938,6 +36302,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -35987,9 +36352,10 @@ class get_partitions_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -36013,6 +36379,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36052,9 +36419,10 @@ class get_partitions_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -36090,6 +36458,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36140,9 +36509,10 @@ class get_partitions_with_auth_args(object):
      - group_names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, max_parts=-1, user_name=None, group_names=None,):
+    def __init__(self, db_name = None, tbl_name = None, max_parts = -1, user_name = None, group_names = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.max_parts = max_parts
@@ -36194,6 +36564,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36256,9 +36627,10 @@ class get_partitions_with_auth_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -36299,6 +36671,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36350,9 +36723,10 @@ class get_partitions_pspec_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.max_parts = max_parts
@@ -36387,6 +36761,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36436,9 +36811,10 @@ class get_partitions_pspec_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -36479,6 +36855,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36530,9 +36907,10 @@ class get_partition_names_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.max_parts = max_parts
@@ -36567,6 +36945,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36616,9 +36995,10 @@ class get_partition_names_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -36658,6 +37038,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36707,9 +37088,10 @@ class fetch_partition_names_req_args(object):
      - partitionReq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitionReq=None,):
+    def __init__(self, partitionReq = None,):
         self.partitionReq = partitionReq
 
     def read(self, iprot):
@@ -36733,6 +37115,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36772,9 +37155,10 @@ class fetch_partition_names_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -36814,6 +37198,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36863,9 +37248,10 @@ class get_partition_values_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -36889,6 +37275,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -36928,9 +37315,10 @@ class get_partition_values_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -36966,6 +37354,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37015,9 +37404,10 @@ class get_partitions_ps_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -37063,6 +37453,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37120,9 +37511,10 @@ class get_partitions_ps_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -37163,6 +37555,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37217,9 +37610,10 @@ class get_partitions_ps_with_auth_args(object):
      - group_names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, max_parts=-1, user_name=None, group_names=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, max_parts = -1, user_name = None, group_names = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -37282,6 +37676,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37352,9 +37747,10 @@ class get_partitions_ps_with_auth_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -37395,6 +37791,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37444,9 +37841,10 @@ class get_partitions_ps_with_auth_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -37470,6 +37868,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37509,9 +37908,10 @@ class get_partitions_ps_with_auth_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -37547,6 +37947,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37596,9 +37997,10 @@ class get_partition_names_ps_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -37644,6 +38046,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37701,9 +38104,10 @@ class get_partition_names_ps_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -37743,6 +38147,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37792,9 +38197,10 @@ class get_partition_names_ps_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -37818,6 +38224,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37857,9 +38264,10 @@ class get_partition_names_ps_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -37895,6 +38303,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -37941,9 +38350,10 @@ class get_partition_names_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -37967,6 +38377,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38006,9 +38417,10 @@ class get_partition_names_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -38048,6 +38460,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38100,9 +38513,10 @@ class get_partitions_by_filter_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, filter=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, filter = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.filter = filter
@@ -38143,6 +38557,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38197,9 +38612,10 @@ class get_partitions_by_filter_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -38240,6 +38656,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38289,9 +38706,10 @@ class get_partitions_by_filter_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -38315,6 +38733,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38354,9 +38773,10 @@ class get_partitions_by_filter_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -38397,6 +38817,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38449,9 +38870,10 @@ class get_part_specs_by_filter_args(object):
      - max_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, filter=None, max_parts=-1,):
+    def __init__(self, db_name = None, tbl_name = None, filter = None, max_parts = -1,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.filter = filter
@@ -38492,6 +38914,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38546,9 +38969,10 @@ class get_part_specs_by_filter_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -38589,6 +39013,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38638,9 +39063,10 @@ class get_partitions_by_expr_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -38664,6 +39090,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38703,9 +39130,10 @@ class get_partitions_by_expr_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -38741,6 +39169,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38787,9 +39216,10 @@ class get_partitions_spec_by_expr_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -38813,6 +39243,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38852,9 +39283,10 @@ class get_partitions_spec_by_expr_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -38890,6 +39322,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -38938,9 +39371,10 @@ class get_num_partitions_by_filter_args(object):
      - filter
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, filter=None,):
+    def __init__(self, db_name = None, tbl_name = None, filter = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.filter = filter
@@ -38975,6 +39409,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39024,9 +39459,10 @@ class get_num_partitions_by_filter_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -39061,6 +39497,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39109,9 +39546,10 @@ class get_partitions_by_names_args(object):
      - names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, names=None,):
+    def __init__(self, db_name = None, tbl_name = None, names = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.names = names
@@ -39151,6 +39589,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39204,9 +39643,10 @@ class get_partitions_by_names_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -39253,6 +39693,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39307,9 +39748,10 @@ class get_partitions_by_names_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -39333,6 +39775,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39373,9 +39816,10 @@ class get_partitions_by_names_req_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -39417,6 +39861,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39468,9 +39913,10 @@ class get_properties_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -39494,6 +39940,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39533,9 +39980,10 @@ class get_properties_result(object):
      - e2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, e1=None, e2=None,):
+    def __init__(self, success = None, e1 = None, e2 = None,):
         self.success = success
         self.e1 = e1
         self.e2 = e2
@@ -39571,6 +40019,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39617,9 +40066,10 @@ class set_properties_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -39643,6 +40093,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39682,9 +40133,10 @@ class set_properties_result(object):
      - e2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, e1=None, e2=None,):
+    def __init__(self, success = None, e1 = None, e2 = None,):
         self.success = success
         self.e1 = e1
         self.e2 = e2
@@ -39719,6 +40171,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39767,9 +40220,10 @@ class alter_partition_args(object):
      - new_part
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, new_part=None,):
+    def __init__(self, db_name = None, tbl_name = None, new_part = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.new_part = new_part
@@ -39805,6 +40259,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39853,9 +40308,10 @@ class alter_partition_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -39884,6 +40340,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -39928,9 +40385,10 @@ class alter_partitions_args(object):
      - new_parts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, new_parts=None,):
+    def __init__(self, db_name = None, tbl_name = None, new_parts = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.new_parts = new_parts
@@ -39971,6 +40429,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40022,9 +40481,10 @@ class alter_partitions_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -40053,6 +40513,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40098,9 +40559,10 @@ class alter_partitions_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, new_parts=None, environment_context=None,):
+    def __init__(self, db_name = None, tbl_name = None, new_parts = None, environment_context = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.new_parts = new_parts
@@ -40148,6 +40610,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40204,9 +40667,10 @@ class alter_partitions_with_environment_context_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -40235,6 +40699,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40277,9 +40742,10 @@ class alter_partitions_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -40303,6 +40769,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40342,9 +40809,10 @@ class alter_partitions_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -40380,6 +40848,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40429,9 +40898,10 @@ class alter_partition_with_environment_context_args(object):
      - environment_context
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, new_part=None, environment_context=None,):
+    def __init__(self, db_name = None, tbl_name = None, new_part = None, environment_context = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.new_part = new_part
@@ -40474,6 +40944,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40527,9 +40998,10 @@ class alter_partition_with_environment_context_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -40558,6 +41030,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40603,9 +41076,10 @@ class rename_partition_args(object):
      - new_part
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, new_part=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, new_part = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -40652,6 +41126,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40708,9 +41183,10 @@ class rename_partition_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -40739,6 +41215,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40781,9 +41258,10 @@ class rename_partition_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -40807,6 +41285,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40846,9 +41325,10 @@ class rename_partition_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -40884,6 +41364,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -40931,9 +41412,10 @@ class partition_name_has_valid_characters_args(object):
      - throw_exception
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, part_vals=None, throw_exception=None,):
+    def __init__(self, part_vals = None, throw_exception = None,):
         self.part_vals = part_vals
         self.throw_exception = throw_exception
 
@@ -40967,6 +41449,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41013,9 +41496,10 @@ class partition_name_has_valid_characters_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -41044,6 +41528,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41086,9 +41571,10 @@ class get_config_value_args(object):
      - defaultValue
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, defaultValue=None,):
+    def __init__(self, name = None, defaultValue = None,):
         self.name = name
         self.defaultValue = defaultValue
 
@@ -41117,6 +41603,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41160,9 +41647,10 @@ class get_config_value_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -41191,6 +41679,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41232,9 +41721,10 @@ class partition_name_to_vals_args(object):
      - part_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, part_name=None,):
+    def __init__(self, part_name = None,):
         self.part_name = part_name
 
     def read(self, iprot):
@@ -41257,6 +41747,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41295,9 +41786,10 @@ class partition_name_to_vals_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -41331,6 +41823,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41375,9 +41868,10 @@ class partition_name_to_spec_args(object):
      - part_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, part_name=None,):
+    def __init__(self, part_name = None,):
         self.part_name = part_name
 
     def read(self, iprot):
@@ -41400,6 +41894,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41438,9 +41933,10 @@ class partition_name_to_spec_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -41475,6 +41971,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41523,9 +42020,10 @@ class markPartitionForEvent_args(object):
      - eventType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, eventType=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, eventType = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -41572,6 +42070,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41633,9 +42132,10 @@ class markPartitionForEvent_result(object):
      - o6
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None, o5=None, o6=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None, o5 = None, o6 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -41688,6 +42188,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41753,9 +42254,10 @@ class isPartitionMarkedForEvent_args(object):
      - eventType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_vals=None, eventType=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_vals = None, eventType = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_vals = part_vals
@@ -41802,6 +42304,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41864,9 +42367,10 @@ class isPartitionMarkedForEvent_result(object):
      - o6
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None, o5=None, o6=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None, o5 = None, o6 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -41925,6 +42429,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -41991,9 +42496,10 @@ class get_primary_keys_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42017,6 +42523,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42056,9 +42563,10 @@ class get_primary_keys_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42094,6 +42602,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42140,9 +42649,10 @@ class get_foreign_keys_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42166,6 +42676,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42205,9 +42716,10 @@ class get_foreign_keys_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42243,6 +42755,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42289,9 +42802,10 @@ class get_unique_constraints_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42315,6 +42829,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42354,9 +42869,10 @@ class get_unique_constraints_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42392,6 +42908,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42438,9 +42955,10 @@ class get_not_null_constraints_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42464,6 +42982,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42503,9 +43022,10 @@ class get_not_null_constraints_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42541,6 +43061,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42587,9 +43108,10 @@ class get_default_constraints_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42613,6 +43135,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42652,9 +43175,10 @@ class get_default_constraints_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42690,6 +43214,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42736,9 +43261,10 @@ class get_check_constraints_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42762,6 +43288,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42801,9 +43328,10 @@ class get_check_constraints_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42839,6 +43367,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42885,9 +43414,10 @@ class get_all_table_constraints_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -42911,6 +43441,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -42950,9 +43481,10 @@ class get_all_table_constraints_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -42988,6 +43520,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43034,9 +43567,10 @@ class update_table_column_statistics_args(object):
      - stats_obj
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, stats_obj=None,):
+    def __init__(self, stats_obj = None,):
         self.stats_obj = stats_obj
 
     def read(self, iprot):
@@ -43060,6 +43594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43101,9 +43636,10 @@ class update_table_column_statistics_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -43150,6 +43686,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43206,9 +43743,10 @@ class update_partition_column_statistics_args(object):
      - stats_obj
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, stats_obj=None,):
+    def __init__(self, stats_obj = None,):
         self.stats_obj = stats_obj
 
     def read(self, iprot):
@@ -43232,6 +43770,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43273,9 +43812,10 @@ class update_partition_column_statistics_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -43322,6 +43862,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43378,9 +43919,10 @@ class update_table_column_statistics_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -43404,6 +43946,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43445,9 +43988,10 @@ class update_table_column_statistics_req_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -43495,6 +44039,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43551,9 +44096,10 @@ class update_partition_column_statistics_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -43577,6 +44123,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43618,9 +44165,10 @@ class update_partition_column_statistics_req_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -43668,6 +44216,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43724,9 +44273,10 @@ class update_transaction_statistics_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -43750,6 +44300,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43787,9 +44338,10 @@ class update_transaction_statistics_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -43812,6 +44364,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43851,9 +44404,10 @@ class get_table_column_statistics_args(object):
      - col_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, col_name=None,):
+    def __init__(self, db_name = None, tbl_name = None, col_name = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.col_name = col_name
@@ -43888,6 +44442,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -43939,9 +44494,10 @@ class get_table_column_statistics_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -43989,6 +44545,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44048,9 +44605,10 @@ class get_partition_column_statistics_args(object):
      - col_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None, col_name=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None, col_name = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -44091,6 +44649,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44147,9 +44706,10 @@ class get_partition_column_statistics_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -44197,6 +44757,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44253,9 +44814,10 @@ class get_table_statistics_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -44279,6 +44841,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44318,9 +44881,10 @@ class get_table_statistics_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -44356,6 +44920,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44402,9 +44967,10 @@ class get_partitions_statistics_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -44428,6 +44994,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44467,9 +45034,10 @@ class get_partitions_statistics_req_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -44505,6 +45073,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44551,9 +45120,10 @@ class get_aggr_stats_for_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -44577,6 +45147,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44616,9 +45187,10 @@ class get_aggr_stats_for_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -44654,6 +45226,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44700,9 +45273,10 @@ class set_aggr_stats_for_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -44726,6 +45300,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44767,9 +45342,10 @@ class set_aggr_stats_for_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -44816,6 +45392,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44876,9 +45453,10 @@ class delete_partition_column_statistics_args(object):
      - engine
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, part_name=None, col_name=None, engine=None,):
+    def __init__(self, db_name = None, tbl_name = None, part_name = None, col_name = None, engine = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.part_name = part_name
@@ -44925,6 +45503,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -44986,9 +45565,10 @@ class delete_partition_column_statistics_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -45035,6 +45615,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45094,9 +45675,10 @@ class delete_table_column_statistics_args(object):
      - engine
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, col_name=None, engine=None,):
+    def __init__(self, db_name = None, tbl_name = None, col_name = None, engine = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.col_name = col_name
@@ -45137,6 +45719,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45193,9 +45776,10 @@ class delete_table_column_statistics_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -45242,6 +45826,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45298,9 +45883,10 @@ class delete_column_statistics_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -45324,6 +45910,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45365,9 +45952,10 @@ class delete_column_statistics_req_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -45414,6 +46002,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45470,9 +46059,10 @@ class create_function_args(object):
      - func
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, func=None,):
+    def __init__(self, func = None,):
         self.func = func
 
     def read(self, iprot):
@@ -45496,6 +46086,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45536,9 +46127,10 @@ class create_function_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -45579,6 +46171,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45632,9 +46225,10 @@ class drop_function_args(object):
      - funcName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, funcName=None,):
+    def __init__(self, dbName = None, funcName = None,):
         self.dbName = dbName
         self.funcName = funcName
 
@@ -45663,6 +46257,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45706,9 +46301,10 @@ class drop_function_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o3=None,):
+    def __init__(self, o1 = None, o3 = None,):
         self.o1 = o1
         self.o3 = o3
 
@@ -45737,6 +46333,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45781,9 +46378,10 @@ class alter_function_args(object):
      - newFunc
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, funcName=None, newFunc=None,):
+    def __init__(self, dbName = None, funcName = None, newFunc = None,):
         self.dbName = dbName
         self.funcName = funcName
         self.newFunc = newFunc
@@ -45819,6 +46417,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45867,9 +46466,10 @@ class alter_function_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -45898,6 +46498,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -45941,9 +46542,10 @@ class get_functions_args(object):
      - pattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, pattern=None,):
+    def __init__(self, dbName = None, pattern = None,):
         self.dbName = dbName
         self.pattern = pattern
 
@@ -45972,6 +46574,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46015,9 +46618,10 @@ class get_functions_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -46051,6 +46655,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46095,9 +46700,10 @@ class get_functions_req_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -46121,6 +46727,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46159,9 +46766,10 @@ class get_functions_req_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -46191,6 +46799,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46233,9 +46842,10 @@ class get_function_args(object):
      - funcName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, funcName=None,):
+    def __init__(self, dbName = None, funcName = None,):
         self.dbName = dbName
         self.funcName = funcName
 
@@ -46264,6 +46874,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46308,9 +46919,10 @@ class get_function_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -46346,6 +46958,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46387,6 +47000,7 @@ def __ne__(self, other):
 
 
 class get_all_functions_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -46404,6 +47018,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46436,9 +47051,10 @@ class get_all_functions_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -46468,6 +47084,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46509,9 +47126,10 @@ class create_role_args(object):
      - role
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, role=None,):
+    def __init__(self, role = None,):
         self.role = role
 
     def read(self, iprot):
@@ -46535,6 +47153,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46573,9 +47192,10 @@ class create_role_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -46604,6 +47224,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46645,9 +47266,10 @@ class drop_role_args(object):
      - role_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, role_name=None,):
+    def __init__(self, role_name = None,):
         self.role_name = role_name
 
     def read(self, iprot):
@@ -46670,6 +47292,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46708,9 +47331,10 @@ class drop_role_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -46739,6 +47363,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46775,6 +47400,7 @@ def __ne__(self, other):
 
 
 class get_role_names_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -46792,6 +47418,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46824,9 +47451,10 @@ class get_role_names_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -46860,6 +47488,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -46909,9 +47538,10 @@ class grant_role_args(object):
      - grant_option
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, role_name=None, principal_name=None, principal_type=None, grantor=None, grantorType=None, grant_option=None,):
+    def __init__(self, role_name = None, principal_name = None, principal_type = None, grantor = None, grantorType = None, grant_option = None,):
         self.role_name = role_name
         self.principal_name = principal_name
         self.principal_type = principal_type
@@ -46964,6 +47594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47027,9 +47658,10 @@ class grant_role_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47058,6 +47690,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47101,9 +47734,10 @@ class revoke_role_args(object):
      - principal_type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, role_name=None, principal_name=None, principal_type=None,):
+    def __init__(self, role_name = None, principal_name = None, principal_type = None,):
         self.role_name = role_name
         self.principal_name = principal_name
         self.principal_type = principal_type
@@ -47138,6 +47772,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47186,9 +47821,10 @@ class revoke_role_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47217,6 +47853,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47259,9 +47896,10 @@ class list_roles_args(object):
      - principal_type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, principal_name=None, principal_type=None,):
+    def __init__(self, principal_name = None, principal_type = None,):
         self.principal_name = principal_name
         self.principal_type = principal_type
 
@@ -47290,6 +47928,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47333,9 +47972,10 @@ class list_roles_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47370,6 +48010,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47414,9 +48055,10 @@ class grant_revoke_role_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -47440,6 +48082,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47478,9 +48121,10 @@ class grant_revoke_role_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47510,6 +48154,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47551,9 +48196,10 @@ class get_principals_in_role_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -47577,6 +48223,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47615,9 +48262,10 @@ class get_principals_in_role_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47647,6 +48295,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47688,9 +48337,10 @@ class get_role_grants_for_principal_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -47714,6 +48364,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47752,9 +48403,10 @@ class get_role_grants_for_principal_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47784,6 +48436,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47827,9 +48480,10 @@ class get_privilege_set_args(object):
      - group_names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, hiveObject=None, user_name=None, group_names=None,):
+    def __init__(self, hiveObject = None, user_name = None, group_names = None,):
         self.hiveObject = hiveObject
         self.user_name = user_name
         self.group_names = group_names
@@ -47870,6 +48524,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47921,9 +48576,10 @@ class get_privilege_set_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -47953,6 +48609,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -47996,9 +48653,10 @@ class list_privileges_args(object):
      - hiveObject
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, principal_name=None, principal_type=None, hiveObject=None,):
+    def __init__(self, principal_name = None, principal_type = None, hiveObject = None,):
         self.principal_name = principal_name
         self.principal_type = principal_type
         self.hiveObject = hiveObject
@@ -48034,6 +48692,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48082,9 +48741,10 @@ class list_privileges_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -48119,6 +48779,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48163,9 +48824,10 @@ class grant_privileges_args(object):
      - privileges
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, privileges=None,):
+    def __init__(self, privileges = None,):
         self.privileges = privileges
 
     def read(self, iprot):
@@ -48189,6 +48851,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48227,9 +48890,10 @@ class grant_privileges_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -48258,6 +48922,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48299,9 +48964,10 @@ class revoke_privileges_args(object):
      - privileges
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, privileges=None,):
+    def __init__(self, privileges = None,):
         self.privileges = privileges
 
     def read(self, iprot):
@@ -48325,6 +48991,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48363,9 +49030,10 @@ class revoke_privileges_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -48394,6 +49062,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48435,9 +49104,10 @@ class grant_revoke_privileges_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -48461,6 +49131,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48499,9 +49170,10 @@ class grant_revoke_privileges_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -48531,6 +49203,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48574,9 +49247,10 @@ class refresh_privileges_args(object):
      - grantRequest
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, objToRefresh=None, authorizer=None, grantRequest=None,):
+    def __init__(self, objToRefresh = None, authorizer = None, grantRequest = None,):
         self.objToRefresh = objToRefresh
         self.authorizer = authorizer
         self.grantRequest = grantRequest
@@ -48613,6 +49287,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48661,9 +49336,10 @@ class refresh_privileges_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -48693,6 +49369,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48735,9 +49412,10 @@ class set_ugi_args(object):
      - group_names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, user_name=None, group_names=None,):
+    def __init__(self, user_name = None, group_names = None,):
         self.user_name = user_name
         self.group_names = group_names
 
@@ -48771,6 +49449,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48817,9 +49496,10 @@ class set_ugi_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -48853,6 +49533,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48898,9 +49579,10 @@ class get_delegation_token_args(object):
      - renewer_kerberos_principal_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, token_owner=None, renewer_kerberos_principal_name=None,):
+    def __init__(self, token_owner = None, renewer_kerberos_principal_name = None,):
         self.token_owner = token_owner
         self.renewer_kerberos_principal_name = renewer_kerberos_principal_name
 
@@ -48929,6 +49611,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -48972,9 +49655,10 @@ class get_delegation_token_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -49003,6 +49687,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49044,9 +49729,10 @@ class renew_delegation_token_args(object):
      - token_str_form
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, token_str_form=None,):
+    def __init__(self, token_str_form = None,):
         self.token_str_form = token_str_form
 
     def read(self, iprot):
@@ -49069,6 +49755,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49107,9 +49794,10 @@ class renew_delegation_token_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -49138,6 +49826,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49179,9 +49868,10 @@ class cancel_delegation_token_args(object):
      - token_str_form
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, token_str_form=None,):
+    def __init__(self, token_str_form = None,):
         self.token_str_form = token_str_form
 
     def read(self, iprot):
@@ -49204,6 +49894,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49241,9 +49932,10 @@ class cancel_delegation_token_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -49266,6 +49958,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49304,9 +49997,10 @@ class add_token_args(object):
      - delegation_token
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, token_identifier=None, delegation_token=None,):
+    def __init__(self, token_identifier = None, delegation_token = None,):
         self.token_identifier = token_identifier
         self.delegation_token = delegation_token
 
@@ -49335,6 +50029,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49377,9 +50072,10 @@ class add_token_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -49402,6 +50098,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49438,9 +50135,10 @@ class remove_token_args(object):
      - token_identifier
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, token_identifier=None,):
+    def __init__(self, token_identifier = None,):
         self.token_identifier = token_identifier
 
     def read(self, iprot):
@@ -49463,6 +50161,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49500,9 +50199,10 @@ class remove_token_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -49525,6 +50225,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49561,9 +50262,10 @@ class get_token_args(object):
      - token_identifier
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, token_identifier=None,):
+    def __init__(self, token_identifier = None,):
         self.token_identifier = token_identifier
 
     def read(self, iprot):
@@ -49586,6 +50288,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49623,9 +50326,10 @@ class get_token_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -49648,6 +50352,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49679,6 +50384,7 @@ def __ne__(self, other):
 
 
 class get_all_token_identifiers_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -49696,6 +50402,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49727,9 +50434,10 @@ class get_all_token_identifiers_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -49757,6 +50465,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49796,9 +50505,10 @@ class add_master_key_args(object):
      - key
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, key=None,):
+    def __init__(self, key = None,):
         self.key = key
 
     def read(self, iprot):
@@ -49821,6 +50531,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49859,9 +50570,10 @@ class add_master_key_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -49890,6 +50602,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -49932,9 +50645,10 @@ class update_master_key_args(object):
      - key
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, seq_number=None, key=None,):
+    def __init__(self, seq_number = None, key = None,):
         self.seq_number = seq_number
         self.key = key
 
@@ -49963,6 +50677,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50006,9 +50721,10 @@ class update_master_key_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -50037,6 +50753,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50079,9 +50796,10 @@ class remove_master_key_args(object):
      - key_seq
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, key_seq=None,):
+    def __init__(self, key_seq = None,):
         self.key_seq = key_seq
 
     def read(self, iprot):
@@ -50104,6 +50822,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50141,9 +50860,10 @@ class remove_master_key_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -50166,6 +50886,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50197,6 +50918,7 @@ def __ne__(self, other):
 
 
 class get_master_keys_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -50214,6 +50936,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50245,9 +50968,10 @@ class get_master_keys_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -50275,6 +50999,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50309,6 +51034,7 @@ def __ne__(self, other):
 
 
 class get_open_txns_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -50326,6 +51052,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50357,9 +51084,10 @@ class get_open_txns_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -50383,6 +51111,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50414,6 +51143,7 @@ def __ne__(self, other):
 
 
 class get_open_txns_info_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -50431,6 +51161,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50462,9 +51193,10 @@ class get_open_txns_info_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -50488,6 +51220,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50524,9 +51257,10 @@ class open_txns_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -50550,6 +51284,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50587,9 +51322,10 @@ class open_txns_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -50613,6 +51349,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50649,9 +51386,10 @@ class abort_txn_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -50675,6 +51413,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50712,9 +51451,10 @@ class abort_txn_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -50737,6 +51477,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50774,9 +51515,10 @@ class abort_txns_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -50800,6 +51542,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50837,9 +51580,10 @@ class abort_txns_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -50862,6 +51606,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50899,9 +51644,10 @@ class commit_txn_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -50925,6 +51671,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -50963,9 +51710,10 @@ class commit_txn_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -50994,6 +51742,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51036,9 +51785,10 @@ class get_latest_txnid_in_conflict_args(object):
      - txnId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnId=None,):
+    def __init__(self, txnId = None,):
         self.txnId = txnId
 
     def read(self, iprot):
@@ -51061,6 +51811,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51099,9 +51850,10 @@ class get_latest_txnid_in_conflict_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -51130,6 +51882,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51171,9 +51924,10 @@ class repl_tbl_writeid_state_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -51197,6 +51951,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51229,6 +51984,7 @@ def __ne__(self, other):
 
 
 class repl_tbl_writeid_state_result(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -51246,6 +52002,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51277,9 +52034,10 @@ class get_valid_write_ids_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -51303,6 +52061,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51342,9 +52101,10 @@ class get_valid_write_ids_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -51380,6 +52140,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51427,9 +52188,10 @@ class add_write_ids_to_min_history_args(object):
      - writeIds
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnId=None, writeIds=None,):
+    def __init__(self, txnId = None, writeIds = None,):
         self.txnId = txnId
         self.writeIds = writeIds
 
@@ -51464,6 +52226,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51510,9 +52273,10 @@ class add_write_ids_to_min_history_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o2=None,):
+    def __init__(self, o2 = None,):
         self.o2 = o2
 
     def read(self, iprot):
@@ -51535,6 +52299,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51572,9 +52337,10 @@ class allocate_table_write_ids_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -51598,6 +52364,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51638,9 +52405,10 @@ class allocate_table_write_ids_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -51682,6 +52450,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51733,9 +52502,10 @@ class get_max_allocated_table_write_id_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -51759,6 +52529,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51797,9 +52568,10 @@ class get_max_allocated_table_write_id_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -51829,6 +52601,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51870,9 +52643,10 @@ class seed_write_id_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -51896,6 +52670,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51933,9 +52708,10 @@ class seed_write_id_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -51958,6 +52734,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -51995,9 +52772,10 @@ class seed_txn_id_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -52021,6 +52799,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52058,9 +52837,10 @@ class seed_txn_id_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -52083,6 +52863,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52120,9 +52901,10 @@ class lock_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -52146,6 +52928,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52185,9 +52968,10 @@ class lock_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -52223,6 +53007,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52269,9 +53054,10 @@ class check_lock_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -52295,6 +53081,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52335,9 +53122,10 @@ class check_lock_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -52379,6 +53167,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52430,9 +53219,10 @@ class unlock_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -52456,6 +53246,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52494,9 +53285,10 @@ class unlock_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -52525,6 +53317,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52567,9 +53360,10 @@ class show_locks_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -52593,6 +53387,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52630,9 +53425,10 @@ class show_locks_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -52656,6 +53452,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52692,9 +53489,10 @@ class heartbeat_args(object):
      - ids
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, ids=None,):
+    def __init__(self, ids = None,):
         self.ids = ids
 
     def read(self, iprot):
@@ -52718,6 +53516,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52757,9 +53556,10 @@ class heartbeat_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -52794,6 +53594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52841,9 +53642,10 @@ class heartbeat_txn_range_args(object):
      - txns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txns=None,):
+    def __init__(self, txns = None,):
         self.txns = txns
 
     def read(self, iprot):
@@ -52867,6 +53669,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52904,9 +53707,10 @@ class heartbeat_txn_range_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -52930,6 +53734,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -52966,9 +53771,10 @@ class compact_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -52992,6 +53798,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53024,6 +53831,7 @@ def __ne__(self, other):
 
 
 class compact_result(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -53041,6 +53849,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53072,9 +53881,10 @@ class compact2_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -53098,6 +53908,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53135,9 +53946,10 @@ class compact2_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -53161,6 +53973,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53197,9 +54010,10 @@ class show_compact_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -53223,6 +54037,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53260,9 +54075,10 @@ class show_compact_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -53286,6 +54102,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53324,9 +54141,10 @@ class submit_for_cleanup_args(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -53362,6 +54180,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53410,9 +54229,10 @@ class submit_for_cleanup_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -53441,6 +54261,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53482,9 +54303,10 @@ class add_dynamic_partitions_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -53508,6 +54330,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53546,9 +54369,10 @@ class add_dynamic_partitions_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -53577,6 +54401,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53619,9 +54444,10 @@ class find_next_compact_args(object):
      - workerId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, workerId=None,):
+    def __init__(self, workerId = None,):
         self.workerId = workerId
 
     def read(self, iprot):
@@ -53644,6 +54470,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53682,9 +54509,10 @@ class find_next_compact_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -53714,6 +54542,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53755,9 +54584,10 @@ class find_next_compact2_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -53781,6 +54611,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53819,9 +54650,10 @@ class find_next_compact2_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -53851,6 +54683,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53893,9 +54726,10 @@ class update_compactor_state_args(object):
      - txn_id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cr=None, txn_id=None,):
+    def __init__(self, cr = None, txn_id = None,):
         self.cr = cr
         self.txn_id = txn_id
 
@@ -53925,6 +54759,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -53962,6 +54797,7 @@ def __ne__(self, other):
 
 
 class update_compactor_state_result(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -53979,6 +54815,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54010,9 +54847,10 @@ class find_columns_with_stats_args(object):
      - cr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cr=None,):
+    def __init__(self, cr = None,):
         self.cr = cr
 
     def read(self, iprot):
@@ -54036,6 +54874,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54073,9 +54912,10 @@ class find_columns_with_stats_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -54103,6 +54943,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54142,9 +54983,10 @@ class mark_cleaned_args(object):
      - cr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cr=None,):
+    def __init__(self, cr = None,):
         self.cr = cr
 
     def read(self, iprot):
@@ -54168,6 +55010,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54205,9 +55048,10 @@ class mark_cleaned_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -54230,6 +55074,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54267,9 +55112,10 @@ class mark_compacted_args(object):
      - cr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cr=None,):
+    def __init__(self, cr = None,):
         self.cr = cr
 
     def read(self, iprot):
@@ -54293,6 +55139,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54330,9 +55177,10 @@ class mark_compacted_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -54355,6 +55203,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54392,9 +55241,10 @@ class mark_failed_args(object):
      - cr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cr=None,):
+    def __init__(self, cr = None,):
         self.cr = cr
 
     def read(self, iprot):
@@ -54418,6 +55268,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54455,9 +55306,10 @@ class mark_failed_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -54480,6 +55332,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54517,9 +55370,10 @@ class mark_refused_args(object):
      - cr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cr=None,):
+    def __init__(self, cr = None,):
         self.cr = cr
 
     def read(self, iprot):
@@ -54543,6 +55397,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54580,9 +55435,10 @@ class mark_refused_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -54605,6 +55461,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54642,9 +55499,10 @@ class update_compaction_metrics_data_args(object):
      - data
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, data=None,):
+    def __init__(self, data = None,):
         self.data = data
 
     def read(self, iprot):
@@ -54668,6 +55526,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54706,9 +55565,10 @@ class update_compaction_metrics_data_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -54737,6 +55597,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54778,9 +55639,10 @@ class remove_compaction_metrics_data_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -54804,6 +55666,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54841,9 +55704,10 @@ class remove_compaction_metrics_data_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -54866,6 +55730,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54904,9 +55769,10 @@ class set_hadoop_jobid_args(object):
      - cq_id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, jobId=None, cq_id=None,):
+    def __init__(self, jobId = None, cq_id = None,):
         self.jobId = jobId
         self.cq_id = cq_id
 
@@ -54935,6 +55801,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -54972,6 +55839,7 @@ def __ne__(self, other):
 
 
 class set_hadoop_jobid_result(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -54989,6 +55857,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55020,9 +55889,10 @@ class get_latest_committed_compaction_info_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -55046,6 +55916,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55083,9 +55954,10 @@ class get_latest_committed_compaction_info_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55109,6 +55981,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55145,9 +56018,10 @@ class get_next_notification_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -55171,6 +56045,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55208,9 +56083,10 @@ class get_next_notification_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55234,6 +56110,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55265,6 +56142,7 @@ def __ne__(self, other):
 
 
 class get_current_notificationEventId_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -55282,6 +56160,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55313,9 +56192,10 @@ class get_current_notificationEventId_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55339,6 +56219,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55375,9 +56256,10 @@ class get_notification_events_count_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -55401,6 +56283,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55438,9 +56321,10 @@ class get_notification_events_count_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55464,6 +56348,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55500,9 +56385,10 @@ class fire_listener_event_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -55526,6 +56412,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55563,9 +56450,10 @@ class fire_listener_event_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55589,6 +56477,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55620,6 +56509,7 @@ def __ne__(self, other):
 
 
 class flushCache_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -55637,6 +56527,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55663,6 +56554,7 @@ def __ne__(self, other):
 
 
 class flushCache_result(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -55680,6 +56572,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55711,9 +56604,10 @@ class add_write_notification_log_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -55737,6 +56631,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55774,9 +56669,10 @@ class add_write_notification_log_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55800,6 +56696,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55836,9 +56733,10 @@ class add_write_notification_log_in_batch_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -55862,6 +56760,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55899,9 +56798,10 @@ class add_write_notification_log_in_batch_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -55925,6 +56825,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -55961,9 +56862,10 @@ class cm_recycle_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -55987,6 +56889,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56025,9 +56928,10 @@ class cm_recycle_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -56057,6 +56961,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56098,9 +57003,10 @@ class get_file_metadata_by_expr_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -56124,6 +57030,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56161,9 +57068,10 @@ class get_file_metadata_by_expr_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -56187,6 +57095,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56223,9 +57132,10 @@ class get_file_metadata_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -56249,6 +57159,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56286,9 +57197,10 @@ class get_file_metadata_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -56312,6 +57224,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56348,9 +57261,10 @@ class put_file_metadata_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -56374,6 +57288,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56411,9 +57326,10 @@ class put_file_metadata_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -56437,6 +57353,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56473,9 +57390,10 @@ class clear_file_metadata_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -56499,6 +57417,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56536,9 +57455,10 @@ class clear_file_metadata_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -56562,6 +57482,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56598,9 +57519,10 @@ class cache_file_metadata_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -56624,6 +57546,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56661,9 +57584,10 @@ class cache_file_metadata_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -56687,6 +57611,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56718,6 +57643,7 @@ def __ne__(self, other):
 
 
 class get_metastore_db_uuid_args(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -56735,6 +57661,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56767,9 +57694,10 @@ class get_metastore_db_uuid_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -56798,6 +57726,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56839,9 +57768,10 @@ class create_resource_plan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -56865,6 +57795,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -56905,9 +57836,10 @@ class create_resource_plan_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -56949,6 +57881,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57000,9 +57933,10 @@ class get_resource_plan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57026,6 +57960,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57065,9 +58000,10 @@ class get_resource_plan_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -57103,6 +58039,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57149,9 +58086,10 @@ class get_active_resource_plan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57175,6 +58113,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57213,9 +58152,10 @@ class get_active_resource_plan_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o2=None,):
+    def __init__(self, success = None, o2 = None,):
         self.success = success
         self.o2 = o2
 
@@ -57245,6 +58185,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57286,9 +58227,10 @@ class get_all_resource_plans_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57312,6 +58254,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57350,9 +58293,10 @@ class get_all_resource_plans_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -57382,6 +58326,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57423,9 +58368,10 @@ class alter_resource_plan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57449,6 +58395,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57489,9 +58436,10 @@ class alter_resource_plan_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -57533,6 +58481,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57584,9 +58533,10 @@ class validate_resource_plan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57610,6 +58560,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57649,9 +58600,10 @@ class validate_resource_plan_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -57687,6 +58639,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57733,9 +58686,10 @@ class drop_resource_plan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57759,6 +58713,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57799,9 +58754,10 @@ class drop_resource_plan_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -57843,6 +58799,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57894,9 +58851,10 @@ class create_wm_trigger_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -57920,6 +58878,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -57961,9 +58920,10 @@ class create_wm_trigger_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58011,6 +58971,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58067,9 +59028,10 @@ class alter_wm_trigger_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -58093,6 +59055,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58133,9 +59096,10 @@ class alter_wm_trigger_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58177,6 +59141,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58228,9 +59193,10 @@ class drop_wm_trigger_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -58254,6 +59220,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58294,9 +59261,10 @@ class drop_wm_trigger_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58338,6 +59306,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58389,9 +59358,10 @@ class get_triggers_for_resourceplan_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -58415,6 +59385,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58454,9 +59425,10 @@ class get_triggers_for_resourceplan_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58492,6 +59464,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58538,9 +59511,10 @@ class create_wm_pool_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -58564,6 +59538,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58605,9 +59580,10 @@ class create_wm_pool_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58655,6 +59631,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58711,9 +59688,10 @@ class alter_wm_pool_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -58737,6 +59715,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58778,9 +59757,10 @@ class alter_wm_pool_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58828,6 +59808,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58884,9 +59865,10 @@ class drop_wm_pool_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -58910,6 +59892,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -58950,9 +59933,10 @@ class drop_wm_pool_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -58994,6 +59978,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59045,9 +60030,10 @@ class create_or_update_wm_mapping_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -59071,6 +60057,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59112,9 +60099,10 @@ class create_or_update_wm_mapping_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -59162,6 +60150,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59218,9 +60207,10 @@ class drop_wm_mapping_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -59244,6 +60234,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59284,9 +60275,10 @@ class drop_wm_mapping_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -59328,6 +60320,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59379,9 +60372,10 @@ class create_or_drop_wm_trigger_to_pool_mapping_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -59405,6 +60399,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59446,9 +60441,10 @@ class create_or_drop_wm_trigger_to_pool_mapping_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, success = None, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -59496,6 +60492,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59552,9 +60549,10 @@ class create_ischema_args(object):
      - schema
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schema=None,):
+    def __init__(self, schema = None,):
         self.schema = schema
 
     def read(self, iprot):
@@ -59578,6 +60576,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59617,9 +60616,10 @@ class create_ischema_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -59654,6 +60654,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59701,9 +60702,10 @@ class alter_ischema_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -59727,6 +60729,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59765,9 +60768,10 @@ class alter_ischema_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -59796,6 +60800,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59838,9 +60843,10 @@ class get_ischema_args(object):
      - name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None,):
+    def __init__(self, name = None,):
         self.name = name
 
     def read(self, iprot):
@@ -59864,6 +60870,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59903,9 +60910,10 @@ class get_ischema_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -59941,6 +60949,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -59987,9 +60996,10 @@ class drop_ischema_args(object):
      - name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None,):
+    def __init__(self, name = None,):
         self.name = name
 
     def read(self, iprot):
@@ -60013,6 +61023,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60052,9 +61063,10 @@ class drop_ischema_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -60089,6 +61101,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60136,9 +61149,10 @@ class add_schema_version_args(object):
      - schemaVersion
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaVersion=None,):
+    def __init__(self, schemaVersion = None,):
         self.schemaVersion = schemaVersion
 
     def read(self, iprot):
@@ -60162,6 +61176,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60201,9 +61216,10 @@ class add_schema_version_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -60238,6 +61254,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60285,9 +61302,10 @@ class get_schema_version_args(object):
      - schemaVersion
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaVersion=None,):
+    def __init__(self, schemaVersion = None,):
         self.schemaVersion = schemaVersion
 
     def read(self, iprot):
@@ -60311,6 +61329,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60350,9 +61369,10 @@ class get_schema_version_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -60388,6 +61408,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60434,9 +61455,10 @@ class get_schema_latest_version_args(object):
      - schemaName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaName=None,):
+    def __init__(self, schemaName = None,):
         self.schemaName = schemaName
 
     def read(self, iprot):
@@ -60460,6 +61482,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60499,9 +61522,10 @@ class get_schema_latest_version_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -60537,6 +61561,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60583,9 +61608,10 @@ class get_schema_all_versions_args(object):
      - schemaName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaName=None,):
+    def __init__(self, schemaName = None,):
         self.schemaName = schemaName
 
     def read(self, iprot):
@@ -60609,6 +61635,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60648,9 +61675,10 @@ class get_schema_all_versions_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -60691,6 +61719,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60740,9 +61769,10 @@ class drop_schema_version_args(object):
      - schemaVersion
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaVersion=None,):
+    def __init__(self, schemaVersion = None,):
         self.schemaVersion = schemaVersion
 
     def read(self, iprot):
@@ -60766,6 +61796,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60804,9 +61835,10 @@ class drop_schema_version_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -60835,6 +61867,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60877,9 +61910,10 @@ class get_schemas_by_cols_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -60903,6 +61937,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -60941,9 +61976,10 @@ class get_schemas_by_cols_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -60973,6 +62009,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61014,9 +62051,10 @@ class map_schema_version_to_serde_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -61040,6 +62078,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61078,9 +62117,10 @@ class map_schema_version_to_serde_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -61109,6 +62149,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61151,9 +62192,10 @@ class set_schema_version_state_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -61177,6 +62219,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61216,9 +62259,10 @@ class set_schema_version_state_result(object):
      - o3
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -61253,6 +62297,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61300,9 +62345,10 @@ class add_serde_args(object):
      - serde
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, serde=None,):
+    def __init__(self, serde = None,):
         self.serde = serde
 
     def read(self, iprot):
@@ -61326,6 +62372,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61364,9 +62411,10 @@ class add_serde_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -61395,6 +62443,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61437,9 +62486,10 @@ class get_serde_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -61463,6 +62513,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61502,9 +62553,10 @@ class get_serde_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -61540,6 +62592,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61588,9 +62641,10 @@ class get_lock_materialization_rebuild_args(object):
      - txnId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, txnId=None,):
+    def __init__(self, dbName = None, tableName = None, txnId = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.txnId = txnId
@@ -61625,6 +62679,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61672,9 +62727,10 @@ class get_lock_materialization_rebuild_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -61698,6 +62754,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61736,9 +62793,10 @@ class heartbeat_lock_materialization_rebuild_args(object):
      - txnId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, txnId=None,):
+    def __init__(self, dbName = None, tableName = None, txnId = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.txnId = txnId
@@ -61773,6 +62831,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61820,9 +62879,10 @@ class heartbeat_lock_materialization_rebuild_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -61845,6 +62905,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61881,9 +62942,10 @@ class get_lock_materialization_rebuild_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -61907,6 +62969,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -61944,9 +63007,10 @@ class get_lock_materialization_rebuild_req_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -61970,6 +63034,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62006,9 +63071,10 @@ class heartbeat_lock_materialization_rebuild_req_args(object):
      - req
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, req=None,):
+    def __init__(self, req = None,):
         self.req = req
 
     def read(self, iprot):
@@ -62032,6 +63098,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62069,9 +63136,10 @@ class heartbeat_lock_materialization_rebuild_req_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -62094,6 +63162,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62130,9 +63199,10 @@ class add_runtime_stats_args(object):
      - stat
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, stat=None,):
+    def __init__(self, stat = None,):
         self.stat = stat
 
     def read(self, iprot):
@@ -62156,6 +63226,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62193,9 +63264,10 @@ class add_runtime_stats_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -62218,6 +63290,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62255,9 +63328,10 @@ class get_runtime_stats_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -62281,6 +63355,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62319,9 +63394,10 @@ class get_runtime_stats_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -62356,6 +63432,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62400,9 +63477,10 @@ class get_partitions_with_specs_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -62426,6 +63504,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62464,9 +63543,10 @@ class get_partitions_with_specs_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -62496,6 +63576,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62537,9 +63618,10 @@ class scheduled_query_poll_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -62563,6 +63645,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62601,9 +63684,10 @@ class scheduled_query_poll_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -62633,6 +63717,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62674,9 +63759,10 @@ class scheduled_query_maintenance_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -62700,6 +63786,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62740,9 +63827,10 @@ class scheduled_query_maintenance_result(object):
      - o4
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None, o3=None, o4=None,):
+    def __init__(self, o1 = None, o2 = None, o3 = None, o4 = None,):
         self.o1 = o1
         self.o2 = o2
         self.o3 = o3
@@ -62783,6 +63871,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62835,9 +63924,10 @@ class scheduled_query_progress_args(object):
      - info
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, info=None,):
+    def __init__(self, info = None,):
         self.info = info
 
     def read(self, iprot):
@@ -62861,6 +63951,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62899,9 +63990,10 @@ class scheduled_query_progress_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -62930,6 +64022,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -62972,9 +64065,10 @@ class get_scheduled_query_args(object):
      - scheduleKey
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduleKey=None,):
+    def __init__(self, scheduleKey = None,):
         self.scheduleKey = scheduleKey
 
     def read(self, iprot):
@@ -62998,6 +64092,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63037,9 +64132,10 @@ class get_scheduled_query_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -63075,6 +64171,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63121,9 +64218,10 @@ class add_replication_metrics_args(object):
      - replicationMetricList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, replicationMetricList=None,):
+    def __init__(self, replicationMetricList = None,):
         self.replicationMetricList = replicationMetricList
 
     def read(self, iprot):
@@ -63147,6 +64245,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63184,9 +64283,10 @@ class add_replication_metrics_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -63209,6 +64309,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63246,9 +64347,10 @@ class get_replication_metrics_args(object):
      - rqst
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, rqst=None,):
+    def __init__(self, rqst = None,):
         self.rqst = rqst
 
     def read(self, iprot):
@@ -63272,6 +64374,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63310,9 +64413,10 @@ class get_replication_metrics_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -63342,6 +64446,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63383,9 +64488,10 @@ class get_open_txns_req_args(object):
      - getOpenTxnsRequest
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, getOpenTxnsRequest=None,):
+    def __init__(self, getOpenTxnsRequest = None,):
         self.getOpenTxnsRequest = getOpenTxnsRequest
 
     def read(self, iprot):
@@ -63409,6 +64515,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63446,9 +64553,10 @@ class get_open_txns_req_result(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -63472,6 +64580,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63508,9 +64617,10 @@ class create_stored_procedure_args(object):
      - proc
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, proc=None,):
+    def __init__(self, proc = None,):
         self.proc = proc
 
     def read(self, iprot):
@@ -63534,6 +64644,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63572,9 +64683,10 @@ class create_stored_procedure_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None, o2=None,):
+    def __init__(self, o1 = None, o2 = None,):
         self.o1 = o1
         self.o2 = o2
 
@@ -63603,6 +64715,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63645,9 +64758,10 @@ class get_stored_procedure_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -63671,6 +64785,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63710,9 +64825,10 @@ class get_stored_procedure_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -63748,6 +64864,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63794,9 +64911,10 @@ class drop_stored_procedure_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -63820,6 +64938,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63857,9 +64976,10 @@ class drop_stored_procedure_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -63882,6 +65002,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63919,9 +65040,10 @@ class get_all_stored_procedures_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -63945,6 +65067,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -63983,9 +65106,10 @@ class get_all_stored_procedures_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -64019,6 +65143,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64063,9 +65188,10 @@ class find_package_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -64089,6 +65215,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64128,9 +65255,10 @@ class find_package_result(object):
      - o2
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None, o2=None,):
+    def __init__(self, success = None, o1 = None, o2 = None,):
         self.success = success
         self.o1 = o1
         self.o2 = o2
@@ -64166,6 +65294,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64212,9 +65341,10 @@ class add_package_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -64238,6 +65368,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64275,9 +65406,10 @@ class add_package_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -64300,6 +65432,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64337,9 +65470,10 @@ class get_all_packages_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -64363,6 +65497,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64401,9 +65536,10 @@ class get_all_packages_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -64437,6 +65573,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64481,9 +65618,10 @@ class drop_package_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -64507,6 +65645,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64544,9 +65683,10 @@ class drop_package_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, o1=None,):
+    def __init__(self, o1 = None,):
         self.o1 = o1
 
     def read(self, iprot):
@@ -64569,6 +65709,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64606,9 +65747,10 @@ class get_all_write_event_info_args(object):
      - request
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, request=None,):
+    def __init__(self, request = None,):
         self.request = request
 
     def read(self, iprot):
@@ -64632,6 +65774,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64670,9 +65813,10 @@ class get_all_write_event_info_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -64707,6 +65851,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64751,9 +65896,10 @@ class get_replayed_txns_for_policy_args(object):
      - policyName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, policyName=None,):
+    def __init__(self, policyName = None,):
         self.policyName = policyName
 
     def read(self, iprot):
@@ -64776,6 +65922,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -64814,9 +65961,10 @@ class get_replayed_txns_for_policy_result(object):
      - o1
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None, o1=None,):
+    def __init__(self, success = None, o1 = None,):
         self.success = success
         self.o1 = o1
 
@@ -64846,6 +65994,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/constants.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/constants.py
index 289683a7068e..ddac5b305e13 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/constants.py
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/constants.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 from .ttypes import *
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py
index ee7b3f22c342..2a8aa8b41877 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -9,6 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 from thrift.TRecursive import fix_spec
+from uuid import UUID
 
 import sys
 import fb303.ttypes
@@ -579,9 +580,10 @@ class Version(object):
      - comments
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, version=None, comments=None,):
+    def __init__(self, version = None, comments = None,):
         self.version = version
         self.comments = comments
 
@@ -610,6 +612,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -648,9 +651,10 @@ class FieldSchema(object):
      - comment
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, type=None, comment=None,):
+    def __init__(self, name = None, type = None, comment = None,):
         self.name = name
         self.type = type
         self.comment = comment
@@ -685,6 +689,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -725,9 +730,10 @@ class EnvironmentContext(object):
      - properties
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, properties=None,):
+    def __init__(self, properties = None,):
         self.properties = properties
 
     def read(self, iprot):
@@ -756,6 +762,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -800,9 +807,10 @@ class SQLPrimaryKey(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, table_db=None, table_name=None, column_name=None, key_seq=None, pk_name=None, enable_cstr=None, validate_cstr=None, rely_cstr=None, catName=None,):
+    def __init__(self, table_db = None, table_name = None, column_name = None, key_seq = None, pk_name = None, enable_cstr = None, validate_cstr = None, rely_cstr = None, catName = None,):
         self.table_db = table_db
         self.table_name = table_name
         self.column_name = column_name
@@ -873,6 +881,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -951,9 +960,10 @@ class SQLForeignKey(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, pktable_db=None, pktable_name=None, pkcolumn_name=None, fktable_db=None, fktable_name=None, fkcolumn_name=None, key_seq=None, update_rule=None, delete_rule=None, fk_name=None, pk_name=None, enable_cstr=None, validate_cstr=None, rely_cstr=None, catName=None,):
+    def __init__(self, pktable_db = None, pktable_name = None, pkcolumn_name = None, fktable_db = None, fktable_name = None, fkcolumn_name = None, key_seq = None, update_rule = None, delete_rule = None, fk_name = None, pk_name = None, enable_cstr = None, validate_cstr = None, rely_cstr = None, catName = None,):
         self.pktable_db = pktable_db
         self.pktable_name = pktable_name
         self.pkcolumn_name = pkcolumn_name
@@ -1060,6 +1070,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1156,9 +1167,10 @@ class SQLUniqueConstraint(object):
      - rely_cstr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, table_db=None, table_name=None, column_name=None, key_seq=None, uk_name=None, enable_cstr=None, validate_cstr=None, rely_cstr=None,):
+    def __init__(self, catName = None, table_db = None, table_name = None, column_name = None, key_seq = None, uk_name = None, enable_cstr = None, validate_cstr = None, rely_cstr = None,):
         self.catName = catName
         self.table_db = table_db
         self.table_name = table_name
@@ -1229,6 +1241,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1300,9 +1313,10 @@ class SQLNotNullConstraint(object):
      - rely_cstr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, table_db=None, table_name=None, column_name=None, nn_name=None, enable_cstr=None, validate_cstr=None, rely_cstr=None,):
+    def __init__(self, catName = None, table_db = None, table_name = None, column_name = None, nn_name = None, enable_cstr = None, validate_cstr = None, rely_cstr = None,):
         self.catName = catName
         self.table_db = table_db
         self.table_name = table_name
@@ -1367,6 +1381,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1435,9 +1450,10 @@ class SQLDefaultConstraint(object):
      - rely_cstr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, table_db=None, table_name=None, column_name=None, default_value=None, dc_name=None, enable_cstr=None, validate_cstr=None, rely_cstr=None,):
+    def __init__(self, catName = None, table_db = None, table_name = None, column_name = None, default_value = None, dc_name = None, enable_cstr = None, validate_cstr = None, rely_cstr = None,):
         self.catName = catName
         self.table_db = table_db
         self.table_name = table_name
@@ -1508,6 +1524,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1580,9 +1597,10 @@ class SQLCheckConstraint(object):
      - rely_cstr
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, table_db=None, table_name=None, column_name=None, check_expression=None, dc_name=None, enable_cstr=None, validate_cstr=None, rely_cstr=None,):
+    def __init__(self, catName = None, table_db = None, table_name = None, column_name = None, check_expression = None, dc_name = None, enable_cstr = None, validate_cstr = None, rely_cstr = None,):
         self.catName = catName
         self.table_db = table_db
         self.table_name = table_name
@@ -1653,6 +1671,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1722,9 +1741,10 @@ class SQLAllTableConstraints(object):
      - checkConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, primaryKeys=None, foreignKeys=None, uniqueConstraints=None, notNullConstraints=None, defaultConstraints=None, checkConstraints=None,):
+    def __init__(self, primaryKeys = None, foreignKeys = None, uniqueConstraints = None, notNullConstraints = None, defaultConstraints = None, checkConstraints = None,):
         self.primaryKeys = primaryKeys
         self.foreignKeys = foreignKeys
         self.uniqueConstraints = uniqueConstraints
@@ -1813,6 +1833,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1886,9 +1907,10 @@ class Type(object):
      - fields
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, type1=None, type2=None, fields=None,):
+    def __init__(self, name = None, type1 = None, type2 = None, fields = None,):
         self.name = name
         self.type1 = type1
         self.type2 = type2
@@ -1935,6 +1957,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -1983,9 +2006,10 @@ class PropertySetRequest(object):
      - propertyMap
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, nameSpace=None, propertyMap=None,):
+    def __init__(self, nameSpace = None, propertyMap = None,):
         self.nameSpace = nameSpace
         self.propertyMap = propertyMap
 
@@ -2020,6 +2044,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2065,9 +2090,10 @@ class PropertyGetRequest(object):
      - mapSelection
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, nameSpace=None, mapPrefix=None, mapPredicate=None, mapSelection=None,):
+    def __init__(self, nameSpace = None, mapPrefix = None, mapPredicate = None, mapSelection = None,):
         self.nameSpace = nameSpace
         self.mapPrefix = mapPrefix
         self.mapPredicate = mapPredicate
@@ -2113,6 +2139,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2162,9 +2189,10 @@ class PropertyGetResponse(object):
      - properties
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, properties=None,):
+    def __init__(self, properties = None,):
         self.properties = properties
 
     def read(self, iprot):
@@ -2199,6 +2227,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2244,9 +2273,10 @@ class HiveObjectRef(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, objectType=None, dbName=None, objectName=None, partValues=None, columnName=None, catName=None,):
+    def __init__(self, objectType = None, dbName = None, objectName = None, partValues = None, columnName = None, catName = None,):
         self.objectType = objectType
         self.dbName = dbName
         self.objectName = objectName
@@ -2304,6 +2334,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2363,9 +2394,10 @@ class PrivilegeGrantInfo(object):
      - grantOption
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, privilege=None, createTime=None, grantor=None, grantorType=None, grantOption=None,):
+    def __init__(self, privilege = None, createTime = None, grantor = None, grantorType = None, grantOption = None,):
         self.privilege = privilege
         self.createTime = createTime
         self.grantor = grantor
@@ -2412,6 +2444,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2464,9 +2497,10 @@ class HiveObjectPrivilege(object):
      - authorizer
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, hiveObject=None, principalName=None, principalType=None, grantInfo=None, authorizer=None,):
+    def __init__(self, hiveObject = None, principalName = None, principalType = None, grantInfo = None, authorizer = None,):
         self.hiveObject = hiveObject
         self.principalName = principalName
         self.principalType = principalType
@@ -2515,6 +2549,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2563,9 +2598,10 @@ class PrivilegeBag(object):
      - privileges
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, privileges=None,):
+    def __init__(self, privileges = None,):
         self.privileges = privileges
 
     def read(self, iprot):
@@ -2594,6 +2630,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2631,9 +2668,10 @@ class PrincipalPrivilegeSet(object):
      - rolePrivileges
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, userPrivileges=None, groupPrivileges=None, rolePrivileges=None,):
+    def __init__(self, userPrivileges = None, groupPrivileges = None, rolePrivileges = None,):
         self.userPrivileges = userPrivileges
         self.groupPrivileges = groupPrivileges
         self.rolePrivileges = rolePrivileges
@@ -2704,6 +2742,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2767,9 +2806,10 @@ class GrantRevokePrivilegeRequest(object):
      - revokeGrantOption
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, requestType=None, privileges=None, revokeGrantOption=None,):
+    def __init__(self, requestType = None, privileges = None, revokeGrantOption = None,):
         self.requestType = requestType
         self.privileges = privileges
         self.revokeGrantOption = revokeGrantOption
@@ -2805,6 +2845,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2845,9 +2886,10 @@ class GrantRevokePrivilegeResponse(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -2870,6 +2912,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -2907,9 +2950,10 @@ class TruncateTableRequest(object):
      - environmentContext
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, partNames=None, writeId=-1, validWriteIdList=None, environmentContext=None,):
+    def __init__(self, dbName = None, tableName = None, partNames = None, writeId = -1, validWriteIdList = None, environmentContext = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.partNames = partNames
@@ -2968,6 +3012,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3022,6 +3067,7 @@ def __ne__(self, other):
 
 
 class TruncateTableResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -3039,6 +3085,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3069,9 +3116,10 @@ class Role(object):
      - ownerName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, roleName=None, createTime=None, ownerName=None,):
+    def __init__(self, roleName = None, createTime = None, ownerName = None,):
         self.roleName = roleName
         self.createTime = createTime
         self.ownerName = ownerName
@@ -3106,6 +3154,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3152,9 +3201,10 @@ class RolePrincipalGrant(object):
      - grantorPrincipalType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, roleName=None, principalName=None, principalType=None, grantOption=None, grantTime=None, grantorName=None, grantorPrincipalType=None,):
+    def __init__(self, roleName = None, principalName = None, principalType = None, grantOption = None, grantTime = None, grantorName = None, grantorPrincipalType = None,):
         self.roleName = roleName
         self.principalName = principalName
         self.principalType = principalType
@@ -3213,6 +3263,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3270,9 +3321,10 @@ class GetRoleGrantsForPrincipalRequest(object):
      - principal_type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, principal_name=None, principal_type=None,):
+    def __init__(self, principal_name = None, principal_type = None,):
         self.principal_name = principal_name
         self.principal_type = principal_type
 
@@ -3301,6 +3353,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3341,9 +3394,10 @@ class GetRoleGrantsForPrincipalResponse(object):
      - principalGrants
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, principalGrants=None,):
+    def __init__(self, principalGrants = None,):
         self.principalGrants = principalGrants
 
     def read(self, iprot):
@@ -3372,6 +3426,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3409,9 +3464,10 @@ class GetPrincipalsInRoleRequest(object):
      - roleName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, roleName=None,):
+    def __init__(self, roleName = None,):
         self.roleName = roleName
 
     def read(self, iprot):
@@ -3434,6 +3490,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3468,9 +3525,10 @@ class GetPrincipalsInRoleResponse(object):
      - principalGrants
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, principalGrants=None,):
+    def __init__(self, principalGrants = None,):
         self.principalGrants = principalGrants
 
     def read(self, iprot):
@@ -3499,6 +3557,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3542,9 +3601,10 @@ class GrantRevokeRoleRequest(object):
      - grantOption
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, requestType=None, roleName=None, principalName=None, principalType=None, grantor=None, grantorType=None, grantOption=None,):
+    def __init__(self, requestType = None, roleName = None, principalName = None, principalType = None, grantor = None, grantorType = None, grantOption = None,):
         self.requestType = requestType
         self.roleName = roleName
         self.principalName = principalName
@@ -3603,6 +3663,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3659,9 +3720,10 @@ class GrantRevokeRoleResponse(object):
      - success
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, success=None,):
+    def __init__(self, success = None,):
         self.success = success
 
     def read(self, iprot):
@@ -3684,6 +3746,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3720,9 +3783,10 @@ class Catalog(object):
      - parameters
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, description=None, locationUri=None, createTime=None, parameters=None,):
+    def __init__(self, name = None, description = None, locationUri = None, createTime = None, parameters = None,):
         self.name = name
         self.description = description
         self.locationUri = locationUri
@@ -3775,6 +3839,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3827,9 +3892,10 @@ class CreateCatalogRequest(object):
      - catalog
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalog=None,):
+    def __init__(self, catalog = None,):
         self.catalog = catalog
 
     def read(self, iprot):
@@ -3853,6 +3919,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3886,9 +3953,10 @@ class AlterCatalogRequest(object):
      - newCat
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, newCat=None,):
+    def __init__(self, name = None, newCat = None,):
         self.name = name
         self.newCat = newCat
 
@@ -3918,6 +3986,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -3954,9 +4023,10 @@ class GetCatalogRequest(object):
      - name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None,):
+    def __init__(self, name = None,):
         self.name = name
 
     def read(self, iprot):
@@ -3979,6 +4049,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4011,9 +4082,10 @@ class GetCatalogResponse(object):
      - catalog
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalog=None,):
+    def __init__(self, catalog = None,):
         self.catalog = catalog
 
     def read(self, iprot):
@@ -4037,6 +4109,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4069,9 +4142,10 @@ class GetCatalogsResponse(object):
      - names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, names=None,):
+    def __init__(self, names = None,):
         self.names = names
 
     def read(self, iprot):
@@ -4099,6 +4173,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4135,9 +4210,10 @@ class DropCatalogRequest(object):
      - ifExists
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, ifExists=True,):
+    def __init__(self, name = None, ifExists = True,):
         self.name = name
         self.ifExists = ifExists
 
@@ -4166,6 +4242,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4214,9 +4291,10 @@ class Database(object):
      - remote_dbname
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, description=None, locationUri=None, parameters=None, privileges=None, ownerName=None, ownerType=None, catalogName=None, createTime=None, managedLocationUri=None, type=None, connector_name=None, remote_dbname=None,):
+    def __init__(self, name = None, description = None, locationUri = None, parameters = None, privileges = None, ownerName = None, ownerType = None, catalogName = None, createTime = None, managedLocationUri = None, type = None, connector_name = None, remote_dbname = None,):
         self.name = name
         self.description = description
         self.locationUri = locationUri
@@ -4318,6 +4396,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4403,9 +4482,10 @@ class GetDatabaseObjectsRequest(object):
      - pattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalogName=None, pattern=None,):
+    def __init__(self, catalogName = None, pattern = None,):
         self.catalogName = catalogName
         self.pattern = pattern
 
@@ -4434,6 +4514,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4470,9 +4551,10 @@ class GetDatabaseObjectsResponse(object):
      - databases
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, databases=None,):
+    def __init__(self, databases = None,):
         self.databases = databases
 
     def read(self, iprot):
@@ -4501,6 +4583,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4544,9 +4627,10 @@ class SerDeInfo(object):
      - serdeType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, serializationLib=None, parameters=None, description=None, serializerClass=None, deserializerClass=None, serdeType=None,):
+    def __init__(self, name = None, serializationLib = None, parameters = None, description = None, serializerClass = None, deserializerClass = None, serdeType = None,):
         self.name = name
         self.serializationLib = serializationLib
         self.parameters = parameters
@@ -4611,6 +4695,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4672,9 +4757,10 @@ class Order(object):
      - order
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, col=None, order=None,):
+    def __init__(self, col = None, order = None,):
         self.col = col
         self.order = order
 
@@ -4703,6 +4789,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4741,9 +4828,10 @@ class SkewedInfo(object):
      - skewedColValueLocationMaps
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, skewedColNames=None, skewedColValues=None, skewedColValueLocationMaps=None,):
+    def __init__(self, skewedColNames = None, skewedColValues = None, skewedColValueLocationMaps = None,):
         self.skewedColNames = skewedColNames
         self.skewedColValues = skewedColValues
         self.skewedColValueLocationMaps = skewedColValueLocationMaps
@@ -4804,6 +4892,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -4871,9 +4960,10 @@ class StorageDescriptor(object):
      - storedAsSubDirectories
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cols=None, location=None, inputFormat=None, outputFormat=None, compressed=None, numBuckets=None, serdeInfo=None, bucketCols=None, sortCols=None, parameters=None, skewedInfo=None, storedAsSubDirectories=None,):
+    def __init__(self, cols = None, location = None, inputFormat = None, outputFormat = None, compressed = None, numBuckets = None, serdeInfo = None, bucketCols = None, sortCols = None, parameters = None, skewedInfo = None, storedAsSubDirectories = None,):
         self.cols = cols
         self.location = location
         self.inputFormat = inputFormat
@@ -4987,6 +5077,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5082,9 +5173,10 @@ class CreationMetadata(object):
      - sourceTables
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, tablesUsed=None, validTxnList=None, materializationTime=None, sourceTables=None,):
+    def __init__(self, catName = None, dbName = None, tblName = None, tablesUsed = None, validTxnList = None, materializationTime = None, sourceTables = None,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -5154,6 +5246,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5227,9 +5320,10 @@ class BooleanColumnStatsData(object):
      - bitVectors
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, numTrues=None, numFalses=None, numNulls=None, bitVectors=None,):
+    def __init__(self, numTrues = None, numFalses = None, numNulls = None, bitVectors = None,):
         self.numTrues = numTrues
         self.numFalses = numFalses
         self.numNulls = numNulls
@@ -5270,6 +5364,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5325,9 +5420,10 @@ class DoubleColumnStatsData(object):
      - histogram
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lowValue=None, highValue=None, numNulls=None, numDVs=None, bitVectors=None, histogram=None,):
+    def __init__(self, lowValue = None, highValue = None, numNulls = None, numDVs = None, bitVectors = None, histogram = None,):
         self.lowValue = lowValue
         self.highValue = highValue
         self.numNulls = numNulls
@@ -5380,6 +5476,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5441,9 +5538,10 @@ class LongColumnStatsData(object):
      - histogram
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lowValue=None, highValue=None, numNulls=None, numDVs=None, bitVectors=None, histogram=None,):
+    def __init__(self, lowValue = None, highValue = None, numNulls = None, numDVs = None, bitVectors = None, histogram = None,):
         self.lowValue = lowValue
         self.highValue = highValue
         self.numNulls = numNulls
@@ -5496,6 +5594,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5556,9 +5655,10 @@ class StringColumnStatsData(object):
      - bitVectors
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, maxColLen=None, avgColLen=None, numNulls=None, numDVs=None, bitVectors=None,):
+    def __init__(self, maxColLen = None, avgColLen = None, numNulls = None, numDVs = None, bitVectors = None,):
         self.maxColLen = maxColLen
         self.avgColLen = avgColLen
         self.numNulls = numNulls
@@ -5605,6 +5705,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5664,9 +5765,10 @@ class BinaryColumnStatsData(object):
      - bitVectors
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, maxColLen=None, avgColLen=None, numNulls=None, bitVectors=None,):
+    def __init__(self, maxColLen = None, avgColLen = None, numNulls = None, bitVectors = None,):
         self.maxColLen = maxColLen
         self.avgColLen = avgColLen
         self.numNulls = numNulls
@@ -5707,6 +5809,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5758,9 +5861,10 @@ class Decimal(object):
      - unscaled
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scale=None, unscaled=None,):
+    def __init__(self, scale = None, unscaled = None,):
         self.scale = scale
         self.unscaled = unscaled
 
@@ -5789,6 +5893,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5834,9 +5939,10 @@ class DecimalColumnStatsData(object):
      - histogram
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lowValue=None, highValue=None, numNulls=None, numDVs=None, bitVectors=None, histogram=None,):
+    def __init__(self, lowValue = None, highValue = None, numNulls = None, numDVs = None, bitVectors = None, histogram = None,):
         self.lowValue = lowValue
         self.highValue = highValue
         self.numNulls = numNulls
@@ -5891,6 +5997,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -5947,9 +6054,10 @@ class Date(object):
      - daysSinceEpoch
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, daysSinceEpoch=None,):
+    def __init__(self, daysSinceEpoch = None,):
         self.daysSinceEpoch = daysSinceEpoch
 
     def read(self, iprot):
@@ -5972,6 +6080,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6011,9 +6120,10 @@ class DateColumnStatsData(object):
      - histogram
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lowValue=None, highValue=None, numNulls=None, numDVs=None, bitVectors=None, histogram=None,):
+    def __init__(self, lowValue = None, highValue = None, numNulls = None, numDVs = None, bitVectors = None, histogram = None,):
         self.lowValue = lowValue
         self.highValue = highValue
         self.numNulls = numNulls
@@ -6068,6 +6178,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6124,9 +6235,10 @@ class Timestamp(object):
      - secondsSinceEpoch
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, secondsSinceEpoch=None,):
+    def __init__(self, secondsSinceEpoch = None,):
         self.secondsSinceEpoch = secondsSinceEpoch
 
     def read(self, iprot):
@@ -6149,6 +6261,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6188,9 +6301,10 @@ class TimestampColumnStatsData(object):
      - histogram
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lowValue=None, highValue=None, numNulls=None, numDVs=None, bitVectors=None, histogram=None,):
+    def __init__(self, lowValue = None, highValue = None, numNulls = None, numDVs = None, bitVectors = None, histogram = None,):
         self.lowValue = lowValue
         self.highValue = highValue
         self.numNulls = numNulls
@@ -6245,6 +6359,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6308,9 +6423,10 @@ class ColumnStatisticsData(object):
      - timestampStats
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, booleanStats=None, longStats=None, doubleStats=None, stringStats=None, binaryStats=None, decimalStats=None, dateStats=None, timestampStats=None,):
+    def __init__(self, booleanStats = None, longStats = None, doubleStats = None, stringStats = None, binaryStats = None, decimalStats = None, dateStats = None, timestampStats = None,):
         self.booleanStats = booleanStats
         self.longStats = longStats
         self.doubleStats = doubleStats
@@ -6383,6 +6499,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6445,9 +6562,10 @@ class ColumnStatisticsObj(object):
      - statsData
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, colName=None, colType=None, statsData=None,):
+    def __init__(self, colName = None, colType = None, statsData = None,):
         self.colName = colName
         self.colType = colType
         self.statsData = statsData
@@ -6483,6 +6601,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6534,9 +6653,10 @@ class ColumnStatisticsDesc(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, isTblLevel=None, dbName=None, tableName=None, partName=None, lastAnalyzed=None, catName=None,):
+    def __init__(self, isTblLevel = None, dbName = None, tableName = None, partName = None, lastAnalyzed = None, catName = None,):
         self.isTblLevel = isTblLevel
         self.dbName = dbName
         self.tableName = tableName
@@ -6589,6 +6709,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6650,9 +6771,10 @@ class ColumnStatistics(object):
      - engine
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, statsDesc=None, statsObj=None, isStatsCompliant=None, engine="hive",):
+    def __init__(self, statsDesc = None, statsObj = None, isStatsCompliant = None, engine = "hive",):
         self.statsDesc = statsDesc
         self.statsObj = statsObj
         self.isStatsCompliant = isStatsCompliant
@@ -6700,6 +6822,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6753,9 +6876,10 @@ class FileMetadata(object):
      - data
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, type=1, version=1, data=None,):
+    def __init__(self, type = 1, version = 1, data = None,):
         self.type = type
         self.version = version
         self.data = data
@@ -6795,6 +6919,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6838,9 +6963,10 @@ class ObjectDictionary(object):
      - values
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None,):
+    def __init__(self, values = None,):
         self.values = values
 
     def read(self, iprot):
@@ -6874,6 +7000,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -6942,9 +7069,10 @@ class Table(object):
      - txnId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tableName=None, dbName=None, owner=None, createTime=None, lastAccessTime=None, retention=None, sd=None, partitionKeys=None, parameters=None, viewOriginalText=None, viewExpandedText=None, tableType=None, privileges=None, temporary=False, rewriteEnabled=None, creationMetadata=None, catName=None, ownerType=1, writeId=-1, isStatsCompliant=None, colStats=None, accessType=None, requiredReadCapabilities=None, requiredWriteCapabilities=None, id=None, fileMetadata=None, dictionary=None, txnId=None,):
+    def __init__(self, tableName = None, dbName = None, owner = None, createTime = None, lastAccessTime = None, retention = None, sd = None, partitionKeys = None, parameters = None, viewOriginalText = None, viewExpandedText = None, tableType = None, privileges = None, temporary = False, rewriteEnabled = None, creationMetadata = None, catName = None, ownerType =     1, writeId = -1, isStatsCompliant = None, colStats = None, accessType = None, requiredReadCapabilities = None, requiredWriteCapabilities = None, id = None, fileMetadata = None, dictionary = None, txnId = None,):
         self.tableName = tableName
         self.dbName = dbName
         self.owner = owner
@@ -7157,6 +7285,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7313,9 +7442,10 @@ class SourceTable(object):
      - deletedCount
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, table=None, insertedCount=None, updatedCount=None, deletedCount=None,):
+    def __init__(self, table = None, insertedCount = None, updatedCount = None, deletedCount = None,):
         self.table = table
         self.insertedCount = insertedCount
         self.updatedCount = updatedCount
@@ -7357,6 +7487,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7421,9 +7552,10 @@ class Partition(object):
      - fileMetadata
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, dbName=None, tableName=None, createTime=None, lastAccessTime=None, sd=None, parameters=None, privileges=None, catName=None, writeId=-1, isStatsCompliant=None, colStats=None, fileMetadata=None,):
+    def __init__(self, values = None, dbName = None, tableName = None, createTime = None, lastAccessTime = None, sd = None, parameters = None, privileges = None, catName = None, writeId = -1, isStatsCompliant = None, colStats = None, fileMetadata = None,):
         self.values = values
         self.dbName = dbName
         self.tableName = tableName
@@ -7533,6 +7665,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7625,9 +7758,10 @@ class PartitionWithoutSD(object):
      - privileges
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None, createTime=None, lastAccessTime=None, relativePath=None, parameters=None, privileges=None,):
+    def __init__(self, values = None, createTime = None, lastAccessTime = None, relativePath = None, parameters = None, privileges = None,):
         self.values = values
         self.createTime = createTime
         self.lastAccessTime = lastAccessTime
@@ -7692,6 +7826,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7752,9 +7887,10 @@ class PartitionSpecWithSharedSD(object):
      - sd
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None, sd=None,):
+    def __init__(self, partitions = None, sd = None,):
         self.partitions = partitions
         self.sd = sd
 
@@ -7790,6 +7926,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7829,9 +7966,10 @@ class PartitionListComposingSpec(object):
      - partitions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None,):
+    def __init__(self, partitions = None,):
         self.partitions = partitions
 
     def read(self, iprot):
@@ -7860,6 +7998,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -7902,9 +8041,10 @@ class PartitionSpec(object):
      - isStatsCompliant
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, rootPath=None, sharedSDPartitionSpec=None, partitionList=None, catName=None, writeId=-1, isStatsCompliant=None,):
+    def __init__(self, dbName = None, tableName = None, rootPath = None, sharedSDPartitionSpec = None, partitionList = None, catName = None, writeId = -1, isStatsCompliant = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.rootPath = rootPath
@@ -7971,6 +8111,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8033,9 +8174,10 @@ class AggrStats(object):
      - isStatsCompliant
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, colStats=None, partsFound=None, isStatsCompliant=None,):
+    def __init__(self, colStats = None, partsFound = None, isStatsCompliant = None,):
         self.colStats = colStats
         self.partsFound = partsFound
         self.isStatsCompliant = isStatsCompliant
@@ -8076,6 +8218,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8127,9 +8270,10 @@ class SetPartitionsStatsRequest(object):
      - engine
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, colStats=None, needMerge=None, writeId=-1, validWriteIdList=None, engine="hive",):
+    def __init__(self, colStats = None, needMerge = None, writeId = -1, validWriteIdList = None, engine = "hive",):
         self.colStats = colStats
         self.needMerge = needMerge
         self.writeId = writeId
@@ -8182,6 +8326,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8235,9 +8380,10 @@ class SetPartitionsStatsResponse(object):
      - result
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, result=None,):
+    def __init__(self, result = None,):
         self.result = result
 
     def read(self, iprot):
@@ -8260,6 +8406,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8295,9 +8442,10 @@ class Schema(object):
      - properties
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fieldSchemas=None, properties=None,):
+    def __init__(self, fieldSchemas = None, properties = None,):
         self.fieldSchemas = fieldSchemas
         self.properties = properties
 
@@ -8338,6 +8486,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8383,9 +8532,10 @@ class PrimaryKeysRequest(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, catName=None,):
+    def __init__(self, db_name = None, tbl_name = None, catName = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.catName = catName
@@ -8420,6 +8570,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8464,9 +8615,10 @@ class PrimaryKeysResponse(object):
      - primaryKeys
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, primaryKeys=None,):
+    def __init__(self, primaryKeys = None,):
         self.primaryKeys = primaryKeys
 
     def read(self, iprot):
@@ -8495,6 +8647,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8536,9 +8689,10 @@ class ForeignKeysRequest(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, parent_db_name=None, parent_tbl_name=None, foreign_db_name=None, foreign_tbl_name=None, catName=None,):
+    def __init__(self, parent_db_name = None, parent_tbl_name = None, foreign_db_name = None, foreign_tbl_name = None, catName = None,):
         self.parent_db_name = parent_db_name
         self.parent_tbl_name = parent_tbl_name
         self.foreign_db_name = foreign_db_name
@@ -8585,6 +8739,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8633,9 +8788,10 @@ class ForeignKeysResponse(object):
      - foreignKeys
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, foreignKeys=None,):
+    def __init__(self, foreignKeys = None,):
         self.foreignKeys = foreignKeys
 
     def read(self, iprot):
@@ -8664,6 +8820,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8703,9 +8860,10 @@ class UniqueConstraintsRequest(object):
      - tbl_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, db_name=None, tbl_name=None,):
+    def __init__(self, catName = None, db_name = None, tbl_name = None,):
         self.catName = catName
         self.db_name = db_name
         self.tbl_name = tbl_name
@@ -8740,6 +8898,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8786,9 +8945,10 @@ class UniqueConstraintsResponse(object):
      - uniqueConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, uniqueConstraints=None,):
+    def __init__(self, uniqueConstraints = None,):
         self.uniqueConstraints = uniqueConstraints
 
     def read(self, iprot):
@@ -8817,6 +8977,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8856,9 +9017,10 @@ class NotNullConstraintsRequest(object):
      - tbl_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, db_name=None, tbl_name=None,):
+    def __init__(self, catName = None, db_name = None, tbl_name = None,):
         self.catName = catName
         self.db_name = db_name
         self.tbl_name = tbl_name
@@ -8893,6 +9055,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -8939,9 +9102,10 @@ class NotNullConstraintsResponse(object):
      - notNullConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, notNullConstraints=None,):
+    def __init__(self, notNullConstraints = None,):
         self.notNullConstraints = notNullConstraints
 
     def read(self, iprot):
@@ -8970,6 +9134,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9009,9 +9174,10 @@ class DefaultConstraintsRequest(object):
      - tbl_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, db_name=None, tbl_name=None,):
+    def __init__(self, catName = None, db_name = None, tbl_name = None,):
         self.catName = catName
         self.db_name = db_name
         self.tbl_name = tbl_name
@@ -9046,6 +9212,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9092,9 +9259,10 @@ class DefaultConstraintsResponse(object):
      - defaultConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, defaultConstraints=None,):
+    def __init__(self, defaultConstraints = None,):
         self.defaultConstraints = defaultConstraints
 
     def read(self, iprot):
@@ -9123,6 +9291,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9162,9 +9331,10 @@ class CheckConstraintsRequest(object):
      - tbl_name
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, db_name=None, tbl_name=None,):
+    def __init__(self, catName = None, db_name = None, tbl_name = None,):
         self.catName = catName
         self.db_name = db_name
         self.tbl_name = tbl_name
@@ -9199,6 +9369,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9245,9 +9416,10 @@ class CheckConstraintsResponse(object):
      - checkConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, checkConstraints=None,):
+    def __init__(self, checkConstraints = None,):
         self.checkConstraints = checkConstraints
 
     def read(self, iprot):
@@ -9276,6 +9448,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9315,9 +9488,10 @@ class AllTableConstraintsRequest(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, catName=None,):
+    def __init__(self, dbName = None, tblName = None, catName = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.catName = catName
@@ -9352,6 +9526,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9398,9 +9573,10 @@ class AllTableConstraintsResponse(object):
      - allTableConstraints
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, allTableConstraints=None,):
+    def __init__(self, allTableConstraints = None,):
         self.allTableConstraints = allTableConstraints
 
     def read(self, iprot):
@@ -9424,6 +9600,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9461,9 +9638,10 @@ class DropConstraintRequest(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tablename=None, constraintname=None, catName=None,):
+    def __init__(self, dbname = None, tablename = None, constraintname = None, catName = None,):
         self.dbname = dbname
         self.tablename = tablename
         self.constraintname = constraintname
@@ -9504,6 +9682,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9554,9 +9733,10 @@ class AddPrimaryKeyRequest(object):
      - primaryKeyCols
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, primaryKeyCols=None,):
+    def __init__(self, primaryKeyCols = None,):
         self.primaryKeyCols = primaryKeyCols
 
     def read(self, iprot):
@@ -9585,6 +9765,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9622,9 +9803,10 @@ class AddForeignKeyRequest(object):
      - foreignKeyCols
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, foreignKeyCols=None,):
+    def __init__(self, foreignKeyCols = None,):
         self.foreignKeyCols = foreignKeyCols
 
     def read(self, iprot):
@@ -9653,6 +9835,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9690,9 +9873,10 @@ class AddUniqueConstraintRequest(object):
      - uniqueConstraintCols
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, uniqueConstraintCols=None,):
+    def __init__(self, uniqueConstraintCols = None,):
         self.uniqueConstraintCols = uniqueConstraintCols
 
     def read(self, iprot):
@@ -9721,6 +9905,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9758,9 +9943,10 @@ class AddNotNullConstraintRequest(object):
      - notNullConstraintCols
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, notNullConstraintCols=None,):
+    def __init__(self, notNullConstraintCols = None,):
         self.notNullConstraintCols = notNullConstraintCols
 
     def read(self, iprot):
@@ -9789,6 +9975,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9826,9 +10013,10 @@ class AddDefaultConstraintRequest(object):
      - defaultConstraintCols
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, defaultConstraintCols=None,):
+    def __init__(self, defaultConstraintCols = None,):
         self.defaultConstraintCols = defaultConstraintCols
 
     def read(self, iprot):
@@ -9857,6 +10045,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9894,9 +10083,10 @@ class AddCheckConstraintRequest(object):
      - checkConstraintCols
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, checkConstraintCols=None,):
+    def __init__(self, checkConstraintCols = None,):
         self.checkConstraintCols = checkConstraintCols
 
     def read(self, iprot):
@@ -9925,6 +10115,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -9963,9 +10154,10 @@ class PartitionsByExprResult(object):
      - hasUnknownPartitions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None, hasUnknownPartitions=None,):
+    def __init__(self, partitions = None, hasUnknownPartitions = None,):
         self.partitions = partitions
         self.hasUnknownPartitions = hasUnknownPartitions
 
@@ -10000,6 +10192,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10044,9 +10237,10 @@ class PartitionsSpecByExprResult(object):
      - hasUnknownPartitions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitionsSpec=None, hasUnknownPartitions=None,):
+    def __init__(self, partitionsSpec = None, hasUnknownPartitions = None,):
         self.partitionsSpec = partitionsSpec
         self.hasUnknownPartitions = hasUnknownPartitions
 
@@ -10081,6 +10275,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10135,9 +10330,10 @@ class PartitionsByExprRequest(object):
      - excludeParamKeyPattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, expr=None, defaultPartitionName=None, maxParts=-1, catName=None, order=None, validWriteIdList=None, id=-1, skipColumnSchemaForPartition=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
+    def __init__(self, dbName = None, tblName = None, expr = None, defaultPartitionName = None, maxParts = -1, catName = None, order = None, validWriteIdList = None, id = -1, skipColumnSchemaForPartition = None, includeParamKeyPattern = None, excludeParamKeyPattern = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.expr = expr
@@ -10226,6 +10422,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10309,9 +10506,10 @@ class TableStatsResult(object):
      - isStatsCompliant
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tableStats=None, isStatsCompliant=None,):
+    def __init__(self, tableStats = None, isStatsCompliant = None,):
         self.tableStats = tableStats
         self.isStatsCompliant = isStatsCompliant
 
@@ -10346,6 +10544,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10388,9 +10587,10 @@ class PartitionsStatsResult(object):
      - isStatsCompliant
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partStats=None, isStatsCompliant=None,):
+    def __init__(self, partStats = None, isStatsCompliant = None,):
         self.partStats = partStats
         self.isStatsCompliant = isStatsCompliant
 
@@ -10431,6 +10631,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10482,9 +10683,10 @@ class TableStatsRequest(object):
      - id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, colNames=None, catName=None, validWriteIdList=None, engine="hive", id=-1,):
+    def __init__(self, dbName = None, tblName = None, colNames = None, catName = None, validWriteIdList = None, engine = "hive", id = -1,):
         self.dbName = dbName
         self.tblName = tblName
         self.colNames = colNames
@@ -10548,6 +10750,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10619,9 +10822,10 @@ class PartitionsStatsRequest(object):
      - engine
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, colNames=None, partNames=None, catName=None, validWriteIdList=None, engine="hive",):
+    def __init__(self, dbName = None, tblName = None, colNames = None, partNames = None, catName = None, validWriteIdList = None, engine = "hive",):
         self.dbName = dbName
         self.tblName = tblName
         self.colNames = colNames
@@ -10690,6 +10894,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10762,9 +10967,10 @@ class AddPartitionsResult(object):
      - partitionColSchema
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None, isStatsCompliant=None, partitionColSchema=None,):
+    def __init__(self, partitions = None, isStatsCompliant = None, partitionColSchema = None,):
         self.partitions = partitions
         self.isStatsCompliant = isStatsCompliant
         self.partitionColSchema = partitionColSchema
@@ -10811,6 +11017,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -10866,9 +11073,10 @@ class AddPartitionsRequest(object):
      - environmentContext
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, parts=None, ifNotExists=None, needResult=True, catName=None, validWriteIdList=None, skipColumnSchemaForPartition=None, partitionColSchema=None, environmentContext=None,):
+    def __init__(self, dbName = None, tblName = None, parts = None, ifNotExists = None, needResult = True, catName = None, validWriteIdList = None, skipColumnSchemaForPartition = None, partitionColSchema = None, environmentContext = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.parts = parts
@@ -10958,6 +11166,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11040,9 +11249,10 @@ class DropPartitionsResult(object):
      - partitions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None,):
+    def __init__(self, partitions = None,):
         self.partitions = partitions
 
     def read(self, iprot):
@@ -11071,6 +11281,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11107,9 +11318,10 @@ class DropPartitionsExpr(object):
      - partArchiveLevel
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, expr=None, partArchiveLevel=None,):
+    def __init__(self, expr = None, partArchiveLevel = None,):
         self.expr = expr
         self.partArchiveLevel = partArchiveLevel
 
@@ -11138,6 +11350,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11177,9 +11390,10 @@ class RequestPartsSpec(object):
      - exprs
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, names=None, exprs=None,):
+    def __init__(self, names = None, exprs = None,):
         self.names = names
         self.exprs = exprs
 
@@ -11219,6 +11433,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11270,9 +11485,10 @@ class DropPartitionsRequest(object):
      - skipColumnSchemaForPartition
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, parts=None, deleteData=None, ifExists=True, ignoreProtection=None, environmentContext=None, needResult=True, catName=None, skipColumnSchemaForPartition=None,):
+    def __init__(self, dbName = None, tblName = None, parts = None, deleteData = None, ifExists = True, ignoreProtection = None, environmentContext = None, needResult = True, catName = None, skipColumnSchemaForPartition = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.parts = parts
@@ -11351,6 +11567,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11431,9 +11648,10 @@ class DropPartitionRequest(object):
      - environmentContext
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, partName=None, partVals=None, deleteData=None, environmentContext=None,):
+    def __init__(self, catName = None, dbName = None, tblName = None, partName = None, partVals = None, deleteData = None, environmentContext = None,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -11498,6 +11716,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11570,9 +11789,10 @@ class PartitionValuesRequest(object):
      - validWriteIdList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, partitionKeys=None, applyDistinct=True, filter=None, partitionOrder=None, ascending=True, maxParts=-1, catName=None, validWriteIdList=None,):
+    def __init__(self, dbName = None, tblName = None, partitionKeys = None, applyDistinct = True, filter = None, partitionOrder = None, ascending = True, maxParts = -1, catName = None, validWriteIdList = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.partitionKeys = partitionKeys
@@ -11661,6 +11881,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11741,9 +11962,10 @@ class PartitionValuesRow(object):
      - row
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, row=None,):
+    def __init__(self, row = None,):
         self.row = row
 
     def read(self, iprot):
@@ -11771,6 +11993,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11808,9 +12031,10 @@ class PartitionValuesResponse(object):
      - partitionValues
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitionValues=None,):
+    def __init__(self, partitionValues = None,):
         self.partitionValues = partitionValues
 
     def read(self, iprot):
@@ -11839,6 +12063,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -11888,9 +12113,10 @@ class GetPartitionsByNamesRequest(object):
      - excludeParamKeyPattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, db_name=None, tbl_name=None, names=None, get_col_stats=None, processorCapabilities=None, processorIdentifier=None, engine="hive", validWriteIdList=None, getFileMetadata=None, id=-1, skipColumnSchemaForPartition=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
+    def __init__(self, db_name = None, tbl_name = None, names = None, get_col_stats = None, processorCapabilities = None, processorIdentifier = None, engine = "hive", validWriteIdList = None, getFileMetadata = None, id = -1, skipColumnSchemaForPartition = None, includeParamKeyPattern = None, excludeParamKeyPattern = None,):
         self.db_name = db_name
         self.tbl_name = tbl_name
         self.names = names
@@ -11995,6 +12221,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12086,9 +12313,10 @@ class GetPartitionsByNamesResult(object):
      - dictionary
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None, dictionary=None,):
+    def __init__(self, partitions = None, dictionary = None,):
         self.partitions = partitions
         self.dictionary = dictionary
 
@@ -12124,6 +12352,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12172,9 +12401,10 @@ class DataConnector(object):
      - createTime
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, type=None, url=None, description=None, parameters=None, ownerName=None, ownerType=None, createTime=None,):
+    def __init__(self, name = None, type = None, url = None, description = None, parameters = None, ownerName = None, ownerType = None, createTime = None,):
         self.name = name
         self.type = type
         self.url = url
@@ -12245,6 +12475,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12310,9 +12541,10 @@ class ResourceUri(object):
      - uri
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourceType=None, uri=None,):
+    def __init__(self, resourceType = None, uri = None,):
         self.resourceType = resourceType
         self.uri = uri
 
@@ -12341,6 +12573,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12385,9 +12618,10 @@ class Function(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, functionName=None, dbName=None, className=None, ownerName=None, ownerType=None, createTime=None, functionType=None, resourceUris=None, catName=None,):
+    def __init__(self, functionName = None, dbName = None, className = None, ownerName = None, ownerType = None, createTime = None, functionType = None, resourceUris = None, catName = None,):
         self.functionName = functionName
         self.dbName = dbName
         self.className = className
@@ -12464,6 +12698,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12539,9 +12774,10 @@ class TxnInfo(object):
      - lastHeartbeatTime
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, id=None, state=None, user=None, hostname=None, agentInfo="Unknown", heartbeatCount=0, metaInfo=None, startedTime=None, lastHeartbeatTime=None,):
+    def __init__(self, id = None, state = None, user = None, hostname = None, agentInfo = "Unknown", heartbeatCount = 0, metaInfo = None, startedTime = None, lastHeartbeatTime = None,):
         self.id = id
         self.state = state
         self.user = user
@@ -12612,6 +12848,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12685,9 +12922,10 @@ class GetOpenTxnsInfoResponse(object):
      - open_txns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txn_high_water_mark=None, open_txns=None,):
+    def __init__(self, txn_high_water_mark = None, open_txns = None,):
         self.txn_high_water_mark = txn_high_water_mark
         self.open_txns = open_txns
 
@@ -12722,6 +12960,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12768,9 +13007,10 @@ class GetOpenTxnsResponse(object):
      - abortedBits
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txn_high_water_mark=None, open_txns=None, min_open_txn=None, abortedBits=None,):
+    def __init__(self, txn_high_water_mark = None, open_txns = None, min_open_txn = None, abortedBits = None,):
         self.txn_high_water_mark = txn_high_water_mark
         self.open_txns = open_txns
         self.min_open_txn = min_open_txn
@@ -12816,6 +13056,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -12875,9 +13116,10 @@ class OpenTxnRequest(object):
      - txn_type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, num_txns=None, user=None, hostname=None, agentInfo="Unknown", replPolicy=None, replSrcTxnIds=None, txn_type=0,):
+    def __init__(self, num_txns = None, user = None, hostname = None, agentInfo = "Unknown", replPolicy = None, replSrcTxnIds = None, txn_type =     0,):
         self.num_txns = num_txns
         self.user = user
         self.hostname = hostname
@@ -12941,6 +13183,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13006,9 +13249,10 @@ class OpenTxnsResponse(object):
      - txn_ids
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txn_ids=None,):
+    def __init__(self, txn_ids = None,):
         self.txn_ids = txn_ids
 
     def read(self, iprot):
@@ -13036,6 +13280,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13076,9 +13321,10 @@ class AbortTxnRequest(object):
      - errorCode
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnid=None, replPolicy=None, txn_type=None, errorCode=None,):
+    def __init__(self, txnid = None, replPolicy = None, txn_type = None, errorCode = None,):
         self.txnid = txnid
         self.replPolicy = replPolicy
         self.txn_type = txn_type
@@ -13119,6 +13365,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13166,9 +13413,10 @@ class AbortTxnsRequest(object):
      - errorCode
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txn_ids=None, errorCode=None,):
+    def __init__(self, txn_ids = None, errorCode = None,):
         self.txn_ids = txn_ids
         self.errorCode = errorCode
 
@@ -13202,6 +13450,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13245,9 +13494,10 @@ class CommitTxnKeyValue(object):
      - value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tableId=None, key=None, value=None,):
+    def __init__(self, tableId = None, key = None, value = None,):
         self.tableId = tableId
         self.key = key
         self.value = value
@@ -13282,6 +13532,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13334,9 +13585,10 @@ class WriteEventInfo(object):
      - partitionObj
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, writeId=None, database=None, table=None, files=None, partition=None, tableObj=None, partitionObj=None,):
+    def __init__(self, writeId = None, database = None, table = None, files = None, partition = None, tableObj = None, partitionObj = None,):
         self.writeId = writeId
         self.database = database
         self.table = table
@@ -13395,6 +13647,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13463,9 +13716,10 @@ class ReplLastIdInfo(object):
      - partitionList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, database=None, lastReplId=None, table=None, catalog=None, partitionList=None,):
+    def __init__(self, database = None, lastReplId = None, table = None, catalog = None, partitionList = None,):
         self.database = database
         self.lastReplId = lastReplId
         self.table = table
@@ -13517,6 +13771,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13575,9 +13830,10 @@ class UpdateTransactionalStatsRequest(object):
      - deletedCount
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tableId=None, insertCount=None, updatedCount=None, deletedCount=None,):
+    def __init__(self, tableId = None, insertCount = None, updatedCount = None, deletedCount = None,):
         self.tableId = tableId
         self.insertCount = insertCount
         self.updatedCount = updatedCount
@@ -13618,6 +13874,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13676,9 +13933,10 @@ class CommitTxnRequest(object):
      - txn_type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnid=None, replPolicy=None, writeEventInfos=None, replLastIdInfo=None, keyValue=None, exclWriteEnabled=True, txn_type=None,):
+    def __init__(self, txnid = None, replPolicy = None, writeEventInfos = None, replLastIdInfo = None, keyValue = None, exclWriteEnabled = True, txn_type = None,):
         self.txnid = txnid
         self.replPolicy = replPolicy
         self.writeEventInfos = writeEventInfos
@@ -13745,6 +14003,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13811,9 +14070,10 @@ class ReplTblWriteIdStateRequest(object):
      - partNames
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, validWriteIdlist=None, user=None, hostName=None, dbName=None, tableName=None, partNames=None,):
+    def __init__(self, validWriteIdlist = None, user = None, hostName = None, dbName = None, tableName = None, partNames = None,):
         self.validWriteIdlist = validWriteIdlist
         self.user = user
         self.hostName = hostName
@@ -13871,6 +14131,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -13938,9 +14199,10 @@ class GetValidWriteIdsRequest(object):
      - writeId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fullTableNames=None, validTxnList=None, writeId=None,):
+    def __init__(self, fullTableNames = None, validTxnList = None, writeId = None,):
         self.fullTableNames = fullTableNames
         self.validTxnList = validTxnList
         self.writeId = writeId
@@ -13980,6 +14242,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14029,9 +14292,10 @@ class TableValidWriteIds(object):
      - abortedBits
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fullTableName=None, writeIdHighWaterMark=None, invalidWriteIds=None, minOpenWriteId=None, abortedBits=None,):
+    def __init__(self, fullTableName = None, writeIdHighWaterMark = None, invalidWriteIds = None, minOpenWriteId = None, abortedBits = None,):
         self.fullTableName = fullTableName
         self.writeIdHighWaterMark = writeIdHighWaterMark
         self.invalidWriteIds = invalidWriteIds
@@ -14083,6 +14347,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14142,9 +14407,10 @@ class GetValidWriteIdsResponse(object):
      - tblValidWriteIds
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tblValidWriteIds=None,):
+    def __init__(self, tblValidWriteIds = None,):
         self.tblValidWriteIds = tblValidWriteIds
 
     def read(self, iprot):
@@ -14173,6 +14439,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14211,9 +14478,10 @@ class TxnToWriteId(object):
      - writeId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnId=None, writeId=None,):
+    def __init__(self, txnId = None, writeId = None,):
         self.txnId = txnId
         self.writeId = writeId
 
@@ -14242,6 +14510,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14287,9 +14556,10 @@ class AllocateTableWriteIdsRequest(object):
      - reallocate
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, txnIds=None, replPolicy=None, srcTxnToWriteIdList=None, reallocate=False,):
+    def __init__(self, dbName = None, tableName = None, txnIds = None, replPolicy = None, srcTxnToWriteIdList = None, reallocate = False,):
         self.dbName = dbName
         self.tableName = tableName
         self.txnIds = txnIds
@@ -14353,6 +14623,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14415,9 +14686,10 @@ class AllocateTableWriteIdsResponse(object):
      - txnToWriteIds
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnToWriteIds=None,):
+    def __init__(self, txnToWriteIds = None,):
         self.txnToWriteIds = txnToWriteIds
 
     def read(self, iprot):
@@ -14446,6 +14718,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14484,9 +14757,10 @@ class MaxAllocatedTableWriteIdRequest(object):
      - tableName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None,):
+    def __init__(self, dbName = None, tableName = None,):
         self.dbName = dbName
         self.tableName = tableName
 
@@ -14515,6 +14789,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14555,9 +14830,10 @@ class MaxAllocatedTableWriteIdResponse(object):
      - maxWriteId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, maxWriteId=None,):
+    def __init__(self, maxWriteId = None,):
         self.maxWriteId = maxWriteId
 
     def read(self, iprot):
@@ -14580,6 +14856,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14616,9 +14893,10 @@ class SeedTableWriteIdsRequest(object):
      - seedWriteId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, seedWriteId=None,):
+    def __init__(self, dbName = None, tableName = None, seedWriteId = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.seedWriteId = seedWriteId
@@ -14653,6 +14931,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14699,9 +14978,10 @@ class SeedTxnIdRequest(object):
      - seedTxnId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, seedTxnId=None,):
+    def __init__(self, seedTxnId = None,):
         self.seedTxnId = seedTxnId
 
     def read(self, iprot):
@@ -14724,6 +15004,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14766,9 +15047,10 @@ class LockComponent(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, type=None, level=None, dbname=None, tablename=None, partitionname=None, operationType=5, isTransactional=False, isDynamicPartitionWrite=False, catName="hive",):
+    def __init__(self, type = None, level = None, dbname = None, tablename = None, partitionname = None, operationType =     5, isTransactional = False, isDynamicPartitionWrite = False, catName = "hive",):
         self.type = type
         self.level = level
         self.dbname = dbname
@@ -14839,6 +15121,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -14916,9 +15199,10 @@ class LockRequest(object):
      - locklessReadsEnabled
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, component=None, txnid=None, user=None, hostname=None, agentInfo="Unknown", zeroWaitReadEnabled=False, exclusiveCTAS=False, locklessReadsEnabled=False,):
+    def __init__(self, component = None, txnid = None, user = None, hostname = None, agentInfo = "Unknown", zeroWaitReadEnabled = False, exclusiveCTAS = False, locklessReadsEnabled = False,):
         self.component = component
         self.txnid = txnid
         self.user = user
@@ -14989,6 +15273,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15060,9 +15345,10 @@ class LockResponse(object):
      - errorMessage
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lockid=None, state=None, errorMessage=None,):
+    def __init__(self, lockid = None, state = None, errorMessage = None,):
         self.lockid = lockid
         self.state = state
         self.errorMessage = errorMessage
@@ -15097,6 +15383,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15143,9 +15430,10 @@ class CheckLockRequest(object):
      - elapsed_ms
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lockid=None, txnid=None, elapsed_ms=None,):
+    def __init__(self, lockid = None, txnid = None, elapsed_ms = None,):
         self.lockid = lockid
         self.txnid = txnid
         self.elapsed_ms = elapsed_ms
@@ -15180,6 +15468,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15222,9 +15511,10 @@ class UnlockRequest(object):
      - lockid
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lockid=None,):
+    def __init__(self, lockid = None,):
         self.lockid = lockid
 
     def read(self, iprot):
@@ -15247,6 +15537,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15286,9 +15577,10 @@ class ShowLocksRequest(object):
      - catname
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tablename=None, partname=None, isExtended=False, txnid=None, catname="hive",):
+    def __init__(self, dbname = None, tablename = None, partname = None, isExtended = False, txnid = None, catname = "hive",):
         self.dbname = dbname
         self.tablename = tablename
         self.partname = partname
@@ -15341,6 +15633,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15409,9 +15702,10 @@ class ShowLocksResponseElement(object):
      - catname
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lockid=None, dbname=None, tablename=None, partname=None, state=None, type=None, txnid=None, lastheartbeat=None, acquiredat=None, user=None, hostname=None, heartbeatCount=0, agentInfo=None, blockedByExtId=None, blockedByIntId=None, lockIdInternal=None, catname=None,):
+    def __init__(self, lockid = None, dbname = None, tablename = None, partname = None, state = None, type = None, txnid = None, lastheartbeat = None, acquiredat = None, user = None, hostname = None, heartbeatCount = 0, agentInfo = None, blockedByExtId = None, blockedByIntId = None, lockIdInternal = None, catname = None,):
         self.lockid = lockid
         self.dbname = dbname
         self.tablename = tablename
@@ -15530,6 +15824,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15645,9 +15940,10 @@ class LockMaterializationRebuildRequest(object):
      - txnId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tableName=None, txnId=None,):
+    def __init__(self, catName = None, dbName = None, tableName = None, txnId = None,):
         self.catName = catName
         self.dbName = dbName
         self.tableName = tableName
@@ -15688,6 +15984,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15740,9 +16037,10 @@ class ShowLocksResponse(object):
      - locks
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, locks=None,):
+    def __init__(self, locks = None,):
         self.locks = locks
 
     def read(self, iprot):
@@ -15771,6 +16069,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15807,9 +16106,10 @@ class HeartbeatRequest(object):
      - txnid
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lockid=None, txnid=None,):
+    def __init__(self, lockid = None, txnid = None,):
         self.lockid = lockid
         self.txnid = txnid
 
@@ -15838,6 +16138,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15875,9 +16176,10 @@ class HeartbeatTxnRangeRequest(object):
      - max
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, min=None, max=None,):
+    def __init__(self, min = None, max = None,):
         self.min = min
         self.max = max
 
@@ -15906,6 +16208,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -15947,9 +16250,10 @@ class HeartbeatTxnRangeResponse(object):
      - nosuch
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, aborted=None, nosuch=None,):
+    def __init__(self, aborted = None, nosuch = None,):
         self.aborted = aborted
         self.nosuch = nosuch
 
@@ -15988,6 +16292,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16044,9 +16349,10 @@ class CompactionRequest(object):
      - orderByClause
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tablename=None, partitionname=None, type=None, runas=None, properties=None, initiatorId=None, initiatorVersion=None, poolName=None, numberOfBuckets=None, orderByClause=None,):
+    def __init__(self, dbname = None, tablename = None, partitionname = None, type = None, runas = None, properties = None, initiatorId = None, initiatorVersion = None, poolName = None, numberOfBuckets = None, orderByClause = None,):
         self.dbname = dbname
         self.tablename = tablename
         self.partitionname = partitionname
@@ -16135,6 +16441,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16235,9 +16542,10 @@ class CompactionInfoStruct(object):
      - orderByClause
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, id=None, dbname=None, tablename=None, partitionname=None, type=None, runas=None, properties=None, toomanyaborts=None, state=None, workerId=None, start=None, highestWriteId=None, errorMessage=None, hasoldabort=None, enqueueTime=None, retryRetention=None, poolname=None, numberOfBuckets=None, orderByClause=None,):
+    def __init__(self, id = None, dbname = None, tablename = None, partitionname = None, type = None, runas = None, properties = None, toomanyaborts = None, state = None, workerId = None, start = None, highestWriteId = None, errorMessage = None, hasoldabort = None, enqueueTime = None, retryRetention = None, poolname = None, numberOfBuckets = None, orderByClause = None,):
         self.id = id
         self.dbname = dbname
         self.tablename = tablename
@@ -16368,6 +16676,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16480,9 +16789,10 @@ class OptionalCompactionInfoStruct(object):
      - ci
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, ci=None,):
+    def __init__(self, ci = None,):
         self.ci = ci
 
     def read(self, iprot):
@@ -16506,6 +16816,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16544,9 +16855,10 @@ class CompactionMetricsDataStruct(object):
      - threshold
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tblname=None, partitionname=None, type=None, metricvalue=None, version=None, threshold=None,):
+    def __init__(self, dbname = None, tblname = None, partitionname = None, type = None, metricvalue = None, version = None, threshold = None,):
         self.dbname = dbname
         self.tblname = tblname
         self.partitionname = partitionname
@@ -16605,6 +16917,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16673,9 +16986,10 @@ class CompactionMetricsDataResponse(object):
      - data
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, data=None,):
+    def __init__(self, data = None,):
         self.data = data
 
     def read(self, iprot):
@@ -16699,6 +17013,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16734,9 +17049,10 @@ class CompactionMetricsDataRequest(object):
      - type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, partitionName=None, type=None,):
+    def __init__(self, dbName = None, tblName = None, partitionName = None, type = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.partitionName = partitionName
@@ -16777,6 +17093,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16830,9 +17147,10 @@ class CompactionResponse(object):
      - errormessage
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, id=None, state=None, accepted=None, errormessage=None,):
+    def __init__(self, id = None, state = None, accepted = None, errormessage = None,):
         self.id = id
         self.state = state
         self.accepted = accepted
@@ -16873,6 +17191,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -16931,9 +17250,10 @@ class ShowCompactRequest(object):
      - order
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, id=None, poolName=None, dbName=None, tbName=None, partName=None, type=None, state=None, limit=None, order=None,):
+    def __init__(self, id = None, poolName = None, dbName = None, tbName = None, partName = None, type = None, state = None, limit = None, order = None,):
         self.id = id
         self.poolName = poolName
         self.dbName = dbName
@@ -17004,6 +17324,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17091,9 +17412,10 @@ class ShowCompactResponseElement(object):
      - hightestWriteId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tablename=None, partitionname=None, type=None, state=None, workerid=None, start=None, runAs=None, hightestTxnId=None, metaInfo=None, endTime=None, hadoopJobId="None", id=None, errorMessage=None, enqueueTime=None, workerVersion=None, initiatorId=None, initiatorVersion=None, cleanerStart=None, poolName=None, nextTxnId=None, txnId=None, commitTime=None, hightestWriteId=None,):
+    def __init__(self, dbname = None, tablename = None, partitionname = None, type = None, state = None, workerid = None, start = None, runAs = None, hightestTxnId = None, metaInfo = None, endTime = None, hadoopJobId = "None", id = None, errorMessage = None, enqueueTime = None, workerVersion = None, initiatorId = None, initiatorVersion = None, cleanerStart = None, poolName = None, nextTxnId = None, txnId = None, commitTime = None, hightestWriteId = None,):
         self.dbname = dbname
         self.tablename = tablename
         self.partitionname = partitionname
@@ -17254,6 +17576,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17386,9 +17709,10 @@ class ShowCompactResponse(object):
      - compacts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, compacts=None,):
+    def __init__(self, compacts = None,):
         self.compacts = compacts
 
     def read(self, iprot):
@@ -17417,6 +17741,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17456,9 +17781,10 @@ class AbortCompactionRequest(object):
      - poolName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, compactionIds=None, type=None, poolName=None,):
+    def __init__(self, compactionIds = None, type = None, poolName = None,):
         self.compactionIds = compactionIds
         self.type = type
         self.poolName = poolName
@@ -17498,6 +17824,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17545,9 +17872,10 @@ class AbortCompactionResponseElement(object):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, compactionId=None, status=None, message=None,):
+    def __init__(self, compactionId = None, status = None, message = None,):
         self.compactionId = compactionId
         self.status = status
         self.message = message
@@ -17582,6 +17910,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17624,9 +17953,10 @@ class AbortCompactResponse(object):
      - abortedcompacts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, abortedcompacts=None,):
+    def __init__(self, abortedcompacts = None,):
         self.abortedcompacts = abortedcompacts
 
     def read(self, iprot):
@@ -17656,6 +17986,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17697,9 +18028,10 @@ class GetLatestCommittedCompactionInfoRequest(object):
      - lastCompactionId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbname=None, tablename=None, partitionnames=None, lastCompactionId=None,):
+    def __init__(self, dbname = None, tablename = None, partitionnames = None, lastCompactionId = None,):
         self.dbname = dbname
         self.tablename = tablename
         self.partitionnames = partitionnames
@@ -17745,6 +18077,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17796,9 +18129,10 @@ class GetLatestCommittedCompactionInfoResponse(object):
      - compactions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, compactions=None,):
+    def __init__(self, compactions = None,):
         self.compactions = compactions
 
     def read(self, iprot):
@@ -17827,6 +18161,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17866,9 +18201,10 @@ class FindNextCompactRequest(object):
      - poolName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, workerId=None, workerVersion=None, poolName=None,):
+    def __init__(self, workerId = None, workerVersion = None, poolName = None,):
         self.workerId = workerId
         self.workerVersion = workerVersion
         self.poolName = poolName
@@ -17903,6 +18239,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -17948,9 +18285,10 @@ class AddDynamicPartitions(object):
      - operationType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnid=None, writeid=None, dbname=None, tablename=None, partitionnames=None, operationType=5,):
+    def __init__(self, txnid = None, writeid = None, dbname = None, tablename = None, partitionnames = None, operationType =     5,):
         self.txnid = txnid
         self.writeid = writeid
         self.dbname = dbname
@@ -18008,6 +18346,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18078,9 +18417,10 @@ class BasicTxnInfo(object):
      - partitionname
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, isnull=None, time=None, txnid=None, dbname=None, tablename=None, partitionname=None,):
+    def __init__(self, isnull = None, time = None, txnid = None, dbname = None, tablename = None, partitionname = None,):
         self.isnull = isnull
         self.time = time
         self.txnid = txnid
@@ -18133,6 +18473,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18193,9 +18534,10 @@ class NotificationEventRequest(object):
      - eventTypeList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, lastEvent=None, maxEvents=None, eventTypeSkipList=None, catName=None, dbName=None, tableNames=None, eventTypeList=None,):
+    def __init__(self, lastEvent = None, maxEvents = None, eventTypeSkipList = None, catName = None, dbName = None, tableNames = None, eventTypeList = None,):
         self.lastEvent = lastEvent
         self.maxEvents = maxEvents
         self.eventTypeSkipList = eventTypeSkipList
@@ -18269,6 +18611,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18343,9 +18686,10 @@ class NotificationEvent(object):
      - catName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, eventId=None, eventTime=None, eventType=None, dbName=None, tableName=None, message=None, messageFormat=None, catName=None,):
+    def __init__(self, eventId = None, eventTime = None, eventType = None, dbName = None, tableName = None, message = None, messageFormat = None, catName = None,):
         self.eventId = eventId
         self.eventTime = eventTime
         self.eventType = eventType
@@ -18410,6 +18754,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18478,9 +18823,10 @@ class NotificationEventResponse(object):
      - events
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, events=None,):
+    def __init__(self, events = None,):
         self.events = events
 
     def read(self, iprot):
@@ -18509,6 +18855,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18546,9 +18893,10 @@ class CurrentNotificationEventId(object):
      - eventId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, eventId=None,):
+    def __init__(self, eventId = None,):
         self.eventId = eventId
 
     def read(self, iprot):
@@ -18571,6 +18919,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18610,9 +18959,10 @@ class NotificationEventsCountRequest(object):
      - tableNames
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fromEventId=None, dbName=None, catName=None, toEventId=None, limit=None, tableNames=None,):
+    def __init__(self, fromEventId = None, dbName = None, catName = None, toEventId = None, limit = None, tableNames = None,):
         self.fromEventId = fromEventId
         self.dbName = dbName
         self.catName = catName
@@ -18670,6 +19020,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18729,9 +19080,10 @@ class NotificationEventsCountResponse(object):
      - eventsCount
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, eventsCount=None,):
+    def __init__(self, eventsCount = None,):
         self.eventsCount = eventsCount
 
     def read(self, iprot):
@@ -18754,6 +19106,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18792,9 +19145,10 @@ class InsertEventRequestData(object):
      - partitionVal
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, replace=None, filesAdded=None, filesAddedChecksum=None, subDirectoryList=None, partitionVal=None,):
+    def __init__(self, replace = None, filesAdded = None, filesAddedChecksum = None, subDirectoryList = None, partitionVal = None,):
         self.replace = replace
         self.filesAdded = filesAdded
         self.filesAddedChecksum = filesAddedChecksum
@@ -18861,6 +19215,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -18925,9 +19280,10 @@ class FireEventRequestData(object):
      - refreshEvent
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, insertData=None, insertDatas=None, refreshEvent=None,):
+    def __init__(self, insertData = None, insertDatas = None, refreshEvent = None,):
         self.insertData = insertData
         self.insertDatas = insertDatas
         self.refreshEvent = refreshEvent
@@ -18969,6 +19325,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19019,9 +19376,10 @@ class FireEventRequest(object):
      - batchPartitionValsForRefresh
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, successful=None, data=None, dbName=None, tableName=None, partitionVals=None, catName=None, tblParams=None, batchPartitionValsForRefresh=None,):
+    def __init__(self, successful = None, data = None, dbName = None, tableName = None, partitionVals = None, catName = None, tblParams = None, batchPartitionValsForRefresh = None,):
         self.successful = successful
         self.data = data
         self.dbName = dbName
@@ -19108,6 +19466,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19185,9 +19544,10 @@ class FireEventResponse(object):
      - eventIds
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, eventIds=None,):
+    def __init__(self, eventIds = None,):
         self.eventIds = eventIds
 
     def read(self, iprot):
@@ -19215,6 +19575,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19255,9 +19616,10 @@ class WriteNotificationLogRequest(object):
      - partitionVals
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnId=None, writeId=None, db=None, table=None, fileInfo=None, partitionVals=None,):
+    def __init__(self, txnId = None, writeId = None, db = None, table = None, fileInfo = None, partitionVals = None,):
         self.txnId = txnId
         self.writeId = writeId
         self.db = db
@@ -19316,6 +19678,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19376,6 +19739,7 @@ def __ne__(self, other):
 
 
 class WriteNotificationLogResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -19393,6 +19757,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19424,9 +19789,10 @@ class WriteNotificationLogBatchRequest(object):
      - requestList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalog=None, db=None, table=None, requestList=None,):
+    def __init__(self, catalog = None, db = None, table = None, requestList = None,):
         self.catalog = catalog
         self.db = db
         self.table = table
@@ -19473,6 +19839,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19523,6 +19890,7 @@ def __ne__(self, other):
 
 
 class WriteNotificationLogBatchResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -19540,6 +19908,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19569,9 +19938,10 @@ class MetadataPpdResult(object):
      - includeBitset
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, metadata=None, includeBitset=None,):
+    def __init__(self, metadata = None, includeBitset = None,):
         self.metadata = metadata
         self.includeBitset = includeBitset
 
@@ -19600,6 +19970,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19637,9 +20008,10 @@ class GetFileMetadataByExprResult(object):
      - isSupported
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, metadata=None, isSupported=None,):
+    def __init__(self, metadata = None, isSupported = None,):
         self.metadata = metadata
         self.isSupported = isSupported
 
@@ -19675,6 +20047,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19722,9 +20095,10 @@ class GetFileMetadataByExprRequest(object):
      - type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fileIds=None, expr=None, doGetFooters=None, type=None,):
+    def __init__(self, fileIds = None, expr = None, doGetFooters = None, type = None,):
         self.fileIds = fileIds
         self.expr = expr
         self.doGetFooters = doGetFooters
@@ -19770,6 +20144,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19822,9 +20197,10 @@ class GetFileMetadataResult(object):
      - isSupported
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, metadata=None, isSupported=None,):
+    def __init__(self, metadata = None, isSupported = None,):
         self.metadata = metadata
         self.isSupported = isSupported
 
@@ -19859,6 +20235,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19903,9 +20280,10 @@ class GetFileMetadataRequest(object):
      - fileIds
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fileIds=None,):
+    def __init__(self, fileIds = None,):
         self.fileIds = fileIds
 
     def read(self, iprot):
@@ -19933,6 +20311,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -19965,6 +20344,7 @@ def __ne__(self, other):
 
 
 class PutFileMetadataResult(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -19982,6 +20362,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20012,9 +20393,10 @@ class PutFileMetadataRequest(object):
      - type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fileIds=None, metadata=None, type=None,):
+    def __init__(self, fileIds = None, metadata = None, type = None,):
         self.fileIds = fileIds
         self.metadata = metadata
         self.type = type
@@ -20059,6 +20441,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20104,6 +20487,7 @@ def __ne__(self, other):
 
 
 class ClearFileMetadataResult(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -20121,6 +20505,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20149,9 +20534,10 @@ class ClearFileMetadataRequest(object):
      - fileIds
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fileIds=None,):
+    def __init__(self, fileIds = None,):
         self.fileIds = fileIds
 
     def read(self, iprot):
@@ -20179,6 +20565,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20216,9 +20603,10 @@ class CacheFileMetadataResult(object):
      - isSupported
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, isSupported=None,):
+    def __init__(self, isSupported = None,):
         self.isSupported = isSupported
 
     def read(self, iprot):
@@ -20241,6 +20629,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20278,9 +20667,10 @@ class CacheFileMetadataRequest(object):
      - isAllParts
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, partName=None, isAllParts=None,):
+    def __init__(self, dbName = None, tblName = None, partName = None, isAllParts = None,):
         self.dbName = dbName
         self.tblName = tblName
         self.partName = partName
@@ -20321,6 +20711,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20369,9 +20760,10 @@ class GetAllFunctionsResponse(object):
      - functions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, functions=None,):
+    def __init__(self, functions = None,):
         self.functions = functions
 
     def read(self, iprot):
@@ -20400,6 +20792,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20435,9 +20828,10 @@ class ClientCapabilities(object):
      - values
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, values=None,):
+    def __init__(self, values = None,):
         self.values = values
 
     def read(self, iprot):
@@ -20465,6 +20859,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20504,9 +20899,10 @@ class GetProjectionsSpec(object):
      - excludeParamKeyPattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fieldList=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
+    def __init__(self, fieldList = None, includeParamKeyPattern = None, excludeParamKeyPattern = None,):
         self.fieldList = fieldList
         self.includeParamKeyPattern = includeParamKeyPattern
         self.excludeParamKeyPattern = excludeParamKeyPattern
@@ -20546,6 +20942,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20598,9 +20995,10 @@ class GetTableRequest(object):
      - id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblName=None, capabilities=None, catName=None, validWriteIdList=None, getColumnStats=None, processorCapabilities=None, processorIdentifier=None, engine="hive", id=-1,):
+    def __init__(self, dbName = None, tblName = None, capabilities = None, catName = None, validWriteIdList = None, getColumnStats = None, processorCapabilities = None, processorIdentifier = None, engine = "hive", id = -1,):
         self.dbName = dbName
         self.tblName = tblName
         self.capabilities = capabilities
@@ -20683,6 +21081,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20759,9 +21158,10 @@ class GetTableResult(object):
      - isStatsCompliant
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, table=None, isStatsCompliant=None,):
+    def __init__(self, table = None, isStatsCompliant = None,):
         self.table = table
         self.isStatsCompliant = isStatsCompliant
 
@@ -20791,6 +21191,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20836,9 +21237,10 @@ class GetTablesRequest(object):
      - tablesPattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tblNames=None, capabilities=None, catName=None, processorCapabilities=None, processorIdentifier=None, projectionSpec=None, tablesPattern=None,):
+    def __init__(self, dbName = None, tblNames = None, capabilities = None, catName = None, processorCapabilities = None, processorIdentifier = None, projectionSpec = None, tablesPattern = None,):
         self.dbName = dbName
         self.tblNames = tblNames
         self.capabilities = capabilities
@@ -20915,6 +21317,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -20983,9 +21386,10 @@ class GetTablesResult(object):
      - tables
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tables=None,):
+    def __init__(self, tables = None,):
         self.tables = tables
 
     def read(self, iprot):
@@ -21014,6 +21418,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21057,9 +21462,10 @@ class GetTablesExtRequest(object):
      - processorIdentifier
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalog=None, database=None, tableNamePattern=None, requestedFields=None, limit=None, processorCapabilities=None, processorIdentifier=None,):
+    def __init__(self, catalog = None, database = None, tableNamePattern = None, requestedFields = None, limit = None, processorCapabilities = None, processorIdentifier = None,):
         self.catalog = catalog
         self.database = database
         self.tableNamePattern = tableNamePattern
@@ -21123,6 +21529,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21193,9 +21600,10 @@ class ExtendedTableInfo(object):
      - requiredWriteCapabilities
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, tblName=None, accessType=None, requiredReadCapabilities=None, requiredWriteCapabilities=None,):
+    def __init__(self, tblName = None, accessType = None, requiredReadCapabilities = None, requiredWriteCapabilities = None,):
         self.tblName = tblName
         self.accessType = accessType
         self.requiredReadCapabilities = requiredReadCapabilities
@@ -21246,6 +21654,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21306,9 +21715,10 @@ class DropTableRequest(object):
      - cancel
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalogName=None, dbName=None, tableName=None, deleteData=None, envContext=None, dropPartitions=None, id=None, asyncDrop=None, cancel=None,):
+    def __init__(self, catalogName = None, dbName = None, tableName = None, deleteData = None, envContext = None, dropPartitions = None, id = None, asyncDrop = None, cancel = None,):
         self.catalogName = catalogName
         self.dbName = dbName
         self.tableName = tableName
@@ -21380,6 +21790,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21450,9 +21861,10 @@ class AsyncOperationResp(object):
      - finished
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, id=None, message=None, finished=None,):
+    def __init__(self, id = None, message = None, finished = None,):
         self.id = id
         self.message = message
         self.finished = finished
@@ -21487,6 +21899,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21532,9 +21945,10 @@ class GetDatabaseRequest(object):
      - processorIdentifier
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, catalogName=None, processorCapabilities=None, processorIdentifier=None,):
+    def __init__(self, name = None, catalogName = None, processorCapabilities = None, processorIdentifier = None,):
         self.name = name
         self.catalogName = catalogName
         self.processorCapabilities = processorCapabilities
@@ -21580,6 +21994,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21628,9 +22043,10 @@ class AlterDatabaseRequest(object):
      - newDb
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, oldDbName=None, newDb=None,):
+    def __init__(self, oldDbName = None, newDb = None,):
         self.oldDbName = oldDbName
         self.newDb = newDb
 
@@ -21660,6 +22076,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21710,9 +22127,10 @@ class DropDatabaseRequest(object):
      - cancel
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, catalogName=None, ignoreUnknownDb=None, deleteData=None, cascade=None, softDelete=False, txnId=0, deleteManagedDir=True, id=None, asyncDrop=None, cancel=None,):
+    def __init__(self, name = None, catalogName = None, ignoreUnknownDb = None, deleteData = None, cascade = None, softDelete = False, txnId = 0, deleteManagedDir = True, id = None, asyncDrop = None, cancel = None,):
         self.name = name
         self.catalogName = catalogName
         self.ignoreUnknownDb = ignoreUnknownDb
@@ -21795,6 +22213,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21878,9 +22297,10 @@ class GetFunctionsRequest(object):
      - returnNames
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, catalogName=None, pattern=None, returnNames=True,):
+    def __init__(self, dbName = None, catalogName = None, pattern = None, returnNames = True,):
         self.dbName = dbName
         self.catalogName = catalogName
         self.pattern = pattern
@@ -21921,6 +22341,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -21968,9 +22389,10 @@ class GetFunctionsResponse(object):
      - functions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, function_names=None, functions=None,):
+    def __init__(self, function_names = None, functions = None,):
         self.function_names = function_names
         self.functions = functions
 
@@ -22010,6 +22432,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22053,9 +22476,10 @@ class CmRecycleRequest(object):
      - purge
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dataPath=None, purge=None,):
+    def __init__(self, dataPath = None, purge = None,):
         self.dataPath = dataPath
         self.purge = purge
 
@@ -22084,6 +22508,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22119,6 +22544,7 @@ def __ne__(self, other):
 
 
 class CmRecycleResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -22136,6 +22562,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22170,9 +22597,10 @@ class TableMeta(object):
      - ownerType
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, dbName=None, tableName=None, tableType=None, comments=None, catName=None, ownerName=None, ownerType=None,):
+    def __init__(self, dbName = None, tableName = None, tableType = None, comments = None, catName = None, ownerName = None, ownerType = None,):
         self.dbName = dbName
         self.tableName = tableName
         self.tableType = tableType
@@ -22231,6 +22659,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22294,9 +22723,10 @@ class Materialization(object):
      - sourceTablesCompacted
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, sourceTablesUpdateDeleteModified=None, sourceTablesCompacted=None,):
+    def __init__(self, sourceTablesUpdateDeleteModified = None, sourceTablesCompacted = None,):
         self.sourceTablesUpdateDeleteModified = sourceTablesUpdateDeleteModified
         self.sourceTablesCompacted = sourceTablesCompacted
 
@@ -22325,6 +22755,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22369,9 +22800,10 @@ class WMResourcePlan(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, status=None, queryParallelism=None, defaultPoolPath=None, ns=None,):
+    def __init__(self, name = None, status = None, queryParallelism = None, defaultPoolPath = None, ns = None,):
         self.name = name
         self.status = status
         self.queryParallelism = queryParallelism
@@ -22418,6 +22850,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22474,9 +22907,10 @@ class WMNullableResourcePlan(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, status=None, queryParallelism=None, isSetQueryParallelism=None, defaultPoolPath=None, isSetDefaultPoolPath=None, ns=None,):
+    def __init__(self, name = None, status = None, queryParallelism = None, isSetQueryParallelism = None, defaultPoolPath = None, isSetDefaultPoolPath = None, ns = None,):
         self.name = name
         self.status = status
         self.queryParallelism = queryParallelism
@@ -22535,6 +22969,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22596,9 +23031,10 @@ class WMPool(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, poolPath=None, allocFraction=None, queryParallelism=None, schedulingPolicy=None, ns=None,):
+    def __init__(self, resourcePlanName = None, poolPath = None, allocFraction = None, queryParallelism = None, schedulingPolicy = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.poolPath = poolPath
         self.allocFraction = allocFraction
@@ -22651,6 +23087,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22713,9 +23150,10 @@ class WMNullablePool(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, poolPath=None, allocFraction=None, queryParallelism=None, schedulingPolicy=None, isSetSchedulingPolicy=None, ns=None,):
+    def __init__(self, resourcePlanName = None, poolPath = None, allocFraction = None, queryParallelism = None, schedulingPolicy = None, isSetSchedulingPolicy = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.poolPath = poolPath
         self.allocFraction = allocFraction
@@ -22774,6 +23212,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22839,9 +23278,10 @@ class WMTrigger(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, triggerName=None, triggerExpression=None, actionExpression=None, isInUnmanaged=None, ns=None,):
+    def __init__(self, resourcePlanName = None, triggerName = None, triggerExpression = None, actionExpression = None, isInUnmanaged = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.triggerName = triggerName
         self.triggerExpression = triggerExpression
@@ -22894,6 +23334,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -22955,9 +23396,10 @@ class WMMapping(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, entityType=None, entityName=None, poolPath=None, ordering=None, ns=None,):
+    def __init__(self, resourcePlanName = None, entityType = None, entityName = None, poolPath = None, ordering = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.entityType = entityType
         self.entityName = entityName
@@ -23010,6 +23452,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23070,9 +23513,10 @@ class WMPoolTrigger(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, pool=None, trigger=None, ns=None,):
+    def __init__(self, pool = None, trigger = None, ns = None,):
         self.pool = pool
         self.trigger = trigger
         self.ns = ns
@@ -23107,6 +23551,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23155,9 +23600,10 @@ class WMFullResourcePlan(object):
      - poolTriggers
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, plan=None, pools=None, mappings=None, triggers=None, poolTriggers=None,):
+    def __init__(self, plan = None, pools = None, mappings = None, triggers = None, poolTriggers = None,):
         self.plan = plan
         self.pools = pools
         self.mappings = mappings
@@ -23229,6 +23675,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23294,9 +23741,10 @@ class WMCreateResourcePlanRequest(object):
      - copyFrom
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlan=None, copyFrom=None,):
+    def __init__(self, resourcePlan = None, copyFrom = None,):
         self.resourcePlan = resourcePlan
         self.copyFrom = copyFrom
 
@@ -23326,6 +23774,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23357,6 +23806,7 @@ def __ne__(self, other):
 
 
 class WMCreateResourcePlanResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -23374,6 +23824,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23402,9 +23853,10 @@ class WMGetActiveResourcePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, ns=None,):
+    def __init__(self, ns = None,):
         self.ns = ns
 
     def read(self, iprot):
@@ -23427,6 +23879,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23459,9 +23912,10 @@ class WMGetActiveResourcePlanResponse(object):
      - resourcePlan
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlan=None,):
+    def __init__(self, resourcePlan = None,):
         self.resourcePlan = resourcePlan
 
     def read(self, iprot):
@@ -23485,6 +23939,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23518,9 +23973,10 @@ class WMGetResourcePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, ns=None,):
+    def __init__(self, resourcePlanName = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.ns = ns
 
@@ -23549,6 +24005,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23585,9 +24042,10 @@ class WMGetResourcePlanResponse(object):
      - resourcePlan
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlan=None,):
+    def __init__(self, resourcePlan = None,):
         self.resourcePlan = resourcePlan
 
     def read(self, iprot):
@@ -23611,6 +24069,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23643,9 +24102,10 @@ class WMGetAllResourcePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, ns=None,):
+    def __init__(self, ns = None,):
         self.ns = ns
 
     def read(self, iprot):
@@ -23668,6 +24128,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23700,9 +24161,10 @@ class WMGetAllResourcePlanResponse(object):
      - resourcePlans
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlans=None,):
+    def __init__(self, resourcePlans = None,):
         self.resourcePlans = resourcePlans
 
     def read(self, iprot):
@@ -23731,6 +24193,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23771,9 +24234,10 @@ class WMAlterResourcePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, resourcePlan=None, isEnableAndActivate=None, isForceDeactivate=None, isReplace=None, ns=None,):
+    def __init__(self, resourcePlanName = None, resourcePlan = None, isEnableAndActivate = None, isForceDeactivate = None, isReplace = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.resourcePlan = resourcePlan
         self.isEnableAndActivate = isEnableAndActivate
@@ -23827,6 +24291,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23879,9 +24344,10 @@ class WMAlterResourcePlanResponse(object):
      - fullResourcePlan
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fullResourcePlan=None,):
+    def __init__(self, fullResourcePlan = None,):
         self.fullResourcePlan = fullResourcePlan
 
     def read(self, iprot):
@@ -23905,6 +24371,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -23938,9 +24405,10 @@ class WMValidateResourcePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, ns=None,):
+    def __init__(self, resourcePlanName = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.ns = ns
 
@@ -23969,6 +24437,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24006,9 +24475,10 @@ class WMValidateResourcePlanResponse(object):
      - warnings
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, errors=None, warnings=None,):
+    def __init__(self, errors = None, warnings = None,):
         self.errors = errors
         self.warnings = warnings
 
@@ -24047,6 +24517,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24090,9 +24561,10 @@ class WMDropResourcePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, ns=None,):
+    def __init__(self, resourcePlanName = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.ns = ns
 
@@ -24121,6 +24593,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24152,6 +24625,7 @@ def __ne__(self, other):
 
 
 class WMDropResourcePlanResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24169,6 +24643,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24197,9 +24672,10 @@ class WMCreateTriggerRequest(object):
      - trigger
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, trigger=None,):
+    def __init__(self, trigger = None,):
         self.trigger = trigger
 
     def read(self, iprot):
@@ -24223,6 +24699,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24250,6 +24727,7 @@ def __ne__(self, other):
 
 
 class WMCreateTriggerResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24267,6 +24745,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24295,9 +24774,10 @@ class WMAlterTriggerRequest(object):
      - trigger
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, trigger=None,):
+    def __init__(self, trigger = None,):
         self.trigger = trigger
 
     def read(self, iprot):
@@ -24321,6 +24801,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24348,6 +24829,7 @@ def __ne__(self, other):
 
 
 class WMAlterTriggerResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24365,6 +24847,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24395,9 +24878,10 @@ class WMDropTriggerRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, triggerName=None, ns=None,):
+    def __init__(self, resourcePlanName = None, triggerName = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.triggerName = triggerName
         self.ns = ns
@@ -24432,6 +24916,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24467,6 +24952,7 @@ def __ne__(self, other):
 
 
 class WMDropTriggerResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24484,6 +24970,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24513,9 +25000,10 @@ class WMGetTriggersForResourePlanRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, ns=None,):
+    def __init__(self, resourcePlanName = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.ns = ns
 
@@ -24544,6 +25032,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24580,9 +25069,10 @@ class WMGetTriggersForResourePlanResponse(object):
      - triggers
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, triggers=None,):
+    def __init__(self, triggers = None,):
         self.triggers = triggers
 
     def read(self, iprot):
@@ -24611,6 +25101,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24646,9 +25137,10 @@ class WMCreatePoolRequest(object):
      - pool
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, pool=None,):
+    def __init__(self, pool = None,):
         self.pool = pool
 
     def read(self, iprot):
@@ -24672,6 +25164,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24699,6 +25192,7 @@ def __ne__(self, other):
 
 
 class WMCreatePoolResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24716,6 +25210,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24745,9 +25240,10 @@ class WMAlterPoolRequest(object):
      - poolPath
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, pool=None, poolPath=None,):
+    def __init__(self, pool = None, poolPath = None,):
         self.pool = pool
         self.poolPath = poolPath
 
@@ -24777,6 +25273,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24808,6 +25305,7 @@ def __ne__(self, other):
 
 
 class WMAlterPoolResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24825,6 +25323,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24855,9 +25354,10 @@ class WMDropPoolRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, poolPath=None, ns=None,):
+    def __init__(self, resourcePlanName = None, poolPath = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.poolPath = poolPath
         self.ns = ns
@@ -24892,6 +25392,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24927,6 +25428,7 @@ def __ne__(self, other):
 
 
 class WMDropPoolResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -24944,6 +25446,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -24973,9 +25476,10 @@ class WMCreateOrUpdateMappingRequest(object):
      - update
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, mapping=None, update=None,):
+    def __init__(self, mapping = None, update = None,):
         self.mapping = mapping
         self.update = update
 
@@ -25005,6 +25509,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25036,6 +25541,7 @@ def __ne__(self, other):
 
 
 class WMCreateOrUpdateMappingResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -25053,6 +25559,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25081,9 +25588,10 @@ class WMDropMappingRequest(object):
      - mapping
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, mapping=None,):
+    def __init__(self, mapping = None,):
         self.mapping = mapping
 
     def read(self, iprot):
@@ -25107,6 +25615,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25134,6 +25643,7 @@ def __ne__(self, other):
 
 
 class WMDropMappingResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -25151,6 +25661,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25183,9 +25694,10 @@ class WMCreateOrDropTriggerToPoolMappingRequest(object):
      - ns
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, resourcePlanName=None, triggerName=None, poolPath=None, drop=None, ns=None,):
+    def __init__(self, resourcePlanName = None, triggerName = None, poolPath = None, drop = None, ns = None,):
         self.resourcePlanName = resourcePlanName
         self.triggerName = triggerName
         self.poolPath = poolPath
@@ -25232,6 +25744,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25275,6 +25788,7 @@ def __ne__(self, other):
 
 
 class WMCreateOrDropTriggerToPoolMappingResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -25292,6 +25806,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25328,9 +25843,10 @@ class ISchema(object):
      - description
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaType=None, name=None, catName=None, dbName=None, compatibility=None, validationLevel=None, canEvolve=None, schemaGroup=None, description=None,):
+    def __init__(self, schemaType = None, name = None, catName = None, dbName = None, compatibility = None, validationLevel = None, canEvolve = None, schemaGroup = None, description = None,):
         self.schemaType = schemaType
         self.name = name
         self.catName = catName
@@ -25401,6 +25917,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25467,9 +25984,10 @@ class ISchemaName(object):
      - schemaName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, schemaName=None,):
+    def __init__(self, catName = None, dbName = None, schemaName = None,):
         self.catName = catName
         self.dbName = dbName
         self.schemaName = schemaName
@@ -25504,6 +26022,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25545,9 +26064,10 @@ class AlterISchemaRequest(object):
      - newSchema
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, newSchema=None,):
+    def __init__(self, name = None, newSchema = None,):
         self.name = name
         self.newSchema = newSchema
 
@@ -25578,6 +26098,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25623,9 +26144,10 @@ class SchemaVersion(object):
      - serDe
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schema=None, version=None, createdAt=None, cols=None, state=None, description=None, schemaText=None, fingerprint=None, name=None, serDe=None,):
+    def __init__(self, schema = None, version = None, createdAt = None, cols = None, state = None, description = None, schemaText = None, fingerprint = None, name = None, serDe = None,):
         self.schema = schema
         self.version = version
         self.createdAt = createdAt
@@ -25710,6 +26232,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25782,9 +26305,10 @@ class SchemaVersionDescriptor(object):
      - version
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schema=None, version=None,):
+    def __init__(self, schema = None, version = None,):
         self.schema = schema
         self.version = version
 
@@ -25814,6 +26338,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25852,9 +26377,10 @@ class FindSchemasByColsRqst(object):
      - type
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, colName=None, colNamespace=None, type=None,):
+    def __init__(self, colName = None, colNamespace = None, type = None,):
         self.colName = colName
         self.colNamespace = colNamespace
         self.type = type
@@ -25889,6 +26415,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25929,9 +26456,10 @@ class FindSchemasByColsResp(object):
      - schemaVersions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaVersions=None,):
+    def __init__(self, schemaVersions = None,):
         self.schemaVersions = schemaVersions
 
     def read(self, iprot):
@@ -25960,6 +26488,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -25996,9 +26525,10 @@ class MapSchemaVersionToSerdeRequest(object):
      - serdeName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaVersion=None, serdeName=None,):
+    def __init__(self, schemaVersion = None, serdeName = None,):
         self.schemaVersion = schemaVersion
         self.serdeName = serdeName
 
@@ -26028,6 +26558,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26065,9 +26596,10 @@ class SetSchemaVersionStateRequest(object):
      - state
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, schemaVersion=None, state=None,):
+    def __init__(self, schemaVersion = None, state = None,):
         self.schemaVersion = schemaVersion
         self.state = state
 
@@ -26097,6 +26629,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26133,9 +26666,10 @@ class GetSerdeRequest(object):
      - serdeName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, serdeName=None,):
+    def __init__(self, serdeName = None,):
         self.serdeName = serdeName
 
     def read(self, iprot):
@@ -26158,6 +26692,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26192,9 +26727,10 @@ class RuntimeStat(object):
      - payload
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, createTime=None, weight=None, payload=None,):
+    def __init__(self, createTime = None, weight = None, payload = None,):
         self.createTime = createTime
         self.weight = weight
         self.payload = payload
@@ -26229,6 +26765,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26274,9 +26811,10 @@ class GetRuntimeStatsRequest(object):
      - maxCreateTime
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, maxWeight=None, maxCreateTime=None,):
+    def __init__(self, maxWeight = None, maxCreateTime = None,):
         self.maxWeight = maxWeight
         self.maxCreateTime = maxCreateTime
 
@@ -26305,6 +26843,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26354,9 +26893,10 @@ class CreateTableRequest(object):
      - processorIdentifier
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, table=None, envContext=None, primaryKeys=None, foreignKeys=None, uniqueConstraints=None, notNullConstraints=None, defaultConstraints=None, checkConstraints=None, processorCapabilities=None, processorIdentifier=None,):
+    def __init__(self, table = None, envContext = None, primaryKeys = None, foreignKeys = None, uniqueConstraints = None, notNullConstraints = None, defaultConstraints = None, checkConstraints = None, processorCapabilities = None, processorIdentifier = None,):
         self.table = table
         self.envContext = envContext
         self.primaryKeys = primaryKeys
@@ -26476,6 +27016,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26579,9 +27120,10 @@ class CreateDatabaseRequest(object):
      - remote_dbname
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, databaseName=None, description=None, locationUri=None, parameters=None, privileges=None, ownerName=None, ownerType=None, catalogName=None, createTime=None, managedLocationUri=None, type=None, dataConnectorName=None, remote_dbname=None,):
+    def __init__(self, databaseName = None, description = None, locationUri = None, parameters = None, privileges = None, ownerName = None, ownerType = None, catalogName = None, createTime = None, managedLocationUri = None, type = None, dataConnectorName = None, remote_dbname = None,):
         self.databaseName = databaseName
         self.description = description
         self.locationUri = locationUri
@@ -26683,6 +27225,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26769,9 +27312,10 @@ class CreateDataConnectorRequest(object):
      - connector
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, connector=None,):
+    def __init__(self, connector = None,):
         self.connector = connector
 
     def read(self, iprot):
@@ -26795,6 +27339,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26829,9 +27374,10 @@ class GetDataConnectorRequest(object):
      - connectorName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, connectorName=None,):
+    def __init__(self, connectorName = None,):
         self.connectorName = connectorName
 
     def read(self, iprot):
@@ -26854,6 +27400,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26889,9 +27436,10 @@ class AlterDataConnectorRequest(object):
      - newConnector
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, connectorName=None, newConnector=None,):
+    def __init__(self, connectorName = None, newConnector = None,):
         self.connectorName = connectorName
         self.newConnector = newConnector
 
@@ -26921,6 +27469,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -26963,9 +27512,10 @@ class DropDataConnectorRequest(object):
      - checkReferences
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, connectorName=None, ifNotExists=None, checkReferences=None,):
+    def __init__(self, connectorName = None, ifNotExists = None, checkReferences = None,):
         self.connectorName = connectorName
         self.ifNotExists = ifNotExists
         self.checkReferences = checkReferences
@@ -27000,6 +27550,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27042,9 +27593,10 @@ class ScheduledQueryPollRequest(object):
      - clusterNamespace
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, clusterNamespace=None,):
+    def __init__(self, clusterNamespace = None,):
         self.clusterNamespace = clusterNamespace
 
     def read(self, iprot):
@@ -27067,6 +27619,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27102,9 +27655,10 @@ class ScheduledQueryKey(object):
      - clusterNamespace
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduleName=None, clusterNamespace=None,):
+    def __init__(self, scheduleName = None, clusterNamespace = None,):
         self.scheduleName = scheduleName
         self.clusterNamespace = clusterNamespace
 
@@ -27133,6 +27687,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27176,9 +27731,10 @@ class ScheduledQueryPollResponse(object):
      - user
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduleKey=None, executionId=None, query=None, user=None,):
+    def __init__(self, scheduleKey = None, executionId = None, query = None, user = None,):
         self.scheduleKey = scheduleKey
         self.executionId = executionId
         self.query = query
@@ -27220,6 +27776,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27269,9 +27826,10 @@ class ScheduledQuery(object):
      - nextExecution
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduleKey=None, enabled=None, schedule=None, user=None, query=None, nextExecution=None,):
+    def __init__(self, scheduleKey = None, enabled = None, schedule = None, user = None, query = None, nextExecution = None,):
         self.scheduleKey = scheduleKey
         self.enabled = enabled
         self.schedule = schedule
@@ -27325,6 +27883,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27380,9 +27939,10 @@ class ScheduledQueryMaintenanceRequest(object):
      - scheduledQuery
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, type=None, scheduledQuery=None,):
+    def __init__(self, type = None, scheduledQuery = None,):
         self.type = type
         self.scheduledQuery = scheduledQuery
 
@@ -27412,6 +27972,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27455,9 +28016,10 @@ class ScheduledQueryProgressInfo(object):
      - errorMessage
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduledExecutionId=None, state=None, executorQueryId=None, errorMessage=None,):
+    def __init__(self, scheduledExecutionId = None, state = None, executorQueryId = None, errorMessage = None,):
         self.scheduledExecutionId = scheduledExecutionId
         self.state = state
         self.executorQueryId = executorQueryId
@@ -27498,6 +28060,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27556,9 +28119,10 @@ class AlterPartitionsRequest(object):
      - partitionColSchema
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tableName=None, partitions=None, environmentContext=None, writeId=-1, validWriteIdList=None, skipColumnSchemaForPartition=None, partitionColSchema=None,):
+    def __init__(self, catName = None, dbName = None, tableName = None, partitions = None, environmentContext = None, writeId = -1, validWriteIdList = None, skipColumnSchemaForPartition = None, partitionColSchema = None,):
         self.catName = catName
         self.dbName = dbName
         self.tableName = tableName
@@ -27642,6 +28206,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27723,9 +28288,10 @@ class AppendPartitionsRequest(object):
      - environmentContext
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catalogName=None, dbName=None, tableName=None, name=None, partVals=None, environmentContext=None,):
+    def __init__(self, catalogName = None, dbName = None, tableName = None, name = None, partVals = None, environmentContext = None,):
         self.catalogName = catalogName
         self.dbName = dbName
         self.tableName = tableName
@@ -27784,6 +28350,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27838,6 +28405,7 @@ def __ne__(self, other):
 
 
 class AlterPartitionsResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -27855,6 +28423,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -27890,9 +28459,10 @@ class RenamePartitionRequest(object):
      - clonePart
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tableName=None, partVals=None, newPart=None, validWriteIdList=None, txnId=None, clonePart=None,):
+    def __init__(self, catName = None, dbName = None, tableName = None, partVals = None, newPart = None, validWriteIdList = None, txnId = None, clonePart = None,):
         self.catName = catName
         self.dbName = dbName
         self.tableName = tableName
@@ -27963,6 +28533,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28029,6 +28600,7 @@ def __ne__(self, other):
 
 
 class RenamePartitionResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -28046,6 +28618,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28084,9 +28657,10 @@ class AlterTableRequest(object):
      - expectedParameterValue
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tableName=None, table=None, environmentContext=None, writeId=-1, validWriteIdList=None, processorCapabilities=None, processorIdentifier=None, expectedParameterKey=None, expectedParameterValue=None,):
+    def __init__(self, catName = None, dbName = None, tableName = None, table = None, environmentContext = None, writeId = -1, validWriteIdList = None, processorCapabilities = None, processorIdentifier = None, expectedParameterKey = None, expectedParameterValue = None,):
         self.catName = catName
         self.dbName = dbName
         self.tableName = tableName
@@ -28176,6 +28750,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28252,6 +28827,7 @@ def __ne__(self, other):
 
 
 class AlterTableResponse(object):
+    thrift_spec = None
 
 
     def read(self, iprot):
@@ -28269,6 +28845,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28302,9 +28879,10 @@ class TableParamsUpdate(object):
      - expected_param_value
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cat_name=None, db_name=None, table_name=None, params=None, expected_param_key=None, expected_param_value=None,):
+    def __init__(self, cat_name = None, db_name = None, table_name = None, params = None, expected_param_key = None, expected_param_value = None,):
         self.cat_name = cat_name
         self.db_name = db_name
         self.table_name = table_name
@@ -28363,6 +28941,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28426,9 +29005,10 @@ class GetPartitionsFilterSpec(object):
      - filters
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, filterMode=None, filters=None,):
+    def __init__(self, filterMode = None, filters = None,):
         self.filterMode = filterMode
         self.filters = filters
 
@@ -28462,6 +29042,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28501,9 +29082,10 @@ class GetPartitionsResponse(object):
      - partitionSpec
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitionSpec=None,):
+    def __init__(self, partitionSpec = None,):
         self.partitionSpec = partitionSpec
 
     def read(self, iprot):
@@ -28532,6 +29114,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28577,9 +29160,10 @@ class GetPartitionsRequest(object):
      - validWriteIdList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, withAuth=None, user=None, groupNames=None, projectionSpec=None, filterSpec=None, processorCapabilities=None, processorIdentifier=None, validWriteIdList=None,):
+    def __init__(self, catName = None, dbName = None, tblName = None, withAuth = None, user = None, groupNames = None, projectionSpec = None, filterSpec = None, processorCapabilities = None, processorIdentifier = None, validWriteIdList = None,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -28674,6 +29258,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28757,9 +29342,10 @@ class GetFieldsRequest(object):
      - id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, envContext=None, validWriteIdList=None, id=-1,):
+    def __init__(self, catName = None, dbName = None, tblName = None, envContext = None, validWriteIdList = None, id = -1,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -28813,6 +29399,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28869,9 +29456,10 @@ class GetFieldsResponse(object):
      - fields
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fields=None,):
+    def __init__(self, fields = None,):
         self.fields = fields
 
     def read(self, iprot):
@@ -28900,6 +29488,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -28942,9 +29531,10 @@ class GetSchemaRequest(object):
      - id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, envContext=None, validWriteIdList=None, id=-1,):
+    def __init__(self, catName = None, dbName = None, tblName = None, envContext = None, validWriteIdList = None, id = -1,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -28998,6 +29588,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29054,9 +29645,10 @@ class GetSchemaResponse(object):
      - fields
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, fields=None,):
+    def __init__(self, fields = None,):
         self.fields = fields
 
     def read(self, iprot):
@@ -29085,6 +29677,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29127,9 +29720,10 @@ class GetPartitionRequest(object):
      - id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, partVals=None, validWriteIdList=None, id=-1,):
+    def __init__(self, catName = None, dbName = None, tblName = None, partVals = None, validWriteIdList = None, id = -1,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -29187,6 +29781,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29248,9 +29843,10 @@ class GetPartitionResponse(object):
      - partition
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partition=None,):
+    def __init__(self, partition = None,):
         self.partition = partition
 
     def read(self, iprot):
@@ -29274,6 +29870,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29316,9 +29913,10 @@ class PartitionsRequest(object):
      - excludeParamKeyPattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, maxParts=-1, validWriteIdList=None, id=-1, skipColumnSchemaForPartition=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
+    def __init__(self, catName = None, dbName = None, tblName = None, maxParts = -1, validWriteIdList = None, id = -1, skipColumnSchemaForPartition = None, includeParamKeyPattern = None, excludeParamKeyPattern = None,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -29389,6 +29987,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29457,9 +30056,10 @@ class PartitionsResponse(object):
      - partitions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None,):
+    def __init__(self, partitions = None,):
         self.partitions = partitions
 
     def read(self, iprot):
@@ -29488,6 +30088,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29532,9 +30133,10 @@ class GetPartitionsByFilterRequest(object):
      - excludeParamKeyPattern
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, filter=None, maxParts=-1, skipColumnSchemaForPartition=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
+    def __init__(self, catName = None, dbName = None, tblName = None, filter = None, maxParts = -1, skipColumnSchemaForPartition = None, includeParamKeyPattern = None, excludeParamKeyPattern = None,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -29599,6 +30201,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29665,9 +30268,10 @@ class GetPartitionNamesPsRequest(object):
      - id
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, partValues=None, maxParts=-1, validWriteIdList=None, id=-1,):
+    def __init__(self, catName = None, dbName = None, tblName = None, partValues = None, maxParts = -1, validWriteIdList = None, id = -1,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -29731,6 +30335,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29794,9 +30399,10 @@ class GetPartitionNamesPsResponse(object):
      - names
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, names=None,):
+    def __init__(self, names = None,):
         self.names = names
 
     def read(self, iprot):
@@ -29824,6 +30430,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -29873,9 +30480,10 @@ class GetPartitionsPsWithAuthRequest(object):
      - partNames
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, tblName=None, partVals=None, maxParts=-1, userName=None, groupNames=None, validWriteIdList=None, id=-1, skipColumnSchemaForPartition=None, includeParamKeyPattern=None, excludeParamKeyPattern=None, partNames=None,):
+    def __init__(self, catName = None, dbName = None, tblName = None, partVals = None, maxParts = -1, userName = None, groupNames = None, validWriteIdList = None, id = -1, skipColumnSchemaForPartition = None, includeParamKeyPattern = None, excludeParamKeyPattern = None, partNames = None,):
         self.catName = catName
         self.dbName = dbName
         self.tblName = tblName
@@ -29985,6 +30593,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30078,9 +30687,10 @@ class GetPartitionsPsWithAuthResponse(object):
      - partitions
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, partitions=None,):
+    def __init__(self, partitions = None,):
         self.partitions = partitions
 
     def read(self, iprot):
@@ -30109,6 +30719,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30151,9 +30762,10 @@ class ReplicationMetrics(object):
      - messageFormat
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduledExecutionId=None, policy=None, dumpExecutionId=None, metadata=None, progress=None, messageFormat=None,):
+    def __init__(self, scheduledExecutionId = None, policy = None, dumpExecutionId = None, metadata = None, progress = None, messageFormat = None,):
         self.scheduledExecutionId = scheduledExecutionId
         self.policy = policy
         self.dumpExecutionId = dumpExecutionId
@@ -30206,6 +30818,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30264,9 +30877,10 @@ class ReplicationMetricList(object):
      - replicationMetricList
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, replicationMetricList=None,):
+    def __init__(self, replicationMetricList = None,):
         self.replicationMetricList = replicationMetricList
 
     def read(self, iprot):
@@ -30295,6 +30909,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30334,9 +30949,10 @@ class GetReplicationMetricsRequest(object):
      - dumpExecutionId
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, scheduledExecutionId=None, policy=None, dumpExecutionId=None,):
+    def __init__(self, scheduledExecutionId = None, policy = None, dumpExecutionId = None,):
         self.scheduledExecutionId = scheduledExecutionId
         self.policy = policy
         self.dumpExecutionId = dumpExecutionId
@@ -30371,6 +30987,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30411,9 +31028,10 @@ class GetOpenTxnsRequest(object):
      - excludeTxnTypes
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, excludeTxnTypes=None,):
+    def __init__(self, excludeTxnTypes = None,):
         self.excludeTxnTypes = excludeTxnTypes
 
     def read(self, iprot):
@@ -30441,6 +31059,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30478,9 +31097,10 @@ class StoredProcedureRequest(object):
      - procName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, procName=None,):
+    def __init__(self, catName = None, dbName = None, procName = None,):
         self.catName = catName
         self.dbName = dbName
         self.procName = procName
@@ -30515,6 +31135,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30562,9 +31183,10 @@ class ListStoredProcedureRequest(object):
      - dbName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None,):
+    def __init__(self, catName = None, dbName = None,):
         self.catName = catName
         self.dbName = dbName
 
@@ -30593,6 +31215,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30635,9 +31258,10 @@ class StoredProcedure(object):
      - source
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, name=None, dbName=None, catName=None, ownerName=None, source=None,):
+    def __init__(self, name = None, dbName = None, catName = None, ownerName = None, source = None,):
         self.name = name
         self.dbName = dbName
         self.catName = catName
@@ -30684,6 +31308,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30737,9 +31362,10 @@ class AddPackageRequest(object):
      - body
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, packageName=None, ownerName=None, header=None, body=None,):
+    def __init__(self, catName = None, dbName = None, packageName = None, ownerName = None, header = None, body = None,):
         self.catName = catName
         self.dbName = dbName
         self.packageName = packageName
@@ -30792,6 +31418,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30846,9 +31473,10 @@ class GetPackageRequest(object):
      - packageName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, packageName=None,):
+    def __init__(self, catName = None, dbName = None, packageName = None,):
         self.catName = catName
         self.dbName = dbName
         self.packageName = packageName
@@ -30883,6 +31511,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -30931,9 +31560,10 @@ class DropPackageRequest(object):
      - packageName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, packageName=None,):
+    def __init__(self, catName = None, dbName = None, packageName = None,):
         self.catName = catName
         self.dbName = dbName
         self.packageName = packageName
@@ -30968,6 +31598,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31015,9 +31646,10 @@ class ListPackageRequest(object):
      - dbName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None,):
+    def __init__(self, catName = None, dbName = None,):
         self.catName = catName
         self.dbName = dbName
 
@@ -31046,6 +31678,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31089,9 +31722,10 @@ class Package(object):
      - body
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, catName=None, dbName=None, packageName=None, ownerName=None, header=None, body=None,):
+    def __init__(self, catName = None, dbName = None, packageName = None, ownerName = None, header = None, body = None,):
         self.catName = catName
         self.dbName = dbName
         self.packageName = packageName
@@ -31144,6 +31778,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31198,9 +31833,10 @@ class GetAllWriteEventInfoRequest(object):
      - tableName
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, txnId=None, dbName=None, tableName=None,):
+    def __init__(self, txnId = None, dbName = None, tableName = None,):
         self.txnId = txnId
         self.dbName = dbName
         self.tableName = tableName
@@ -31235,6 +31871,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31283,9 +31920,10 @@ class DeleteColumnStatisticsRequest(object):
      - tableLevel
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, cat_name=None, db_name=None, tbl_name=None, part_names=None, col_names=None, engine="hive", tableLevel=False,):
+    def __init__(self, cat_name = None, db_name = None, tbl_name = None, part_names = None, col_names = None, engine = "hive", tableLevel = False,):
         self.cat_name = cat_name
         self.db_name = db_name
         self.tbl_name = tbl_name
@@ -31354,6 +31992,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31420,9 +32059,10 @@ class ReplayedTxnsForPolicyResult(object):
      - replTxnMapEntry
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, replTxnMapEntry=None,):
+    def __init__(self, replTxnMapEntry = None,):
         self.replTxnMapEntry = replTxnMapEntry
 
     def read(self, iprot):
@@ -31451,6 +32091,7 @@ def read(self, iprot):
         iprot.readStructEnd()
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31487,9 +32128,10 @@ class MetaException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(MetaException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31525,6 +32167,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31560,9 +32203,10 @@ class UnknownTableException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(UnknownTableException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31598,6 +32242,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31633,9 +32278,10 @@ class UnknownDBException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(UnknownDBException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31671,6 +32317,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31706,9 +32353,10 @@ class AlreadyExistsException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(AlreadyExistsException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31744,6 +32392,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31779,9 +32428,10 @@ class InvalidPartitionException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(InvalidPartitionException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31817,6 +32467,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31852,9 +32503,10 @@ class UnknownPartitionException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(UnknownPartitionException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31890,6 +32542,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31925,9 +32578,10 @@ class InvalidObjectException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(InvalidObjectException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -31963,6 +32617,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -31998,9 +32653,10 @@ class NoSuchObjectException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(NoSuchObjectException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32036,6 +32692,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32071,9 +32728,10 @@ class InvalidOperationException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(InvalidOperationException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32109,6 +32767,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32144,9 +32803,10 @@ class ConfigValSecurityException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(ConfigValSecurityException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32182,6 +32842,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32217,9 +32878,10 @@ class InvalidInputException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(InvalidInputException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32255,6 +32917,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32290,9 +32953,10 @@ class NoSuchTxnException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(NoSuchTxnException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32328,6 +32992,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32363,9 +33028,10 @@ class TxnAbortedException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(TxnAbortedException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32401,6 +33067,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32436,9 +33103,10 @@ class TxnOpenException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(TxnOpenException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32474,6 +33142,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32509,9 +33178,10 @@ class NoSuchLockException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(NoSuchLockException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32547,6 +33217,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32582,9 +33253,10 @@ class CompactionAbortedException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(CompactionAbortedException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32620,6 +33292,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -32655,9 +33328,10 @@ class NoSuchCompactionException(TException):
      - message
 
     """
+    thrift_spec = None
 
 
-    def __init__(self, message=None,):
+    def __init__(self, message = None,):
         super(NoSuchCompactionException, self).__setattr__('message', message)
 
     def __setattr__(self, *args):
@@ -32693,6 +33367,7 @@ def read(cls, iprot):
         )
 
     def write(self, oprot):
+        self.validate()
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
@@ -33259,7 +33934,7 @@ def __ne__(self, other):
     (15, TType.BOOL, 'rewriteEnabled', None, None, ),  # 15
     (16, TType.STRUCT, 'creationMetadata', [CreationMetadata, None], None, ),  # 16
     (17, TType.STRING, 'catName', 'UTF8', None, ),  # 17
-    (18, TType.I32, 'ownerType', None, 1, ),  # 18
+    (18, TType.I32, 'ownerType', None,     1, ),  # 18
     (19, TType.I64, 'writeId', None, -1, ),  # 19
     (20, TType.BOOL, 'isStatsCompliant', None, None, ),  # 20
     (21, TType.STRUCT, 'colStats', [ColumnStatistics, None], None, ),  # 21
@@ -33719,7 +34394,7 @@ def __ne__(self, other):
     (4, TType.STRING, 'agentInfo', 'UTF8', "Unknown", ),  # 4
     (5, TType.STRING, 'replPolicy', 'UTF8', None, ),  # 5
     (6, TType.LIST, 'replSrcTxnIds', (TType.I64, None, False), None, ),  # 6
-    (7, TType.I32, 'txn_type', None, 0, ),  # 7
+    (7, TType.I32, 'txn_type', None,     0, ),  # 7
 )
 all_structs.append(OpenTxnsResponse)
 OpenTxnsResponse.thrift_spec = (
@@ -33869,7 +34544,7 @@ def __ne__(self, other):
     (3, TType.STRING, 'dbname', 'UTF8', None, ),  # 3
     (4, TType.STRING, 'tablename', 'UTF8', None, ),  # 4
     (5, TType.STRING, 'partitionname', 'UTF8', None, ),  # 5
-    (6, TType.I32, 'operationType', None, 5, ),  # 6
+    (6, TType.I32, 'operationType', None,     5, ),  # 6
     (7, TType.BOOL, 'isTransactional', None, False, ),  # 7
     (8, TType.BOOL, 'isDynamicPartitionWrite', None, False, ),  # 8
     (9, TType.STRING, 'catName', 'UTF8', "hive", ),  # 9
@@ -34135,7 +34810,7 @@ def __ne__(self, other):
     (3, TType.STRING, 'dbname', 'UTF8', None, ),  # 3
     (4, TType.STRING, 'tablename', 'UTF8', None, ),  # 4
     (5, TType.LIST, 'partitionnames', (TType.STRING, 'UTF8', False), None, ),  # 5
-    (6, TType.I32, 'operationType', None, 5, ),  # 6
+    (6, TType.I32, 'operationType', None,     5, ),  # 6
 )
 all_structs.append(BasicTxnInfo)
 BasicTxnInfo.thrift_spec = (
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/facebook_service.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/facebook_service.rb
new file mode 100644
index 000000000000..6ec6821a40ce
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/facebook_service.rb
@@ -0,0 +1,722 @@
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'fb303_types'
+
+module FacebookService
+  class Client
+    include ::Thrift::Client
+
+    def getName()
+      send_getName()
+      return recv_getName()
+    end
+
+    def send_getName()
+      send_message('getName', GetName_args)
+    end
+
+    def recv_getName()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getName')
+      result = receive_message(GetName_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getName failed: unknown result')
+    end
+
+    def getVersion()
+      send_getVersion()
+      return recv_getVersion()
+    end
+
+    def send_getVersion()
+      send_message('getVersion', GetVersion_args)
+    end
+
+    def recv_getVersion()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getVersion')
+      result = receive_message(GetVersion_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getVersion failed: unknown result')
+    end
+
+    def getStatus()
+      send_getStatus()
+      return recv_getStatus()
+    end
+
+    def send_getStatus()
+      send_message('getStatus', GetStatus_args)
+    end
+
+    def recv_getStatus()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getStatus')
+      result = receive_message(GetStatus_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getStatus failed: unknown result')
+    end
+
+    def getStatusDetails()
+      send_getStatusDetails()
+      return recv_getStatusDetails()
+    end
+
+    def send_getStatusDetails()
+      send_message('getStatusDetails', GetStatusDetails_args)
+    end
+
+    def recv_getStatusDetails()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getStatusDetails')
+      result = receive_message(GetStatusDetails_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getStatusDetails failed: unknown result')
+    end
+
+    def getCounters()
+      send_getCounters()
+      return recv_getCounters()
+    end
+
+    def send_getCounters()
+      send_message('getCounters', GetCounters_args)
+    end
+
+    def recv_getCounters()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getCounters')
+      result = receive_message(GetCounters_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getCounters failed: unknown result')
+    end
+
+    def getCounter(key)
+      send_getCounter(key)
+      return recv_getCounter()
+    end
+
+    def send_getCounter(key)
+      send_message('getCounter', GetCounter_args, :key => key)
+    end
+
+    def recv_getCounter()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getCounter')
+      result = receive_message(GetCounter_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getCounter failed: unknown result')
+    end
+
+    def setOption(key, value)
+      send_setOption(key, value)
+      recv_setOption()
+    end
+
+    def send_setOption(key, value)
+      send_message('setOption', SetOption_args, :key => key, :value => value)
+    end
+
+    def recv_setOption()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'setOption')
+      result = receive_message(SetOption_result)
+      return
+    end
+
+    def getOption(key)
+      send_getOption(key)
+      return recv_getOption()
+    end
+
+    def send_getOption(key)
+      send_message('getOption', GetOption_args, :key => key)
+    end
+
+    def recv_getOption()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getOption')
+      result = receive_message(GetOption_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getOption failed: unknown result')
+    end
+
+    def getOptions()
+      send_getOptions()
+      return recv_getOptions()
+    end
+
+    def send_getOptions()
+      send_message('getOptions', GetOptions_args)
+    end
+
+    def recv_getOptions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getOptions')
+      result = receive_message(GetOptions_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getOptions failed: unknown result')
+    end
+
+    def getCpuProfile(profileDurationInSec)
+      send_getCpuProfile(profileDurationInSec)
+      return recv_getCpuProfile()
+    end
+
+    def send_getCpuProfile(profileDurationInSec)
+      send_message('getCpuProfile', GetCpuProfile_args, :profileDurationInSec => profileDurationInSec)
+    end
+
+    def recv_getCpuProfile()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getCpuProfile')
+      result = receive_message(GetCpuProfile_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getCpuProfile failed: unknown result')
+    end
+
+    def aliveSince()
+      send_aliveSince()
+      return recv_aliveSince()
+    end
+
+    def send_aliveSince()
+      send_message('aliveSince', AliveSince_args)
+    end
+
+    def recv_aliveSince()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'aliveSince')
+      result = receive_message(AliveSince_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'aliveSince failed: unknown result')
+    end
+
+    def reinitialize()
+      send_reinitialize()
+    end
+
+    def send_reinitialize()
+      send_oneway_message('reinitialize', Reinitialize_args)
+    end
+    def shutdown()
+      send_shutdown()
+    end
+
+    def send_shutdown()
+      send_oneway_message('shutdown', Shutdown_args)
+    end
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def process_getName(seqid, iprot, oprot)
+      args = read_args(iprot, GetName_args)
+      result = GetName_result.new()
+      result.success = @handler.getName()
+      write_result(result, oprot, 'getName', seqid)
+    end
+
+    def process_getVersion(seqid, iprot, oprot)
+      args = read_args(iprot, GetVersion_args)
+      result = GetVersion_result.new()
+      result.success = @handler.getVersion()
+      write_result(result, oprot, 'getVersion', seqid)
+    end
+
+    def process_getStatus(seqid, iprot, oprot)
+      args = read_args(iprot, GetStatus_args)
+      result = GetStatus_result.new()
+      result.success = @handler.getStatus()
+      write_result(result, oprot, 'getStatus', seqid)
+    end
+
+    def process_getStatusDetails(seqid, iprot, oprot)
+      args = read_args(iprot, GetStatusDetails_args)
+      result = GetStatusDetails_result.new()
+      result.success = @handler.getStatusDetails()
+      write_result(result, oprot, 'getStatusDetails', seqid)
+    end
+
+    def process_getCounters(seqid, iprot, oprot)
+      args = read_args(iprot, GetCounters_args)
+      result = GetCounters_result.new()
+      result.success = @handler.getCounters()
+      write_result(result, oprot, 'getCounters', seqid)
+    end
+
+    def process_getCounter(seqid, iprot, oprot)
+      args = read_args(iprot, GetCounter_args)
+      result = GetCounter_result.new()
+      result.success = @handler.getCounter(args.key)
+      write_result(result, oprot, 'getCounter', seqid)
+    end
+
+    def process_setOption(seqid, iprot, oprot)
+      args = read_args(iprot, SetOption_args)
+      result = SetOption_result.new()
+      @handler.setOption(args.key, args.value)
+      write_result(result, oprot, 'setOption', seqid)
+    end
+
+    def process_getOption(seqid, iprot, oprot)
+      args = read_args(iprot, GetOption_args)
+      result = GetOption_result.new()
+      result.success = @handler.getOption(args.key)
+      write_result(result, oprot, 'getOption', seqid)
+    end
+
+    def process_getOptions(seqid, iprot, oprot)
+      args = read_args(iprot, GetOptions_args)
+      result = GetOptions_result.new()
+      result.success = @handler.getOptions()
+      write_result(result, oprot, 'getOptions', seqid)
+    end
+
+    def process_getCpuProfile(seqid, iprot, oprot)
+      args = read_args(iprot, GetCpuProfile_args)
+      result = GetCpuProfile_result.new()
+      result.success = @handler.getCpuProfile(args.profileDurationInSec)
+      write_result(result, oprot, 'getCpuProfile', seqid)
+    end
+
+    def process_aliveSince(seqid, iprot, oprot)
+      args = read_args(iprot, AliveSince_args)
+      result = AliveSince_result.new()
+      result.success = @handler.aliveSince()
+      write_result(result, oprot, 'aliveSince', seqid)
+    end
+
+    def process_reinitialize(seqid, iprot, oprot)
+      args = read_args(iprot, Reinitialize_args)
+      @handler.reinitialize()
+      return
+    end
+
+    def process_shutdown(seqid, iprot, oprot)
+      args = read_args(iprot, Shutdown_args)
+      @handler.shutdown()
+      return
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class GetName_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetName_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetVersion_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetVersion_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetStatus_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetStatus_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success', :enum_class => ::Fb_status}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+      unless @success.nil? || ::Fb_status::VALID_VALUES.include?(@success)
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field success!')
+      end
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetStatusDetails_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetStatusDetails_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetCounters_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetCounters_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::I64}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetCounter_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    KEY = 1
+
+    FIELDS = {
+      KEY => {:type => ::Thrift::Types::STRING, :name => 'key'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetCounter_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I64, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class SetOption_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    KEY = 1
+    VALUE = 2
+
+    FIELDS = {
+      KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
+      VALUE => {:type => ::Thrift::Types::STRING, :name => 'value'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class SetOption_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetOption_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    KEY = 1
+
+    FIELDS = {
+      KEY => {:type => ::Thrift::Types::STRING, :name => 'key'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetOption_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetOptions_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetOptions_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetCpuProfile_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    PROFILEDURATIONINSEC = 1
+
+    FIELDS = {
+      PROFILEDURATIONINSEC => {:type => ::Thrift::Types::I32, :name => 'profileDurationInSec'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetCpuProfile_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class AliveSince_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class AliveSince_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I64, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Reinitialize_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Reinitialize_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Shutdown_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Shutdown_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end
+
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/fb303_constants.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/fb303_constants.rb
new file mode 100644
index 000000000000..90a9add4696d
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/fb303_constants.rb
@@ -0,0 +1,9 @@
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'fb303_types'
+
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/fb303_types.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/fb303_types.rb
new file mode 100644
index 000000000000..934edeadb47c
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/fb303_types.rb
@@ -0,0 +1,19 @@
+#
+# Autogenerated by Thrift Compiler (0.23.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Fb_status
+  DEAD = 0
+  STARTING = 1
+  ALIVE = 2
+  STOPPING = 3
+  STOPPED = 4
+  WARNING = 5
+  VALUE_MAP = {0 => "DEAD", 1 => "STARTING", 2 => "ALIVE", 3 => "STOPPING", 4 => "STOPPED", 5 => "WARNING"}
+  VALID_VALUES = Set.new([DEAD, STARTING, ALIVE, STOPPING, STOPPED, WARNING]).freeze
+end
+
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_constants.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_constants.rb
index dc2b185abdf6..1fffea4d4d76 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_constants.rb
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_constants.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb
index 3905ff02a889..8fd55104f3a8 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -1242,7 +1242,7 @@ class PropertySetRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nameSpace is unset!') unless @nameSpace
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nameSpace is unset!') unless @nameSpace
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1265,7 +1265,7 @@ class PropertyGetRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nameSpace is unset!') unless @nameSpace
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nameSpace is unset!') unless @nameSpace
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1309,7 +1309,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @objectType.nil? || ::HiveObjectType::VALID_VALUES.include?(@objectType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field objectType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field objectType!')
     end
   end
 
@@ -1336,7 +1336,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @grantorType.nil? || ::PrincipalType::VALID_VALUES.include?(@grantorType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field grantorType!')
     end
   end
 
@@ -1363,7 +1363,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @principalType.nil? || ::PrincipalType::VALID_VALUES.include?(@principalType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principalType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principalType!')
     end
   end
 
@@ -1422,7 +1422,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @requestType.nil? || ::GrantRevokeType::VALID_VALUES.include?(@requestType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field requestType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field requestType!')
     end
   end
 
@@ -1466,8 +1466,8 @@ class TruncateTableRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1532,10 +1532,10 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @principalType.nil? || ::PrincipalType::VALID_VALUES.include?(@principalType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principalType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principalType!')
     end
     unless @grantorPrincipalType.nil? || ::PrincipalType::VALID_VALUES.include?(@grantorPrincipalType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorPrincipalType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field grantorPrincipalType!')
     end
   end
 
@@ -1555,10 +1555,10 @@ class GetRoleGrantsForPrincipalRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field principal_name is unset!') unless @principal_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field principal_type is unset!') unless @principal_type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field principal_name is unset!') unless @principal_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field principal_type is unset!') unless @principal_type
     unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principal_type!')
     end
   end
 
@@ -1576,7 +1576,7 @@ class GetRoleGrantsForPrincipalResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field principalGrants is unset!') unless @principalGrants
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field principalGrants is unset!') unless @principalGrants
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1593,7 +1593,7 @@ class GetPrincipalsInRoleRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field roleName is unset!') unless @roleName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field roleName is unset!') unless @roleName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1610,7 +1610,7 @@ class GetPrincipalsInRoleResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field principalGrants is unset!') unless @principalGrants
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field principalGrants is unset!') unless @principalGrants
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1640,13 +1640,13 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @requestType.nil? || ::GrantRevokeType::VALID_VALUES.include?(@requestType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field requestType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field requestType!')
     end
     unless @principalType.nil? || ::PrincipalType::VALID_VALUES.include?(@principalType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principalType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principalType!')
     end
     unless @grantorType.nil? || ::PrincipalType::VALID_VALUES.include?(@grantorType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field grantorType!')
     end
   end
 
@@ -1829,10 +1829,10 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field ownerType!')
     end
     unless @type.nil? || ::DatabaseType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -1868,7 +1868,7 @@ class GetDatabaseObjectsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field databases is unset!') unless @databases
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field databases is unset!') unless @databases
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -1898,7 +1898,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @serdeType.nil? || ::SerdeType::VALID_VALUES.include?(@serdeType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field serdeType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field serdeType!')
     end
   end
 
@@ -2004,10 +2004,10 @@ class CreationMetadata
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablesUsed is unset!') unless @tablesUsed
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablesUsed is unset!') unless @tablesUsed
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2030,9 +2030,9 @@ class BooleanColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numTrues is unset!') unless @numTrues
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numFalses is unset!') unless @numFalses
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numTrues is unset!') unless @numTrues
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numFalses is unset!') unless @numFalses
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2059,8 +2059,8 @@ class DoubleColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numDVs is unset!') unless @numDVs
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2087,8 +2087,8 @@ class LongColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numDVs is unset!') unless @numDVs
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2113,10 +2113,10 @@ class StringColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field maxColLen is unset!') unless @maxColLen
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field avgColLen is unset!') unless @avgColLen
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field maxColLen is unset!') unless @maxColLen
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field avgColLen is unset!') unless @avgColLen
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numDVs is unset!') unless @numDVs
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2139,9 +2139,9 @@ class BinaryColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field maxColLen is unset!') unless @maxColLen
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field avgColLen is unset!') unless @avgColLen
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field maxColLen is unset!') unless @maxColLen
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field avgColLen is unset!') unless @avgColLen
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2160,8 +2160,8 @@ class Decimal
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field scale is unset!') unless @scale
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field unscaled is unset!') unless @unscaled
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field scale is unset!') unless @scale
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field unscaled is unset!') unless @unscaled
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2188,8 +2188,8 @@ class DecimalColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numDVs is unset!') unless @numDVs
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2206,7 +2206,7 @@ class Date
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field daysSinceEpoch is unset!') unless @daysSinceEpoch
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field daysSinceEpoch is unset!') unless @daysSinceEpoch
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2233,8 +2233,8 @@ class DateColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numDVs is unset!') unless @numDVs
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2251,7 +2251,7 @@ class Timestamp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field secondsSinceEpoch is unset!') unless @secondsSinceEpoch
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field secondsSinceEpoch is unset!') unless @secondsSinceEpoch
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2278,8 +2278,8 @@ class TimestampColumnStatsData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numNulls is unset!') unless @numNulls
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field numDVs is unset!') unless @numDVs
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2344,7 +2344,7 @@ def timestampStats(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -2365,9 +2365,9 @@ class ColumnStatisticsObj
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colName is unset!') unless @colName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colType is unset!') unless @colType
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field statsData is unset!') unless @statsData
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colName is unset!') unless @colName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colType is unset!') unless @colType
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field statsData is unset!') unless @statsData
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2394,9 +2394,9 @@ class ColumnStatisticsDesc
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field isTblLevel is unset!') if @isTblLevel.nil?
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field isTblLevel is unset!') if @isTblLevel.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2419,8 +2419,8 @@ class ColumnStatistics
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field statsDesc is unset!') unless @statsDesc
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field statsObj is unset!') unless @statsObj
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field statsDesc is unset!') unless @statsDesc
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field statsObj is unset!') unless @statsObj
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2457,7 +2457,7 @@ class ObjectDictionary
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2529,7 +2529,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field ownerType!')
     end
   end
 
@@ -2553,10 +2553,10 @@ class SourceTable
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field insertedCount is unset!') unless @insertedCount
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field updatedCount is unset!') unless @updatedCount
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field deletedCount is unset!') unless @deletedCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field insertedCount is unset!') unless @insertedCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field updatedCount is unset!') unless @updatedCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field deletedCount is unset!') unless @deletedCount
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2707,8 +2707,8 @@ class AggrStats
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colStats is unset!') unless @colStats
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partsFound is unset!') unless @partsFound
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colStats is unset!') unless @colStats
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partsFound is unset!') unless @partsFound
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2733,7 +2733,7 @@ class SetPartitionsStatsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colStats is unset!') unless @colStats
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colStats is unset!') unless @colStats
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2750,7 +2750,7 @@ class SetPartitionsStatsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field result is unset!') if @result.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field result is unset!') if @result.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2789,8 +2789,8 @@ class PrimaryKeysRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2807,7 +2807,7 @@ class PrimaryKeysResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field primaryKeys is unset!') unless @primaryKeys
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field primaryKeys is unset!') unless @primaryKeys
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2848,7 +2848,7 @@ class ForeignKeysResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field foreignKeys is unset!') unless @foreignKeys
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field foreignKeys is unset!') unless @foreignKeys
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2869,9 +2869,9 @@ class UniqueConstraintsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2888,7 +2888,7 @@ class UniqueConstraintsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field uniqueConstraints is unset!') unless @uniqueConstraints
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field uniqueConstraints is unset!') unless @uniqueConstraints
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2909,9 +2909,9 @@ class NotNullConstraintsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2928,7 +2928,7 @@ class NotNullConstraintsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field notNullConstraints is unset!') unless @notNullConstraints
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field notNullConstraints is unset!') unless @notNullConstraints
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2949,9 +2949,9 @@ class DefaultConstraintsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2968,7 +2968,7 @@ class DefaultConstraintsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field defaultConstraints is unset!') unless @defaultConstraints
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field defaultConstraints is unset!') unless @defaultConstraints
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -2989,9 +2989,9 @@ class CheckConstraintsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3008,7 +3008,7 @@ class CheckConstraintsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field checkConstraints is unset!') unless @checkConstraints
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field checkConstraints is unset!') unless @checkConstraints
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3029,9 +3029,9 @@ class AllTableConstraintsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3048,7 +3048,7 @@ class AllTableConstraintsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field allTableConstraints is unset!') unless @allTableConstraints
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field allTableConstraints is unset!') unless @allTableConstraints
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3071,9 +3071,9 @@ class DropConstraintRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablename is unset!') unless @tablename
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field constraintname is unset!') unless @constraintname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablename is unset!') unless @tablename
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field constraintname is unset!') unless @constraintname
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3090,7 +3090,7 @@ class AddPrimaryKeyRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field primaryKeyCols is unset!') unless @primaryKeyCols
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field primaryKeyCols is unset!') unless @primaryKeyCols
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3107,7 +3107,7 @@ class AddForeignKeyRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field foreignKeyCols is unset!') unless @foreignKeyCols
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field foreignKeyCols is unset!') unless @foreignKeyCols
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3124,7 +3124,7 @@ class AddUniqueConstraintRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field uniqueConstraintCols is unset!') unless @uniqueConstraintCols
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field uniqueConstraintCols is unset!') unless @uniqueConstraintCols
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3141,7 +3141,7 @@ class AddNotNullConstraintRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field notNullConstraintCols is unset!') unless @notNullConstraintCols
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field notNullConstraintCols is unset!') unless @notNullConstraintCols
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3158,7 +3158,7 @@ class AddDefaultConstraintRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field defaultConstraintCols is unset!') unless @defaultConstraintCols
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field defaultConstraintCols is unset!') unless @defaultConstraintCols
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3175,7 +3175,7 @@ class AddCheckConstraintRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field checkConstraintCols is unset!') unless @checkConstraintCols
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field checkConstraintCols is unset!') unless @checkConstraintCols
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3194,8 +3194,8 @@ class PartitionsByExprResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitions is unset!') unless @partitions
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hasUnknownPartitions is unset!') if @hasUnknownPartitions.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitions is unset!') unless @partitions
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hasUnknownPartitions is unset!') if @hasUnknownPartitions.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3214,8 +3214,8 @@ class PartitionsSpecByExprResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitionsSpec is unset!') unless @partitionsSpec
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hasUnknownPartitions is unset!') if @hasUnknownPartitions.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitionsSpec is unset!') unless @partitionsSpec
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hasUnknownPartitions is unset!') if @hasUnknownPartitions.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3254,9 +3254,9 @@ class PartitionsByExprRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field expr is unset!') unless @expr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field expr is unset!') unless @expr
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3275,7 +3275,7 @@ class TableStatsResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableStats is unset!') unless @tableStats
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableStats is unset!') unless @tableStats
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3294,7 +3294,7 @@ class PartitionsStatsResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partStats is unset!') unless @partStats
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partStats is unset!') unless @partStats
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3323,9 +3323,9 @@ class TableStatsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colNames is unset!') unless @colNames
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colNames is unset!') unless @colNames
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3354,10 +3354,10 @@ class PartitionsStatsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field colNames is unset!') unless @colNames
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partNames is unset!') unless @partNames
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field colNames is unset!') unless @colNames
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partNames is unset!') unless @partNames
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3412,10 +3412,10 @@ class AddPartitionsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field parts is unset!') unless @parts
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field ifNotExists is unset!') if @ifNotExists.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field parts is unset!') unless @parts
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field ifNotExists is unset!') if @ifNotExists.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3450,7 +3450,7 @@ class DropPartitionsExpr
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field expr is unset!') unless @expr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field expr is unset!') unless @expr
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3479,7 +3479,7 @@ def exprs(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -3514,9 +3514,9 @@ class DropPartitionsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field parts is unset!') unless @parts
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field parts is unset!') unless @parts
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3545,8 +3545,8 @@ class DropPartitionRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3581,9 +3581,9 @@ class PartitionValuesRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitionKeys is unset!') unless @partitionKeys
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitionKeys is unset!') unless @partitionKeys
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3600,7 +3600,7 @@ class PartitionValuesRow
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field row is unset!') unless @row
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field row is unset!') unless @row
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3617,7 +3617,7 @@ class PartitionValuesResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitionValues is unset!') unless @partitionValues
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitionValues is unset!') unless @partitionValues
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3658,8 +3658,8 @@ class GetPartitionsByNamesRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3678,7 +3678,7 @@ class GetPartitionsByNamesResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitions is unset!') unless @partitions
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitions is unset!') unless @partitions
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3710,7 +3710,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field ownerType!')
     end
   end
 
@@ -3731,7 +3731,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @resourceType.nil? || ::ResourceType::VALID_VALUES.include?(@resourceType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field resourceType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field resourceType!')
     end
   end
 
@@ -3766,10 +3766,10 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field ownerType!')
     end
     unless @functionType.nil? || ::FunctionType::VALID_VALUES.include?(@functionType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field functionType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field functionType!')
     end
   end
 
@@ -3803,12 +3803,12 @@ class TxnInfo
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field id is unset!') unless @id
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field state is unset!') unless @state
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field user is unset!') unless @user
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hostname is unset!') unless @hostname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field id is unset!') unless @id
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field state is unset!') unless @state
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field user is unset!') unless @user
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hostname is unset!') unless @hostname
     unless @state.nil? || ::TxnState::VALID_VALUES.include?(@state)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field state!')
     end
   end
 
@@ -3828,8 +3828,8 @@ class GetOpenTxnsInfoResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txn_high_water_mark is unset!') unless @txn_high_water_mark
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field open_txns is unset!') unless @open_txns
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txn_high_water_mark is unset!') unless @txn_high_water_mark
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field open_txns is unset!') unless @open_txns
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3852,9 +3852,9 @@ class GetOpenTxnsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txn_high_water_mark is unset!') unless @txn_high_water_mark
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field open_txns is unset!') unless @open_txns
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field abortedBits is unset!') unless @abortedBits
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txn_high_water_mark is unset!') unless @txn_high_water_mark
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field open_txns is unset!') unless @open_txns
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field abortedBits is unset!') unless @abortedBits
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3883,11 +3883,11 @@ class OpenTxnRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field num_txns is unset!') unless @num_txns
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field user is unset!') unless @user
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hostname is unset!') unless @hostname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field num_txns is unset!') unless @num_txns
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field user is unset!') unless @user
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hostname is unset!') unless @hostname
     unless @txn_type.nil? || ::TxnType::VALID_VALUES.include?(@txn_type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field txn_type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field txn_type!')
     end
   end
 
@@ -3905,7 +3905,7 @@ class OpenTxnsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txn_ids is unset!') unless @txn_ids
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txn_ids is unset!') unless @txn_ids
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3928,9 +3928,9 @@ class AbortTxnRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnid is unset!') unless @txnid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnid is unset!') unless @txnid
     unless @txn_type.nil? || ::TxnType::VALID_VALUES.include?(@txn_type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field txn_type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field txn_type!')
     end
   end
 
@@ -3950,7 +3950,7 @@ class AbortTxnsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txn_ids is unset!') unless @txn_ids
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txn_ids is unset!') unless @txn_ids
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -3971,9 +3971,9 @@ class CommitTxnKeyValue
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableId is unset!') unless @tableId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field value is unset!') unless @value
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableId is unset!') unless @tableId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field key is unset!') unless @key
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field value is unset!') unless @value
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4002,10 +4002,10 @@ class WriteEventInfo
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field writeId is unset!') unless @writeId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field database is unset!') unless @database
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field files is unset!') unless @files
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field writeId is unset!') unless @writeId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field database is unset!') unless @database
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field files is unset!') unless @files
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4030,8 +4030,8 @@ class ReplLastIdInfo
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field database is unset!') unless @database
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lastReplId is unset!') unless @lastReplId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field database is unset!') unless @database
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lastReplId is unset!') unless @lastReplId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4054,10 +4054,10 @@ class UpdateTransactionalStatsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableId is unset!') unless @tableId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field insertCount is unset!') unless @insertCount
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field updatedCount is unset!') unless @updatedCount
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field deletedCount is unset!') unless @deletedCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableId is unset!') unless @tableId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field insertCount is unset!') unless @insertCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field updatedCount is unset!') unless @updatedCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field deletedCount is unset!') unless @deletedCount
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4086,9 +4086,9 @@ class CommitTxnRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnid is unset!') unless @txnid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnid is unset!') unless @txnid
     unless @txn_type.nil? || ::TxnType::VALID_VALUES.include?(@txn_type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field txn_type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field txn_type!')
     end
   end
 
@@ -4116,11 +4116,11 @@ class ReplTblWriteIdStateRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field validWriteIdlist is unset!') unless @validWriteIdlist
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field user is unset!') unless @user
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hostName is unset!') unless @hostName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field validWriteIdlist is unset!') unless @validWriteIdlist
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field user is unset!') unless @user
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hostName is unset!') unless @hostName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4141,7 +4141,7 @@ class GetValidWriteIdsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fullTableNames is unset!') unless @fullTableNames
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fullTableNames is unset!') unless @fullTableNames
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4166,10 +4166,10 @@ class TableValidWriteIds
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fullTableName is unset!') unless @fullTableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field writeIdHighWaterMark is unset!') unless @writeIdHighWaterMark
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field invalidWriteIds is unset!') unless @invalidWriteIds
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field abortedBits is unset!') unless @abortedBits
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fullTableName is unset!') unless @fullTableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field writeIdHighWaterMark is unset!') unless @writeIdHighWaterMark
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field invalidWriteIds is unset!') unless @invalidWriteIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field abortedBits is unset!') unless @abortedBits
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4186,7 +4186,7 @@ class GetValidWriteIdsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblValidWriteIds is unset!') unless @tblValidWriteIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblValidWriteIds is unset!') unless @tblValidWriteIds
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4205,8 +4205,8 @@ class TxnToWriteId
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnId is unset!') unless @txnId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field writeId is unset!') unless @writeId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnId is unset!') unless @txnId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field writeId is unset!') unless @writeId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4233,8 +4233,8 @@ class AllocateTableWriteIdsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4251,7 +4251,7 @@ class AllocateTableWriteIdsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnToWriteIds is unset!') unless @txnToWriteIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnToWriteIds is unset!') unless @txnToWriteIds
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4270,8 +4270,8 @@ class MaxAllocatedTableWriteIdRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4288,7 +4288,7 @@ class MaxAllocatedTableWriteIdResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field maxWriteId is unset!') unless @maxWriteId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field maxWriteId is unset!') unless @maxWriteId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4309,9 +4309,9 @@ class SeedTableWriteIdsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field seedWriteId is unset!') unless @seedWriteId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field seedWriteId is unset!') unless @seedWriteId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4328,7 +4328,7 @@ class SeedTxnIdRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field seedTxnId is unset!') unless @seedTxnId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field seedTxnId is unset!') unless @seedTxnId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4361,17 +4361,17 @@ class LockComponent
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field level is unset!') unless @level
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field level is unset!') unless @level
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
     unless @type.nil? || ::LockType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
     unless @level.nil? || ::LockLevel::VALID_VALUES.include?(@level)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field level!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field level!')
     end
     unless @operationType.nil? || ::DataOperationType::VALID_VALUES.include?(@operationType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field operationType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field operationType!')
     end
   end
 
@@ -4403,9 +4403,9 @@ class LockRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field component is unset!') unless @component
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field user is unset!') unless @user
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hostname is unset!') unless @hostname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field component is unset!') unless @component
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field user is unset!') unless @user
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hostname is unset!') unless @hostname
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4426,10 +4426,10 @@ class LockResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lockid is unset!') unless @lockid
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field state is unset!') unless @state
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lockid is unset!') unless @lockid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field state is unset!') unless @state
     unless @state.nil? || ::LockState::VALID_VALUES.include?(@state)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field state!')
     end
   end
 
@@ -4451,7 +4451,7 @@ class CheckLockRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lockid is unset!') unless @lockid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lockid is unset!') unless @lockid
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4468,7 +4468,7 @@ class UnlockRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lockid is unset!') unless @lockid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lockid is unset!') unless @lockid
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4543,19 +4543,19 @@ class ShowLocksResponseElement
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lockid is unset!') unless @lockid
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field state is unset!') unless @state
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lastheartbeat is unset!') unless @lastheartbeat
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field user is unset!') unless @user
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field hostname is unset!') unless @hostname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catname is unset!') unless @catname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lockid is unset!') unless @lockid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field state is unset!') unless @state
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lastheartbeat is unset!') unless @lastheartbeat
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field user is unset!') unless @user
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field hostname is unset!') unless @hostname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catname is unset!') unless @catname
     unless @state.nil? || ::LockState::VALID_VALUES.include?(@state)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field state!')
     end
     unless @type.nil? || ::LockType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -4579,10 +4579,10 @@ class LockMaterializationRebuildRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnId is unset!') unless @txnId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnId is unset!') unless @txnId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4635,8 +4635,8 @@ class HeartbeatTxnRangeRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field min is unset!') unless @min
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field max is unset!') unless @max
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field min is unset!') unless @min
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field max is unset!') unless @max
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4655,8 +4655,8 @@ class HeartbeatTxnRangeResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field aborted is unset!') unless @aborted
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field nosuch is unset!') unless @nosuch
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field aborted is unset!') unless @aborted
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field nosuch is unset!') unless @nosuch
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4693,11 +4693,11 @@ class CompactionRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablename is unset!') unless @tablename
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablename is unset!') unless @tablename
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
     unless @type.nil? || ::CompactionType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -4751,12 +4751,12 @@ class CompactionInfoStruct
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field id is unset!') unless @id
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablename is unset!') unless @tablename
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field id is unset!') unless @id
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablename is unset!') unless @tablename
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
     unless @type.nil? || ::CompactionType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -4802,14 +4802,14 @@ class CompactionMetricsDataStruct
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblname is unset!') unless @tblname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field metricvalue is unset!') unless @metricvalue
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field version is unset!') unless @version
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field threshold is unset!') unless @threshold
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblname is unset!') unless @tblname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field metricvalue is unset!') unless @metricvalue
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field version is unset!') unless @version
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field threshold is unset!') unless @threshold
     unless @type.nil? || ::CompactionMetricsMetricType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -4849,11 +4849,11 @@ class CompactionMetricsDataRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
     unless @type.nil? || ::CompactionMetricsMetricType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -4877,9 +4877,9 @@ class CompactionResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field id is unset!') unless @id
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field state is unset!') unless @state
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field accepted is unset!') if @accepted.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field id is unset!') unless @id
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field state is unset!') unless @state
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field accepted is unset!') if @accepted.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -4913,7 +4913,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @type.nil? || ::CompactionType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -4977,12 +4977,12 @@ class ShowCompactResponseElement
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablename is unset!') unless @tablename
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field state is unset!') unless @state
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablename is unset!') unless @tablename
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field state is unset!') unless @state
     unless @type.nil? || ::CompactionType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -5000,7 +5000,7 @@ class ShowCompactResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field compacts is unset!') unless @compacts
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field compacts is unset!') unless @compacts
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5021,7 +5021,7 @@ class AbortCompactionRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field compactionIds is unset!') unless @compactionIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field compactionIds is unset!') unless @compactionIds
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5042,7 +5042,7 @@ class AbortCompactionResponseElement
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field compactionId is unset!') unless @compactionId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field compactionId is unset!') unless @compactionId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5059,7 +5059,7 @@ class AbortCompactResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field abortedcompacts is unset!') unless @abortedcompacts
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field abortedcompacts is unset!') unless @abortedcompacts
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5082,8 +5082,8 @@ class GetLatestCommittedCompactionInfoRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablename is unset!') unless @tablename
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablename is unset!') unless @tablename
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5100,7 +5100,7 @@ class GetLatestCommittedCompactionInfoResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field compactions is unset!') unless @compactions
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field compactions is unset!') unless @compactions
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5147,13 +5147,13 @@ class AddDynamicPartitions
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnid is unset!') unless @txnid
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field writeid is unset!') unless @writeid
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbname is unset!') unless @dbname
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tablename is unset!') unless @tablename
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitionnames is unset!') unless @partitionnames
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnid is unset!') unless @txnid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field writeid is unset!') unless @writeid
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbname is unset!') unless @dbname
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tablename is unset!') unless @tablename
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitionnames is unset!') unless @partitionnames
     unless @operationType.nil? || ::DataOperationType::VALID_VALUES.include?(@operationType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field operationType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field operationType!')
     end
   end
 
@@ -5181,7 +5181,7 @@ class BasicTxnInfo
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field isnull is unset!') if @isnull.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field isnull is unset!') if @isnull.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5210,7 +5210,7 @@ class NotificationEventRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lastEvent is unset!') unless @lastEvent
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field lastEvent is unset!') unless @lastEvent
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5241,10 +5241,10 @@ class NotificationEvent
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field eventId is unset!') unless @eventId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field eventTime is unset!') unless @eventTime
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field eventType is unset!') unless @eventType
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field message is unset!') unless @message
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field eventId is unset!') unless @eventId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field eventTime is unset!') unless @eventTime
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field eventType is unset!') unless @eventType
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field message is unset!') unless @message
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5261,7 +5261,7 @@ class NotificationEventResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field events is unset!') unless @events
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field events is unset!') unless @events
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5278,7 +5278,7 @@ class CurrentNotificationEventId
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field eventId is unset!') unless @eventId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field eventId is unset!') unless @eventId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5305,8 +5305,8 @@ class NotificationEventsCountRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fromEventId is unset!') unless @fromEventId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fromEventId is unset!') unless @fromEventId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5323,7 +5323,7 @@ class NotificationEventsCountResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field eventsCount is unset!') unless @eventsCount
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field eventsCount is unset!') unless @eventsCount
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5348,7 +5348,7 @@ class InsertEventRequestData
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field filesAdded is unset!') unless @filesAdded
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field filesAdded is unset!') unless @filesAdded
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5383,7 +5383,7 @@ def refreshEvent(val)
   def struct_fields; FIELDS; end
 
   def validate
-    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
   end
 
   ::Thrift::Union.generate_accessors self
@@ -5414,8 +5414,8 @@ class FireEventRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field successful is unset!') if @successful.nil?
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field data is unset!') unless @data
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field successful is unset!') if @successful.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field data is unset!') unless @data
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5458,11 +5458,11 @@ class WriteNotificationLogRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnId is unset!') unless @txnId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field writeId is unset!') unless @writeId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db is unset!') unless @db
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fileInfo is unset!') unless @fileInfo
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnId is unset!') unless @txnId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field writeId is unset!') unless @writeId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db is unset!') unless @db
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fileInfo is unset!') unless @fileInfo
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5500,10 +5500,10 @@ class WriteNotificationLogBatchRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catalog is unset!') unless @catalog
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db is unset!') unless @db
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field requestList is unset!') unless @requestList
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catalog is unset!') unless @catalog
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db is unset!') unless @db
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field requestList is unset!') unless @requestList
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5555,8 +5555,8 @@ class GetFileMetadataByExprResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field metadata is unset!') unless @metadata
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field isSupported is unset!') if @isSupported.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field metadata is unset!') unless @metadata
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field isSupported is unset!') if @isSupported.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5579,10 +5579,10 @@ class GetFileMetadataByExprRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fileIds is unset!') unless @fileIds
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field expr is unset!') unless @expr
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fileIds is unset!') unless @fileIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field expr is unset!') unless @expr
     unless @type.nil? || ::FileMetadataExprType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -5602,8 +5602,8 @@ class GetFileMetadataResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field metadata is unset!') unless @metadata
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field isSupported is unset!') if @isSupported.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field metadata is unset!') unless @metadata
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field isSupported is unset!') if @isSupported.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5620,7 +5620,7 @@ class GetFileMetadataRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fileIds is unset!') unless @fileIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fileIds is unset!') unless @fileIds
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5656,10 +5656,10 @@ class PutFileMetadataRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fileIds is unset!') unless @fileIds
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field metadata is unset!') unless @metadata
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fileIds is unset!') unless @fileIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field metadata is unset!') unless @metadata
     unless @type.nil? || ::FileMetadataExprType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -5692,7 +5692,7 @@ class ClearFileMetadataRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fileIds is unset!') unless @fileIds
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fileIds is unset!') unless @fileIds
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5709,7 +5709,7 @@ class CacheFileMetadataResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field isSupported is unset!') if @isSupported.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field isSupported is unset!') if @isSupported.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5732,8 +5732,8 @@ class CacheFileMetadataRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5766,7 +5766,7 @@ class ClientCapabilities
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field values is unset!') unless @values
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5821,8 +5821,8 @@ class GetTableRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5841,7 +5841,7 @@ class GetTableResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5872,7 +5872,7 @@ class GetTablesRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5889,7 +5889,7 @@ class GetTablesResult
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tables is unset!') unless @tables
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tables is unset!') unless @tables
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5918,10 +5918,10 @@ class GetTablesExtRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catalog is unset!') unless @catalog
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field database is unset!') unless @database
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableNamePattern is unset!') unless @tableNamePattern
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field requestedFields is unset!') unless @requestedFields
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catalog is unset!') unless @catalog
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field database is unset!') unless @database
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableNamePattern is unset!') unless @tableNamePattern
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field requestedFields is unset!') unless @requestedFields
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5944,7 +5944,7 @@ class ExtendedTableInfo
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5977,8 +5977,8 @@ class DropTableRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -5999,7 +5999,7 @@ class AsyncOperationResp
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field id is unset!') unless @id
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field id is unset!') unless @id
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6040,8 +6040,8 @@ class AlterDatabaseRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field oldDbName is unset!') unless @oldDbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field newDb is unset!') unless @newDb
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field oldDbName is unset!') unless @oldDbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field newDb is unset!') unless @newDb
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6078,10 +6078,10 @@ class DropDatabaseRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field name is unset!') unless @name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field ignoreUnknownDb is unset!') if @ignoreUnknownDb.nil?
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field deleteData is unset!') if @deleteData.nil?
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field cascade is unset!') if @cascade.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field name is unset!') unless @name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field ignoreUnknownDb is unset!') if @ignoreUnknownDb.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field deleteData is unset!') if @deleteData.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field cascade is unset!') if @cascade.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6104,7 +6104,7 @@ class GetFunctionsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6141,8 +6141,8 @@ class CmRecycleRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dataPath is unset!') unless @dataPath
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field purge is unset!') if @purge.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dataPath is unset!') unless @dataPath
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field purge is unset!') if @purge.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6186,11 +6186,11 @@ class TableMeta
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableType is unset!') unless @tableType
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableType is unset!') unless @tableType
     unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field ownerType!')
     end
   end
 
@@ -6210,8 +6210,8 @@ class Materialization
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sourceTablesUpdateDeleteModified is unset!') if @sourceTablesUpdateDeleteModified.nil?
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field sourceTablesCompacted is unset!') if @sourceTablesCompacted.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sourceTablesUpdateDeleteModified is unset!') if @sourceTablesUpdateDeleteModified.nil?
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field sourceTablesCompacted is unset!') if @sourceTablesCompacted.nil?
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6236,9 +6236,9 @@ class WMResourcePlan
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field name is unset!') unless @name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field name is unset!') unless @name
     unless @status.nil? || ::WMResourcePlanStatus::VALID_VALUES.include?(@status)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field status!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field status!')
     end
   end
 
@@ -6269,7 +6269,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @status.nil? || ::WMResourcePlanStatus::VALID_VALUES.include?(@status)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field status!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field status!')
     end
   end
 
@@ -6297,8 +6297,8 @@ class WMPool
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field resourcePlanName is unset!') unless @resourcePlanName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field poolPath is unset!') unless @poolPath
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field resourcePlanName is unset!') unless @resourcePlanName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field poolPath is unset!') unless @poolPath
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6327,8 +6327,8 @@ class WMNullablePool
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field resourcePlanName is unset!') unless @resourcePlanName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field poolPath is unset!') unless @poolPath
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field resourcePlanName is unset!') unless @resourcePlanName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field poolPath is unset!') unless @poolPath
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6355,8 +6355,8 @@ class WMTrigger
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field resourcePlanName is unset!') unless @resourcePlanName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field triggerName is unset!') unless @triggerName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field resourcePlanName is unset!') unless @resourcePlanName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field triggerName is unset!') unless @triggerName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6383,9 +6383,9 @@ class WMMapping
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field resourcePlanName is unset!') unless @resourcePlanName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field entityType is unset!') unless @entityType
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field entityName is unset!') unless @entityName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field resourcePlanName is unset!') unless @resourcePlanName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field entityType is unset!') unless @entityType
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field entityName is unset!') unless @entityName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6406,8 +6406,8 @@ class WMPoolTrigger
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field pool is unset!') unless @pool
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field trigger is unset!') unless @trigger
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field pool is unset!') unless @pool
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field trigger is unset!') unless @trigger
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -6432,8 +6432,8 @@ class WMFullResourcePlan
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field plan is unset!') unless @plan
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field pools is unset!') unless @pools
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field plan is unset!') unless @plan
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field pools is unset!') unless @pools
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7042,13 +7042,13 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @schemaType.nil? || ::SchemaType::VALID_VALUES.include?(@schemaType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field schemaType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field schemaType!')
     end
     unless @compatibility.nil? || ::SchemaCompatibility::VALID_VALUES.include?(@compatibility)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field compatibility!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field compatibility!')
     end
     unless @validationLevel.nil? || ::SchemaValidation::VALID_VALUES.include?(@validationLevel)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field validationLevel!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field validationLevel!')
     end
   end
 
@@ -7123,7 +7123,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @state.nil? || ::SchemaVersionState::VALID_VALUES.include?(@state)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field state!')
     end
   end
 
@@ -7216,7 +7216,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @state.nil? || ::SchemaVersionState::VALID_VALUES.include?(@state)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field state!')
     end
   end
 
@@ -7254,8 +7254,8 @@ class RuntimeStat
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field weight is unset!') unless @weight
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field payload is unset!') unless @payload
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field weight is unset!') unless @weight
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field payload is unset!') unless @payload
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7274,8 +7274,8 @@ class GetRuntimeStatsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field maxWeight is unset!') unless @maxWeight
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field maxCreateTime is unset!') unless @maxCreateTime
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field maxWeight is unset!') unless @maxWeight
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field maxCreateTime is unset!') unless @maxCreateTime
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7310,7 +7310,7 @@ class CreateTableRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7351,12 +7351,12 @@ class CreateDatabaseRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field databaseName is unset!') unless @databaseName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field databaseName is unset!') unless @databaseName
     unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field ownerType!')
     end
     unless @type.nil? || ::DatabaseType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -7374,7 +7374,7 @@ class CreateDataConnectorRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field connector is unset!') unless @connector
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field connector is unset!') unless @connector
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7391,7 +7391,7 @@ class GetDataConnectorRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field connectorName is unset!') unless @connectorName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field connectorName is unset!') unless @connectorName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7410,8 +7410,8 @@ class AlterDataConnectorRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field connectorName is unset!') unless @connectorName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field newConnector is unset!') unless @newConnector
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field connectorName is unset!') unless @connectorName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field newConnector is unset!') unless @newConnector
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7432,7 +7432,7 @@ class DropDataConnectorRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field connectorName is unset!') unless @connectorName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field connectorName is unset!') unless @connectorName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7449,7 +7449,7 @@ class ScheduledQueryPollRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field clusterNamespace is unset!') unless @clusterNamespace
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field clusterNamespace is unset!') unless @clusterNamespace
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7468,8 +7468,8 @@ class ScheduledQueryKey
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field scheduleName is unset!') unless @scheduleName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field clusterNamespace is unset!') unless @clusterNamespace
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field scheduleName is unset!') unless @scheduleName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field clusterNamespace is unset!') unless @clusterNamespace
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7518,7 +7518,7 @@ class ScheduledQuery
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field scheduleKey is unset!') unless @scheduleKey
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field scheduleKey is unset!') unless @scheduleKey
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7537,10 +7537,10 @@ class ScheduledQueryMaintenanceRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field scheduledQuery is unset!') unless @scheduledQuery
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field type is unset!') unless @type
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field scheduledQuery is unset!') unless @scheduledQuery
     unless @type.nil? || ::ScheduledQueryMaintenanceRequestType::VALID_VALUES.include?(@type)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field type!')
     end
   end
 
@@ -7564,11 +7564,11 @@ class ScheduledQueryProgressInfo
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field scheduledExecutionId is unset!') unless @scheduledExecutionId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field state is unset!') unless @state
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field executorQueryId is unset!') unless @executorQueryId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field scheduledExecutionId is unset!') unless @scheduledExecutionId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field state is unset!') unless @state
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field executorQueryId is unset!') unless @executorQueryId
     unless @state.nil? || ::QueryState::VALID_VALUES.include?(@state)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field state!')
     end
   end
 
@@ -7602,9 +7602,9 @@ class AlterPartitionsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitions is unset!') unless @partitions
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitions is unset!') unless @partitions
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7631,8 +7631,8 @@ class AppendPartitionsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7678,10 +7678,10 @@ class RenamePartitionRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partVals is unset!') unless @partVals
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field newPart is unset!') unless @newPart
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partVals is unset!') unless @partVals
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field newPart is unset!') unless @newPart
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7733,9 +7733,9 @@ class AlterTableRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tableName is unset!') unless @tableName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table is unset!') unless @table
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tableName is unset!') unless @tableName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table is unset!') unless @table
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7777,9 +7777,9 @@ class TableParamsUpdate
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field table_name is unset!') unless @table_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field params is unset!') unless @params
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field table_name is unset!') unless @table_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field params is unset!') unless @params
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7799,7 +7799,7 @@ def struct_fields; FIELDS; end
 
   def validate
     unless @filterMode.nil? || ::PartitionFilterMode::VALID_VALUES.include?(@filterMode)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field filterMode!')
+      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field filterMode!')
     end
   end
 
@@ -7879,8 +7879,8 @@ class GetFieldsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7897,7 +7897,7 @@ class GetFieldsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fields is unset!') unless @fields
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fields is unset!') unless @fields
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7924,8 +7924,8 @@ class GetSchemaRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7942,7 +7942,7 @@ class GetSchemaResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fields is unset!') unless @fields
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field fields is unset!') unless @fields
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7969,9 +7969,9 @@ class GetPartitionRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partVals is unset!') unless @partVals
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partVals is unset!') unless @partVals
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -7988,7 +7988,7 @@ class GetPartitionResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partition is unset!') unless @partition
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partition is unset!') unless @partition
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8021,8 +8021,8 @@ class PartitionsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8039,7 +8039,7 @@ class PartitionsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitions is unset!') unless @partitions
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitions is unset!') unless @partitions
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8098,8 +8098,8 @@ class GetPartitionNamesPsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8116,7 +8116,7 @@ class GetPartitionNamesPsResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field names is unset!') unless @names
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field names is unset!') unless @names
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8157,8 +8157,8 @@ class GetPartitionsPsWithAuthRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tblName is unset!') unless @tblName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tblName is unset!') unless @tblName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8175,7 +8175,7 @@ class GetPartitionsPsWithAuthResponse
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field partitions is unset!') unless @partitions
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field partitions is unset!') unless @partitions
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8202,9 +8202,9 @@ class ReplicationMetrics
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field scheduledExecutionId is unset!') unless @scheduledExecutionId
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field policy is unset!') unless @policy
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dumpExecutionId is unset!') unless @dumpExecutionId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field scheduledExecutionId is unset!') unless @scheduledExecutionId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field policy is unset!') unless @policy
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dumpExecutionId is unset!') unless @dumpExecutionId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8221,7 +8221,7 @@ class ReplicationMetricList
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field replicationMetricList is unset!') unless @replicationMetricList
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field replicationMetricList is unset!') unless @replicationMetricList
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8278,9 +8278,9 @@ class StoredProcedureRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field procName is unset!') unless @procName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field procName is unset!') unless @procName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8299,7 +8299,7 @@ class ListStoredProcedureRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8370,9 +8370,9 @@ class GetPackageRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field packageName is unset!') unless @packageName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field packageName is unset!') unless @packageName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8393,9 +8393,9 @@ class DropPackageRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field dbName is unset!') unless @dbName
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field packageName is unset!') unless @packageName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field dbName is unset!') unless @dbName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field packageName is unset!') unless @packageName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8414,7 +8414,7 @@ class ListPackageRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field catName is unset!') unless @catName
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field catName is unset!') unless @catName
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8461,7 +8461,7 @@ class GetAllWriteEventInfoRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field txnId is unset!') unless @txnId
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field txnId is unset!') unless @txnId
   end
 
   ::Thrift::Struct.generate_accessors self
@@ -8490,8 +8490,8 @@ class DeleteColumnStatisticsRequest
   def struct_fields; FIELDS; end
 
   def validate
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field db_name is unset!') unless @db_name
-    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field tbl_name is unset!') unless @tbl_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field db_name is unset!') unless @db_name
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Required field tbl_name is unset!') unless @tbl_name
   end
 
   ::Thrift::Struct.generate_accessors self
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/thrift_hive_metastore.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
index e22db5f468f7..b155ace02e1e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.16.0)
+# Autogenerated by Thrift Compiler (0.23.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -22,6 +22,8 @@ def send_abort_Compactions(rqst)
     end
 
     def recv_abort_Compactions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'abort_Compactions')
       result = receive_message(Abort_Compactions_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'abort_Compactions failed: unknown result')
@@ -37,6 +39,8 @@ def send_getMetaConf(key)
     end
 
     def recv_getMetaConf()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'getMetaConf')
       result = receive_message(GetMetaConf_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -53,6 +57,8 @@ def send_setMetaConf(key, value)
     end
 
     def recv_setMetaConf()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'setMetaConf')
       result = receive_message(SetMetaConf_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -68,6 +74,8 @@ def send_create_catalog(catalog)
     end
 
     def recv_create_catalog()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_catalog')
       result = receive_message(Create_catalog_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -85,6 +93,8 @@ def send_alter_catalog(rqst)
     end
 
     def recv_alter_catalog()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_catalog')
       result = receive_message(Alter_catalog_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -102,6 +112,8 @@ def send_get_catalog(catName)
     end
 
     def recv_get_catalog()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_catalog')
       result = receive_message(Get_catalog_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -119,6 +131,8 @@ def send_get_catalogs()
     end
 
     def recv_get_catalogs()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_catalogs')
       result = receive_message(Get_catalogs_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -135,6 +149,8 @@ def send_drop_catalog(catName)
     end
 
     def recv_drop_catalog()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_catalog')
       result = receive_message(Drop_catalog_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -152,6 +168,8 @@ def send_create_database(database)
     end
 
     def recv_create_database()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_database')
       result = receive_message(Create_database_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -169,6 +187,8 @@ def send_create_database_req(createDatabaseRequest)
     end
 
     def recv_create_database_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_database_req')
       result = receive_message(Create_database_req_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -186,6 +206,8 @@ def send_get_database(name)
     end
 
     def recv_get_database()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_database')
       result = receive_message(Get_database_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -203,6 +225,8 @@ def send_get_database_req(request)
     end
 
     def recv_get_database_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_database_req')
       result = receive_message(Get_database_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -220,6 +244,8 @@ def send_drop_database(name, deleteData, cascade)
     end
 
     def recv_drop_database()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_database')
       result = receive_message(Drop_database_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -237,6 +263,8 @@ def send_drop_database_req(req)
     end
 
     def recv_drop_database_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_database_req')
       result = receive_message(Drop_database_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -255,6 +283,8 @@ def send_get_databases(pattern)
     end
 
     def recv_get_databases()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_databases')
       result = receive_message(Get_databases_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -271,6 +301,8 @@ def send_get_all_databases()
     end
 
     def recv_get_all_databases()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_databases')
       result = receive_message(Get_all_databases_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -287,6 +319,8 @@ def send_get_databases_req(request)
     end
 
     def recv_get_databases_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_databases_req')
       result = receive_message(Get_databases_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -303,6 +337,8 @@ def send_alter_database(dbname, db)
     end
 
     def recv_alter_database()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_database')
       result = receive_message(Alter_database_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -319,6 +355,8 @@ def send_alter_database_req(alterDbReq)
     end
 
     def recv_alter_database_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_database_req')
       result = receive_message(Alter_database_req_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -335,6 +373,8 @@ def send_create_dataconnector_req(connectorReq)
     end
 
     def recv_create_dataconnector_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_dataconnector_req')
       result = receive_message(Create_dataconnector_req_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -352,6 +392,8 @@ def send_get_dataconnector_req(request)
     end
 
     def recv_get_dataconnector_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_dataconnector_req')
       result = receive_message(Get_dataconnector_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -369,6 +411,8 @@ def send_drop_dataconnector_req(dropDcReq)
     end
 
     def recv_drop_dataconnector_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_dataconnector_req')
       result = receive_message(Drop_dataconnector_req_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -386,6 +430,8 @@ def send_get_dataconnectors()
     end
 
     def recv_get_dataconnectors()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_dataconnectors')
       result = receive_message(Get_dataconnectors_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -402,6 +448,8 @@ def send_alter_dataconnector_req(alterReq)
     end
 
     def recv_alter_dataconnector_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_dataconnector_req')
       result = receive_message(Alter_dataconnector_req_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -418,6 +466,8 @@ def send_get_type(name)
     end
 
     def recv_get_type()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_type')
       result = receive_message(Get_type_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -435,6 +485,8 @@ def send_create_type(type)
     end
 
     def recv_create_type()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_type')
       result = receive_message(Create_type_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -453,6 +505,8 @@ def send_drop_type(type)
     end
 
     def recv_drop_type()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_type')
       result = receive_message(Drop_type_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -470,6 +524,8 @@ def send_get_type_all(name)
     end
 
     def recv_get_type_all()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_type_all')
       result = receive_message(Get_type_all_result)
       return result.success unless result.success.nil?
       raise result.o2 unless result.o2.nil?
@@ -486,6 +542,8 @@ def send_get_fields(db_name, table_name)
     end
 
     def recv_get_fields()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_fields')
       result = receive_message(Get_fields_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -504,6 +562,8 @@ def send_get_fields_with_environment_context(db_name, table_name, environment_co
     end
 
     def recv_get_fields_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_fields_with_environment_context')
       result = receive_message(Get_fields_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -522,6 +582,8 @@ def send_get_fields_req(req)
     end
 
     def recv_get_fields_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_fields_req')
       result = receive_message(Get_fields_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -540,6 +602,8 @@ def send_get_schema(db_name, table_name)
     end
 
     def recv_get_schema()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schema')
       result = receive_message(Get_schema_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -558,6 +622,8 @@ def send_get_schema_with_environment_context(db_name, table_name, environment_co
     end
 
     def recv_get_schema_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schema_with_environment_context')
       result = receive_message(Get_schema_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -576,6 +642,8 @@ def send_get_schema_req(req)
     end
 
     def recv_get_schema_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schema_req')
       result = receive_message(Get_schema_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -594,6 +662,8 @@ def send_create_table(tbl)
     end
 
     def recv_create_table()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_table')
       result = receive_message(Create_table_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -612,6 +682,8 @@ def send_create_table_with_environment_context(tbl, environment_context)
     end
 
     def recv_create_table_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_table_with_environment_context')
       result = receive_message(Create_table_with_environment_context_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -630,6 +702,8 @@ def send_create_table_with_constraints(tbl, primaryKeys, foreignKeys, uniqueCons
     end
 
     def recv_create_table_with_constraints()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_table_with_constraints')
       result = receive_message(Create_table_with_constraints_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -648,6 +722,8 @@ def send_create_table_req(request)
     end
 
     def recv_create_table_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_table_req')
       result = receive_message(Create_table_req_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -666,6 +742,8 @@ def send_drop_constraint(req)
     end
 
     def recv_drop_constraint()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_constraint')
       result = receive_message(Drop_constraint_result)
       raise result.o1 unless result.o1.nil?
       raise result.o3 unless result.o3.nil?
@@ -682,6 +760,8 @@ def send_add_primary_key(req)
     end
 
     def recv_add_primary_key()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_primary_key')
       result = receive_message(Add_primary_key_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -698,6 +778,8 @@ def send_add_foreign_key(req)
     end
 
     def recv_add_foreign_key()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_foreign_key')
       result = receive_message(Add_foreign_key_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -714,6 +796,8 @@ def send_add_unique_constraint(req)
     end
 
     def recv_add_unique_constraint()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_unique_constraint')
       result = receive_message(Add_unique_constraint_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -730,6 +814,8 @@ def send_add_not_null_constraint(req)
     end
 
     def recv_add_not_null_constraint()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_not_null_constraint')
       result = receive_message(Add_not_null_constraint_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -746,6 +832,8 @@ def send_add_default_constraint(req)
     end
 
     def recv_add_default_constraint()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_default_constraint')
       result = receive_message(Add_default_constraint_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -762,6 +850,8 @@ def send_add_check_constraint(req)
     end
 
     def recv_add_check_constraint()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_check_constraint')
       result = receive_message(Add_check_constraint_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -778,6 +868,8 @@ def send_translate_table_dryrun(request)
     end
 
     def recv_translate_table_dryrun()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'translate_table_dryrun')
       result = receive_message(Translate_table_dryrun_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -797,6 +889,8 @@ def send_drop_table(dbname, name, deleteData)
     end
 
     def recv_drop_table()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_table')
       result = receive_message(Drop_table_result)
       raise result.o1 unless result.o1.nil?
       raise result.o3 unless result.o3.nil?
@@ -813,6 +907,8 @@ def send_drop_table_with_environment_context(dbname, name, deleteData, environme
     end
 
     def recv_drop_table_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_table_with_environment_context')
       result = receive_message(Drop_table_with_environment_context_result)
       raise result.o1 unless result.o1.nil?
       raise result.o3 unless result.o3.nil?
@@ -829,6 +925,8 @@ def send_drop_table_req(dropTableReq)
     end
 
     def recv_drop_table_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_table_req')
       result = receive_message(Drop_table_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -846,6 +944,8 @@ def send_truncate_table(dbName, tableName, partNames)
     end
 
     def recv_truncate_table()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'truncate_table')
       result = receive_message(Truncate_table_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -861,6 +961,8 @@ def send_truncate_table_req(req)
     end
 
     def recv_truncate_table_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'truncate_table_req')
       result = receive_message(Truncate_table_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -877,6 +979,8 @@ def send_get_tables(db_name, pattern)
     end
 
     def recv_get_tables()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_tables')
       result = receive_message(Get_tables_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -893,6 +997,8 @@ def send_get_tables_by_type(db_name, pattern, tableType)
     end
 
     def recv_get_tables_by_type()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_tables_by_type')
       result = receive_message(Get_tables_by_type_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -909,6 +1015,8 @@ def send_get_all_materialized_view_objects_for_rewriting()
     end
 
     def recv_get_all_materialized_view_objects_for_rewriting()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_materialized_view_objects_for_rewriting')
       result = receive_message(Get_all_materialized_view_objects_for_rewriting_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -925,6 +1033,8 @@ def send_get_materialized_views_for_rewriting(db_name)
     end
 
     def recv_get_materialized_views_for_rewriting()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_materialized_views_for_rewriting')
       result = receive_message(Get_materialized_views_for_rewriting_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -941,6 +1051,8 @@ def send_get_table_meta(db_patterns, tbl_patterns, tbl_types)
     end
 
     def recv_get_table_meta()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_table_meta')
       result = receive_message(Get_table_meta_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -957,6 +1069,8 @@ def send_get_all_tables(db_name)
     end
 
     def recv_get_all_tables()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_tables')
       result = receive_message(Get_all_tables_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -973,6 +1087,8 @@ def send_get_tables_ext(req)
     end
 
     def recv_get_tables_ext()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_tables_ext')
       result = receive_message(Get_tables_ext_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -989,6 +1105,8 @@ def send_get_table_req(req)
     end
 
     def recv_get_table_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_table_req')
       result = receive_message(Get_table_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1006,6 +1124,8 @@ def send_get_table_objects_by_name_req(req)
     end
 
     def recv_get_table_objects_by_name_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_table_objects_by_name_req')
       result = receive_message(Get_table_objects_by_name_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1024,6 +1144,8 @@ def send_get_materialization_invalidation_info(creation_metadata, validTxnList)
     end
 
     def recv_get_materialization_invalidation_info()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_materialization_invalidation_info')
       result = receive_message(Get_materialization_invalidation_info_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1042,6 +1164,8 @@ def send_update_creation_metadata(catName, dbname, tbl_name, creation_metadata)
     end
 
     def recv_update_creation_metadata()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_creation_metadata')
       result = receive_message(Update_creation_metadata_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1059,6 +1183,8 @@ def send_get_table_names_by_filter(dbname, filter, max_tables)
     end
 
     def recv_get_table_names_by_filter()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_table_names_by_filter')
       result = receive_message(Get_table_names_by_filter_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1077,6 +1203,8 @@ def send_alter_table(dbname, tbl_name, new_tbl)
     end
 
     def recv_alter_table()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_table')
       result = receive_message(Alter_table_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1093,6 +1221,8 @@ def send_alter_table_with_environment_context(dbname, tbl_name, new_tbl, environ
     end
 
     def recv_alter_table_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_table_with_environment_context')
       result = receive_message(Alter_table_with_environment_context_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1109,6 +1239,8 @@ def send_alter_table_with_cascade(dbname, tbl_name, new_tbl, cascade)
     end
 
     def recv_alter_table_with_cascade()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_table_with_cascade')
       result = receive_message(Alter_table_with_cascade_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1125,6 +1257,8 @@ def send_alter_table_req(req)
     end
 
     def recv_alter_table_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_table_req')
       result = receive_message(Alter_table_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1142,6 +1276,8 @@ def send_update_table_params(updates)
     end
 
     def recv_update_table_params()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_table_params')
       result = receive_message(Update_table_params_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -1157,6 +1293,8 @@ def send_add_partition(new_part)
     end
 
     def recv_add_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_partition')
       result = receive_message(Add_partition_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1175,6 +1313,8 @@ def send_add_partition_with_environment_context(new_part, environment_context)
     end
 
     def recv_add_partition_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_partition_with_environment_context')
       result = receive_message(Add_partition_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1193,6 +1333,8 @@ def send_add_partitions(new_parts)
     end
 
     def recv_add_partitions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_partitions')
       result = receive_message(Add_partitions_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1211,6 +1353,8 @@ def send_add_partitions_pspec(new_parts)
     end
 
     def recv_add_partitions_pspec()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_partitions_pspec')
       result = receive_message(Add_partitions_pspec_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1229,6 +1373,8 @@ def send_append_partition(db_name, tbl_name, part_vals)
     end
 
     def recv_append_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'append_partition')
       result = receive_message(Append_partition_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1247,6 +1393,8 @@ def send_add_partitions_req(request)
     end
 
     def recv_add_partitions_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_partitions_req')
       result = receive_message(Add_partitions_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1265,6 +1413,8 @@ def send_append_partition_with_environment_context(db_name, tbl_name, part_vals,
     end
 
     def recv_append_partition_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'append_partition_with_environment_context')
       result = receive_message(Append_partition_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1283,6 +1433,8 @@ def send_append_partition_req(appendPartitionsReq)
     end
 
     def recv_append_partition_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'append_partition_req')
       result = receive_message(Append_partition_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1301,6 +1453,8 @@ def send_append_partition_by_name(db_name, tbl_name, part_name)
     end
 
     def recv_append_partition_by_name()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'append_partition_by_name')
       result = receive_message(Append_partition_by_name_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1319,6 +1473,8 @@ def send_append_partition_by_name_with_environment_context(db_name, tbl_name, pa
     end
 
     def recv_append_partition_by_name_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'append_partition_by_name_with_environment_context')
       result = receive_message(Append_partition_by_name_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1337,6 +1493,8 @@ def send_drop_partition(db_name, tbl_name, part_vals, deleteData)
     end
 
     def recv_drop_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_partition')
       result = receive_message(Drop_partition_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1354,6 +1512,8 @@ def send_drop_partition_with_environment_context(db_name, tbl_name, part_vals, d
     end
 
     def recv_drop_partition_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_partition_with_environment_context')
       result = receive_message(Drop_partition_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1371,6 +1531,8 @@ def send_drop_partition_req(dropPartitionReq)
     end
 
     def recv_drop_partition_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_partition_req')
       result = receive_message(Drop_partition_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1388,6 +1550,8 @@ def send_drop_partition_by_name(db_name, tbl_name, part_name, deleteData)
     end
 
     def recv_drop_partition_by_name()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_partition_by_name')
       result = receive_message(Drop_partition_by_name_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1405,6 +1569,8 @@ def send_drop_partition_by_name_with_environment_context(db_name, tbl_name, part
     end
 
     def recv_drop_partition_by_name_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_partition_by_name_with_environment_context')
       result = receive_message(Drop_partition_by_name_with_environment_context_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1422,6 +1588,8 @@ def send_drop_partitions_req(req)
     end
 
     def recv_drop_partitions_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_partitions_req')
       result = receive_message(Drop_partitions_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1439,6 +1607,8 @@ def send_get_partition(db_name, tbl_name, part_vals)
     end
 
     def recv_get_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition')
       result = receive_message(Get_partition_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1456,6 +1626,8 @@ def send_get_partition_req(req)
     end
 
     def recv_get_partition_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_req')
       result = receive_message(Get_partition_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1473,6 +1645,8 @@ def send_exchange_partition(partitionSpecs, source_db, source_table_name, dest_d
     end
 
     def recv_exchange_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'exchange_partition')
       result = receive_message(Exchange_partition_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1492,6 +1666,8 @@ def send_exchange_partitions(partitionSpecs, source_db, source_table_name, dest_
     end
 
     def recv_exchange_partitions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'exchange_partitions')
       result = receive_message(Exchange_partitions_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1511,6 +1687,8 @@ def send_get_partition_with_auth(db_name, tbl_name, part_vals, user_name, group_
     end
 
     def recv_get_partition_with_auth()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_with_auth')
       result = receive_message(Get_partition_with_auth_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1528,6 +1706,8 @@ def send_get_partition_by_name(db_name, tbl_name, part_name)
     end
 
     def recv_get_partition_by_name()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_by_name')
       result = receive_message(Get_partition_by_name_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1545,6 +1725,8 @@ def send_get_partitions(db_name, tbl_name, max_parts)
     end
 
     def recv_get_partitions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions')
       result = receive_message(Get_partitions_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1562,6 +1744,8 @@ def send_get_partitions_req(req)
     end
 
     def recv_get_partitions_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_req')
       result = receive_message(Get_partitions_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1579,6 +1763,8 @@ def send_get_partitions_with_auth(db_name, tbl_name, max_parts, user_name, group
     end
 
     def recv_get_partitions_with_auth()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_with_auth')
       result = receive_message(Get_partitions_with_auth_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1596,6 +1782,8 @@ def send_get_partitions_pspec(db_name, tbl_name, max_parts)
     end
 
     def recv_get_partitions_pspec()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_pspec')
       result = receive_message(Get_partitions_pspec_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1613,6 +1801,8 @@ def send_get_partition_names(db_name, tbl_name, max_parts)
     end
 
     def recv_get_partition_names()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_names')
       result = receive_message(Get_partition_names_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1630,6 +1820,8 @@ def send_fetch_partition_names_req(partitionReq)
     end
 
     def recv_fetch_partition_names_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'fetch_partition_names_req')
       result = receive_message(Fetch_partition_names_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1647,6 +1839,8 @@ def send_get_partition_values(request)
     end
 
     def recv_get_partition_values()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_values')
       result = receive_message(Get_partition_values_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1664,6 +1858,8 @@ def send_get_partitions_ps(db_name, tbl_name, part_vals, max_parts)
     end
 
     def recv_get_partitions_ps()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_ps')
       result = receive_message(Get_partitions_ps_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1681,6 +1877,8 @@ def send_get_partitions_ps_with_auth(db_name, tbl_name, part_vals, max_parts, us
     end
 
     def recv_get_partitions_ps_with_auth()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_ps_with_auth')
       result = receive_message(Get_partitions_ps_with_auth_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1698,6 +1896,8 @@ def send_get_partitions_ps_with_auth_req(req)
     end
 
     def recv_get_partitions_ps_with_auth_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_ps_with_auth_req')
       result = receive_message(Get_partitions_ps_with_auth_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1715,6 +1915,8 @@ def send_get_partition_names_ps(db_name, tbl_name, part_vals, max_parts)
     end
 
     def recv_get_partition_names_ps()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_names_ps')
       result = receive_message(Get_partition_names_ps_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1732,6 +1934,8 @@ def send_get_partition_names_ps_req(req)
     end
 
     def recv_get_partition_names_ps_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_names_ps_req')
       result = receive_message(Get_partition_names_ps_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1749,6 +1953,8 @@ def send_get_partition_names_req(req)
     end
 
     def recv_get_partition_names_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_names_req')
       result = receive_message(Get_partition_names_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1766,6 +1972,8 @@ def send_get_partitions_by_filter(db_name, tbl_name, filter, max_parts)
     end
 
     def recv_get_partitions_by_filter()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_by_filter')
       result = receive_message(Get_partitions_by_filter_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1783,6 +1991,8 @@ def send_get_partitions_by_filter_req(req)
     end
 
     def recv_get_partitions_by_filter_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_by_filter_req')
       result = receive_message(Get_partitions_by_filter_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1800,6 +2010,8 @@ def send_get_part_specs_by_filter(db_name, tbl_name, filter, max_parts)
     end
 
     def recv_get_part_specs_by_filter()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_part_specs_by_filter')
       result = receive_message(Get_part_specs_by_filter_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1817,6 +2029,8 @@ def send_get_partitions_by_expr(req)
     end
 
     def recv_get_partitions_by_expr()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_by_expr')
       result = receive_message(Get_partitions_by_expr_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1834,6 +2048,8 @@ def send_get_partitions_spec_by_expr(req)
     end
 
     def recv_get_partitions_spec_by_expr()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_spec_by_expr')
       result = receive_message(Get_partitions_spec_by_expr_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1851,6 +2067,8 @@ def send_get_num_partitions_by_filter(db_name, tbl_name, filter)
     end
 
     def recv_get_num_partitions_by_filter()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_num_partitions_by_filter')
       result = receive_message(Get_num_partitions_by_filter_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1868,6 +2086,8 @@ def send_get_partitions_by_names(db_name, tbl_name, names)
     end
 
     def recv_get_partitions_by_names()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_by_names')
       result = receive_message(Get_partitions_by_names_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1886,6 +2106,8 @@ def send_get_partitions_by_names_req(req)
     end
 
     def recv_get_partitions_by_names_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_by_names_req')
       result = receive_message(Get_partitions_by_names_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -1904,6 +2126,8 @@ def send_get_properties(req)
     end
 
     def recv_get_properties()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_properties')
       result = receive_message(Get_properties_result)
       return result.success unless result.success.nil?
       raise result.e1 unless result.e1.nil?
@@ -1921,6 +2145,8 @@ def send_set_properties(req)
     end
 
     def recv_set_properties()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'set_properties')
       result = receive_message(Set_properties_result)
       return result.success unless result.success.nil?
       raise result.e1 unless result.e1.nil?
@@ -1938,6 +2164,8 @@ def send_alter_partition(db_name, tbl_name, new_part)
     end
 
     def recv_alter_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_partition')
       result = receive_message(Alter_partition_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1954,6 +2182,8 @@ def send_alter_partitions(db_name, tbl_name, new_parts)
     end
 
     def recv_alter_partitions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_partitions')
       result = receive_message(Alter_partitions_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1970,6 +2200,8 @@ def send_alter_partitions_with_environment_context(db_name, tbl_name, new_parts,
     end
 
     def recv_alter_partitions_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_partitions_with_environment_context')
       result = receive_message(Alter_partitions_with_environment_context_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -1986,6 +2218,8 @@ def send_alter_partitions_req(req)
     end
 
     def recv_alter_partitions_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_partitions_req')
       result = receive_message(Alter_partitions_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2003,6 +2237,8 @@ def send_alter_partition_with_environment_context(db_name, tbl_name, new_part, e
     end
 
     def recv_alter_partition_with_environment_context()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_partition_with_environment_context')
       result = receive_message(Alter_partition_with_environment_context_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -2019,6 +2255,8 @@ def send_rename_partition(db_name, tbl_name, part_vals, new_part)
     end
 
     def recv_rename_partition()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'rename_partition')
       result = receive_message(Rename_partition_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -2035,6 +2273,8 @@ def send_rename_partition_req(req)
     end
 
     def recv_rename_partition_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'rename_partition_req')
       result = receive_message(Rename_partition_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2052,6 +2292,8 @@ def send_partition_name_has_valid_characters(part_vals, throw_exception)
     end
 
     def recv_partition_name_has_valid_characters()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'partition_name_has_valid_characters')
       result = receive_message(Partition_name_has_valid_characters_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2068,6 +2310,8 @@ def send_get_config_value(name, defaultValue)
     end
 
     def recv_get_config_value()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_config_value')
       result = receive_message(Get_config_value_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2084,6 +2328,8 @@ def send_partition_name_to_vals(part_name)
     end
 
     def recv_partition_name_to_vals()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'partition_name_to_vals')
       result = receive_message(Partition_name_to_vals_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2100,6 +2346,8 @@ def send_partition_name_to_spec(part_name)
     end
 
     def recv_partition_name_to_spec()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'partition_name_to_spec')
       result = receive_message(Partition_name_to_spec_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2116,6 +2364,8 @@ def send_markPartitionForEvent(db_name, tbl_name, part_vals, eventType)
     end
 
     def recv_markPartitionForEvent()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'markPartitionForEvent')
       result = receive_message(MarkPartitionForEvent_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -2136,6 +2386,8 @@ def send_isPartitionMarkedForEvent(db_name, tbl_name, part_vals, eventType)
     end
 
     def recv_isPartitionMarkedForEvent()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'isPartitionMarkedForEvent')
       result = receive_message(IsPartitionMarkedForEvent_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2157,6 +2409,8 @@ def send_get_primary_keys(request)
     end
 
     def recv_get_primary_keys()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_primary_keys')
       result = receive_message(Get_primary_keys_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2174,6 +2428,8 @@ def send_get_foreign_keys(request)
     end
 
     def recv_get_foreign_keys()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_foreign_keys')
       result = receive_message(Get_foreign_keys_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2191,6 +2447,8 @@ def send_get_unique_constraints(request)
     end
 
     def recv_get_unique_constraints()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_unique_constraints')
       result = receive_message(Get_unique_constraints_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2208,6 +2466,8 @@ def send_get_not_null_constraints(request)
     end
 
     def recv_get_not_null_constraints()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_not_null_constraints')
       result = receive_message(Get_not_null_constraints_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2225,6 +2485,8 @@ def send_get_default_constraints(request)
     end
 
     def recv_get_default_constraints()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_default_constraints')
       result = receive_message(Get_default_constraints_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2242,6 +2504,8 @@ def send_get_check_constraints(request)
     end
 
     def recv_get_check_constraints()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_check_constraints')
       result = receive_message(Get_check_constraints_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2259,6 +2523,8 @@ def send_get_all_table_constraints(request)
     end
 
     def recv_get_all_table_constraints()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_table_constraints')
       result = receive_message(Get_all_table_constraints_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2276,6 +2542,8 @@ def send_update_table_column_statistics(stats_obj)
     end
 
     def recv_update_table_column_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_table_column_statistics')
       result = receive_message(Update_table_column_statistics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2295,6 +2563,8 @@ def send_update_partition_column_statistics(stats_obj)
     end
 
     def recv_update_partition_column_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_partition_column_statistics')
       result = receive_message(Update_partition_column_statistics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2314,6 +2584,8 @@ def send_update_table_column_statistics_req(req)
     end
 
     def recv_update_table_column_statistics_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_table_column_statistics_req')
       result = receive_message(Update_table_column_statistics_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2333,6 +2605,8 @@ def send_update_partition_column_statistics_req(req)
     end
 
     def recv_update_partition_column_statistics_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_partition_column_statistics_req')
       result = receive_message(Update_partition_column_statistics_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2352,6 +2626,8 @@ def send_update_transaction_statistics(req)
     end
 
     def recv_update_transaction_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_transaction_statistics')
       result = receive_message(Update_transaction_statistics_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -2367,6 +2643,8 @@ def send_get_table_column_statistics(db_name, tbl_name, col_name)
     end
 
     def recv_get_table_column_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_table_column_statistics')
       result = receive_message(Get_table_column_statistics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2386,6 +2664,8 @@ def send_get_partition_column_statistics(db_name, tbl_name, part_name, col_name)
     end
 
     def recv_get_partition_column_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partition_column_statistics')
       result = receive_message(Get_partition_column_statistics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2405,6 +2685,8 @@ def send_get_table_statistics_req(request)
     end
 
     def recv_get_table_statistics_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_table_statistics_req')
       result = receive_message(Get_table_statistics_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2422,6 +2704,8 @@ def send_get_partitions_statistics_req(request)
     end
 
     def recv_get_partitions_statistics_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_statistics_req')
       result = receive_message(Get_partitions_statistics_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2439,6 +2723,8 @@ def send_get_aggr_stats_for(request)
     end
 
     def recv_get_aggr_stats_for()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_aggr_stats_for')
       result = receive_message(Get_aggr_stats_for_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2456,6 +2742,8 @@ def send_set_aggr_stats_for(request)
     end
 
     def recv_set_aggr_stats_for()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'set_aggr_stats_for')
       result = receive_message(Set_aggr_stats_for_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2475,6 +2763,8 @@ def send_delete_partition_column_statistics(db_name, tbl_name, part_name, col_na
     end
 
     def recv_delete_partition_column_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'delete_partition_column_statistics')
       result = receive_message(Delete_partition_column_statistics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2494,6 +2784,8 @@ def send_delete_table_column_statistics(db_name, tbl_name, col_name, engine)
     end
 
     def recv_delete_table_column_statistics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'delete_table_column_statistics')
       result = receive_message(Delete_table_column_statistics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2513,6 +2805,8 @@ def send_delete_column_statistics_req(req)
     end
 
     def recv_delete_column_statistics_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'delete_column_statistics_req')
       result = receive_message(Delete_column_statistics_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2532,6 +2826,8 @@ def send_create_function(func)
     end
 
     def recv_create_function()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_function')
       result = receive_message(Create_function_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -2550,6 +2846,8 @@ def send_drop_function(dbName, funcName)
     end
 
     def recv_drop_function()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_function')
       result = receive_message(Drop_function_result)
       raise result.o1 unless result.o1.nil?
       raise result.o3 unless result.o3.nil?
@@ -2566,6 +2864,8 @@ def send_alter_function(dbName, funcName, newFunc)
     end
 
     def recv_alter_function()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_function')
       result = receive_message(Alter_function_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -2582,6 +2882,8 @@ def send_get_functions(dbName, pattern)
     end
 
     def recv_get_functions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_functions')
       result = receive_message(Get_functions_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2598,6 +2900,8 @@ def send_get_functions_req(request)
     end
 
     def recv_get_functions_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_functions_req')
       result = receive_message(Get_functions_req_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2614,6 +2918,8 @@ def send_get_function(dbName, funcName)
     end
 
     def recv_get_function()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_function')
       result = receive_message(Get_function_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2631,6 +2937,8 @@ def send_get_all_functions()
     end
 
     def recv_get_all_functions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_functions')
       result = receive_message(Get_all_functions_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2647,6 +2955,8 @@ def send_create_role(role)
     end
 
     def recv_create_role()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_role')
       result = receive_message(Create_role_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2663,6 +2973,8 @@ def send_drop_role(role_name)
     end
 
     def recv_drop_role()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_role')
       result = receive_message(Drop_role_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2679,6 +2991,8 @@ def send_get_role_names()
     end
 
     def recv_get_role_names()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_role_names')
       result = receive_message(Get_role_names_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2695,6 +3009,8 @@ def send_grant_role(role_name, principal_name, principal_type, grantor, grantorT
     end
 
     def recv_grant_role()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'grant_role')
       result = receive_message(Grant_role_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2711,6 +3027,8 @@ def send_revoke_role(role_name, principal_name, principal_type)
     end
 
     def recv_revoke_role()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'revoke_role')
       result = receive_message(Revoke_role_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2727,6 +3045,8 @@ def send_list_roles(principal_name, principal_type)
     end
 
     def recv_list_roles()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'list_roles')
       result = receive_message(List_roles_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2743,6 +3063,8 @@ def send_grant_revoke_role(request)
     end
 
     def recv_grant_revoke_role()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'grant_revoke_role')
       result = receive_message(Grant_revoke_role_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2759,6 +3081,8 @@ def send_get_principals_in_role(request)
     end
 
     def recv_get_principals_in_role()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_principals_in_role')
       result = receive_message(Get_principals_in_role_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2775,6 +3099,8 @@ def send_get_role_grants_for_principal(request)
     end
 
     def recv_get_role_grants_for_principal()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_role_grants_for_principal')
       result = receive_message(Get_role_grants_for_principal_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2791,6 +3117,8 @@ def send_get_privilege_set(hiveObject, user_name, group_names)
     end
 
     def recv_get_privilege_set()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_privilege_set')
       result = receive_message(Get_privilege_set_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2807,6 +3135,8 @@ def send_list_privileges(principal_name, principal_type, hiveObject)
     end
 
     def recv_list_privileges()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'list_privileges')
       result = receive_message(List_privileges_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2823,6 +3153,8 @@ def send_grant_privileges(privileges)
     end
 
     def recv_grant_privileges()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'grant_privileges')
       result = receive_message(Grant_privileges_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2839,6 +3171,8 @@ def send_revoke_privileges(privileges)
     end
 
     def recv_revoke_privileges()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'revoke_privileges')
       result = receive_message(Revoke_privileges_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2855,6 +3189,8 @@ def send_grant_revoke_privileges(request)
     end
 
     def recv_grant_revoke_privileges()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'grant_revoke_privileges')
       result = receive_message(Grant_revoke_privileges_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2871,6 +3207,8 @@ def send_refresh_privileges(objToRefresh, authorizer, grantRequest)
     end
 
     def recv_refresh_privileges()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'refresh_privileges')
       result = receive_message(Refresh_privileges_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2887,6 +3225,8 @@ def send_set_ugi(user_name, group_names)
     end
 
     def recv_set_ugi()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'set_ugi')
       result = receive_message(Set_ugi_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2903,6 +3243,8 @@ def send_get_delegation_token(token_owner, renewer_kerberos_principal_name)
     end
 
     def recv_get_delegation_token()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_delegation_token')
       result = receive_message(Get_delegation_token_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2919,6 +3261,8 @@ def send_renew_delegation_token(token_str_form)
     end
 
     def recv_renew_delegation_token()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'renew_delegation_token')
       result = receive_message(Renew_delegation_token_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -2935,6 +3279,8 @@ def send_cancel_delegation_token(token_str_form)
     end
 
     def recv_cancel_delegation_token()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'cancel_delegation_token')
       result = receive_message(Cancel_delegation_token_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -2950,6 +3296,8 @@ def send_add_token(token_identifier, delegation_token)
     end
 
     def recv_add_token()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_token')
       result = receive_message(Add_token_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'add_token failed: unknown result')
@@ -2965,6 +3313,8 @@ def send_remove_token(token_identifier)
     end
 
     def recv_remove_token()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'remove_token')
       result = receive_message(Remove_token_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'remove_token failed: unknown result')
@@ -2980,6 +3330,8 @@ def send_get_token(token_identifier)
     end
 
     def recv_get_token()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_token')
       result = receive_message(Get_token_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_token failed: unknown result')
@@ -2995,6 +3347,8 @@ def send_get_all_token_identifiers()
     end
 
     def recv_get_all_token_identifiers()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_token_identifiers')
       result = receive_message(Get_all_token_identifiers_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_all_token_identifiers failed: unknown result')
@@ -3010,6 +3364,8 @@ def send_add_master_key(key)
     end
 
     def recv_add_master_key()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_master_key')
       result = receive_message(Add_master_key_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3026,6 +3382,8 @@ def send_update_master_key(seq_number, key)
     end
 
     def recv_update_master_key()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_master_key')
       result = receive_message(Update_master_key_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -3042,6 +3400,8 @@ def send_remove_master_key(key_seq)
     end
 
     def recv_remove_master_key()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'remove_master_key')
       result = receive_message(Remove_master_key_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'remove_master_key failed: unknown result')
@@ -3057,6 +3417,8 @@ def send_get_master_keys()
     end
 
     def recv_get_master_keys()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_master_keys')
       result = receive_message(Get_master_keys_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_master_keys failed: unknown result')
@@ -3072,6 +3434,8 @@ def send_get_open_txns()
     end
 
     def recv_get_open_txns()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_open_txns')
       result = receive_message(Get_open_txns_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_open_txns failed: unknown result')
@@ -3087,6 +3451,8 @@ def send_get_open_txns_info()
     end
 
     def recv_get_open_txns_info()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_open_txns_info')
       result = receive_message(Get_open_txns_info_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_open_txns_info failed: unknown result')
@@ -3102,6 +3468,8 @@ def send_open_txns(rqst)
     end
 
     def recv_open_txns()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'open_txns')
       result = receive_message(Open_txns_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'open_txns failed: unknown result')
@@ -3117,6 +3485,8 @@ def send_abort_txn(rqst)
     end
 
     def recv_abort_txn()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'abort_txn')
       result = receive_message(Abort_txn_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3132,6 +3502,8 @@ def send_abort_txns(rqst)
     end
 
     def recv_abort_txns()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'abort_txns')
       result = receive_message(Abort_txns_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3147,6 +3519,8 @@ def send_commit_txn(rqst)
     end
 
     def recv_commit_txn()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'commit_txn')
       result = receive_message(Commit_txn_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -3163,6 +3537,8 @@ def send_get_latest_txnid_in_conflict(txnId)
     end
 
     def recv_get_latest_txnid_in_conflict()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_latest_txnid_in_conflict')
       result = receive_message(Get_latest_txnid_in_conflict_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3179,6 +3555,8 @@ def send_repl_tbl_writeid_state(rqst)
     end
 
     def recv_repl_tbl_writeid_state()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'repl_tbl_writeid_state')
       result = receive_message(Repl_tbl_writeid_state_result)
       return
     end
@@ -3193,6 +3571,8 @@ def send_get_valid_write_ids(rqst)
     end
 
     def recv_get_valid_write_ids()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_valid_write_ids')
       result = receive_message(Get_valid_write_ids_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3210,6 +3590,8 @@ def send_add_write_ids_to_min_history(txnId, writeIds)
     end
 
     def recv_add_write_ids_to_min_history()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_write_ids_to_min_history')
       result = receive_message(Add_write_ids_to_min_history_result)
       raise result.o2 unless result.o2.nil?
       return
@@ -3225,6 +3607,8 @@ def send_allocate_table_write_ids(rqst)
     end
 
     def recv_allocate_table_write_ids()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'allocate_table_write_ids')
       result = receive_message(Allocate_table_write_ids_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3243,6 +3627,8 @@ def send_get_max_allocated_table_write_id(rqst)
     end
 
     def recv_get_max_allocated_table_write_id()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_max_allocated_table_write_id')
       result = receive_message(Get_max_allocated_table_write_id_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3259,6 +3645,8 @@ def send_seed_write_id(rqst)
     end
 
     def recv_seed_write_id()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'seed_write_id')
       result = receive_message(Seed_write_id_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3274,6 +3662,8 @@ def send_seed_txn_id(rqst)
     end
 
     def recv_seed_txn_id()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'seed_txn_id')
       result = receive_message(Seed_txn_id_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3289,6 +3679,8 @@ def send_lock(rqst)
     end
 
     def recv_lock()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'lock')
       result = receive_message(Lock_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3306,6 +3698,8 @@ def send_check_lock(rqst)
     end
 
     def recv_check_lock()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'check_lock')
       result = receive_message(Check_lock_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3324,6 +3718,8 @@ def send_unlock(rqst)
     end
 
     def recv_unlock()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'unlock')
       result = receive_message(Unlock_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -3340,6 +3736,8 @@ def send_show_locks(rqst)
     end
 
     def recv_show_locks()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'show_locks')
       result = receive_message(Show_locks_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'show_locks failed: unknown result')
@@ -3355,6 +3753,8 @@ def send_heartbeat(ids)
     end
 
     def recv_heartbeat()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'heartbeat')
       result = receive_message(Heartbeat_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -3372,6 +3772,8 @@ def send_heartbeat_txn_range(txns)
     end
 
     def recv_heartbeat_txn_range()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'heartbeat_txn_range')
       result = receive_message(Heartbeat_txn_range_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'heartbeat_txn_range failed: unknown result')
@@ -3387,6 +3789,8 @@ def send_compact(rqst)
     end
 
     def recv_compact()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'compact')
       result = receive_message(Compact_result)
       return
     end
@@ -3401,6 +3805,8 @@ def send_compact2(rqst)
     end
 
     def recv_compact2()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'compact2')
       result = receive_message(Compact2_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'compact2 failed: unknown result')
@@ -3416,6 +3822,8 @@ def send_show_compact(rqst)
     end
 
     def recv_show_compact()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'show_compact')
       result = receive_message(Show_compact_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'show_compact failed: unknown result')
@@ -3431,6 +3839,8 @@ def send_submit_for_cleanup(o1, o2, o3)
     end
 
     def recv_submit_for_cleanup()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'submit_for_cleanup')
       result = receive_message(Submit_for_cleanup_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3447,6 +3857,8 @@ def send_add_dynamic_partitions(rqst)
     end
 
     def recv_add_dynamic_partitions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_dynamic_partitions')
       result = receive_message(Add_dynamic_partitions_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -3463,6 +3875,8 @@ def send_find_next_compact(workerId)
     end
 
     def recv_find_next_compact()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'find_next_compact')
       result = receive_message(Find_next_compact_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3479,6 +3893,8 @@ def send_find_next_compact2(rqst)
     end
 
     def recv_find_next_compact2()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'find_next_compact2')
       result = receive_message(Find_next_compact2_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3495,6 +3911,8 @@ def send_update_compactor_state(cr, txn_id)
     end
 
     def recv_update_compactor_state()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_compactor_state')
       result = receive_message(Update_compactor_state_result)
       return
     end
@@ -3509,6 +3927,8 @@ def send_find_columns_with_stats(cr)
     end
 
     def recv_find_columns_with_stats()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'find_columns_with_stats')
       result = receive_message(Find_columns_with_stats_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'find_columns_with_stats failed: unknown result')
@@ -3524,6 +3944,8 @@ def send_mark_cleaned(cr)
     end
 
     def recv_mark_cleaned()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'mark_cleaned')
       result = receive_message(Mark_cleaned_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3539,6 +3961,8 @@ def send_mark_compacted(cr)
     end
 
     def recv_mark_compacted()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'mark_compacted')
       result = receive_message(Mark_compacted_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3554,6 +3978,8 @@ def send_mark_failed(cr)
     end
 
     def recv_mark_failed()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'mark_failed')
       result = receive_message(Mark_failed_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3569,6 +3995,8 @@ def send_mark_refused(cr)
     end
 
     def recv_mark_refused()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'mark_refused')
       result = receive_message(Mark_refused_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3584,6 +4012,8 @@ def send_update_compaction_metrics_data(data)
     end
 
     def recv_update_compaction_metrics_data()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'update_compaction_metrics_data')
       result = receive_message(Update_compaction_metrics_data_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3600,6 +4030,8 @@ def send_remove_compaction_metrics_data(request)
     end
 
     def recv_remove_compaction_metrics_data()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'remove_compaction_metrics_data')
       result = receive_message(Remove_compaction_metrics_data_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -3615,6 +4047,8 @@ def send_set_hadoop_jobid(jobId, cq_id)
     end
 
     def recv_set_hadoop_jobid()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'set_hadoop_jobid')
       result = receive_message(Set_hadoop_jobid_result)
       return
     end
@@ -3629,6 +4063,8 @@ def send_get_latest_committed_compaction_info(rqst)
     end
 
     def recv_get_latest_committed_compaction_info()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_latest_committed_compaction_info')
       result = receive_message(Get_latest_committed_compaction_info_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_latest_committed_compaction_info failed: unknown result')
@@ -3644,6 +4080,8 @@ def send_get_next_notification(rqst)
     end
 
     def recv_get_next_notification()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_next_notification')
       result = receive_message(Get_next_notification_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_next_notification failed: unknown result')
@@ -3659,6 +4097,8 @@ def send_get_current_notificationEventId()
     end
 
     def recv_get_current_notificationEventId()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_current_notificationEventId')
       result = receive_message(Get_current_notificationEventId_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_current_notificationEventId failed: unknown result')
@@ -3674,6 +4114,8 @@ def send_get_notification_events_count(rqst)
     end
 
     def recv_get_notification_events_count()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_notification_events_count')
       result = receive_message(Get_notification_events_count_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_notification_events_count failed: unknown result')
@@ -3689,6 +4131,8 @@ def send_fire_listener_event(rqst)
     end
 
     def recv_fire_listener_event()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'fire_listener_event')
       result = receive_message(Fire_listener_event_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fire_listener_event failed: unknown result')
@@ -3704,6 +4148,8 @@ def send_flushCache()
     end
 
     def recv_flushCache()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'flushCache')
       result = receive_message(FlushCache_result)
       return
     end
@@ -3718,6 +4164,8 @@ def send_add_write_notification_log(rqst)
     end
 
     def recv_add_write_notification_log()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_write_notification_log')
       result = receive_message(Add_write_notification_log_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'add_write_notification_log failed: unknown result')
@@ -3733,6 +4181,8 @@ def send_add_write_notification_log_in_batch(rqst)
     end
 
     def recv_add_write_notification_log_in_batch()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_write_notification_log_in_batch')
       result = receive_message(Add_write_notification_log_in_batch_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'add_write_notification_log_in_batch failed: unknown result')
@@ -3748,6 +4198,8 @@ def send_cm_recycle(request)
     end
 
     def recv_cm_recycle()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'cm_recycle')
       result = receive_message(Cm_recycle_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3764,6 +4216,8 @@ def send_get_file_metadata_by_expr(req)
     end
 
     def recv_get_file_metadata_by_expr()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_file_metadata_by_expr')
       result = receive_message(Get_file_metadata_by_expr_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_file_metadata_by_expr failed: unknown result')
@@ -3779,6 +4233,8 @@ def send_get_file_metadata(req)
     end
 
     def recv_get_file_metadata()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_file_metadata')
       result = receive_message(Get_file_metadata_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_file_metadata failed: unknown result')
@@ -3794,6 +4250,8 @@ def send_put_file_metadata(req)
     end
 
     def recv_put_file_metadata()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'put_file_metadata')
       result = receive_message(Put_file_metadata_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'put_file_metadata failed: unknown result')
@@ -3809,6 +4267,8 @@ def send_clear_file_metadata(req)
     end
 
     def recv_clear_file_metadata()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'clear_file_metadata')
       result = receive_message(Clear_file_metadata_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'clear_file_metadata failed: unknown result')
@@ -3824,6 +4284,8 @@ def send_cache_file_metadata(req)
     end
 
     def recv_cache_file_metadata()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'cache_file_metadata')
       result = receive_message(Cache_file_metadata_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'cache_file_metadata failed: unknown result')
@@ -3839,6 +4301,8 @@ def send_get_metastore_db_uuid()
     end
 
     def recv_get_metastore_db_uuid()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_metastore_db_uuid')
       result = receive_message(Get_metastore_db_uuid_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3855,6 +4319,8 @@ def send_create_resource_plan(request)
     end
 
     def recv_create_resource_plan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_resource_plan')
       result = receive_message(Create_resource_plan_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3873,6 +4339,8 @@ def send_get_resource_plan(request)
     end
 
     def recv_get_resource_plan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_resource_plan')
       result = receive_message(Get_resource_plan_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3890,6 +4358,8 @@ def send_get_active_resource_plan(request)
     end
 
     def recv_get_active_resource_plan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_active_resource_plan')
       result = receive_message(Get_active_resource_plan_result)
       return result.success unless result.success.nil?
       raise result.o2 unless result.o2.nil?
@@ -3906,6 +4376,8 @@ def send_get_all_resource_plans(request)
     end
 
     def recv_get_all_resource_plans()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_resource_plans')
       result = receive_message(Get_all_resource_plans_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3922,6 +4394,8 @@ def send_alter_resource_plan(request)
     end
 
     def recv_alter_resource_plan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_resource_plan')
       result = receive_message(Alter_resource_plan_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3940,6 +4414,8 @@ def send_validate_resource_plan(request)
     end
 
     def recv_validate_resource_plan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'validate_resource_plan')
       result = receive_message(Validate_resource_plan_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3957,6 +4433,8 @@ def send_drop_resource_plan(request)
     end
 
     def recv_drop_resource_plan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_resource_plan')
       result = receive_message(Drop_resource_plan_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3975,6 +4453,8 @@ def send_create_wm_trigger(request)
     end
 
     def recv_create_wm_trigger()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_wm_trigger')
       result = receive_message(Create_wm_trigger_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -3994,6 +4474,8 @@ def send_alter_wm_trigger(request)
     end
 
     def recv_alter_wm_trigger()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_wm_trigger')
       result = receive_message(Alter_wm_trigger_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4012,6 +4494,8 @@ def send_drop_wm_trigger(request)
     end
 
     def recv_drop_wm_trigger()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_wm_trigger')
       result = receive_message(Drop_wm_trigger_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4030,6 +4514,8 @@ def send_get_triggers_for_resourceplan(request)
     end
 
     def recv_get_triggers_for_resourceplan()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_triggers_for_resourceplan')
       result = receive_message(Get_triggers_for_resourceplan_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4047,6 +4533,8 @@ def send_create_wm_pool(request)
     end
 
     def recv_create_wm_pool()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_wm_pool')
       result = receive_message(Create_wm_pool_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4066,6 +4554,8 @@ def send_alter_wm_pool(request)
     end
 
     def recv_alter_wm_pool()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_wm_pool')
       result = receive_message(Alter_wm_pool_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4085,6 +4575,8 @@ def send_drop_wm_pool(request)
     end
 
     def recv_drop_wm_pool()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_wm_pool')
       result = receive_message(Drop_wm_pool_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4103,6 +4595,8 @@ def send_create_or_update_wm_mapping(request)
     end
 
     def recv_create_or_update_wm_mapping()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_or_update_wm_mapping')
       result = receive_message(Create_or_update_wm_mapping_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4122,6 +4616,8 @@ def send_drop_wm_mapping(request)
     end
 
     def recv_drop_wm_mapping()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_wm_mapping')
       result = receive_message(Drop_wm_mapping_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4140,6 +4636,8 @@ def send_create_or_drop_wm_trigger_to_pool_mapping(request)
     end
 
     def recv_create_or_drop_wm_trigger_to_pool_mapping()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_or_drop_wm_trigger_to_pool_mapping')
       result = receive_message(Create_or_drop_wm_trigger_to_pool_mapping_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4159,6 +4657,8 @@ def send_create_ischema(schema)
     end
 
     def recv_create_ischema()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_ischema')
       result = receive_message(Create_ischema_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4176,6 +4676,8 @@ def send_alter_ischema(rqst)
     end
 
     def recv_alter_ischema()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'alter_ischema')
       result = receive_message(Alter_ischema_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4192,6 +4694,8 @@ def send_get_ischema(name)
     end
 
     def recv_get_ischema()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_ischema')
       result = receive_message(Get_ischema_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4209,6 +4713,8 @@ def send_drop_ischema(name)
     end
 
     def recv_drop_ischema()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_ischema')
       result = receive_message(Drop_ischema_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4226,6 +4732,8 @@ def send_add_schema_version(schemaVersion)
     end
 
     def recv_add_schema_version()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_schema_version')
       result = receive_message(Add_schema_version_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4243,6 +4751,8 @@ def send_get_schema_version(schemaVersion)
     end
 
     def recv_get_schema_version()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schema_version')
       result = receive_message(Get_schema_version_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4260,6 +4770,8 @@ def send_get_schema_latest_version(schemaName)
     end
 
     def recv_get_schema_latest_version()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schema_latest_version')
       result = receive_message(Get_schema_latest_version_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4277,6 +4789,8 @@ def send_get_schema_all_versions(schemaName)
     end
 
     def recv_get_schema_all_versions()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schema_all_versions')
       result = receive_message(Get_schema_all_versions_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4294,6 +4808,8 @@ def send_drop_schema_version(schemaVersion)
     end
 
     def recv_drop_schema_version()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_schema_version')
       result = receive_message(Drop_schema_version_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4310,6 +4826,8 @@ def send_get_schemas_by_cols(rqst)
     end
 
     def recv_get_schemas_by_cols()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_schemas_by_cols')
       result = receive_message(Get_schemas_by_cols_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4326,6 +4844,8 @@ def send_map_schema_version_to_serde(rqst)
     end
 
     def recv_map_schema_version_to_serde()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'map_schema_version_to_serde')
       result = receive_message(Map_schema_version_to_serde_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4342,6 +4862,8 @@ def send_set_schema_version_state(rqst)
     end
 
     def recv_set_schema_version_state()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'set_schema_version_state')
       result = receive_message(Set_schema_version_state_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4359,6 +4881,8 @@ def send_add_serde(serde)
     end
 
     def recv_add_serde()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_serde')
       result = receive_message(Add_serde_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4375,6 +4899,8 @@ def send_get_serde(rqst)
     end
 
     def recv_get_serde()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_serde')
       result = receive_message(Get_serde_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4392,6 +4918,8 @@ def send_get_lock_materialization_rebuild(dbName, tableName, txnId)
     end
 
     def recv_get_lock_materialization_rebuild()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_lock_materialization_rebuild')
       result = receive_message(Get_lock_materialization_rebuild_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_lock_materialization_rebuild failed: unknown result')
@@ -4407,6 +4935,8 @@ def send_heartbeat_lock_materialization_rebuild(dbName, tableName, txnId)
     end
 
     def recv_heartbeat_lock_materialization_rebuild()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'heartbeat_lock_materialization_rebuild')
       result = receive_message(Heartbeat_lock_materialization_rebuild_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'heartbeat_lock_materialization_rebuild failed: unknown result')
@@ -4422,6 +4952,8 @@ def send_get_lock_materialization_rebuild_req(req)
     end
 
     def recv_get_lock_materialization_rebuild_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_lock_materialization_rebuild_req')
       result = receive_message(Get_lock_materialization_rebuild_req_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_lock_materialization_rebuild_req failed: unknown result')
@@ -4437,6 +4969,8 @@ def send_heartbeat_lock_materialization_rebuild_req(req)
     end
 
     def recv_heartbeat_lock_materialization_rebuild_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'heartbeat_lock_materialization_rebuild_req')
       result = receive_message(Heartbeat_lock_materialization_rebuild_req_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'heartbeat_lock_materialization_rebuild_req failed: unknown result')
@@ -4452,6 +4986,8 @@ def send_add_runtime_stats(stat)
     end
 
     def recv_add_runtime_stats()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_runtime_stats')
       result = receive_message(Add_runtime_stats_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -4467,6 +5003,8 @@ def send_get_runtime_stats(rqst)
     end
 
     def recv_get_runtime_stats()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_runtime_stats')
       result = receive_message(Get_runtime_stats_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4483,6 +5021,8 @@ def send_get_partitions_with_specs(request)
     end
 
     def recv_get_partitions_with_specs()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_partitions_with_specs')
       result = receive_message(Get_partitions_with_specs_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4499,6 +5039,8 @@ def send_scheduled_query_poll(request)
     end
 
     def recv_scheduled_query_poll()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'scheduled_query_poll')
       result = receive_message(Scheduled_query_poll_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4515,6 +5057,8 @@ def send_scheduled_query_maintenance(request)
     end
 
     def recv_scheduled_query_maintenance()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'scheduled_query_maintenance')
       result = receive_message(Scheduled_query_maintenance_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4533,6 +5077,8 @@ def send_scheduled_query_progress(info)
     end
 
     def recv_scheduled_query_progress()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'scheduled_query_progress')
       result = receive_message(Scheduled_query_progress_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4549,6 +5095,8 @@ def send_get_scheduled_query(scheduleKey)
     end
 
     def recv_get_scheduled_query()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_scheduled_query')
       result = receive_message(Get_scheduled_query_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4566,6 +5114,8 @@ def send_add_replication_metrics(replicationMetricList)
     end
 
     def recv_add_replication_metrics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_replication_metrics')
       result = receive_message(Add_replication_metrics_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -4581,6 +5131,8 @@ def send_get_replication_metrics(rqst)
     end
 
     def recv_get_replication_metrics()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_replication_metrics')
       result = receive_message(Get_replication_metrics_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4597,6 +5149,8 @@ def send_get_open_txns_req(getOpenTxnsRequest)
     end
 
     def recv_get_open_txns_req()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_open_txns_req')
       result = receive_message(Get_open_txns_req_result)
       return result.success unless result.success.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_open_txns_req failed: unknown result')
@@ -4612,6 +5166,8 @@ def send_create_stored_procedure(proc)
     end
 
     def recv_create_stored_procedure()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'create_stored_procedure')
       result = receive_message(Create_stored_procedure_result)
       raise result.o1 unless result.o1.nil?
       raise result.o2 unless result.o2.nil?
@@ -4628,6 +5184,8 @@ def send_get_stored_procedure(request)
     end
 
     def recv_get_stored_procedure()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_stored_procedure')
       result = receive_message(Get_stored_procedure_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4645,6 +5203,8 @@ def send_drop_stored_procedure(request)
     end
 
     def recv_drop_stored_procedure()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_stored_procedure')
       result = receive_message(Drop_stored_procedure_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -4660,6 +5220,8 @@ def send_get_all_stored_procedures(request)
     end
 
     def recv_get_all_stored_procedures()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_stored_procedures')
       result = receive_message(Get_all_stored_procedures_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4676,6 +5238,8 @@ def send_find_package(request)
     end
 
     def recv_find_package()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'find_package')
       result = receive_message(Find_package_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4693,6 +5257,8 @@ def send_add_package(request)
     end
 
     def recv_add_package()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'add_package')
       result = receive_message(Add_package_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -4708,6 +5274,8 @@ def send_get_all_packages(request)
     end
 
     def recv_get_all_packages()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_packages')
       result = receive_message(Get_all_packages_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4724,6 +5292,8 @@ def send_drop_package(request)
     end
 
     def recv_drop_package()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'drop_package')
       result = receive_message(Drop_package_result)
       raise result.o1 unless result.o1.nil?
       return
@@ -4739,6 +5309,8 @@ def send_get_all_write_event_info(request)
     end
 
     def recv_get_all_write_event_info()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_all_write_event_info')
       result = receive_message(Get_all_write_event_info_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -4755,6 +5327,8 @@ def send_get_replayed_txns_for_policy(policyName)
     end
 
     def recv_get_replayed_txns_for_policy()
+      fname, mtype, rseqid = receive_message_begin()
+      validate_message_begin(fname, mtype, rseqid, 'get_replayed_txns_for_policy')
       result = receive_message(Get_replayed_txns_for_policy_result)
       return result.success unless result.success.nil?
       raise result.o1 unless result.o1.nil?
@@ -13033,7 +13607,7 @@ def struct_fields; FIELDS; end
 
     def validate
       unless @eventType.nil? || ::PartitionEventType::VALID_VALUES.include?(@eventType)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field eventType!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field eventType!')
       end
     end
 
@@ -13084,7 +13658,7 @@ def struct_fields; FIELDS; end
 
     def validate
       unless @eventType.nil? || ::PartitionEventType::VALID_VALUES.include?(@eventType)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field eventType!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field eventType!')
       end
     end
 
@@ -14311,10 +14885,10 @@ def struct_fields; FIELDS; end
 
     def validate
       unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principal_type!')
       end
       unless @grantorType.nil? || ::PrincipalType::VALID_VALUES.include?(@grantorType)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorType!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field grantorType!')
       end
     end
 
@@ -14355,7 +14929,7 @@ def struct_fields; FIELDS; end
 
     def validate
       unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principal_type!')
       end
     end
 
@@ -14394,7 +14968,7 @@ def struct_fields; FIELDS; end
 
     def validate
       unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principal_type!')
       end
     end
 
@@ -14575,7 +15149,7 @@ def struct_fields; FIELDS; end
 
     def validate
       unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::INVALID_DATA, 'Invalid value of field principal_type!')
       end
     end
 
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java
index da5bb5360c22..986dcbe05912 100644
--- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java
+++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java
@@ -38,6 +38,17 @@
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenSelector;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
+import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.thrift.transport.THttpClient;
 import org.apache.thrift.transport.TSSLTransportFactory;
 import org.apache.thrift.transport.TServerSocket;
@@ -45,14 +56,6 @@
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.zookeeper.client.ZooKeeperSaslClient;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
-import org.apache.http.ssl.SSLContexts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -393,7 +396,7 @@ public static TTransport getSSLSocket(String host, int port, int socketTimeout,
   public static THttpClient getThriftHttpsClient(String httpsUrl, String trustStorePath,
       String trustStorePasswd, String trustStoreAlgorithm, String trustStoreType,
       String includeProtocols, String includeCipherSuites,
-      HttpClientBuilder underlyingHttpClientBuilder) throws TTransportException, IOException,
+       HttpClientBuilder underlyingHttpClientBuilder) throws TTransportException, IOException,
       KeyStoreException, NoSuchAlgorithmException, CertificateException,
       KeyManagementException {
     Preconditions.checkNotNull(underlyingHttpClientBuilder, "httpClientBuilder should not be null");
@@ -421,12 +424,19 @@ public static THttpClient getThriftHttpsClient(String httpsUrl, String trustStor
     if (parsedCipherSuites.length > 0) {
       ciphers = parsedCipherSuites;
     }
-    SSLConnectionSocketFactory socketFactory =
-        new SSLConnectionSocketFactory(sslContext, protocols, ciphers, new DefaultHostnameVerifier(null));
-    final Registry<ConnectionSocketFactory> registry =
-        RegistryBuilder.<ConnectionSocketFactory> create().register("https", socketFactory)
-            .build();
-    underlyingHttpClientBuilder.setConnectionManager(new BasicHttpClientConnectionManager(registry));
+
+    TlsSocketStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
+        .setSslContext(sslContext)
+        .setTlsVersions(protocols)
+        .setCiphers(ciphers)
+        .setHostnameVerifier(new DefaultHostnameVerifier())
+        .buildClassic(); // Use buildClassic() for synchronous/classic HttpClient
+
+    final Registry<TlsSocketStrategy> registry = RegistryBuilder.<TlsSocketStrategy>create()
+        .register("https", tlsStrategy)
+        .build();
+
+    underlyingHttpClientBuilder.setConnectionManager(BasicHttpClientConnectionManager.create(registry));
     return new THttpClient(httpsUrl, underlyingHttpClientBuilder.build());
   }
 
diff --git a/standalone-metastore/metastore-common/src/main/thrift/fb303.thrift b/standalone-metastore/metastore-common/src/main/thrift/fb303.thrift
new file mode 100644
index 000000000000..f1ca982b8bca
--- /dev/null
+++ b/standalone-metastore/metastore-common/src/main/thrift/fb303.thrift
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * fb303.thrift
+ */
+
+namespace java com.facebook.fb303
+namespace cpp facebook.fb303
+namespace perl Facebook.FB303
+namespace netstd Facebook.FB303.Test
+
+/**
+ * Common status reporting mechanism across all services
+ */
+enum fb_status {
+  DEAD = 0,
+  STARTING = 1,
+  ALIVE = 2,
+  STOPPING = 3,
+  STOPPED = 4,
+  WARNING = 5,
+}
+
+/**
+ * Standard base service
+ */
+service FacebookService {
+
+  /**
+   * Returns a descriptive name of the service
+   */
+  string getName(),
+
+  /**
+   * Returns the version of the service
+   */
+  string getVersion(),
+
+  /**
+   * Gets the status of this service
+   */
+  fb_status getStatus(),
+
+  /**
+   * User friendly description of status, such as why the service is in
+   * the dead or warning state, or what is being started or stopped.
+   */
+  string getStatusDetails(),
+
+  /**
+   * Gets the counters for this service
+   */
+  map<string, i64> getCounters(),
+
+  /**
+   * Gets the value of a single counter
+   */
+  i64 getCounter(1: string key),
+
+  /**
+   * Sets an option
+   */
+  void setOption(1: string key, 2: string value),
+
+  /**
+   * Gets an option
+   */
+  string getOption(1: string key),
+
+  /**
+   * Gets all options
+   */
+  map<string, string> getOptions(),
+
+  /**
+   * Returns a CPU profile over the given time interval (client and server
+   * must agree on the profile format).
+   */
+  string getCpuProfile(1: i32 profileDurationInSec),
+
+  /**
+   * Returns the unix time that the server has been running since
+   */
+  i64 aliveSince(),
+
+  /**
+   * Tell the server to reload its configuration, reopen log files, etc
+   */
+  oneway void reinitialize(),
+
+  /**
+   * Suggest a shutdown to the server
+   */
+  oneway void shutdown(),
+
+}
diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
index b52e6f1fd45e..f492581d6b97 100644
--- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
+++ b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
@@ -22,7 +22,7 @@
 # Thrift Service that the MetaStore is built on
 #
 
-include "share/fb303/if/fb303.thrift"
+include "fb303.thrift"
 
 namespace java org.apache.hadoop.hive.metastore.api
 namespace php metastore
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index 64926eaba1c9..4fc224f51718 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -31,16 +31,9 @@
       <version>${hive.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpcomponents.client.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
+      <version>${httpcomponents5.client.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.orc</groupId>
@@ -288,6 +281,16 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index b7a0004c76bd..c53883369afc 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -415,7 +415,7 @@ public void setThreadFactory(ThreadFactory threadFactory) {
     boolean jwt = MetastoreConf.getVar(conf, ConfVars.THRIFT_METASTORE_AUTHENTICATION).equalsIgnoreCase("jwt");
     AuthType authType = jwt ? AuthType.JWT : AuthType.SIMPLE;
     ServletSecurity security = new ServletSecurity(authType, conf);
-    Servlet thriftHttpServlet = security.proxy(new TServlet(processor, protocolFactory));
+    Servlet thriftHttpServlet = security.proxy(new HiveThriftServlet(processor, protocolFactory));
 
     boolean directSqlEnabled = MetastoreConf.getBoolVar(conf, ConfVars.TRY_DIRECT_SQL);
     HMSHandler.LOG.info("Direct SQL optimization = {}",  directSqlEnabled);
@@ -602,7 +602,13 @@ public void preServe() {
       @Override
       public ServerContext createContext(TProtocol tProtocol, TProtocol tProtocol1) {
         Metrics.getOpenConnectionsCounter().inc();
-        return null;
+        return new ServerContext() {
+          // Implement required ServerContext interface methods as no-ops
+          @Override
+          public <T> T unwrap(Class<T> iface) { return null; }
+          @Override
+          public boolean isWrapperFor(Class<?> iface) { return false; }
+        };
       }
 
       @Override
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveThriftServlet.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveThriftServlet.java
new file mode 100644
index 000000000000..70c463e106b5
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveThriftServlet.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore;
+
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.transport.TTransport;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class HiveThriftServlet extends HttpServlet {
+  private final TProcessor processor;
+  private final TProtocolFactory inProtocolFactory;
+  private final TProtocolFactory outProtocolFactory;
+
+  public HiveThriftServlet(TProcessor processor, TProtocolFactory inProtocolFactory, TProtocolFactory outProtocolFactory) {
+    this.processor = processor;
+    this.inProtocolFactory = inProtocolFactory;
+    this.outProtocolFactory = outProtocolFactory;
+  }
+
+  public HiveThriftServlet(TProcessor processor, TProtocolFactory protocolFactory) {
+    this(processor, protocolFactory, protocolFactory);
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+      throws ServletException {
+    try {
+      resp.setContentType("application/x-thrift");
+      InputStream in = req.getInputStream();
+      OutputStream out = resp.getOutputStream();
+      TTransport transport = new TIOStreamTransport(in, out);
+
+      processor.process(inProtocolFactory.getProtocol(transport), outProtocolFactory.getProtocol(transport));
+      out.flush();
+    } catch (Exception e) {
+      throw new ServletException(e);
+    }
+  }
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+      throws ServletException, IOException {
+    doPost(req, resp);
+  }
+}
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java
index 75d2e7c0a6b4..4814d4199511 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java
@@ -55,7 +55,7 @@
 public class TUGIBasedProcessor<I extends Iface> extends TSetIpAddressProcessor<Iface> {
 
   private final I iface;
-  private final Map<String,  org.apache.thrift.ProcessFunction<Iface, ? extends  TBase>>
+  private final Map<String,  org.apache.thrift.ProcessFunction<Iface, ? extends  TBase, ? extends  TBase>>
     functions;
   static final Logger LOG = LoggerFactory.getLogger(TUGIBasedProcessor.class);
 
@@ -73,7 +73,7 @@ public void process(final TProtocol in, final TProtocol out) throws TException {
    setIpAddress(in);
 
    final TMessage msg = in.readMessageBegin();
-   final ProcessFunction<Iface, ? extends  TBase> fn = functions.get(msg.name);
+   final ProcessFunction<Iface, ? extends  TBase, ? extends  TBase> fn = functions.get(msg.name);
    if (fn == null) {
      TProtocolUtil.skip(in, TType.STRUCT);
      in.readMessageEnd();
diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreHttpHeaders.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreHttpHeaders.java
index f7988f95b3c5..5f3cbb2906db 100644
--- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreHttpHeaders.java
+++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreHttpHeaders.java
@@ -26,12 +26,13 @@
 import org.apache.hadoop.hive.metastore.client.builder.DatabaseBuilder;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge;
-import org.apache.http.Header;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -58,9 +59,9 @@ public TestHiveMetaStoreClient(Configuration conf) throws MetaException {
     @Override
     protected HttpClientBuilder createHttpClientBuilder() throws MetaException {
       HttpClientBuilder builder = super.createHttpClientBuilder();
-      builder.addInterceptorLast(new HttpRequestInterceptor() {
+      builder.addRequestInterceptorLast(new HttpRequestInterceptor() {
         @Override
-        public void process(HttpRequest httpRequest, HttpContext httpContext) throws HttpException, IOException {
+        public void process(HttpRequest httpRequest, EntityDetails entity, HttpContext httpContext) throws HttpException, IOException {
           Header header1 = httpRequest.getFirstHeader(testHeaderKey1);
           Assert.assertEquals(testHeaderVal1, header1.getValue());
           Header header2 = httpRequest.getFirstHeader(testHeaderKey2);
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 5e52e03e1d3c..10900c70a549 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -96,7 +96,7 @@
     <junit.vintage.version>5.13.3</junit.vintage.version>
     <junit.platform.version>1.13.3</junit.platform.version>
     <libfb303.version>0.9.3</libfb303.version>
-    <libthrift.version>0.16.0</libthrift.version>
+    <libthrift.version>0.23.0</libthrift.version>
     <log4j2.version>2.25.3</log4j2.version>
     <mockito-core.version>5.17.0</mockito-core.version>
     <orc.version>2.1.2</orc.version>
@@ -119,8 +119,8 @@
     <spotbugs.version>4.8.6</spotbugs.version>
     <caffeine.version>2.8.4</caffeine.version>
     <slf4j.version>1.7.30</slf4j.version>
-    <httpcomponents.core.version>4.4.13</httpcomponents.core.version>
-    <httpcomponents.client.version>4.5.13</httpcomponents.client.version>
+    <httpcomponents5.client.version>5.6.2</httpcomponents5.client.version>
+    <httpcomponents5.core.version>5.4.3</httpcomponents5.core.version>
     <pac4j-core.version>4.5.8</pac4j-core.version>
     <nimbus-oauth.version>11.28</nimbus-oauth.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
@@ -328,6 +328,11 @@
         <artifactId>log4j-1.2-api</artifactId>
         <version>${log4j2.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <artifactId>httpclient5</artifactId>
+        <version>5.3.1</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libfb303</artifactId>
@@ -337,6 +342,16 @@
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
         <version>${libthrift.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.datanucleus</groupId>
@@ -443,9 +458,9 @@
         <scope>runtime</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>${httpcomponents.core.version}</version>
+        <groupId>org.apache.httpcomponents.core5</groupId>
+        <artifactId>httpcore5</artifactId>
+        <version>${httpcomponents5.core.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>